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

Christian Costa : d3dxof: Add some syntax tests and remove some useless ref count checks.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 2df8998dbd0c4a5497b4707b61a601a34799997d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df8998dbd0c4a5497b4707b6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:33:07 2013 +0200 d3dxof: Add some syntax tests and remove some useless ref count checks. --- dlls/d3dxof/tests/d3dxof.c | 209 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 165 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2df8998dbd0c4a5497b47…

1 0

Christian Costa : d3dxof: Add object separators tests for binary format.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: f63da07505d0d97434fff4cffb86223a1585c9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63da07505d0d97434fff4cff… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:33:16 2013 +0200 d3dxof: Add object separators tests for binary format. --- dlls/d3dxof/tests/d3dxof.c | 157 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63da07505d0d97434fff…

1 0

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

May 20, 2013

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

Nikolay Sivov : comctl32: Remove duplicated code for scroll control size calculation.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 4f99560ef006d729b9a79284124d045788ba83fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f99560ef006d729b9a792841… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 19 10:54:39 2013 +0400 comctl32: Remove duplicated code for scroll control size calculation. --- dlls/comctl32/tab.c | 35 ++++++++--------------------------- 1 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 43d8cdf..229e72b 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1023,37 +1023,18 @@ static void TAB_SetupScrolling( /* * Calculate the position of the scroll control. */ - if(infoPtr->dwStyle & TCS_VERTICAL) - { - controlPos.right = clientRect->right; - controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); + controlPos.right = clientRect->right; + controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - if (infoPtr->dwStyle & TCS_BOTTOM) - { - controlPos.top = clientRect->bottom - infoPtr->tabHeight; - controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); - } - else - { - controlPos.bottom = clientRect->top + infoPtr->tabHeight; - controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); - } + if (infoPtr->dwStyle & TCS_BOTTOM) + { + controlPos.top = clientRect->bottom - infoPtr->tabHeight; + controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); } else { - controlPos.right = clientRect->right; - controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - - if (infoPtr->dwStyle & TCS_BOTTOM) - { - controlPos.top = clientRect->bottom - infoPtr->tabHeight; - controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); - } - else - { - controlPos.bottom = clientRect->top + infoPtr->tabHeight; - controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); - } + controlPos.bottom = clientRect->top + infoPtr->tabHeight; + controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); } /*

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT( VT_DATE) to, DBTYPE_DBTIMESTAMP.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 70af1dd0253f713a0271db50edf0dfcd5a2a8ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70af1dd0253f713a0271db50e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 20 15:09:09 2013 +1000 oledb32: Implement DataConvert DBTYPE_VARIANT(VT_DATE) to, DBTYPE_DBTIMESTAMP. --- dlls/oledb32/convert.c | 18 ++++++++++++++++++ dlls/oledb32/tests/convert.c | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index af603e4..6ae9a06 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -445,6 +445,24 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->fraction = st.wMilliseconds * 1000000; break; } + case DBTYPE_VARIANT: + { + if( V_VT((VARIANT*)src) == VT_DATE) + { + SYSTEMTIME st; + hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = st.wMilliseconds * 1000000; + break; + } + else + FIXME("Unimplemented variant type %d -> DBTIMESTAMP\n", V_VT((VARIANT*)src)); + } default: FIXME("Unimplemented conversion %04x -> DBTIMESTAMP\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 6f02899..39f96d2 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2603,6 +2603,26 @@ static void test_converttovar(void) ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst)); } +static void test_converttotimestamp(void) +{ + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBTIMESTAMP dst; + DBSTATUS dst_status; + DBLENGTH dst_len; + VARIANT var; + HRESULT hr; + + VariantInit(&var); + V_VT(&var) = VT_DATE; + V_DATE(&var) = 41408.086250; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBTIMESTAMP, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); +} + START_TEST(convert) { HRESULT hr; @@ -2638,6 +2658,7 @@ START_TEST(convert) test_converttobytes(); test_converttodbdate(); test_getconversionsize(); + test_converttotimestamp(); IDataConvert_Release(convert);

1 0

Ken Thomases : user32/tests: Test that sending WM_CANCELMODE cancels tracking in window's menu bar.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 7e0c42e8395abc51fd1058d54d89e693c2531b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0c42e8395abc51fd1058d54… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 17 00:41:48 2013 -0500 user32/tests: Test that sending WM_CANCELMODE cancels tracking in window's menu bar. --- dlls/user32/tests/menu.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 07cf437..3e4cf93 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3266,7 +3266,8 @@ static void test_menu_cancelmode(void) { DWORD ret; HWND hwnd, hwndchild; - HMENU menu; + HMENU menu, menubar; + MSG msg; if( !pEndMenu) { /* win95 */ win_skip( "EndMenu is not available\n"); return; @@ -3287,7 +3288,8 @@ static void test_menu_cancelmode(void) ret = AppendMenuA( menu, MF_STRING, 1, "winetest"); ok( ret, "Functie failed lasterror is %u\n", GetLastError()); /* seems to be needed only on wine :( */ - {MSG msg; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg);} + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); /* test the effect of sending a WM_CANCELMODE message in the WM_INITMENULOOP * handler of the menu owner */ /* test results is extracted from variable g_got_enteridle. Possible values: @@ -3314,7 +3316,27 @@ static void test_menu_cancelmode(void) g_hwndtosend = hwnd; TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); + + /* test canceling tracking in a window's menu bar */ + menubar = CreateMenu(); + ok( menubar != NULL, "CreateMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA( menubar, MF_POPUP|MF_STRING, (UINT_PTR)menu, "winetest"); + ok( ret, "AppendMenuA failed lasterror is %u\n", GetLastError()); + ret = SetMenu( hwnd, menubar ); + ok( ret, "SetMenu failed lasterror is %u\n", GetLastError()); + /* initiate tracking */ + g_hwndtosend = hwnd; + ret = SendMessage( hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0 ); + ok( ret == 0, "Sending WM_SYSCOMMAND/SC_KEYMENU failed lasterror is %u\n", GetLastError()); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + todo_wine { + ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); + } + ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + /* cleanup */ + DestroyMenu( menubar ); DestroyMenu( menu); DestroyWindow( hwndchild); DestroyWindow( hwnd);

1 0

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

May 20, 2013

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

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

May 20, 2013

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

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

May 20, 2013

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

Christian Costa : d3dxof: Group and simplify templates and objects in a cleaner manner.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 83f49b9855e8b1a8eaa494dc9fff32275f3de447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f49b9855e8b1a8eaa494dc9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:32:58 2013 +0200 d3dxof: Group and simplify templates and objects in a cleaner manner. --- dlls/d3dxof/tests/d3dxof.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 87b7985..8e380a8 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -84,6 +84,15 @@ static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x0 static char empty_cmp_file[] = "xof 0302cmp 0064"; static char empty_xxxx_file[] = "xof 0302xxxx0064"; +static char templates_bad_file_type1[] = "xOf 0302txt 0064\n"; +static char templates_bad_file_version[] = "xof 0102txt 0064\n"; +static char templates_bad_file_type2[] = "xof 0302foo 0064\n"; +static char templates_bad_file_float_size[] = "xof 0302txt 0050\n"; + +static char templates_parse_error[] = +"xof 0302txt 0064" +"foobar;\n"; + static char object_noname[] = "xof 0302txt 0064\n" "Header\n" @@ -91,7 +100,7 @@ static char object_noname[] = "1; 2; 3;\n" "}\n"; -static char template_syntax_empty_array[] = +static char template_syntax_array_mixed[] = "xof 0302txt 0064\n" "template Buffer\n" "{\n" @@ -140,22 +149,6 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; -static char templates_bad_file_type1[] = -"xOf 0302txt 0064\n"; - -static char templates_bad_file_version[] = -"xof 0102txt 0064\n"; - -static char templates_bad_file_type2[] = -"xof 0302foo 0064\n"; - -static char templates_bad_file_float_size[] = -"xof 0302txt 0050\n"; - -static char templates_parse_error[] = -"xof 0302txt 0064" -"foobar;\n"; - static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -592,7 +585,7 @@ static void test_syntax(void) return; } - hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_empty_array, sizeof(template_syntax_empty_array) - 1); + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); dxflm.lpMemory = &object_syntax_empty_array_semicolon;

1 0