wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Alexandre Julliard : user32: Use the correct type for the return value of DefDlgProcA/W.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: b76f85872c061f2a9645780cd61427d1c4226cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f85872c061f2a9645780cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 11:52:15 2009 +0100 user32: Use the correct type for the return value of DefDlgProcA/W. --- dlls/user32/defdlg.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index e57dae9..3db59ad 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -317,22 +317,6 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, } /*********************************************************************** - * DEFDLG_Epilog - */ -static LRESULT DEFDLG_Epilog(HWND hwnd, UINT msg, BOOL fResult) -{ - /* see SDK 3.1 */ - - if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) || - msg == WM_CTLCOLOR || msg == WM_COMPAREITEM || - msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM || - msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG) - return fResult; - - return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); -} - -/*********************************************************************** * DIALOG_get_info * * Get the DIALOGINFO structure of a window, allocating it if needed @@ -380,7 +364,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; - BOOL result = FALSE; + LRESULT result = 0; /* Perform DIALOGINFO initialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; @@ -420,7 +404,14 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return DefWindowProcA( hwnd, msg, wParam, lParam ); } } - return DEFDLG_Epilog(hwnd, msg, result); + + if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) || + msg == WM_CTLCOLOR || msg == WM_COMPAREITEM || + msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM || + msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG) + return result; + + return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } @@ -430,8 +421,8 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; - BOOL result = FALSE; DLGPROC dlgproc; + LRESULT result = 0; /* Perform DIALOGINFO initialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; @@ -471,5 +462,12 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return DefWindowProcW( hwnd, msg, wParam, lParam ); } } - return DEFDLG_Epilog(hwnd, msg, result); + + if ((msg >= WM_CTLCOLORMSGBOX && msg <= WM_CTLCOLORSTATIC) || + msg == WM_CTLCOLOR || msg == WM_COMPAREITEM || + msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM || + msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG) + return result; + + return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); }

1 0

Alexandre Julliard : user32: Reimplement DefDlgProc16 using message mapping functions.
by Alexandre Julliard 13 Nov '09

13 Nov '09

Module: wine Branch: master Commit: 76dcb0ecb9c64a949314efa30ce32a29f3ba7b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dcb0ecb9c64a949314efa30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 11:11:31 2009 +0100 user32: Reimplement DefDlgProc16 using message mapping functions. --- dlls/user32/defdlg.c | 55 +------------------------------------------------- dlls/user32/msg16.c | 18 ++++++++++++++++ 2 files changed, 19 insertions(+), 54 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 6096890..e57dae9 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" +#include "winuser.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -374,59 +374,6 @@ out: } /*********************************************************************** - * DefDlgProc (USER.308) - */ -LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, - LPARAM lParam ) -{ - DIALOGINFO *dlgInfo; - DLGPROC16 dlgproc; - HWND hwnd32 = WIN_Handle32( hwnd ); - BOOL result = FALSE; - - /* Perform DIALOGINFO initialization if not done */ - if(!(dlgInfo = DIALOG_get_info(hwnd32, TRUE))) return 0; - - SetWindowLongPtrW( hwnd32, DWLP_MSGRESULT, 0 ); - - if ((dlgproc = (DLGPROC16)DEFDLG_GetDlgProc( hwnd32 ))) /* Call dialog procedure */ - result = WINPROC_CallDlgProc16( dlgproc, hwnd, msg, wParam, lParam ); - - if (!result && IsWindow(hwnd32)) - { - /* callback didn't process this message */ - - switch(msg) - { - case WM_ERASEBKGND: - case WM_SHOWWINDOW: - case WM_ACTIVATE: - case WM_SETFOCUS: - case DM_SETDEFID: - case DM_GETDEFID: - case WM_NEXTDLGCTL: - case WM_GETFONT: - case WM_CLOSE: - case WM_NCDESTROY: - case WM_ENTERMENULOOP: - case WM_LBUTTONDOWN: - case WM_NCLBUTTONDOWN: - return DEFDLG_Proc( hwnd32, msg, (WPARAM)wParam, lParam, dlgInfo ); - case WM_INITDIALOG: - case WM_VKEYTOITEM: - case WM_COMPAREITEM: - case WM_CHARTOITEM: - break; - - default: - return DefWindowProc16( hwnd, msg, wParam, lParam ); - } - } - return DEFDLG_Epilog( hwnd32, msg, result); -} - - -/*********************************************************************** * DefDlgProcA (USER32.@) */ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index dba7a14..d5d4825 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -77,6 +77,13 @@ static LRESULT get_message_callback( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARA return 0; } +static LRESULT defdlg_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + *result = DefDlgProcA( hwnd, msg, wp, lp ); + return *result; +} + /*********************************************************************** * SendMessage (USER.111) @@ -270,6 +277,17 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, LPAR /*********************************************************************** + * DefDlgProc (USER.308) + */ +LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) +{ + LRESULT result; + WINPROC_CallProc16To32A( defdlg_proc_callback, hwnd, msg, wParam, lParam, &result, 0 ); + return result; +} + + +/*********************************************************************** * PeekMessage (USER.109) */ BOOL16 WINAPI PeekMessage16( MSG16 *msg, HWND16 hwnd,

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

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 : 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 : 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 : 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 : 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 : 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 : 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

← Newer
1
...
52
53
54
55
56
57
58
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009