forked from Mirrors/wine-wine
Cleanup code that is strange or difficult to parse.
parent
b3eaa866e2
commit
3c0211f969
|
@ -1858,6 +1858,7 @@ static void TAB_DrawItem(
|
|||
TAB_DrawItemInterior(hwnd, hdc, iItem, &r);
|
||||
SelectObject(hdc,hOldFont);
|
||||
}
|
||||
|
||||
/* Draw the focus rectangle */
|
||||
if (((lStyle & TCS_FOCUSNEVER) == 0) &&
|
||||
(GetFocus() == hwnd) &&
|
||||
|
|
|
@ -65,7 +65,7 @@ static D3DHAL_CALLBACKS d3d_hal_cbs1;
|
|||
static D3DHAL_CALLBACKS2 d3d_hal_cbs2;
|
||||
|
||||
/* in real windoze, these entry points are 16-bit, but we can work in 32-bit */
|
||||
static BOOL DDAPI set_hal_info(LPDDHALINFO lpDDHalInfo, BOOL reset)
|
||||
static BOOL WINAPI set_hal_info(LPDDHALINFO lpDDHalInfo, BOOL reset)
|
||||
{
|
||||
dd_cbs.HALDD = *lpDDHalInfo->lpDDCallbacks;
|
||||
dd_cbs.HALDDSurface = *lpDDHalInfo->lpDDSurfaceCallbacks;
|
||||
|
|
|
@ -344,6 +344,7 @@ char* MSVCRT_setlocale(int category, const char* locale)
|
|||
case MSVCRT_LC_NUMERIC:
|
||||
if (!lc_all) break;
|
||||
case MSVCRT_LC_TIME:
|
||||
break;
|
||||
}
|
||||
UNLOCK_LOCALE;
|
||||
return MSVCRT_current_lc_all;
|
||||
|
@ -442,6 +443,7 @@ char* MSVCRT_setlocale(int category, const char* locale)
|
|||
case MSVCRT_LC_NUMERIC:
|
||||
if (!lc_all) break;
|
||||
case MSVCRT_LC_TIME:
|
||||
break;
|
||||
}
|
||||
UNLOCK_LOCALE;
|
||||
return MSVCRT_current_lc_all;
|
||||
|
@ -517,4 +519,3 @@ int _getmbcp(void)
|
|||
{
|
||||
return MSVCRT_current_lc_all_cp;
|
||||
}
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ static void EXC_DefaultHandling( EXCEPTION_RECORD *rec, CONTEXT *context )
|
|||
/***********************************************************************
|
||||
* RtlRaiseException (NTDLL.@)
|
||||
*/
|
||||
DEFINE_REGS_ENTRYPOINT_1( RtlRaiseException, EXC_RtlRaiseException, EXCEPTION_RECORD * )
|
||||
DEFINE_REGS_ENTRYPOINT_1( RtlRaiseException, EXC_RtlRaiseException, EXCEPTION_RECORD * );
|
||||
void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
|
||||
{
|
||||
PEXCEPTION_FRAME frame, dispatch, nested_frame;
|
||||
|
@ -234,7 +234,7 @@ void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
|
|||
* RtlUnwind (NTDLL.@)
|
||||
*/
|
||||
DEFINE_REGS_ENTRYPOINT_4( RtlUnwind, EXC_RtlUnwind,
|
||||
PEXCEPTION_FRAME, LPVOID, PEXCEPTION_RECORD, DWORD )
|
||||
PEXCEPTION_FRAME, LPVOID, PEXCEPTION_RECORD, DWORD );
|
||||
void WINAPI EXC_RtlUnwind( PEXCEPTION_FRAME pEndFrame, LPVOID unusedEip,
|
||||
PEXCEPTION_RECORD pRecord, DWORD returnEax,
|
||||
CONTEXT *context )
|
||||
|
@ -311,7 +311,7 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_FRAME pEndFrame, LPVOID unusedEip,
|
|||
* NtRaiseException (NTDLL.@)
|
||||
*/
|
||||
DEFINE_REGS_ENTRYPOINT_3( NtRaiseException, EXC_NtRaiseException,
|
||||
EXCEPTION_RECORD *, CONTEXT *, BOOL )
|
||||
EXCEPTION_RECORD *, CONTEXT *, BOOL );
|
||||
void WINAPI EXC_NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *ctx,
|
||||
BOOL first, CONTEXT *context )
|
||||
{
|
||||
|
|
|
@ -857,7 +857,8 @@ HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface,
|
|||
|
||||
else{
|
||||
/* Otherwise, the method calls IMoniker::BindToObject on the pmkToLeft parameter, requesting an */
|
||||
/* IParseDisplayName interface pointer to the object identified by the moniker, and passes the display */ /* name to IParseDisplayName::ParseDisplayName */
|
||||
/* IParseDisplayName interface pointer to the object identified by the moniker, and passes the display */
|
||||
/* name to IParseDisplayName::ParseDisplayName */
|
||||
res=IMoniker_BindToObject(pmkToLeft,pbc,NULL,&IID_IOleItemContainer,(void**)&poic);
|
||||
|
||||
if (SUCCEEDED(res)){
|
||||
|
|
|
@ -31,156 +31,156 @@ static LPCSTR hresult_to_string( HRESULT hr )
|
|||
{
|
||||
switch ( hr )
|
||||
{
|
||||
#define ENTRY(x) case x: return (const char*)#x;
|
||||
#define ENTRY(x) case x: return (const char*)#x
|
||||
/* some known codes */
|
||||
ENTRY(S_OK)
|
||||
ENTRY(S_FALSE)
|
||||
ENTRY(E_FAIL)
|
||||
ENTRY(E_POINTER)
|
||||
ENTRY(E_NOTIMPL)
|
||||
ENTRY(E_NOINTERFACE)
|
||||
ENTRY(E_OUTOFMEMORY)
|
||||
ENTRY(CLASS_E_CLASSNOTAVAILABLE)
|
||||
ENTRY(CLASS_E_NOAGGREGATION)
|
||||
ENTRY(S_OK);
|
||||
ENTRY(S_FALSE);
|
||||
ENTRY(E_FAIL);
|
||||
ENTRY(E_POINTER);
|
||||
ENTRY(E_NOTIMPL);
|
||||
ENTRY(E_NOINTERFACE);
|
||||
ENTRY(E_OUTOFMEMORY);
|
||||
ENTRY(CLASS_E_CLASSNOTAVAILABLE);
|
||||
ENTRY(CLASS_E_NOAGGREGATION);
|
||||
|
||||
/* vfwmsgs.h */
|
||||
ENTRY(VFW_S_NO_MORE_ITEMS)
|
||||
ENTRY(VFW_E_BAD_KEY)
|
||||
ENTRY(VFW_E_INVALIDMEDIATYPE)
|
||||
ENTRY(VFW_E_INVALIDSUBTYPE)
|
||||
ENTRY(VFW_E_NEED_OWNER)
|
||||
ENTRY(VFW_E_ENUM_OUT_OF_SYNC)
|
||||
ENTRY(VFW_E_ALREADY_CONNECTED)
|
||||
ENTRY(VFW_E_FILTER_ACTIVE)
|
||||
ENTRY(VFW_E_NO_TYPES)
|
||||
ENTRY(VFW_E_NO_ACCEPTABLE_TYPES)
|
||||
ENTRY(VFW_E_INVALID_DIRECTION)
|
||||
ENTRY(VFW_E_NOT_CONNECTED)
|
||||
ENTRY(VFW_E_NO_ALLOCATOR)
|
||||
ENTRY(VFW_E_RUNTIME_ERROR)
|
||||
ENTRY(VFW_E_BUFFER_NOTSET)
|
||||
ENTRY(VFW_E_BUFFER_OVERFLOW)
|
||||
ENTRY(VFW_E_BADALIGN)
|
||||
ENTRY(VFW_E_ALREADY_COMMITTED)
|
||||
ENTRY(VFW_E_BUFFERS_OUTSTANDING)
|
||||
ENTRY(VFW_E_NOT_COMMITTED)
|
||||
ENTRY(VFW_E_SIZENOTSET)
|
||||
ENTRY(VFW_E_NO_CLOCK)
|
||||
ENTRY(VFW_E_NO_SINK)
|
||||
ENTRY(VFW_E_NO_INTERFACE)
|
||||
ENTRY(VFW_E_NOT_FOUND)
|
||||
ENTRY(VFW_E_CANNOT_CONNECT)
|
||||
ENTRY(VFW_E_CANNOT_RENDER)
|
||||
ENTRY(VFW_E_CHANGING_FORMAT)
|
||||
ENTRY(VFW_E_NO_COLOR_KEY_SET)
|
||||
ENTRY(VFW_E_NOT_OVERLAY_CONNECTION)
|
||||
ENTRY(VFW_E_NOT_SAMPLE_CONNECTION)
|
||||
ENTRY(VFW_E_PALETTE_SET)
|
||||
ENTRY(VFW_E_COLOR_KEY_SET)
|
||||
ENTRY(VFW_E_NO_COLOR_KEY_FOUND)
|
||||
ENTRY(VFW_E_NO_PALETTE_AVAILABLE)
|
||||
ENTRY(VFW_E_NO_DISPLAY_PALETTE)
|
||||
ENTRY(VFW_E_TOO_MANY_COLORS)
|
||||
ENTRY(VFW_E_STATE_CHANGED)
|
||||
ENTRY(VFW_E_NOT_STOPPED)
|
||||
ENTRY(VFW_E_NOT_PAUSED)
|
||||
ENTRY(VFW_E_NOT_RUNNING)
|
||||
ENTRY(VFW_E_WRONG_STATE)
|
||||
ENTRY(VFW_E_START_TIME_AFTER_END)
|
||||
ENTRY(VFW_E_INVALID_RECT)
|
||||
ENTRY(VFW_E_TYPE_NOT_ACCEPTED)
|
||||
ENTRY(VFW_E_SAMPLE_REJECTED)
|
||||
ENTRY(VFW_E_SAMPLE_REJECTED_EOS)
|
||||
ENTRY(VFW_S_DUPLICATE_NAME)
|
||||
ENTRY(VFW_E_DUPLICATE_NAME)
|
||||
ENTRY(VFW_E_TIMEOUT)
|
||||
ENTRY(VFW_E_INVALID_FILE_FORMAT)
|
||||
ENTRY(VFW_E_ENUM_OUT_OF_RANGE)
|
||||
ENTRY(VFW_E_CIRCULAR_GRAPH)
|
||||
ENTRY(VFW_E_NOT_ALLOWED_TO_SAVE)
|
||||
ENTRY(VFW_E_TIME_ALREADY_PASSED)
|
||||
ENTRY(VFW_E_ALREADY_CANCELLED)
|
||||
ENTRY(VFW_E_CORRUPT_GRAPH_FILE)
|
||||
ENTRY(VFW_E_ADVISE_ALREADY_SET)
|
||||
ENTRY(VFW_S_STATE_INTERMEDIATE)
|
||||
ENTRY(VFW_E_NO_MODEX_AVAILABLE)
|
||||
ENTRY(VFW_E_NO_ADVISE_SET)
|
||||
ENTRY(VFW_E_NO_FULLSCREEN)
|
||||
ENTRY(VFW_E_IN_FULLSCREEN_MODE)
|
||||
ENTRY(VFW_E_UNKNOWN_FILE_TYPE)
|
||||
ENTRY(VFW_E_CANNOT_LOAD_SOURCE_FILTER)
|
||||
ENTRY(VFW_S_PARTIAL_RENDER)
|
||||
ENTRY(VFW_E_FILE_TOO_SHORT)
|
||||
ENTRY(VFW_E_INVALID_FILE_VERSION)
|
||||
ENTRY(VFW_S_SOME_DATA_IGNORED)
|
||||
ENTRY(VFW_S_CONNECTIONS_DEFERRED)
|
||||
ENTRY(VFW_E_INVALID_CLSID)
|
||||
ENTRY(VFW_E_INVALID_MEDIA_TYPE)
|
||||
ENTRY(VFW_E_SAMPLE_TIME_NOT_SET)
|
||||
ENTRY(VFW_S_RESOURCE_NOT_NEEDED)
|
||||
ENTRY(VFW_E_MEDIA_TIME_NOT_SET)
|
||||
ENTRY(VFW_E_NO_TIME_FORMAT_SET)
|
||||
ENTRY(VFW_E_MONO_AUDIO_HW)
|
||||
ENTRY(VFW_S_MEDIA_TYPE_IGNORED)
|
||||
ENTRY(VFW_E_NO_DECOMPRESSOR)
|
||||
ENTRY(VFW_E_NO_AUDIO_HARDWARE)
|
||||
ENTRY(VFW_S_VIDEO_NOT_RENDERED)
|
||||
ENTRY(VFW_S_AUDIO_NOT_RENDERED)
|
||||
ENTRY(VFW_E_RPZA)
|
||||
ENTRY(VFW_S_RPZA)
|
||||
ENTRY(VFW_E_PROCESSOR_NOT_SUITABLE)
|
||||
ENTRY(VFW_E_UNSUPPORTED_AUDIO)
|
||||
ENTRY(VFW_E_UNSUPPORTED_VIDEO)
|
||||
ENTRY(VFW_E_MPEG_NOT_CONSTRAINED)
|
||||
ENTRY(VFW_E_NOT_IN_GRAPH)
|
||||
ENTRY(VFW_S_ESTIMATED)
|
||||
ENTRY(VFW_E_NO_TIME_FORMAT)
|
||||
ENTRY(VFW_E_READ_ONLY)
|
||||
ENTRY(VFW_S_RESERVED)
|
||||
ENTRY(VFW_E_BUFFER_UNDERFLOW)
|
||||
ENTRY(VFW_E_UNSUPPORTED_STREAM)
|
||||
ENTRY(VFW_E_NO_TRANSPORT)
|
||||
ENTRY(VFW_S_STREAM_OFF)
|
||||
ENTRY(VFW_S_CANT_CUE)
|
||||
ENTRY(VFW_E_BAD_VIDEOCD)
|
||||
ENTRY(VFW_S_NO_STOP_TIME)
|
||||
ENTRY(VFW_E_OUT_OF_VIDEO_MEMORY)
|
||||
ENTRY(VFW_E_VP_NEGOTIATION_FAILED)
|
||||
ENTRY(VFW_E_DDRAW_CAPS_NOT_SUITABLE)
|
||||
ENTRY(VFW_E_NO_VP_HARDWARE)
|
||||
ENTRY(VFW_E_NO_CAPTURE_HARDWARE)
|
||||
ENTRY(VFW_E_DVD_OPERATION_INHIBITED)
|
||||
ENTRY(VFW_E_DVD_INVALIDDOMAIN)
|
||||
ENTRY(VFW_E_DVD_NO_BUTTON)
|
||||
ENTRY(VFW_E_DVD_GRAPHNOTREADY)
|
||||
ENTRY(VFW_E_DVD_RENDERFAIL)
|
||||
ENTRY(VFW_E_DVD_DECNOTENOUGH)
|
||||
ENTRY(VFW_E_DDRAW_VERSION_NOT_SUITABLE)
|
||||
ENTRY(VFW_E_COPYPROT_FAILED)
|
||||
ENTRY(VFW_S_NOPREVIEWPIN)
|
||||
ENTRY(VFW_E_TIME_EXPIRED)
|
||||
ENTRY(VFW_S_DVD_NON_ONE_SEQUENTIAL)
|
||||
ENTRY(VFW_E_DVD_WRONG_SPEED)
|
||||
ENTRY(VFW_E_DVD_MENU_DOES_NOT_EXIST)
|
||||
ENTRY(VFW_E_DVD_CMD_CANCELLED)
|
||||
ENTRY(VFW_E_DVD_STATE_WRONG_VERSION)
|
||||
ENTRY(VFW_E_DVD_STATE_CORRUPT)
|
||||
ENTRY(VFW_E_DVD_STATE_WRONG_DISC)
|
||||
ENTRY(VFW_E_DVD_INCOMPATIBLE_REGION)
|
||||
ENTRY(VFW_E_DVD_NO_ATTRIBUTES)
|
||||
ENTRY(VFW_E_DVD_NO_GOUP_PGC)
|
||||
ENTRY(VFW_E_DVD_LOW_PARENTAL_LEVEL)
|
||||
ENTRY(VFW_E_DVD_NOT_IN_KARAOKE_MODE)
|
||||
ENTRY(VFW_S_DVD_CHANNEL_CONTENTS_NOT_AVAILABLE)
|
||||
ENTRY(VFW_S_DVD_NOT_ACCURATE)
|
||||
ENTRY(VFW_E_FRAME_STEP_UNSUPPORTED)
|
||||
ENTRY(VFW_E_DVD_STREAM_DISABLED)
|
||||
ENTRY(VFW_E_DVD_TITLE_UNKNOWN)
|
||||
ENTRY(VFW_E_DVD_INVALID_DISC)
|
||||
ENTRY(VFW_E_DVD_NO_RESUME_INFORMATION)
|
||||
ENTRY(VFW_E_PIN_ALREADY_BLOCKED_ON_THIS_THREAD)
|
||||
ENTRY(VFW_E_PIN_ALREADY_BLOCKED)
|
||||
ENTRY(VFW_E_CERTIFICATION_FAILURE)
|
||||
ENTRY(VFW_S_NO_MORE_ITEMS);
|
||||
ENTRY(VFW_E_BAD_KEY);
|
||||
ENTRY(VFW_E_INVALIDMEDIATYPE);
|
||||
ENTRY(VFW_E_INVALIDSUBTYPE);
|
||||
ENTRY(VFW_E_NEED_OWNER);
|
||||
ENTRY(VFW_E_ENUM_OUT_OF_SYNC);
|
||||
ENTRY(VFW_E_ALREADY_CONNECTED);
|
||||
ENTRY(VFW_E_FILTER_ACTIVE);
|
||||
ENTRY(VFW_E_NO_TYPES);
|
||||
ENTRY(VFW_E_NO_ACCEPTABLE_TYPES);
|
||||
ENTRY(VFW_E_INVALID_DIRECTION);
|
||||
ENTRY(VFW_E_NOT_CONNECTED);
|
||||
ENTRY(VFW_E_NO_ALLOCATOR);
|
||||
ENTRY(VFW_E_RUNTIME_ERROR);
|
||||
ENTRY(VFW_E_BUFFER_NOTSET);
|
||||
ENTRY(VFW_E_BUFFER_OVERFLOW);
|
||||
ENTRY(VFW_E_BADALIGN);
|
||||
ENTRY(VFW_E_ALREADY_COMMITTED);
|
||||
ENTRY(VFW_E_BUFFERS_OUTSTANDING);
|
||||
ENTRY(VFW_E_NOT_COMMITTED);
|
||||
ENTRY(VFW_E_SIZENOTSET);
|
||||
ENTRY(VFW_E_NO_CLOCK);
|
||||
ENTRY(VFW_E_NO_SINK);
|
||||
ENTRY(VFW_E_NO_INTERFACE);
|
||||
ENTRY(VFW_E_NOT_FOUND);
|
||||
ENTRY(VFW_E_CANNOT_CONNECT);
|
||||
ENTRY(VFW_E_CANNOT_RENDER);
|
||||
ENTRY(VFW_E_CHANGING_FORMAT);
|
||||
ENTRY(VFW_E_NO_COLOR_KEY_SET);
|
||||
ENTRY(VFW_E_NOT_OVERLAY_CONNECTION);
|
||||
ENTRY(VFW_E_NOT_SAMPLE_CONNECTION);
|
||||
ENTRY(VFW_E_PALETTE_SET);
|
||||
ENTRY(VFW_E_COLOR_KEY_SET);
|
||||
ENTRY(VFW_E_NO_COLOR_KEY_FOUND);
|
||||
ENTRY(VFW_E_NO_PALETTE_AVAILABLE);
|
||||
ENTRY(VFW_E_NO_DISPLAY_PALETTE);
|
||||
ENTRY(VFW_E_TOO_MANY_COLORS);
|
||||
ENTRY(VFW_E_STATE_CHANGED);
|
||||
ENTRY(VFW_E_NOT_STOPPED);
|
||||
ENTRY(VFW_E_NOT_PAUSED);
|
||||
ENTRY(VFW_E_NOT_RUNNING);
|
||||
ENTRY(VFW_E_WRONG_STATE);
|
||||
ENTRY(VFW_E_START_TIME_AFTER_END);
|
||||
ENTRY(VFW_E_INVALID_RECT);
|
||||
ENTRY(VFW_E_TYPE_NOT_ACCEPTED);
|
||||
ENTRY(VFW_E_SAMPLE_REJECTED);
|
||||
ENTRY(VFW_E_SAMPLE_REJECTED_EOS);
|
||||
ENTRY(VFW_S_DUPLICATE_NAME);
|
||||
ENTRY(VFW_E_DUPLICATE_NAME);
|
||||
ENTRY(VFW_E_TIMEOUT);
|
||||
ENTRY(VFW_E_INVALID_FILE_FORMAT);
|
||||
ENTRY(VFW_E_ENUM_OUT_OF_RANGE);
|
||||
ENTRY(VFW_E_CIRCULAR_GRAPH);
|
||||
ENTRY(VFW_E_NOT_ALLOWED_TO_SAVE);
|
||||
ENTRY(VFW_E_TIME_ALREADY_PASSED);
|
||||
ENTRY(VFW_E_ALREADY_CANCELLED);
|
||||
ENTRY(VFW_E_CORRUPT_GRAPH_FILE);
|
||||
ENTRY(VFW_E_ADVISE_ALREADY_SET);
|
||||
ENTRY(VFW_S_STATE_INTERMEDIATE);
|
||||
ENTRY(VFW_E_NO_MODEX_AVAILABLE);
|
||||
ENTRY(VFW_E_NO_ADVISE_SET);
|
||||
ENTRY(VFW_E_NO_FULLSCREEN);
|
||||
ENTRY(VFW_E_IN_FULLSCREEN_MODE);
|
||||
ENTRY(VFW_E_UNKNOWN_FILE_TYPE);
|
||||
ENTRY(VFW_E_CANNOT_LOAD_SOURCE_FILTER);
|
||||
ENTRY(VFW_S_PARTIAL_RENDER);
|
||||
ENTRY(VFW_E_FILE_TOO_SHORT);
|
||||
ENTRY(VFW_E_INVALID_FILE_VERSION);
|
||||
ENTRY(VFW_S_SOME_DATA_IGNORED);
|
||||
ENTRY(VFW_S_CONNECTIONS_DEFERRED);
|
||||
ENTRY(VFW_E_INVALID_CLSID);
|
||||
ENTRY(VFW_E_INVALID_MEDIA_TYPE);
|
||||
ENTRY(VFW_E_SAMPLE_TIME_NOT_SET);
|
||||
ENTRY(VFW_S_RESOURCE_NOT_NEEDED);
|
||||
ENTRY(VFW_E_MEDIA_TIME_NOT_SET);
|
||||
ENTRY(VFW_E_NO_TIME_FORMAT_SET);
|
||||
ENTRY(VFW_E_MONO_AUDIO_HW);
|
||||
ENTRY(VFW_S_MEDIA_TYPE_IGNORED);
|
||||
ENTRY(VFW_E_NO_DECOMPRESSOR);
|
||||
ENTRY(VFW_E_NO_AUDIO_HARDWARE);
|
||||
ENTRY(VFW_S_VIDEO_NOT_RENDERED);
|
||||
ENTRY(VFW_S_AUDIO_NOT_RENDERED);
|
||||
ENTRY(VFW_E_RPZA);
|
||||
ENTRY(VFW_S_RPZA);
|
||||
ENTRY(VFW_E_PROCESSOR_NOT_SUITABLE);
|
||||
ENTRY(VFW_E_UNSUPPORTED_AUDIO);
|
||||
ENTRY(VFW_E_UNSUPPORTED_VIDEO);
|
||||
ENTRY(VFW_E_MPEG_NOT_CONSTRAINED);
|
||||
ENTRY(VFW_E_NOT_IN_GRAPH);
|
||||
ENTRY(VFW_S_ESTIMATED);
|
||||
ENTRY(VFW_E_NO_TIME_FORMAT);
|
||||
ENTRY(VFW_E_READ_ONLY);
|
||||
ENTRY(VFW_S_RESERVED);
|
||||
ENTRY(VFW_E_BUFFER_UNDERFLOW);
|
||||
ENTRY(VFW_E_UNSUPPORTED_STREAM);
|
||||
ENTRY(VFW_E_NO_TRANSPORT);
|
||||
ENTRY(VFW_S_STREAM_OFF);
|
||||
ENTRY(VFW_S_CANT_CUE);
|
||||
ENTRY(VFW_E_BAD_VIDEOCD);
|
||||
ENTRY(VFW_S_NO_STOP_TIME);
|
||||
ENTRY(VFW_E_OUT_OF_VIDEO_MEMORY);
|
||||
ENTRY(VFW_E_VP_NEGOTIATION_FAILED);
|
||||
ENTRY(VFW_E_DDRAW_CAPS_NOT_SUITABLE);
|
||||
ENTRY(VFW_E_NO_VP_HARDWARE);
|
||||
ENTRY(VFW_E_NO_CAPTURE_HARDWARE);
|
||||
ENTRY(VFW_E_DVD_OPERATION_INHIBITED);
|
||||
ENTRY(VFW_E_DVD_INVALIDDOMAIN);
|
||||
ENTRY(VFW_E_DVD_NO_BUTTON);
|
||||
ENTRY(VFW_E_DVD_GRAPHNOTREADY);
|
||||
ENTRY(VFW_E_DVD_RENDERFAIL);
|
||||
ENTRY(VFW_E_DVD_DECNOTENOUGH);
|
||||
ENTRY(VFW_E_DDRAW_VERSION_NOT_SUITABLE);
|
||||
ENTRY(VFW_E_COPYPROT_FAILED);
|
||||
ENTRY(VFW_S_NOPREVIEWPIN);
|
||||
ENTRY(VFW_E_TIME_EXPIRED);
|
||||
ENTRY(VFW_S_DVD_NON_ONE_SEQUENTIAL);
|
||||
ENTRY(VFW_E_DVD_WRONG_SPEED);
|
||||
ENTRY(VFW_E_DVD_MENU_DOES_NOT_EXIST);
|
||||
ENTRY(VFW_E_DVD_CMD_CANCELLED);
|
||||
ENTRY(VFW_E_DVD_STATE_WRONG_VERSION);
|
||||
ENTRY(VFW_E_DVD_STATE_CORRUPT);
|
||||
ENTRY(VFW_E_DVD_STATE_WRONG_DISC);
|
||||
ENTRY(VFW_E_DVD_INCOMPATIBLE_REGION);
|
||||
ENTRY(VFW_E_DVD_NO_ATTRIBUTES);
|
||||
ENTRY(VFW_E_DVD_NO_GOUP_PGC);
|
||||
ENTRY(VFW_E_DVD_LOW_PARENTAL_LEVEL);
|
||||
ENTRY(VFW_E_DVD_NOT_IN_KARAOKE_MODE);
|
||||
ENTRY(VFW_S_DVD_CHANNEL_CONTENTS_NOT_AVAILABLE);
|
||||
ENTRY(VFW_S_DVD_NOT_ACCURATE);
|
||||
ENTRY(VFW_E_FRAME_STEP_UNSUPPORTED);
|
||||
ENTRY(VFW_E_DVD_STREAM_DISABLED);
|
||||
ENTRY(VFW_E_DVD_TITLE_UNKNOWN);
|
||||
ENTRY(VFW_E_DVD_INVALID_DISC);
|
||||
ENTRY(VFW_E_DVD_NO_RESUME_INFORMATION);
|
||||
ENTRY(VFW_E_PIN_ALREADY_BLOCKED_ON_THIS_THREAD);
|
||||
ENTRY(VFW_E_PIN_ALREADY_BLOCKED);
|
||||
ENTRY(VFW_E_CERTIFICATION_FAILURE);
|
||||
#undef ENTRY
|
||||
}
|
||||
|
||||
|
|
|
@ -907,14 +907,12 @@ static BOOL SETUPX_AddCustomLDID(int ldid, INT16 hInf)
|
|||
{ /* found */
|
||||
|
||||
/* but we don't want entries in the strings section */
|
||||
if (!strcasecmp(pSec, "Strings"))
|
||||
goto next_section;
|
||||
if (!strcasecmp(pSec, "Strings")) continue;
|
||||
p = pEqual+1;
|
||||
goto found;
|
||||
}
|
||||
}
|
||||
}
|
||||
next_section:
|
||||
}
|
||||
goto end;
|
||||
found:
|
||||
|
|
|
@ -430,7 +430,7 @@ ASPI_ExecScsiCmd(SRB_ExecSCSICmd *lpPRB)
|
|||
return SS_COMP; /* some junk expects ss_comp here. */
|
||||
/*FALLTHROUGH*/
|
||||
default:
|
||||
/*FALLTHROUGH*/
|
||||
break;
|
||||
}
|
||||
|
||||
/* In real WNASPI32 stuff really is always pending because ASPI does things
|
||||
|
|
|
@ -447,7 +447,7 @@ lend:
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect,
|
||||
HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect,
|
||||
LPCSTR lpszSearchFile, LPWIN32_FIND_DATAA lpFindFileData, DWORD dwFlags, DWORD dwContext)
|
||||
{
|
||||
LPWININETFTPSESSIONA lpwfs = (LPWININETFTPSESSIONA) hConnect;
|
||||
|
@ -492,7 +492,7 @@ INTERNETAPI HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect,
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileA(HINTERNET hConnect,
|
||||
HINTERNET WINAPI FTP_FtpFindFirstFileA(HINTERNET hConnect,
|
||||
LPCSTR lpszSearchFile, LPWIN32_FIND_DATAA lpFindFileData, DWORD dwFlags, DWORD dwContext)
|
||||
{
|
||||
INT nResCode;
|
||||
|
@ -710,7 +710,7 @@ lend:
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession,
|
||||
HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession,
|
||||
LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags,
|
||||
DWORD dwContext)
|
||||
{
|
||||
|
|
|
@ -80,7 +80,7 @@ inline static LPSTR HTTP_strdup( LPCSTR str )
|
|||
* FALSE on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
|
||||
BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
|
||||
LPCSTR lpszHeader, DWORD dwHeaderLength, DWORD dwModifier)
|
||||
{
|
||||
LPSTR lpszStart;
|
||||
|
@ -137,7 +137,7 @@ INTERNETAPI BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest,
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession,
|
||||
HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession,
|
||||
LPCSTR lpszVerb, LPCSTR lpszObjectName, LPCSTR lpszVersion,
|
||||
LPCSTR lpszReferrer , LPCSTR *lpszAcceptTypes,
|
||||
DWORD dwFlags, DWORD dwContext)
|
||||
|
@ -189,7 +189,7 @@ INTERNETAPI HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession,
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestA(HINTERNET hHttpSession,
|
||||
HINTERNET WINAPI HTTP_HttpOpenRequestA(HINTERNET hHttpSession,
|
||||
LPCSTR lpszVerb, LPCSTR lpszObjectName, LPCSTR lpszVersion,
|
||||
LPCSTR lpszReferrer , LPCSTR *lpszAcceptTypes,
|
||||
DWORD dwFlags, DWORD dwContext)
|
||||
|
|
|
@ -139,7 +139,7 @@ WININET_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent,
|
||||
HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent,
|
||||
DWORD dwAccessType, LPCSTR lpszProxy,
|
||||
LPCSTR lpszProxyBypass, DWORD dwFlags)
|
||||
{
|
||||
|
@ -242,7 +242,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved)
|
|||
* NULL on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI HINTERNET WINAPI InternetConnectA(HINTERNET hInternet,
|
||||
HINTERNET WINAPI InternetConnectA(HINTERNET hInternet,
|
||||
LPCSTR lpszServerName, INTERNET_PORT nServerPort,
|
||||
LPCSTR lpszUserName, LPCSTR lpszPassword,
|
||||
DWORD dwService, DWORD dwFlags, DWORD dwContext)
|
||||
|
@ -707,7 +707,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
|
|||
* Error value on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI DWORD WINAPI InternetAttemptConnect(DWORD dwReserved)
|
||||
DWORD WINAPI InternetAttemptConnect(DWORD dwReserved)
|
||||
{
|
||||
FIXME("Stub\n");
|
||||
return ERROR_SUCCESS;
|
||||
|
@ -752,7 +752,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer,
|
|||
* INTERNET_INVALID_STATUS_CALLBACK on failure
|
||||
*
|
||||
*/
|
||||
INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallback(
|
||||
INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallback(
|
||||
HINTERNET hInternet ,INTERNET_STATUS_CALLBACK lpfnIntCB)
|
||||
{
|
||||
INTERNET_STATUS_CALLBACK retVal;
|
||||
|
|
|
@ -40,8 +40,8 @@ static void convert_mode(XDGAMode *mode, LPDDHALMODEINFO info)
|
|||
info->dwGBitMask = mode->greenMask;
|
||||
info->dwBBitMask = mode->blueMask;
|
||||
info->dwAlphaBitMask = 0;
|
||||
TRACE(" width=%ld, height=%ld, bpp=%ld, refresh=%d\n", \
|
||||
info->dwWidth, info->dwHeight, info->dwBPP, info->wRefreshRate); \
|
||||
TRACE(" width=%ld, height=%ld, bpp=%ld, refresh=%d\n",
|
||||
info->dwWidth, info->dwHeight, info->dwBPP, info->wRefreshRate);
|
||||
}
|
||||
|
||||
void X11DRV_XF86DGA2_Init(void)
|
||||
|
|
|
@ -32,30 +32,40 @@ LPDDHALMODEINFO xf86vm_modes;
|
|||
unsigned xf86vm_mode_count;
|
||||
XF86VidModeModeInfo** modes;
|
||||
|
||||
#define CONVERT_MODE(dotclock) \
|
||||
info->dwWidth = mode->hdisplay; \
|
||||
info->dwHeight = mode->vdisplay; \
|
||||
info->wRefreshRate = dotclock * 1000 / (mode->htotal * mode->vtotal); \
|
||||
TRACE(" width=%ld, height=%ld, refresh=%d\n", \
|
||||
info->dwWidth, info->dwHeight, info->wRefreshRate); \
|
||||
/* XVidMode cannot change display depths... */ \
|
||||
/* let's not bother with filling out these then... */ \
|
||||
info->lPitch = 0; \
|
||||
info->dwBPP = 0; \
|
||||
info->wFlags = 0; \
|
||||
info->dwRBitMask = 0; \
|
||||
info->dwGBitMask = 0; \
|
||||
info->dwBBitMask = 0; \
|
||||
info->dwAlphaBitMask = 0;
|
||||
|
||||
static void convert_modeinfo(XF86VidModeModeInfo *mode, LPDDHALMODEINFO info)
|
||||
static void convert_modeinfo( const XF86VidModeModeInfo *mode, LPDDHALMODEINFO info )
|
||||
{
|
||||
CONVERT_MODE(mode->dotclock)
|
||||
info->dwWidth = mode->hdisplay;
|
||||
info->dwHeight = mode->vdisplay;
|
||||
info->wRefreshRate = mode->dotclock * 1000 / (mode->htotal * mode->vtotal);
|
||||
TRACE(" width=%ld, height=%ld, refresh=%d\n",
|
||||
info->dwWidth, info->dwHeight, info->wRefreshRate);
|
||||
/* XVidMode cannot change display depths... */
|
||||
/* let's not bother with filling out these then... */
|
||||
info->lPitch = 0;
|
||||
info->dwBPP = 0;
|
||||
info->wFlags = 0;
|
||||
info->dwRBitMask = 0;
|
||||
info->dwGBitMask = 0;
|
||||
info->dwBBitMask = 0;
|
||||
info->dwAlphaBitMask = 0;
|
||||
}
|
||||
|
||||
static void convert_modeline(int dotclock, XF86VidModeModeLine *mode, LPDDHALMODEINFO info)
|
||||
static void convert_modeline(int dotclock, const XF86VidModeModeLine *mode, LPDDHALMODEINFO info)
|
||||
{
|
||||
CONVERT_MODE(dotclock)
|
||||
info->dwWidth = mode->hdisplay;
|
||||
info->dwHeight = mode->vdisplay;
|
||||
info->wRefreshRate = dotclock * 1000 / (mode->htotal * mode->vtotal);
|
||||
TRACE(" width=%ld, height=%ld, refresh=%d\n",
|
||||
info->dwWidth, info->dwHeight, info->wRefreshRate);
|
||||
/* XVidMode cannot change display depths... */
|
||||
/* let's not bother with filling out these then... */
|
||||
info->lPitch = 0;
|
||||
info->dwBPP = 0;
|
||||
info->wFlags = 0;
|
||||
info->dwRBitMask = 0;
|
||||
info->dwGBitMask = 0;
|
||||
info->dwBBitMask = 0;
|
||||
info->dwAlphaBitMask = 0;
|
||||
}
|
||||
|
||||
void X11DRV_XF86VM_Init(void)
|
||||
|
|
|
@ -460,7 +460,7 @@ static int do_bitop( int s, int d, int rop )
|
|||
return res & 1;
|
||||
}
|
||||
|
||||
main()
|
||||
int main()
|
||||
{
|
||||
int rop, i, res, src, dst, pat, tmp, dstUsed;
|
||||
const BYTE *opcode;
|
||||
|
@ -516,6 +516,8 @@ main()
|
|||
}
|
||||
if (res != rop) printf( "%02x: ERROR, res=%02x\n", rop, res );
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* BITBLT_TEST */
|
||||
|
|
|
@ -136,17 +136,15 @@ static struct
|
|||
/* palette indexes, but system colors that will be converted to */
|
||||
/* indexes later on. */
|
||||
|
||||
#ifdef HAVE_LIBXXPM
|
||||
static XpmColorSymbol
|
||||
#else /* defined(HAVE_LIBXXPM) */
|
||||
static struct
|
||||
{
|
||||
#ifndef HAVE_LIBXXPM
|
||||
typedef struct {
|
||||
char *name;
|
||||
char *value;
|
||||
Pixel pixel;
|
||||
}
|
||||
#endif /* defined(HAVE_LIBXXPM) */
|
||||
OBM_Colors[] =
|
||||
} XpmColorSymbol;
|
||||
#endif /* !defined(HAVE_LIBXXPM) */
|
||||
|
||||
static XpmColorSymbol OBM_Colors[] =
|
||||
{
|
||||
{ "black", NULL, (Pixel)RGB(0,0,0) },
|
||||
{ "white", NULL, (Pixel)RGB(255,255,255) },
|
||||
|
|
Loading…
Reference in New Issue