November 2009 - Wine-commits

Vincent Povirk : ole32: Rename PROPERTY_NAME_*_LEN to DIRENTRY_NAME_*_LEN.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 74d050302615037751c2edbc7233149647f4f1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d050302615037751c2edbc7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 10:31:55 2009 -0600 ole32: Rename PROPERTY_NAME_*_LEN to DIRENTRY_NAME_*_LEN. --- dlls/ole32/storage32.c | 12 ++++++------ dlls/ole32/storage32.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c2adc32..70a1c33 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -853,7 +853,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( newStreamProperty.sizeOfNameString = ( lstrlenW(pwcsName)+1 ) * sizeof(WCHAR); - if (newStreamProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN) + if (newStreamProperty.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN) return STG_E_INVALIDNAME; strcpyW(newStreamProperty.name, pwcsName); @@ -1033,7 +1033,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( newProperty.sizeOfNameString = (lstrlenW(pwcsName)+1)*sizeof(WCHAR); - if (newProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN) + if (newProperty.sizeOfNameString > DIRENTRY_NAME_BUFFER_LEN) { FIXME("name too long\n"); return STG_E_INVALIDNAME; @@ -3052,7 +3052,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) memcpy( buffer + OFFSET_PS_NAME, newData->name, - PROPERTY_NAME_BUFFER_LEN ); + DIRENTRY_NAME_BUFFER_LEN ); memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1); @@ -3137,7 +3137,7 @@ BOOL StorageImpl_ReadDirEntry( memcpy( buffer->name, propName, - PROPERTY_NAME_BUFFER_LEN ); + DIRENTRY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1); @@ -5840,8 +5840,8 @@ HRESULT WINAPI StgOpenStorage( /* prepare the file name string given in lieu of the root property name */ GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL); - memcpy(newStorage->filename, fullname, PROPERTY_NAME_BUFFER_LEN); - newStorage->filename[PROPERTY_NAME_BUFFER_LEN-1] = '\0'; + memcpy(newStorage->filename, fullname, DIRENTRY_NAME_BUFFER_LEN); + newStorage->filename[DIRENTRY_NAME_BUFFER_LEN-1] = '\0'; /* * Get an "out" pointer for the caller. diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 1bc5b41..bed3a07 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -74,8 +74,8 @@ static const ULONG BLOCK_END_OF_CHAIN = 0xFFFFFFFE; static const ULONG BLOCK_UNUSED = 0xFFFFFFFF; static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; -#define PROPERTY_NAME_MAX_LEN 0x20 -#define PROPERTY_NAME_BUFFER_LEN 0x40 +#define DIRENTRY_NAME_MAX_LEN 0x20 +#define DIRENTRY_NAME_BUFFER_LEN 0x40 #define PROPSET_BLOCK_SIZE 0x00000080 @@ -127,7 +127,7 @@ typedef struct StgStreamImpl StgStreamImpl; */ struct DirEntry { - WCHAR name[PROPERTY_NAME_MAX_LEN]; + WCHAR name[DIRENTRY_NAME_MAX_LEN]; WORD sizeOfNameString; BYTE propertyType; ULONG leftChild; @@ -255,7 +255,7 @@ struct StorageImpl The behaviour of STGM_SIMPLE depends on this */ /* FIXME: should this be in Storage32BaseImpl ? */ - WCHAR filename[PROPERTY_NAME_BUFFER_LEN]; + WCHAR filename[DIRENTRY_NAME_BUFFER_LEN]; /* * File header

1 0

Vincent Povirk : ole32: Rename PROPSET_BLOCK_SIZE to RAW_DIRENTRY_SIZE.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 8a8471a765a6b4310974acd948f7657d0e4b8b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8471a765a6b4310974acd94… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 11 10:34:45 2009 -0600 ole32: Rename PROPSET_BLOCK_SIZE to RAW_DIRENTRY_SIZE. --- dlls/ole32/storage32.c | 26 +++++++++++++------------- dlls/ole32/storage32.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 70a1c33..b24bcff 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1099,7 +1099,7 @@ static HRESULT createDirEntry( ULONG currentPropertyIndex = 0; ULONG newPropertyIndex = DIRENTRY_NULL; HRESULT hr = S_OK; - BYTE currentData[PROPSET_BLOCK_SIZE]; + BYTE currentData[RAW_DIRENTRY_SIZE]; WORD sizeOfNameString; do @@ -1139,7 +1139,7 @@ static HRESULT createDirEntry( */ if (FAILED(hr)) { - BYTE emptyData[PROPSET_BLOCK_SIZE]; + BYTE emptyData[RAW_DIRENTRY_SIZE]; ULARGE_INTEGER newSize; ULONG propertyIndex; ULONG lastProperty = 0; @@ -1166,12 +1166,12 @@ static HRESULT createDirEntry( * memset the empty property in order to initialize the unused newly * created property */ - memset(&emptyData, 0, PROPSET_BLOCK_SIZE); + memset(&emptyData, 0, RAW_DIRENTRY_SIZE); /* * initialize them */ - lastProperty = storage->bigBlockSize / PROPSET_BLOCK_SIZE * blockCount; + lastProperty = storage->bigBlockSize / RAW_DIRENTRY_SIZE * blockCount; for( propertyIndex = newPropertyIndex + 1; @@ -1206,9 +1206,9 @@ static HRESULT destroyDirEntry( ULONG index) { HRESULT hr; - BYTE emptyData[PROPSET_BLOCK_SIZE]; + BYTE emptyData[RAW_DIRENTRY_SIZE]; - memset(&emptyData, 0, PROPSET_BLOCK_SIZE); + memset(&emptyData, 0, RAW_DIRENTRY_SIZE); hr = StorageImpl_WriteRawDirEntry(storage, index, emptyData); @@ -3000,12 +3000,12 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer ULONG bytesRead; offset.u.HighPart = 0; - offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + offset.u.LowPart = index * RAW_DIRENTRY_SIZE; hr = BlockChainStream_ReadAt( This->rootBlockChain, offset, - PROPSET_BLOCK_SIZE, + RAW_DIRENTRY_SIZE, buffer, &bytesRead); @@ -3026,12 +3026,12 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE ULONG bytesRead; offset.u.HighPart = 0; - offset.u.LowPart = index * PROPSET_BLOCK_SIZE; + offset.u.LowPart = index * RAW_DIRENTRY_SIZE; hr = BlockChainStream_WriteAt( This->rootBlockChain, offset, - PROPSET_BLOCK_SIZE, + RAW_DIRENTRY_SIZE, buffer, &bytesRead); @@ -3047,7 +3047,7 @@ HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE */ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) { - memset(buffer, 0, PROPSET_BLOCK_SIZE); + memset(buffer, 0, RAW_DIRENTRY_SIZE); memcpy( buffer + OFFSET_PS_NAME, @@ -3122,7 +3122,7 @@ BOOL StorageImpl_ReadDirEntry( ULONG index, DirEntry* buffer) { - BYTE currentProperty[PROPSET_BLOCK_SIZE]; + BYTE currentProperty[RAW_DIRENTRY_SIZE]; HRESULT readRes; readRes = StorageImpl_ReadRawDirEntry(This, index, currentProperty); @@ -3211,7 +3211,7 @@ BOOL StorageImpl_WriteDirEntry( ULONG index, const DirEntry* buffer) { - BYTE currentProperty[PROPSET_BLOCK_SIZE]; + BYTE currentProperty[RAW_DIRENTRY_SIZE]; HRESULT writeRes; UpdateRawDirEntry(currentProperty, buffer); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index bed3a07..a2cd6fe 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -77,7 +77,7 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; #define DIRENTRY_NAME_MAX_LEN 0x20 #define DIRENTRY_NAME_BUFFER_LEN 0x40 -#define PROPSET_BLOCK_SIZE 0x00000080 +#define RAW_DIRENTRY_SIZE 0x00000080 /* * Property type of relation

1 0

Alexandre Julliard : comdlg32: Create a 32-bit dialog for find/replace.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: c8deafdfaa3bee6fc705720d85031cb2803ebbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8deafdfaa3bee6fc705720d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 22:54:47 2009 +0100 comdlg32: Create a 32-bit dialog for find/replace. --- dlls/comdlg32/finddlg16.c | 333 +++++++++++---------------------------------- 1 files changed, 77 insertions(+), 256 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8deafdfaa3bee6fc7057…

1 0

Alexandre Julliard : comdlg32: Make commdlg. dll into a stand-alone 16-bit module.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 910f331f8a2d91172b21a7672ca7df61c292a266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910f331f8a2d91172b21a7672… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 21:14:18 2009 +0100 comdlg32: Make commdlg.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 4 - dlls/comdlg32/Makefile.in | 11 +-- dlls/comdlg32/cdlg32.c | 1 - dlls/comdlg32/{finddlg32.c => finddlg.c} | 122 ++++++++++---------- dlls/commdlg.dll16/Makefile.in | 18 +++ dlls/{comdlg32 => commdlg.dll16}/cdlg16.h | 0 .../colordlg16.c => commdlg.dll16/colordlg.c} | 0 .../commdlg.dll16.spec} | 2 +- .../filedlg16.c => commdlg.dll16/filedlg.c} | 0 .../finddlg16.c => commdlg.dll16/finddlg.c} | 9 ++ .../fontdlg16.c => commdlg.dll16/fontdlg.c} | 0 .../printdlg16.c => commdlg.dll16/printdlg.c} | 0 15 files changed, 100 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=910f331f8a2d91172b21a…

1 0

Alexandre Julliard : winmm: Use PeekMessageW instead of UserYield.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 9a43c410f9bcf8b01f20770156f56f939923a883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a43c410f9bcf8b01f2077015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 21:52:55 2009 +0100 winmm: Use PeekMessageW instead of UserYield. --- dlls/winmm/mci.c | 23 ++++------------------- 1 files changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 82b1de1..9198f87 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2131,37 +2131,21 @@ UINT WINAPI mciGetDeviceIDW(LPCWSTR lpwstrName) return MCI_GetDriverFromString(lpwstrName); } -/****************************************************************** - * MyUserYield - * - * Internal wrapper to call USER.UserYield16 (in fact through a Wine only export from USER32). - */ -static void MyUserYield(void) -{ - HMODULE mod = GetModuleHandleA( "user32.dll" ); - if (mod) - { - FARPROC proc = GetProcAddress( mod, "UserYield16" ); - if (proc) proc(); - } -} - /************************************************************************** * MCI_DefYieldProc [internal] */ static UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data) { INT16 ret; + MSG msg; TRACE("(0x%04x, 0x%08x)\n", wDevID, data); if ((HIWORD(data) != 0 && HWND_16(GetActiveWindow()) != HIWORD(data)) || (GetAsyncKeyState(LOWORD(data)) & 1) == 0) { - MyUserYield(); + PeekMessageW(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE); ret = 0; } else { - MSG msg; - msg.hwnd = HWND_32(HIWORD(data)); while (!PeekMessageW(&msg, msg.hwnd, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)); ret = -1; @@ -2263,7 +2247,8 @@ UINT WINAPI mciDriverYield(MCIDEVICEID uDeviceID) TRACE("(%04x)\n", uDeviceID); if (!(wmd = MCI_GetDriver(uDeviceID)) || !wmd->lpfnYieldProc) { - MyUserYield(); + MSG msg; + PeekMessageW(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE); } else { ret = wmd->lpfnYieldProc(uDeviceID, wmd->dwYieldData); }

1 0

Alexandre Julliard : mmsystem: Use PeekMessageW instead of UserYield.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 7c930a37714460a6cf04d9e57a8d060c2ea0252b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c930a37714460a6cf04d9e57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 21:53:02 2009 +0100 mmsystem: Use PeekMessageW instead of UserYield. --- dlls/mmsystem.dll16/mci16.c | 3 ++- dlls/mmsystem.dll16/mmsystem.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 75d7202..f09923a 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -482,7 +482,8 @@ static UINT MCI_Yield1632(DWORD pfn16, MCIDEVICEID id, DWORD yield_data) if (!pfn16) { - UserYield16(); + MSG msg; + PeekMessageW( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); return 0; } diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 94bb85f..5f193e7 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -2059,7 +2059,8 @@ LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl, DWORD WARN("Couldn't resume thread\n"); while (lpMMThd->dwStatus != 0x10) { /* test also HIWORD of dwStatus */ - UserYield16(); + MSG msg; + PeekMessageW( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); } } }

