Cleanup code that is strange or difficult to parse.
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 5614d53..db5d1ad 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -1853,11 +1853,12 @@
}
/* This modifies r to be the text rectangle. */
-{
- HFONT hOldFont = SelectObject(hdc, infoPtr->hFont);
- TAB_DrawItemInterior(hwnd, hdc, iItem, &r);
- SelectObject(hdc,hOldFont);
-}
+ {
+ HFONT hOldFont = SelectObject(hdc, infoPtr->hFont);
+ TAB_DrawItemInterior(hwnd, hdc, iItem, &r);
+ SelectObject(hdc,hOldFont);
+ }
+
/* Draw the focus rectangle */
if (((lStyle & TCS_FOCUSNEVER) == 0) &&
(GetFocus() == hwnd) &&
diff --git a/dlls/ddraw/ddraw/hal.c b/dlls/ddraw/ddraw/hal.c
index 6780d4f..b577c94 100644
--- a/dlls/ddraw/ddraw/hal.c
+++ b/dlls/ddraw/ddraw/hal.c
@@ -65,7 +65,7 @@
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;
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index 86a9b08..31c62cb 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -142,8 +142,8 @@
0);
if (hFile == INVALID_HANDLE_VALUE)
{
- return CHECKSUM_OPEN_FAILURE;
-}
+ return CHECKSUM_OPEN_FAILURE;
+ }
hMapping = CreateFileMappingW(hFile,
NULL,
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index 83d8d36..3bb407d 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -344,6 +344,7 @@
case MSVCRT_LC_NUMERIC:
if (!lc_all) break;
case MSVCRT_LC_TIME:
+ break;
}
UNLOCK_LOCALE;
return MSVCRT_current_lc_all;
@@ -442,6 +443,7 @@
case MSVCRT_LC_NUMERIC:
if (!lc_all) break;
case MSVCRT_LC_TIME:
+ break;
}
UNLOCK_LOCALE;
return MSVCRT_current_lc_all;
@@ -517,4 +519,3 @@
{
return MSVCRT_current_lc_all_cp;
}
-
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 270b1ce..247347c 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -165,7 +165,7 @@
/***********************************************************************
* 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 @@
* 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 @@
* 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 )
{
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index ff7e61f..9807b4c 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -236,7 +236,7 @@
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){
FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
return E_FAIL;
-}
+ }
This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */
@@ -384,7 +384,7 @@
if (This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj==NULL)
return E_OUTOFMEMORY;
strcpyW(This->bindCtxTable[This->bindCtxTableLastIndex].pkeyObj,pszkey);
-}
+ }
This->bindCtxTableLastIndex++;
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index a248cbe..164341a 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -688,8 +688,8 @@
FIXME("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
- return E_NOTIMPL;
-}
+ return E_NOTIMPL;
+ }
return res;
}
@@ -892,7 +892,7 @@
for (i = len ; i > 0; i -= skip, off += skip) {
h = (h * 39) + val[off];
}
-}
+ }
*pdwHash=h;
@@ -964,7 +964,7 @@
return MK_E_NOOBJECT;
*pFileTime=info.ftLastWriteTime;
-}
+ }
return S_OK;
}
@@ -1035,7 +1035,7 @@
if( (*stringTable1[i]=='\\') && (i+1 < sameIdx) && (*stringTable1[i+1]=='\\') ){
machimeNameCase=FALSE;
break;
-}
+ }
}
if (machimeNameCase && *stringTable1[sameIdx-1]=='\\')
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index 7317a54..ec6d5a3 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -556,7 +556,7 @@
tempMkComposite=*ppmkComposite;
IMoniker_AddRef(tempMkComposite);
-}
+ }
return res;
}
else
@@ -645,7 +645,7 @@
if (len < 16) {
for (i = len ; i > 0; i--) {
h = (h * 37) + val[off++];
-}
+ }
} else {
/* only sample some characters */
skip = len / 8;
@@ -747,7 +747,7 @@
res=IMoniker_GetTimeOfLastChange(pmkToLeft,pbc,NULL,pItemTime);
IMoniker_Release(compositeMk);
-}
+ }
return res;
}
@@ -857,7 +857,8 @@
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)){
@@ -871,7 +872,7 @@
IOleItemContainer_Release(poic);
IParseDisplayName_Release(ppdn);
}
-}
+ }
return res;
}
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 9c0a4a6..9853a65 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -276,7 +276,7 @@
FIXME("runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
return E_FAIL;
-}
+ }
This->runObjTabRegister++;
This->runObjTabLastIndx++;
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 5403d05..5cb736b 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -189,7 +189,7 @@
* In-place activation
*/
if (OLE_moduleLockCount==0)
-{
+ {
/*
* Initialize the libraries.
*/
@@ -209,7 +209,7 @@
* OLE shared menu
*/
OLEMenu_Initialize();
-}
+ }
/*
* Then, we increase the lock count on the OLE module.
diff --git a/dlls/quartz/amerror.c b/dlls/quartz/amerror.c
index 0f778c0..73a37fa 100644
--- a/dlls/quartz/amerror.c
+++ b/dlls/quartz/amerror.c
@@ -31,156 +31,156 @@
{
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
}
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index 953820e..d1a87fe 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -29,7 +29,7 @@
* Gen generic installer (geninst.c ?)
* Ip .INF parsing (infparse.c)
* LDD logical device descriptor (ldd.c ?)
- * LDID logical device ID
+ * LDID logical device ID
* SU setup (setup.c ?)
* Tp text processing (textproc.c ?)
* Vcp virtual copy module (vcp.c ?)
@@ -122,7 +122,7 @@
break;
p = q+1;
}
-
+
/* put number of entries at beginning of list */
*(DWORD *)res = count;
return res;
@@ -162,7 +162,7 @@
* FIXME: use SETUPX_GetSubStrings() instead.
* Hmm, but on the other hand SETUPX_GetSubStrings() will probably
* soon be replaced by InitSubstrData() etc. anyway.
- *
+ *
*/
static BOOL SETUPX_LookupRegistryString(LPSTR regstr, LPSTR buffer, DWORD buflen)
{
@@ -200,7 +200,7 @@
}
TRACE("got '%s','%s','%s','%s','%s'\n",
items[0], items[1], items[2], items[3], items[4]);
-
+
/* check root key */
if (!strcasecmp(items[0], "HKCR"))
hkey = HKEY_CLASSES_ROOT;
@@ -282,7 +282,7 @@
* lpszCmdLine = e.g. "DefaultInstall 132 C:\MYINSTALL\MYDEV.INF"
* Here "DefaultInstall" is the .inf file section to be installed (optional).
* The 132 value is made of the HOW_xxx flags and sometimes 128 (-> setupx16.h).
- *
+ *
* nCmdShow = nCmdShow of CreateProcess
*/
typedef INT WINAPI (*MSGBOX_PROC)( HWND, LPCSTR, LPCSTR, UINT );
@@ -296,9 +296,9 @@
BOOL reboot = FALSE;
HMODULE hMod;
MSGBOX_PROC pMessageBoxA;
-
+
TRACE("(%04x, %04x, %s, %d);\n", hwnd, hinst, lpszCmdLine, nCmdShow);
-
+
pSub = SETUPX_GetSubStrings((LPSTR)lpszCmdLine, ' ');
count = *(DWORD *)pSub;
@@ -326,7 +326,7 @@
{
if ((pMessageBoxA = (MSGBOX_PROC)GetProcAddress( hMod, "MessageBoxA" )))
{
-
+
if (pMessageBoxA(hwnd, "You must restart Wine before the new settings will take effect.\n\nDo you want to exit Wine now ?", "Systems Settings Change", MB_YESNO|MB_ICONQUESTION) == IDYES)
reboot = TRUE;
}
@@ -336,7 +336,7 @@
ERR("invalid flags %d !\n", wFlags);
goto end;
}
-
+
res = OK;
end:
tmp = VcpClose16(VCPFL_ALL, NULL);
@@ -503,7 +503,7 @@
/* the rest (34-38) isn't too interesting, so I'll forget about it */
};
-/*
+/*
* LDD == Logical Device Descriptor
* LDID == Logical Device ID
*
@@ -581,7 +581,7 @@
}
if (hKey) RegCloseKey(hKey);
}
-
+
/***********************************************************************
* CtlDelLdd (SETUPX.37)
*
@@ -619,7 +619,7 @@
if (pCurr == pFirstLDD)
pFirstLDD = NULL;
HeapFree(GetProcessHeap(), 0, pCurr);
-
+
return OK;
}
@@ -640,14 +640,14 @@
* RETURN
* ERR_VCP_LDDINVALID if pldd->cbSize != structsize
* 1 in all other cases ??
- *
+ *
*/
RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
{
LDD_LIST *pCurr, *pPrev = NULL;
TRACE("(%p)\n", pldd);
-
+
if (!std_LDDs_done)
SETUPX_CreateStandardLDDs();
@@ -667,7 +667,7 @@
memcpy(pldd, pCurr->pldd, pldd->cbSize);
/* hmm, we probably ought to strcpy() the string ptrs here */
-
+
return 1; /* what is this ?? */
}
@@ -747,7 +747,7 @@
if (!pFirstLDD)
pFirstLDD = pCurr;
}
-
+
return OK;
}
@@ -773,7 +773,7 @@
*
* RETURN
* ERR_VCP_LDDINVALID if pldd->cbSize != structsize
- *
+ *
*/
static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
{
@@ -845,7 +845,7 @@
{
LOGDISKDESC_S ldd;
TRACE("(%d, '%s');\n", ldid, szPath);
-
+
INIT_LDD(ldd, ldid);
ldd.pszPath = szPath;
return CtlSetLdd16(&ldd);
@@ -862,13 +862,13 @@
* HKLM,"Software\Microsoft\Windows\CurrentVersion","ProgramFilesDir",,"C:\"
* -- registry lookup -->
* C:\Program Files (or C:\ if not found in registry)
- *
+ *
* FIXME:
* - maybe we ought to add a caching array for speed ? - I don't care :)
* - not sure whether the processing is correct - sometimes there are equal
* LDIDs for both install and removal sections.
* - probably the whole function can be removed as installers add that on their
- * own
+ * own
*/
static BOOL SETUPX_AddCustomLDID(int ldid, INT16 hInf)
{
@@ -907,14 +907,12 @@
{ /* 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:
@@ -971,9 +969,9 @@
}
else
handled = TRUE;
-
+
SETUPX_GetLdd(&ldd);
-
+
if (!handled)
{
FIXME("What is LDID %d ??\n", ldid);
@@ -995,7 +993,7 @@
LPCSTR pSrc = szSrc, pSrcEnd = szSrc + strlen(szSrc);
LPSTR pDst = szDst, p, pPHBegin;
int count;
-
+
TRACE("(%p, '%s', %04x);\n", szDst, szSrc, hInf);
while (pSrc < pSrcEnd)
{
@@ -1030,7 +1028,7 @@
in the [strings] section of the hInf */
DWORD ret;
char buf[256]; /* long enough ? */
-
+
ret = GetPrivateProfileStringA("strings", placeholder, "",
buf, 256, IP_GetFileName(hInf));
if (ret)
@@ -1049,7 +1047,7 @@
count = (int)p - (int)pPHBegin + 2;
strncpy(pDst, pPHBegin-1, count);
pDst += count;
-
+
}
pSrc = p+1;
continue;
@@ -1098,7 +1096,7 @@
INIT_LDD(ldd, LDID_SRCPATH);
SETUPX_GetLdd(&ldd);
pSrcDir = ldd.pszPath;
-
+
/* get destination directory for that entry */
if (!(GetPrivateProfileStringA("DestinationDirs", pCopyEntry, "",
pDstStr, sizeof(pDstStr), filename)))
@@ -1120,7 +1118,7 @@
}
else
pDstDir = pDstStr;
-
+
/* now that we have the destination dir, register file copying */
if (bSingle)
@@ -1157,7 +1155,7 @@
SETUPX_FreeSubStrings(pSubFile);
}
}
-
+
return TRUE;
}
@@ -1167,7 +1165,7 @@
* generic installer function for .INF file sections
*
* This is not perfect - patch whenever you can !
- *
+ *
* wFlags == GENINSTALL_DO_xxx
* e.g. NetMeeting:
* first call GENINSTALL_DO_REGSRCPATH | GENINSTALL_DO_FILES,
@@ -1238,7 +1236,7 @@
}
#endif
}
-
+
SETUPX_FreeSubStrings(pSub);
}
HeapFree(GetProcessHeap(), 0, pEntries);
diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c
index 1cecb20..a18ce21 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -515,8 +515,8 @@
sh32_policy_table[polidx].cache = retval;
}
- RegCloseKey(xhkey);
-}
+ RegCloseKey(xhkey);
+ }
return retval;
}
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index 98c8fbf..5b8c203 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -92,7 +92,7 @@
/* device is now open */
/* FIXME: Let users specify SCSI timeout in registry */
SCSI_LinuxSetTimeout( fd, SCSI_DEFAULT_TIMEOUT );
-
+
curr = HeapAlloc( GetProcessHeap(), 0, sizeof(ASPI_DEVICE_INFO) );
curr->fd = fd;
curr->hostId = prb->SRB_HaId;
@@ -309,7 +309,7 @@
((lpPRB->SRB_Flags & 0x18) == 0x18)
) && lpPRB->SRB_BufLen
) {
- FIXME("command 0x%02x, no data transfer specified, but buflen is %ld!!!\n",lpPRB->CDBByte[0],lpPRB->SRB_BufLen);
+ FIXME("command 0x%02x, no data transfer specified, but buflen is %ld!!!\n",lpPRB->CDBByte[0],lpPRB->SRB_BufLen);
}
break;
}
@@ -430,14 +430,14 @@
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
in the background, but we are not doing that (yet) */
return ret;
-
+
error_exit:
SRB_Status = SS_ERR;
if (error_code == EBUSY) {
@@ -467,7 +467,7 @@
* RETURNS
* HIWORD: 0.
* HIBYTE of LOWORD: status (SS_COMP or SS_FAILED_INIT)
- * LOBYTE of LOWORD: # of host adapters.
+ * LOBYTE of LOWORD: # of host adapters.
*/
DWORD __cdecl GetASPI32SupportInfo(void)
{
@@ -508,7 +508,7 @@
/* Copy header */
memcpy(&tmpsrb.common,&(lpSRB->common),sizeof(tmpsrb.common));
-
+
tmpsrb.cmd.SRB_Flags |= 8; /* target to host */
tmpsrb.cmd.SRB_Cmd = SC_EXEC_SCSI_CMD;
tmpsrb.cmd.SRB_Target = lpSRB->devtype.SRB_Target;
@@ -540,7 +540,7 @@
FIXME("Not implemented SC_RESET_DEV\n");
break;
case SC_GET_DISK_INFO:
- /* here we have to find out the int13 / bios association.
+ /* here we have to find out the int13 / bios association.
* We just say we do not have any.
*/
FIXME("SC_GET_DISK_INFO always return 'int13 unassociated disk'.\n");
@@ -573,10 +573,10 @@
/***********************************************************************
* GetASPI32Buffer (WNASPI32.8)
* Supposed to return a DMA capable large SCSI buffer.
- * Our implementation does not use those at all, all buffer stuff is
+ * Our implementation does not use those at all, all buffer stuff is
* done in the kernel SG device layer. So we just heapalloc the buffer.
*/
-BOOL __cdecl GetASPI32Buffer(PASPI32BUFF pab)
+BOOL __cdecl GetASPI32Buffer(PASPI32BUFF pab)
{
pab->AB_BufPointer = HeapAlloc(GetProcessHeap(),
pab->AB_ZeroFill?HEAP_ZERO_MEMORY:0,
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index f8fd220..061d484 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -447,7 +447,7 @@
* 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 @@
* 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 @@
* NULL on failure
*
*/
-INTERNETAPI HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession,
+HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession,
LPCSTR lpszFileName, DWORD fdwAccess, DWORD dwFlags,
DWORD dwContext)
{
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index c525087..41611dc 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -80,7 +80,7 @@
* 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 @@
* 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 @@
* 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)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 6a5b8c9..db5fd67 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -139,7 +139,7 @@
* 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 @@
* 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 @@
* 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 @@
* 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;
@@ -1470,7 +1470,7 @@
{
INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT);
goto lend;
-}
+ }
}
lend:
diff --git a/dlls/x11drv/dga2.c b/dlls/x11drv/dga2.c
index 3b0045e..9dc634b 100644
--- a/dlls/x11drv/dga2.c
+++ b/dlls/x11drv/dga2.c
@@ -40,8 +40,8 @@
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)
diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c
index c347d04..b36757f 100644
--- a/dlls/x11drv/xvidmode.c
+++ b/dlls/x11drv/xvidmode.c
@@ -32,30 +32,40 @@
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)
@@ -206,7 +216,7 @@
/* compute min & max while compensating for estimated error */
if (!g_n || g_min > (r_v + r_e)) g_min = r_v + r_e;
if (!g_n || g_max < (r_v - r_e)) g_max = r_v - r_e;
-
+
/* add to average */
g_avg += r_v;
g_n++;
@@ -287,7 +297,7 @@
*
* FIXME: should move to somewhere appropriate, but probably not before
* the stuff in graphics/x11drv/ has been moved to dlls/x11drv, so that
- * they can include xvidmode.h directly
+ * they can include xvidmode.h directly
*/
BOOL X11DRV_GetDeviceGammaRamp(DC *dc, LPVOID ramp)
{
@@ -303,7 +313,7 @@
*
* FIXME: should move to somewhere appropriate, but probably not before
* the stuff in graphics/x11drv/ has been moved to dlls/x11drv, so that
- * they can include xvidmode.h directly
+ * they can include xvidmode.h directly
*/
BOOL X11DRV_SetDeviceGammaRamp(DC *dc, LPVOID ramp)
{
diff --git a/graphics/painting.c b/graphics/painting.c
index 9af5593..e6d1b4c 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -131,7 +131,7 @@
else if (dc->funcs->pArc)
ret = dc->funcs->pArc(dc,left,top,right,bottom,xstart,ystart,xend,yend);
GDI_ReleaseObj( hdc );
-}
+ }
return ret;
}
@@ -295,7 +295,7 @@
else if (dc->funcs->pRectangle)
ret = dc->funcs->pRectangle(dc,left,top,right,bottom);
GDI_ReleaseObj( hdc );
-}
+ }
return ret;
}
@@ -365,9 +365,9 @@
{
if (dc->funcs->pSetPixel)
{
- dc->funcs->pSetPixel(dc,x,y,color);
+ dc->funcs->pSetPixel(dc,x,y,color);
ret = TRUE;
-}
+ }
GDI_ReleaseObj( hdc );
}
return ret;
@@ -642,11 +642,11 @@
{
if (REGION_FrameRgn( tmp, hrgn, nWidth, nHeight ))
{
- FillRgn( hdc, tmp, hbrush );
+ FillRgn( hdc, tmp, hbrush );
ret = TRUE;
}
- DeleteObject( tmp );
-}
+ DeleteObject( tmp );
+ }
}
GDI_ReleaseObj( hdc );
return ret;
@@ -787,7 +787,7 @@
if (PATH_IsPathOpen(dc->path)) ret = PATH_Polygon(dc, pt, count);
else if (dc->funcs->pPolygon) ret = dc->funcs->pPolygon(dc,pt,count);
GDI_ReleaseObj( hdc );
-}
+ }
return ret;
}
@@ -853,7 +853,7 @@
if (PATH_IsPathOpen(dc->path)) ret = PATH_PolyPolyline(dc, pt, counts, polylines);
else if (dc->funcs->pPolyPolyline) ret = dc->funcs->pPolyPolyline(dc,pt,counts,polylines);
GDI_ReleaseObj( hdc );
-}
+ }
return ret;
}
@@ -879,7 +879,7 @@
{
if (dc->funcs->pExtFloodFill) ret = dc->funcs->pExtFloodFill(dc,x,y,color,fillType);
GDI_ReleaseObj( hdc );
-}
+ }
return ret;
}
@@ -963,12 +963,12 @@
if ((Pts = GDI_Bezier( lppt, cPoints, &nOut )))
{
- TRACE("Pts = %p, no = %d\n", Pts, nOut);
- ret = Polyline( dc->hSelf, Pts, nOut );
- HeapFree( GetProcessHeap(), 0, Pts );
+ TRACE("Pts = %p, no = %d\n", Pts, nOut);
+ ret = Polyline( dc->hSelf, Pts, nOut );
+ HeapFree( GetProcessHeap(), 0, Pts );
+ }
}
-}
-
+
GDI_ReleaseObj( hdc );
return ret;
}
diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c
index 0342ef0..e99081c 100644
--- a/graphics/x11drv/bitblt.c
+++ b/graphics/x11drv/bitblt.c
@@ -460,7 +460,7 @@
return res & 1;
}
-main()
+int main()
{
int rop, i, res, src, dst, pat, tmp, dstUsed;
const BYTE *opcode;
@@ -516,6 +516,8 @@
}
if (res != rop) printf( "%02x: ERROR, res=%02x\n", rop, res );
}
+
+ return 0;
}
#endif /* BITBLT_TEST */
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index c3c9cdc..abcd294 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -136,17 +136,15 @@
/* 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) },
diff --git a/msdos/int10.c b/msdos/int10.c
index e0e1783..c55a105 100644
--- a/msdos/int10.c
+++ b/msdos/int10.c
@@ -313,8 +313,8 @@
FIXME("VESA Function (0x%x) - Not Supported\n", AH_reg(context));
break;
}
-}
-else {
+ }
+ else {
switch(AH_reg(context)) {
@@ -757,7 +757,7 @@
FIXME("Unknown - 0x%x\n", AH_reg(context));
INT_BARF( context, 0x10 );
}
-}
+ }
}
static void conv_text_mode_attributes(char attribute, int *fg, int *bg,
diff --git a/objects/clipping.c b/objects/clipping.c
index 6bf47a6..e2cbeef 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -424,7 +424,7 @@
{
ret = PtInRegion( dc->hGCClipRgn, XLPTODP(dc,x) + dc->DCOrgX,
YLPTODP(dc,y) + dc->DCOrgY );
-}
+ }
GDI_ReleaseObj( hdc );
return ret;
}
