June 2006 - Wine-commits - list.winehq.org

Mike McCormack : server: Use unsigned long for request types that are 64bit in win64.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: f386950fdd1bb500dc0b2c77db74c77490e84cc0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f386950fdd1bb500dc0b2c7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 7 18:33:09 2006 +0900 server: Use unsigned long for request types that are 64bit in win64. --- include/wine/server_protocol.h | 12 ++++++------ server/protocol.def | 10 +++++----- server/trace.c | 10 +++++----- tools/make_requests | 1 + 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 315ae44..7481eb1 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2194,8 +2194,8 @@ struct send_message_request int flags; user_handle_t win; unsigned int msg; - unsigned int wparam; - unsigned int lparam; + unsigned long wparam; + unsigned long lparam; int x; int y; unsigned int time; @@ -2250,8 +2250,8 @@ struct get_message_reply int type; user_handle_t win; unsigned int msg; - unsigned int wparam; - unsigned int lparam; + unsigned long wparam; + unsigned long lparam; int x; int y; user_handle_t hook; @@ -2316,7 +2316,7 @@ struct set_win_timer_request unsigned int msg; unsigned int id; unsigned int rate; - unsigned int lparam; + unsigned long lparam; }; struct set_win_timer_reply { @@ -4382,6 +4382,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 234 +#define SERVER_PROTOCOL_VERSION 235 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0e18ab3..c313df1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1566,8 +1566,8 @@ #define SNAP_MODULE 0x00000008 int flags; /* message flags (see below) */ user_handle_t win; /* window handle */ unsigned int msg; /* message code */ - unsigned int wparam; /* parameters */ - unsigned int lparam; /* parameters */ + unsigned long wparam; /* parameters */ + unsigned long lparam; /* parameters */ int x; /* x position */ int y; /* y position */ unsigned int time; /* message time */ @@ -1607,8 +1607,8 @@ #define SEND_MSG_ABORT_IF_HUNG 0x01 int type; /* message type */ user_handle_t win; /* window handle */ unsigned int msg; /* message code */ - unsigned int wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */ - unsigned int lparam; /* parameters (result for MSG_CALLBACK_RESULT) */ + unsigned long wparam; /* parameters (callback function for MSG_CALLBACK_RESULT) */ + unsigned long lparam; /* parameters (result for MSG_CALLBACK_RESULT) */ int x; /* x position */ int y; /* y position */ user_handle_t hook; /* winevent hook handle */ @@ -1654,7 +1654,7 @@ #define GET_MSG_SENT_ONLY 2 /* only g unsigned int msg; /* message to post */ unsigned int id; /* timer id */ unsigned int rate; /* timer rate in ms */ - unsigned int lparam; /* message lparam (callback proc) */ + unsigned long lparam; /* message lparam (callback proc) */ @REPLY unsigned int id; /* timer id */ @END diff --git a/server/trace.c b/server/trace.c index 1c1cfc0..98f622c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2080,8 +2080,8 @@ static void dump_send_message_request( c fprintf( stderr, " flags=%d,", req->flags ); fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " msg=%08x,", req->msg ); - fprintf( stderr, " wparam=%08x,", req->wparam ); - fprintf( stderr, " lparam=%08x,", req->lparam ); + fprintf( stderr, " wparam=%lx,", req->wparam ); + fprintf( stderr, " lparam=%lx,", req->lparam ); fprintf( stderr, " x=%d,", req->x ); fprintf( stderr, " y=%d,", req->y ); fprintf( stderr, " time=%08x,", req->time ); @@ -2111,8 +2111,8 @@ static void dump_get_message_reply( cons fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " win=%p,", req->win ); fprintf( stderr, " msg=%08x,", req->msg ); - fprintf( stderr, " wparam=%08x,", req->wparam ); - fprintf( stderr, " lparam=%08x,", req->lparam ); + fprintf( stderr, " wparam=%lx,", req->wparam ); + fprintf( stderr, " lparam=%lx,", req->lparam ); fprintf( stderr, " x=%d,", req->x ); fprintf( stderr, " y=%d,", req->y ); fprintf( stderr, " hook=%p,", req->hook ); @@ -2159,7 +2159,7 @@ static void dump_set_win_timer_request( fprintf( stderr, " msg=%08x,", req->msg ); fprintf( stderr, " id=%08x,", req->id ); fprintf( stderr, " rate=%08x,", req->rate ); - fprintf( stderr, " lparam=%08x", req->lparam ); + fprintf( stderr, " lparam=%lx", req->lparam ); } static void dump_set_win_timer_reply( const struct set_win_timer_reply *req ) diff --git a/tools/make_requests b/tools/make_requests index a34b430..a11cc24 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -29,6 +29,7 @@ ( "unsigned char" => "%02x", "unsigned short"=> "%04x", "unsigned int" => "%08x", + "unsigned long" => "%lx", "void*" => "%p", "time_t" => "%ld (long)", "size_t" => "%lu (unsigned long)",

1 0

Alexandre Julliard : server: Print process/ thread id instead of pointer in protocol errors.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 202ef6901e7e29f02d590278d7ab46991e262425 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=202ef6901e7e29f02d59027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 14:20:38 2006 +0200 server: Print process/thread id instead of pointer in protocol errors. --- server/request.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/request.c b/server/request.c index c6b4472..9ae5fa4 100644 --- a/server/request.c +++ b/server/request.c @@ -141,7 +141,7 @@ void fatal_protocol_error( struct thread va_list args; va_start( args, err ); - fprintf( stderr, "Protocol error:%p: ", thread ); + fprintf( stderr, "Protocol error:%04x: ", thread->id ); vfprintf( stderr, err, args ); va_end( args ); thread->exit_code = 1; @@ -154,7 +154,7 @@ void fatal_protocol_perror( struct threa va_list args; va_start( args, err ); - fprintf( stderr, "Protocol error:%p: ", thread ); + fprintf( stderr, "Protocol error:%04x: ", thread->id ); vfprintf( stderr, err, args ); perror( " " ); va_end( args ); @@ -397,15 +397,15 @@ #endif } else if (ret > 0) { - fprintf( stderr, "Protocol error: process %p: partial recvmsg %d for fd\n", - process, ret ); + fprintf( stderr, "Protocol error: process %04x: partial recvmsg %d for fd\n", + process->id, ret ); kill_process( process, NULL, 1 ); } else { if (errno != EWOULDBLOCK && errno != EAGAIN) { - fprintf( stderr, "Protocol error: process %p: ", process ); + fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); kill_process( process, NULL, 1 ); } @@ -440,7 +440,7 @@ #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIG if (ret >= 0) { - fprintf( stderr, "Protocol error: process %p: partial sendmsg %d\n", process, ret ); + fprintf( stderr, "Protocol error: process %04x: partial sendmsg %d\n", process->id, ret ); kill_process( process, NULL, 1 ); } else if (errno == EPIPE) @@ -449,7 +449,7 @@ #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIG } else { - fprintf( stderr, "Protocol error: process %p: ", process ); + fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "sendmsg" ); kill_process( process, NULL, 1 ); }

1 0

Michael Stefaniuc : Remove more redundant NULL checks before HeapFree ( found by Smatch).
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 56026299d0ce1bbc3b389cddcda08a1b9d9704c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56026299d0ce1bbc3b389cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 7 10:55:33 2006 +0200 Remove more redundant NULL checks before HeapFree (found by Smatch). --- dlls/advpack/install.c | 2 +- dlls/setupapi/install.c | 2 +- dlls/shlwapi/assoc.c | 12 ++++++------ dlls/x11drv/dib.c | 2 +- programs/regedit/listview.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 093f0e5..20441cf 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -274,7 +274,7 @@ static HRESULT iterate_section_fields(HI hr = S_OK; done: - if (buffer && buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer); + if (buffer != static_buffer) HeapFree(GetProcessHeap(), 0, buffer); return hr; } diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 78c472e..591e9e6 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -787,7 +787,7 @@ static BOOL iterate_section_fields( HINF } ret = TRUE; done: - if (buffer && buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); return ret; } diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 741d99d..8f3827f 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -220,10 +220,10 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfF hRet = AssocQueryKeyW(cfFlags, assockey, lpszAssocW, lpszExtraW, phkeyOut); } - if (lpszAssocW && lpszAssocW != szAssocW) + if (lpszAssocW != szAssocW) HeapFree(GetProcessHeap(), 0, lpszAssocW); - if (lpszExtraW && lpszExtraW != szExtraW) + if (lpszExtraW != szExtraW) HeapFree(GetProcessHeap(), 0, lpszExtraW); return hRet; @@ -312,14 +312,14 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF WideCharToMultiByte(CP_ACP,0,szReturnW,-1,pszOut,dwLenOut,0,0); *pcchOut = dwLenOut; - if (lpszReturnW && lpszReturnW != szReturnW) + if (lpszReturnW != szReturnW) HeapFree(GetProcessHeap(), 0, lpszReturnW); } } - if (lpszAssocW && lpszAssocW != szAssocW) + if (lpszAssocW != szAssocW) HeapFree(GetProcessHeap(), 0, lpszAssocW); - if (lpszExtraW && lpszExtraW != szExtraW) + if (lpszExtraW != szExtraW) HeapFree(GetProcessHeap(), 0, lpszExtraW); return hRet; } @@ -406,7 +406,7 @@ HRESULT WINAPI AssocQueryStringByKeyA(AS } } - if (lpszExtraW && lpszExtraW != szExtraW) + if (lpszExtraW != szExtraW) HeapFree(GetProcessHeap(), 0, lpszExtraW); return hRet; } diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index 0d53c1d..51f57c8 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -4157,7 +4157,7 @@ #endif info->bmiHeader.biCompression = 0; } - if(descr.colorMap && descr.colorMap != colorPtr) + if(descr.colorMap != colorPtr) HeapFree(GetProcessHeap(), 0, descr.colorMap); return lines; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index cddeea0..8b96068 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -81,7 +81,7 @@ LPCTSTR GetValueName(HWND hwndLV) { INT item; - if (g_valueName && g_valueName != LPSTR_TEXTCALLBACK) + if (g_valueName != LPSTR_TEXTCALLBACK) HeapFree(GetProcessHeap(), 0, g_valueName); g_valueName = NULL;