1 0

Alexandre Julliard : kernel32: Use PeekMessageW instead of UserYield.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 18ddbc1c7d69c358042873d174482dbb8e9f6787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ddbc1c7d69c358042873d17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 21:54:15 2009 +0100 kernel32: Use PeekMessageW instead of UserYield. --- dlls/kernel32/task.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/task.c b/dlls/kernel32/task.c index 2987420..1bcf211 100644 --- a/dlls/kernel32/task.c +++ b/dlls/kernel32/task.c @@ -819,10 +819,12 @@ void WINAPI Yield16(void) HMODULE mod = GetModuleHandleA( "user32.dll" ); if (mod) { - FARPROC proc = GetProcAddress( mod, "UserYield16" ); - if (proc) + BOOL (WINAPI *pPeekMessageW)( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags ); + pPeekMessageW = (void *)GetProcAddress( mod, "PeekMessageW" ); + if (pPeekMessageW) { - proc(); + MSG msg; + pPeekMessageW( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); return; } }

1 0

Alexandre Julliard : user32: Reimplement UserYield using PeekMessageW.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: dd64dd5548b68214c251bcc5d25090bb6a026eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd64dd5548b68214c251bcc5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 22:01:35 2009 +0100 user32: Reimplement UserYield using PeekMessageW. --- dlls/user32/message.c | 22 ---------------------- dlls/user32/msg16.c | 10 ++++++++++ dlls/user32/user32.spec | 1 - 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 80eadec..a1d7779 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3365,28 +3365,6 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) /*********************************************************************** - * UserYield (USER.332) - */ -void WINAPI UserYield16(void) -{ - DWORD count; - - /* Handle sent messages */ - process_sent_messages(); - - /* Yield */ - ReleaseThunkLock(&count); - - if (count) - { - RestoreThunkLock(count); - /* Handle sent messages again */ - process_sent_messages(); - } -} - - -/*********************************************************************** * RegisterWindowMessageA (USER32.@) * RegisterWindowMessage (USER.118) */ diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index ec42ae9..dba7a14 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -506,6 +506,16 @@ BOOL16 WINAPI SetMessageQueue16( INT16 size ) /*********************************************************************** + * UserYield (USER.332) + */ +void WINAPI UserYield16(void) +{ + MSG msg; + PeekMessageW( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); +} + + +/*********************************************************************** * GetQueueStatus (USER.334) */ DWORD WINAPI GetQueueStatus16( UINT16 flags ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index acf386c..d500f8d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -784,7 +784,6 @@ @ stdcall GetDriverModuleHandle16(long) @ stdcall OpenDriver16(str str long) @ stdcall SendDriverMessage16(long long long long) -@ stdcall UserYield16() ################################################################ # Wine dll separation hacks, these will go away, don't use them

1 0

Alexandre Julliard : user32: Move driver support to mmsystem and replace it with stubs in user.exe.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 2a64c6b11ca2982b01f944337640232e3e866178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a64c6b11ca2982b01f944337… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 22:26:00 2009 +0100 user32: Move driver support to mmsystem and replace it with stubs in user.exe. --- dlls/mmsystem.dll16/Makefile.in | 1 + .../{user32/driver16.c => mmsystem.dll16/driver.c} | 110 +++----------------- dlls/mmsystem.dll16/mmsystem.c | 52 --------- dlls/user32/Makefile.in | 1 - dlls/user32/user16.c | 74 +++++++++++++ dlls/user32/user32.spec | 5 - 6 files changed, 90 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a64c6b11ca2982b01f94…

1 0

Alexandre Julliard : ctl3d: Stub out Ctl3dDlgFramePaint16 to avoid calling DefWindowProc16.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 0bc1eaac767906405714a6ff6bbade60445eff37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc1eaac767906405714a6ff6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 22:57:04 2009 +0100 ctl3d: Stub out Ctl3dDlgFramePaint16 to avoid calling DefWindowProc16. --- dlls/ctl3d.dll16/ctl3d.c | 4 ++-- dlls/ctl3dv2.dll16/ctl3d.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ctl3d.dll16/ctl3d.c b/dlls/ctl3d.dll16/ctl3d.c index c16bab7..fa46175 100644 --- a/dlls/ctl3d.dll16/ctl3d.c +++ b/dlls/ctl3d.dll16/ctl3d.c @@ -68,9 +68,9 @@ HBRUSH WINAPI Ctl3dCtlColorEx16(UINT16 msg, WPARAM16 wParam, LPARAM lParam) /*********************************************************************** * Ctl3dDlgFramePaint (CTL3D.20) */ -LONG WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam) +LRESULT WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam) { - return DefWindowProc16(hwnd, msg, wParam, lParam); + return 0; } /*********************************************************************** diff --git a/dlls/ctl3dv2.dll16/ctl3d.c b/dlls/ctl3dv2.dll16/ctl3d.c index 3d23da2..d89b881 100644 --- a/dlls/ctl3dv2.dll16/ctl3d.c +++ b/dlls/ctl3dv2.dll16/ctl3d.c @@ -68,9 +68,9 @@ HBRUSH WINAPI Ctl3dCtlColorEx16(UINT16 msg, WPARAM16 wParam, LPARAM lParam) /*********************************************************************** * Ctl3dDlgFramePaint (CTL3DV2.20) */ -LONG WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam) +LRESULT WINAPI Ctl3dDlgFramePaint16(HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam) { - return DefWindowProc16(hwnd, msg, wParam, lParam); + return 0; } /***********************************************************************

1 0