May 2013 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32: Forward WM_MEASUREITEM to Rebar notification window.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 2d5abbd1d732b60a6bb9771f358f126b9db8ccb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5abbd1d732b60a6bb9771f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 19 23:51:33 2013 +0400 comctl32: Forward WM_MEASUREITEM to Rebar notification window. --- dlls/comctl32/rebar.c | 4 +--- dlls/comctl32/tests/rebar.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index fa21baa..461dc34 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -46,7 +46,6 @@ * - RB_SETTOOLTIPS * - WM_CHARTOITEM * - WM_LBUTTONDBLCLK - * - WM_MEASUREITEM * - WM_PALETTECHANGED * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN @@ -3723,6 +3722,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: case WM_DRAWITEM: case WM_NOTIFY: + case WM_MEASUREITEM: return SendMessageW(REBAR_GetNotifyParent (infoPtr), uMsg, wParam, lParam); @@ -3748,8 +3748,6 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_LBUTTONUP: return REBAR_LButtonUp (infoPtr); -/* case WM_MEASUREITEM: supported according to ControlSpy */ - case WM_MOUSEMOVE: return REBAR_MouseMove (infoPtr, lParam); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 88c931c..331af28 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -124,7 +124,9 @@ static HWND build_toolbar(int nr, HWND hParent) return hToolbar; } -static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static int g_parent_measureitem; + +static LRESULT CALLBACK parent_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -135,6 +137,9 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa GetClientRect(lpnm->hwndFrom, &height_change_notify_rect); } break; + case WM_MEASUREITEM: + g_parent_measureitem++; + break; } return DefWindowProcA(hWnd, msg, wParam, lParam); } @@ -1056,7 +1061,7 @@ static BOOL register_parent_wnd_class(void) wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd"; - wc.lpfnWndProc = MyWndProc; + wc.lpfnWndProc = parent_wndproc; return RegisterClassA(&wc); } @@ -1106,6 +1111,20 @@ static void test_showband(void) DestroyWindow(hRebar); } +static void test_notification(void) +{ + MEASUREITEMSTRUCT mis; + HWND rebar; + + rebar = create_rebar_control(); + + g_parent_measureitem = 0; + SendMessageA(rebar, WM_MEASUREITEM, 0, (LPARAM)&mis); + ok(g_parent_measureitem == 1, "got %d\n", g_parent_measureitem); + + DestroyWindow(rebar); +} + START_TEST(rebar) { HMODULE hComctl32; @@ -1132,6 +1151,7 @@ START_TEST(rebar) test_bandinfo(); test_colors(); test_showband(); + test_notification(); if(!is_font_installed("System") || !is_font_installed("Tahoma")) {

1 0

André Hentschel : inetcpl.cpl: Add stub for LaunchConnectionDialog.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 8afc3668a5b646f92799deffcb73eeefe875153f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afc3668a5b646f92799deffc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 18 16:12:05 2013 +0200 inetcpl.cpl: Add stub for LaunchConnectionDialog. --- dlls/inetcpl.cpl/inetcpl.c | 12 +++++++++++- dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index e11bf85..7a5ba07 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -212,11 +212,21 @@ BOOL WINAPI LaunchInternetControlPanel(HWND parent) } /********************************************************************* + * LaunchConnectionDialog (inetcpl.@) + * + */ +BOOL WINAPI LaunchConnectionDialog(HWND hParent) +{ + FIXME("(%p): stub\n", hParent); + return FALSE; +} + +/********************************************************************* * LaunchInternetControlPanel (inetcpl.@) * */ BOOL WINAPI LaunchPrivacyDialog(HWND hParent) { - FIXME(": stub\n"); + FIXME("(%p): stub\n", hParent); return FALSE; } diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index 2e59562..bd56ae9 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -7,7 +7,7 @@ @ stub GetAddSitesDisplayUrl @ stub ImportExportPFX @ stub LaunchAddSitesDialog -@ stub LaunchConnectionDialog +@ stdcall LaunchConnectionDialog(long) @ stdcall LaunchInternetControlPanel(long) @ stub LaunchPerSitePrivacyActionDialog @ stub LaunchPopupWindowManagementDialog

1 0

Alexandre Julliard : msacm32: Don't bother to free memory at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 3181d9130c6f23a7e7cf885efec0a126af9d4d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3181d9130c6f23a7e7cf885ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:27:44 2013 +0200 msacm32: Don't bother to free memory at process exit. --- dlls/msacm32/msacm32_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index 6552812..a47611c 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -55,9 +55,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: MSACM_UnregisterAllDrivers(); + if (lpvReserved) break; HeapDestroy(MSACM_hHeap); - MSACM_hHeap = NULL; - MSACM_hInstance32 = NULL; break; default: break;

1 0