1 0

EA Durbin : msi/tests: Fixed a typo.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 4e66d4791cc889230a700cfdd54318939536f485 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e66d4791cc889230a700cf… Author: EA Durbin <ead1234(a)hotmail.com> Date: Mon Jun 5 18:59:40 2006 -0500 msi/tests: Fixed a typo. --- dlls/msi/tests/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 665a843..2ae69a4 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -45,7 +45,7 @@ static void test_msidatabase(void) ok( res == ERROR_SUCCESS , "Failed to close database\n" ); res = DeleteFile( msifile ); - ok( res == TRUE, "Falled to delete database\n" ); + ok( res == TRUE, "Failed to delete database\n" ); } static void test_msiinsert(void)

1 0

Mike McCormack : hlink: Implement DllRegisterServer.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: b23b4f5d0101f48d20aa252d1462243b751e5e40 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b23b4f5d0101f48d20aa252… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 20:42:39 2006 +0900 hlink: Implement DllRegisterServer. --- dlls/hlink/hlink.spec | 4 ++-- dlls/hlink/hlink_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf | 1 + 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 075fcd4..7f843fc 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -29,5 +29,5 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub -private DllRegisterServer -@ stub -private DllUnregisterServer +@ stdcall -private DllRegisterServer() +# @ stub -private DllUnregisterServer diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 584ddac..9a535d7 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -26,6 +26,7 @@ #include "winerror.h" #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" #include "unknwn.h" @@ -312,3 +313,44 @@ HRESULT WINAPI DllGetClassObject(REFCLSI return IClassFactory_QueryInterface(pcf, iid, ppv); } + +static HRESULT register_clsid(LPCGUID guid) +{ + static const WCHAR clsid[] = + {'C','L','S','I','D','\\',0}; + static const WCHAR ips[] = + {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + static const WCHAR hlink[] = + {'h','l','i','n','k','.','d','l','l',0}; + static const WCHAR threading_model[] = + {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; + static const WCHAR apartment[] = + {'A','p','a','r','t','m','e','n','t',0}; + WCHAR path[80]; + HKEY key = NULL; + LONG r; + + lstrcpyW(path, clsid); + StringFromGUID2(guid, &path[6], 80); + lstrcatW(path, ips); + r = RegCreateKeyW(HKEY_CLASSES_ROOT, path, &key); + if (r != ERROR_SUCCESS) + return E_FAIL; + + RegSetValueExW(key, NULL, 0, REG_SZ, (LPBYTE)hlink, sizeof hlink); + RegSetValueExW(key, threading_model, 0, REG_SZ, (LPBYTE)apartment, sizeof apartment); + RegCloseKey(key); + + return S_OK; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT r; + + r = register_clsid(&CLSID_StdHlink); + if (SUCCEEDED(r)) + r = register_clsid(&CLSID_StdHlinkBrowseContext); + + return S_OK; +} diff --git a/tools/wine.inf b/tools/wine.inf index 96ba9e9..04ed3f7 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2091,6 +2091,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,dswave.dll,1 11,,dxdiagn.dll,1 11,,hhctrl.ocx,1 +11,,hlink.dll,1 11,,itss.dll,1 11,,mlang.dll,1 11,,mshtml.dll,1

1 0

Mike McCormack : hlink: Add a basic implementation ( based on work by Aric Stewart).
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 58709d2263b0ea549cd0ec2d3bde86a2cda5d21f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58709d2263b0ea549cd0ec2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 19:39:58 2006 +0900 hlink: Add a basic implementation (based on work by Aric Stewart). --- dlls/hlink/Makefile.in | 4 dlls/hlink/browse_ctx.c | 281 ++++++++++++++++++ dlls/hlink/hlink_main.c | 208 ++++++++++++- dlls/hlink/link.c | 741 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1216 insertions(+), 18 deletions(-) create mode 100644 dlls/hlink/browse_ctx.c create mode 100644 dlls/hlink/link.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=58709d2263b0ea549cd…

1 0

Mike McCormack : hlink: Add a stub implementation (based on Aric Stewart' s code).
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: b732e9b4c13e8751c0117d0f19232ff50360078b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b732e9b4c13e8751c0117d0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 19:26:24 2006 +0900 hlink: Add a stub implementation (based on Aric Stewart's code). --- configure | 3 + configure.ac | 1 dlls/Makefile.in | 1 dlls/hlink/.gitignore | 1 dlls/hlink/Makefile.in | 15 +++++ dlls/hlink/hlink.spec | 33 +++++++++++ dlls/hlink/hlink_main.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 insertions(+), 1 deletions(-) create mode 100644 dlls/hlink/.gitignore create mode 100644 dlls/hlink/Makefile.in create mode 100644 dlls/hlink/hlink.spec create mode 100644 dlls/hlink/hlink_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b732e9b4c13e8751c01…

1 0

Mike McCormack : hlink: Declare prototypes for some functions.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: bf7eb624a96c7f8b58f15dc45667477e05acde6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf7eb624a96c7f8b58f15dc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 19:24:14 2006 +0900 hlink: Declare prototypes for some functions. --- include/hlink.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index aa4f068..8843dc0 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -18,9 +18,21 @@ import "urlmon.idl"; +interface IHlink; interface IHlinkSite; +interface IHlinkFrame; interface IHlinkBrowseContext; +cpp_quote("HRESULT WINAPI HlinkCreateFromMoniker(IMoniker*, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);"); +cpp_quote("HRESULT WINAPI HlinkCreateFromString(LPCWSTR, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);"); +cpp_quote("HRESULT WINAPI HlinkCreateFromData(IDataObject*, IHlinkSite*, DWORD dwSiteData, IUnknown*, REFIID, void**);"); +cpp_quote("HRESULT WINAPI HlinkQueryCreateFromData(IDataObject*);"); +cpp_quote("HRESULT WINAPI HlinkClone(IHlink*, REFIID, IHlinkSite*, DWORD, void **);"); +cpp_quote("HRESULT WINAPI HlinkCreateBrowseContext(IUnknown*, REFIID, void **);"); +cpp_quote("HRESULT WINAPI HlinkNavigateToStringReference(LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IHlinkFrame*, DWORD, LPBC, IBindStatusCallback*, IHlinkBrowseContext*);"); +cpp_quote("HRESULT WINAPI HlinkNavigate(IHlink*, IHlinkFrame*, DWORD, LPBC, IBindStatusCallback*, IHlinkBrowseContext*);"); +cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DWORD, IMoniker*, LPCWSTR, LPCWSTR, ULONG*);"); + /***************************************************************************** * IHlink interface */

1 0

Dmitry Timoshkov : winecfg: Avoid unnecessary casts.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: f2ae9e4bdc107a7ed242f7a132040bd2bd13333d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2ae9e4bdc107a7ed242f7a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 7 16:45:47 2006 +0900 winecfg: Avoid unnecessary casts. --- programs/winecfg/main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 0c62f24..d2b3100 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -37,7 +37,7 @@ #include "winecfg.h" WINE_DEFAULT_DEBUG_CHANNEL(winecfg); -static void CALLBACK +static INT CALLBACK PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) { switch (uMsg) @@ -54,6 +54,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, default: break; } + return 0; } static INT_PTR CALLBACK @@ -197,8 +198,8 @@ doPropertySheet (HINSTANCE hInstance, HW psh.u.pszIcon = NULL; psh.pszCaption = load_string (IDS_WINECFG_TITLE); psh.nPages = NUM_PROPERTY_PAGES; - psh.u3.ppsp = (LPCPROPSHEETPAGEW) & psp; - psh.pfnCallback = (PFNPROPSHEETCALLBACK) PropSheetCallback; + psh.u3.ppsp = psp; + psh.pfnCallback = PropSheetCallback; psh.u2.nStartPage = 0; /*

1 0

Dmitry Timoshkov : comctl32: Remove WM_SYSCOMMAND handler from PROPSHEET_DialogProc.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: b4d5dd5efa302c98ea1d85f3f57051c79caedb09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4d5dd5efa302c98ea1d85f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 7 16:45:28 2006 +0900 comctl32: Remove WM_SYSCOMMAND handler from PROPSHEET_DialogProc. --- dlls/comctl32/propsheet.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index ba20116..9f3527d 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3552,17 +3552,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMs } return TRUE; - case WM_SYSCOMMAND: - switch(wParam & 0xfff0) - { - case SC_CLOSE: - PROPSHEET_Cancel(hwnd, 1); - return TRUE; - - default: - return FALSE; - } - case WM_NOTIFY: { NMHDR* pnmh = (LPNMHDR) lParam;

1 0