Alexandre Julliard : ntoskrnl.exe: Don' t bother to remove exception handler at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: b30160f669aa7741d7ee6eba8f49fec91e5cd9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30160f669aa7741d7ee6eba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:28:08 2013 +0200 ntoskrnl.exe: Don't bother to remove exception handler at process exit. --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 654957a..2d8db4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1861,6 +1861,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) KeQueryTickCount( &count ); /* initialize the global KeTickCount */ break; case DLL_PROCESS_DETACH: + if (reserved) break; RtlRemoveVectoredExceptionHandler( handler ); break; }

1 0

Alexandre Julliard : msvcrt: Don't bother to clean up at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 66a54686766b5762c8e8c1fcb01081b19bb92fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a54686766b5762c8e8c1fcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:28:38 2013 +0200 msvcrt: Don't bother to clean up at process exit. --- dlls/msvcrt/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 6df9ccf..a62e62b 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -118,8 +118,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_THREAD_ATTACH: break; case DLL_PROCESS_DETACH: - msvcrt_free_popen_data(); msvcrt_free_io(); + if (lpvReserved) break; + msvcrt_free_popen_data(); msvcrt_free_mt_locks(); msvcrt_free_console(); msvcrt_free_args();

1 0

Alexandre Julliard : msvcp60: Don't bother to clean up at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 16d87fef68103b29ddea1a155b43c8a1e3b1b00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d87fef68103b29ddea1a155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:28:48 2013 +0200 msvcp60: Don't bother to clean up at process exit. --- dlls/msvcp60/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index dd7a4ef..e9c6975 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -89,6 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_io(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; free_io(); free_locale(); free_lockit();

1 0

Alexandre Julliard : msvcp71: Don't bother to clean up at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 02c15be9ade9dbac7aa6c6a35b64a5af485d2c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c15be9ade9dbac7aa6c6a35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:29:00 2013 +0200 msvcp71: Don't bother to clean up at process exit. --- dlls/msvcp71/msvcp71.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index bcc3685..52e2d16 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -88,6 +88,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) init_io(hdll); break; case DLL_PROCESS_DETACH: + if (reserved) break; free_io(); free_locale(); free_lockit();

1 0

Alexandre Julliard : msvcp90: Don't bother to clean up at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 418fbc677038b051091810d2163b4b9b8d58ea47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418fbc677038b051091810d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:29:07 2013 +0200 msvcp90: Don't bother to clean up at process exit. --- dlls/msvcp90/msvcp90_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 7a7aafe..496efa9 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -92,6 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_io(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; free_io(); free_locale(); free_lockit();

1 0

Alexandre Julliard : msvcp100: Don't bother to clean up at process exit.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: b9271be3c0298ed84024e00332becd4f49f2e064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9271be3c0298ed84024e0033… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:29:13 2013 +0200 msvcp100: Don't bother to clean up at process exit. --- dlls/msvcp100/msvcp100.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index c0f1ecd..244c5d2 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -96,6 +96,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_io(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; free_io(); free_locale(); free_lockit();

1 0

Alexandre Julliard : setupapi: Don' t set the DLL flag when creating a fake dll that ends in .exe.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 361057501fd365ff42f985b2a6e676a2455452ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=361057501fd365ff42f985b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:48:09 2013 +0200 setupapi: Don't set the DLL flag when creating a fake dll that ends in .exe. --- dlls/setupapi/fakedll.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 525f399..3528e79 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -245,11 +245,13 @@ done: } /* build a complete fake dll from scratch */ -static BOOL build_fake_dll( HANDLE file ) +static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) { + static const WCHAR dotexeW[] = { '.','e','x','e',0 }; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; struct dll_info info; + const WCHAR *ext; BYTE *buffer; BOOL ret = FALSE; DWORD lfanew = (sizeof(*dos) + sizeof(fakedll_signature) + 15) & ~15; @@ -279,7 +281,7 @@ static BOOL build_fake_dll( HANDLE file ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #endif nt->FileHeader.TimeDateStamp = 0; - nt->FileHeader.Characteristics = IMAGE_FILE_DLL; + nt->FileHeader.Characteristics = 0; nt->OptionalHeader.MajorLinkerVersion = 1; nt->OptionalHeader.MinorLinkerVersion = 0; nt->OptionalHeader.MajorOperatingSystemVersion = 1; @@ -312,6 +314,9 @@ static BOOL build_fake_dll( HANDLE file ) nt->OptionalHeader.AddressOfEntryPoint = info.mem_pos; nt->OptionalHeader.BaseOfCode = info.mem_pos; + ext = strrchrW( name, '.' ); + if (!ext || strcmpiW( ext, dotexeW )) nt->FileHeader.Characteristics |= IMAGE_FILE_DLL; + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) { size = sizeof(dll_code_section); @@ -963,7 +968,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) else { WARN( "fake dll %s not found for %s\n", debugstr_w(source), debugstr_w(name) ); - ret = build_fake_dll( h ); + ret = build_fake_dll( h, name ); } CloseHandle( h );

1 0