January 2015 - Wine-commits

Bruno Jesus : dplayx: Cache GUID values so they persist after enumeration.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: 2d08038bac1beb29161143385642701190f8a4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08038bac1beb29161143385… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 14 21:09:49 2015 -0200 dplayx: Cache GUID values so they persist after enumeration. --- dlls/dplayx/dplay.c | 39 +++++++++++---- dlls/dplayx/tests/dplayx.c | 115 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 36e97a6..bae6a15 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5785,6 +5785,11 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, DWORD max_sizeOfDescriptionA = 0; WCHAR *descriptionW = NULL; DWORD max_sizeOfDescriptionW = 0; + DWORD sizeOfSubKeyName; + WCHAR subKeyName[255]; /* 255 is the maximum key size according to MSDN */ + LONG ret_value; + static GUID *guid_cache; + static int cache_count; if (!lpEnumCallbackA && !lpEnumCallbackW) { @@ -5799,19 +5804,37 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, ERR(": no service provider key in the registry - check your Wine installation !!!\n"); return DPERR_GENERIC; } - + + dwIndex = 0; + do + { + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName); + dwIndex++; + } + while (ret_value == ERROR_SUCCESS); + /* The game Swing from bug 37185 expects GUID values to persist after + * the end of the enumeration. */ + if (cache_count < dwIndex) + { + HeapFree(GetProcessHeap(), 0, guid_cache); + guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex); + if (!guid_cache) + { + ERR(": failed to alloc required memory.\n"); + return DPERR_EXCEPTION; + } + cache_count = dwIndex; + } /* Traverse all the service providers we have available */ dwIndex = 0; while (1) { - WCHAR subKeyName[255]; /* 255 is the maximum key size according to MSDN */ - DWORD sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); HKEY hkServiceProvider; - GUID serviceProviderGUID; WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ]; DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent); - LONG ret_value; + sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, &filetime); if (ret_value == ERROR_NO_MORE_ITEMS) @@ -5842,7 +5865,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, ERR(": invalid format for the GUID registry data member for service provider %s (%s).\n", debugstr_w(subKeyName), debugstr_w(guidKeyContent)); continue; } - CLSIDFromString(guidKeyContent, &serviceProviderGUID ); + CLSIDFromString(guidKeyContent, &guid_cache[dwIndex]); /* The enumeration will return FALSE if we are not to continue. * @@ -5870,7 +5893,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, RegQueryValueExA(hkServiceProvider, "DescriptionA", NULL, NULL, (LPBYTE) descriptionA, &sizeOfDescription); - if (!lpEnumCallbackA(&serviceProviderGUID, descriptionA, 6, 0, lpContext)) + if (!lpEnumCallbackA(&guid_cache[dwIndex], descriptionA, 6, 0, lpContext)) goto end; } else @@ -5892,7 +5915,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, RegQueryValueExW(hkServiceProvider, descW, NULL, NULL, (LPBYTE) descriptionW, &sizeOfDescription); - if (!lpEnumCallbackW(&serviceProviderGUID, descriptionW, 6, 0, lpContext)) + if (!lpEnumCallbackW(&guid_cache[dwIndex], descriptionW, 6, 0, lpContext)) goto end; } diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index fb6646d..236e1a8 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -72,6 +72,13 @@ typedef struct tagCallbackData UINT dpidSize; } CallbackData, *lpCallbackData; +struct provider_data +{ + int call_count; + GUID *guid_ptr[10]; + GUID guid_data[10]; + BOOL ret_value; +}; static LPSTR get_temp_buffer(void) { @@ -749,6 +756,113 @@ static void test_DirectPlayCreate(void) } +static BOOL CALLBACK callback_providersA(GUID* guid, char *name, DWORD major, DWORD minor, void *arg) +{ + struct provider_data *prov = arg; + + if (!prov) return TRUE; + + if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + { + prov->guid_ptr[prov->call_count] = guid; + prov->guid_data[prov->call_count] = *guid; + + prov->call_count++; + } + + if (prov->ret_value) /* Only trace when looping all providers */ + trace("Provider #%d '%s' (%d.%d)\n", prov->call_count, name, major, minor); + return prov->ret_value; +} + +static BOOL CALLBACK callback_providersW(GUID* guid, WCHAR *name, DWORD major, DWORD minor, void *arg) +{ + struct provider_data *prov = arg; + + if (!prov) return TRUE; + + if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + { + prov->guid_ptr[prov->call_count] = guid; + prov->guid_data[prov->call_count] = *guid; + + prov->call_count++; + } + + return prov->ret_value; +} + +static void test_EnumerateProviders(void) +{ + HRESULT hr; + int i; + struct provider_data arg; + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = TRUE; + + hr = DirectPlayEnumerateA(callback_providersA, NULL); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateA(NULL, &arg); + ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateA(NULL, NULL); + ok(FAILED(hr), "DirectPlayEnumerateA expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + hr = DirectPlayEnumerateA(callback_providersA, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + ok(arg.call_count > 0, "Expected at least one valid provider\n"); + trace("Found %d providers\n", arg.call_count); + + /* The returned GUID values must have persisted after enumeration (bug 37185) */ + for(i = 0; i < arg.call_count; i++) + { + ok(IsEqualGUID(arg.guid_ptr[i], &arg.guid_data[i]), "#%d Expected equal GUID values\n", i); + } + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = FALSE; + hr = DirectPlayEnumerateA(callback_providersA, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateA failed\n"); + ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); + + hr = DirectPlayEnumerateW(callback_providersW, NULL); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateW(NULL, &arg); + ok(FAILED(hr), "DirectPlayEnumerateW expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + SetLastError(0xdeadbeef); + hr = DirectPlayEnumerateW(NULL, NULL); + ok(FAILED(hr), "DirectPlayEnumerateW expected to fail\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%x\n", GetLastError()); + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = TRUE; + hr = DirectPlayEnumerateW(callback_providersW, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + ok(arg.call_count > 0, "Expected at least one valid provider\n"); + + /* The returned GUID values must have persisted after enumeration (bug 37185) */ + for(i = 0; i < arg.call_count; i++) + { + ok(IsEqualGUID(arg.guid_ptr[i], &arg.guid_data[i]), "#%d Expected equal GUID values\n", i); + } + + memset(&arg, 0, sizeof(arg)); + arg.ret_value = FALSE; + hr = DirectPlayEnumerateW(callback_providersW, &arg); + ok(SUCCEEDED(hr), "DirectPlayEnumerateW failed\n"); + ok(arg.call_count == 1, "Expected 1, got %d\n", arg.call_count); +} + /* EnumConnections */ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, @@ -6544,6 +6658,7 @@ START_TEST(dplayx) test_COM(); test_COM_dplobby(); + test_EnumerateProviders(); if (!winetest_interactive) {

1 0

Qian Hong : kernel32: Fixed buffer size on 64bit in IsWow64Process.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: bfd088dbc6b4f397d9adfbc11a6f878ac0e8fd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd088dbc6b4f397d9adfbc11… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Jan 17 02:17:31 2015 +0800 kernel32: Fixed buffer size on 64bit in IsWow64Process. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/process.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0a087ab..396b7d4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3755,7 +3755,7 @@ DWORD WINAPI RegisterServiceProcess(DWORD dwProcessId, DWORD dwType) */ BOOL WINAPI IsWow64Process(HANDLE hProcess, PBOOL Wow64Process) { - ULONG pbi; + ULONG_PTR pbi; NTSTATUS status; status = NtQueryInformationProcess( hProcess, ProcessWow64Information, &pbi, sizeof(pbi), NULL ); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 218a0d3..d7d3148 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1863,6 +1863,62 @@ static void test_Handles(void) SetStdHandle( STD_ERROR_HANDLE, handle ); } +static void test_IsWow64Process(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DWORD ret; + BOOL is_wow64; + static char cmdline[] = "C:\\Program Files\\Internet Explorer\\iexplore.exe"; + static char cmdline_wow64[] = "C:\\Program Files (x86)\\Internet Explorer\\iexplore.exe"; + + if (!pIsWow64Process) + { + skip("IsWow64Process is not available\n"); + return; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + ret = CreateProcessA(NULL, cmdline_wow64, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + if (ret) + { + trace("Created process %s\n", cmdline_wow64); + is_wow64 = FALSE; + ret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(ret, "IsWow64Process failed.\n"); + ok(is_wow64, "is_wow64 returned FALSE.\n"); + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + if (ret) + { + trace("Created process %s\n", cmdline); + is_wow64 = TRUE; + ret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(ret, "IsWow64Process failed.\n"); + ok(!is_wow64, "is_wow64 returned TRUE.\n"); + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } +} + static void test_SystemInfo(void) { SYSTEM_INFO si, nsi; @@ -2089,6 +2145,7 @@ START_TEST(process) test_QueryFullProcessImageNameA(); test_QueryFullProcessImageNameW(); test_Handles(); + test_IsWow64Process(); test_SystemInfo(); test_RegistryQuota(); test_DuplicateHandle();

1 0

Matteo Bruni : opengl32: Store the OpenGL context version in the handle value.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: cf92569cdd292fd8780bfafb7dafa01280aa9a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf92569cdd292fd8780bfafb7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 16 19:38:54 2015 +0100 opengl32: Store the OpenGL context version in the handle value. --- dlls/opengl32/wgl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3a5e148..32d241c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -51,8 +51,9 @@ extern struct opengl_funcs null_opengl_funcs; enum wgl_handle_type { - HANDLE_CONTEXT = 0 << 12, - HANDLE_PBUFFER = 1 << 12, + HANDLE_PBUFFER = 0 << 12, + HANDLE_CONTEXT = 1 << 12, + HANDLE_CONTEXT_V3 = 3 << 12, HANDLE_TYPE_MASK = 15 << 12 }; @@ -270,8 +271,24 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib { if ((context = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*context) ))) { + enum wgl_handle_type type = HANDLE_CONTEXT; + + if (attribs) + { + while (*attribs) + { + if (attribs[0] == WGL_CONTEXT_MAJOR_VERSION_ARB) + { + if (attribs[1] >= 3) + type = HANDLE_CONTEXT_V3; + break; + } + attribs += 2; + } + } + context->drv_ctx = drv_ctx; - if (!(ret = alloc_handle( HANDLE_CONTEXT, funcs, context ))) + if (!(ret = alloc_handle( type, funcs, context ))) HeapFree( GetProcessHeap(), 0, context ); } if (!ret) funcs->wgl.p_wglDeleteContext( drv_ctx );

1 0

Qian Hong : kernel32: Make SetUnhandledExceptionFilter hotpatchable.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: caa0829d564310a126ad52a58865dc53f48e77e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa0829d564310a126ad52a58… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 01:50:18 2015 +0800 kernel32: Make SetUnhandledExceptionFilter hotpatchable. --- dlls/kernel32/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 77ec91d..bd50e88 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -461,7 +461,7 @@ LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) /*********************************************************************** * SetUnhandledExceptionFilter (KERNEL32.@) */ -LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter( +LPTOP_LEVEL_EXCEPTION_FILTER WINAPI DECLSPEC_HOTPATCH SetUnhandledExceptionFilter( LPTOP_LEVEL_EXCEPTION_FILTER filter ) { LPTOP_LEVEL_EXCEPTION_FILTER old = top_filter;

1 0

Qian Hong : ntdll: Make RtlAddVectoredExceptionHandler hotpatchable.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: cffd86f195383770fccfaaa9ff5766e73fd3f0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cffd86f195383770fccfaaa9f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 02:07:39 2015 +0800 ntdll: Make RtlAddVectoredExceptionHandler hotpatchable. --- dlls/ntdll/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 5b4abb6..daca45a 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -286,7 +286,7 @@ ULONG WINAPI RtlRemoveVectoredContinueHandler( PVOID handler ) /******************************************************************* * RtlAddVectoredExceptionHandler (NTDLL.@) */ -PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) +PVOID WINAPI DECLSPEC_HOTPATCH RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HANDLER func ) { return add_vectored_handler( &vectored_exception_handlers, first, func ); }

1 0

Qian Hong : ole32: Make CoUninitialize and OleUninitialize hotpatchable.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: a940718a4d77a2c9e1b2f14044d5ff3cd7fdfbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a940718a4d77a2c9e1b2f1404… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 02:07:50 2015 +0800 ole32: Make CoUninitialize and OleUninitialize hotpatchable. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/ole2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index da466c4..82cc77d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1948,7 +1948,7 @@ HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) * SEE ALSO * CoInitializeEx */ -void WINAPI CoUninitialize(void) +void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { struct oletls * info = COM_CurrentInfo(); LONG lCOMRefCnt; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f6c6c10..b9cc1f0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -231,7 +231,7 @@ HRESULT WINAPI OleInitialize(LPVOID reserved) /****************************************************************************** * OleUninitialize [OLE32.@] */ -void WINAPI OleUninitialize(void) +void WINAPI DECLSPEC_HOTPATCH OleUninitialize(void) { TRACE("()\n");

1 0

Huw Davies : user32/tests: Add tests for setting and getting the background brush.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: 14f7fd4e23a714849bcf269d0e7d01bf62f4c060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f7fd4e23a714849bcf269d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 11:10:38 2015 +0000 user32/tests: Add tests for setting and getting the background brush. --- dlls/user32/tests/menu.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 575d786..62c3229 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2976,6 +2976,7 @@ static void test_menu_setmenuinfo(void) MENUITEMINFOA mii = { sizeof(MENUITEMINFOA) }; BOOL ret; DWORD gle; + HBRUSH brush; if (!pGetMenuInfo || !pSetMenuInfo) { @@ -3091,6 +3092,31 @@ static void test_menu_setmenuinfo(void) ok( ret, "GetMenuInfo() should have succeeded\n"); ok( gle == 0xdeadbeef, "GetMenuInfo() error got %u\n", gle); ok( !(mi.dwStyle & MNS_NOCHECK), "menustyle was not expected to have the MNS_NOCHECK flag\n"); + + /* test background brush */ + mi.cbSize = sizeof(mi); + mi.fMask = MIM_BACKGROUND; + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == NULL, "got %p\n", mi.hbrBack ); + + brush = CreateSolidBrush( RGB(0xff, 0, 0) ); + mi.hbrBack = brush; + ret = pSetMenuInfo( hmenu, &mi ); + ok( ret, "SetMenuInfo() should have succeeded\n" ); + mi.hbrBack = NULL; + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == brush, "got %p original %p\n", mi.hbrBack, brush ); + + mi.hbrBack = NULL; + ret = pSetMenuInfo( hmenu, &mi ); + ok( ret, "SetMenuInfo() should have succeeded\n" ); + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == NULL, "got %p\n", mi.hbrBack ); + DeleteObject( brush ); + /* clean up */ DestroyMenu( hsubmenu); DestroyMenu( hmenu);

1 0

Huw Davies : user32: Actually use the menu's background brush.
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: 9650f21b2db51ba85e578ebfefb84e4444c75145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9650f21b2db51ba85e578ebfe… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 16 11:10:39 2015 +0000 user32: Actually use the menu's background brush. --- dlls/user32/menu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f0eb66b..847540b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1737,15 +1737,17 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, */ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) { - HBRUSH hPrevBrush = 0; + HBRUSH hPrevBrush = 0, brush = GetSysColorBrush( COLOR_MENU ); RECT rect; + POPUPMENU *menu = MENU_GetMenu( hmenu ); TRACE("wnd=%p dc=%p menu=%p\n", hwnd, hdc, hmenu); GetClientRect( hwnd, &rect ); - if((hPrevBrush = SelectObject( hdc, GetSysColorBrush(COLOR_MENU) )) - && (SelectObject( hdc, get_menu_font(FALSE)))) + if (menu && menu->hbrBack) brush = menu->hbrBack; + if ((hPrevBrush = SelectObject( hdc, brush )) + && SelectObject( hdc, get_menu_font(FALSE) )) { HPEN hPrevPen; @@ -1754,7 +1756,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) ); if( hPrevPen ) { - POPUPMENU *menu; BOOL flat_menu = FALSE; SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); @@ -1763,7 +1764,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) else DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - if( (menu = MENU_GetMenu( hmenu ))) + if (menu) { TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); /* draw menu items */

1 0

Michael Stefaniuc : gdiplus/tests: Actually test a GdipCreateFromHDC call (PVS-Studio).
by Alexandre Julliard 16 Jan '15

16 Jan '15

Module: wine Branch: master Commit: 0c91032f3a232e0cb2ae53fd68729fe1ec6aaad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91032f3a232e0cb2ae53fd6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 12:13:03 2015 +0100 gdiplus/tests: Actually test a GdipCreateFromHDC call (PVS-Studio). --- dlls/gdiplus/tests/graphics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c9cc463..8ce372b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3769,6 +3769,7 @@ static void test_font_height_scaling(void) hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); status = GdipGetDpiY(graphics, &dpi); expect(Ok, status);

1 0

André Hentschel : Acutally add German translation for WWN 382
by Jeremy Newman 16 Jan '15

16 Jan '15

Module: website Branch: master Commit: 8d679a57e4e162063a6fc39f746f6b395bfadc1f URL: http://source.winehq.org/git/website.git/?a=commit;h=8d679a57e4e162063a6fc3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 16 19:08:08 2015 +0100 Acutally add German translation for WWN 382 --- news/de/2014121901.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/news/de/2014121901.xml b/news/de/2014121901.xml index ad09b97..3be6b7b 100644 --- a/news/de/2014121901.xml +++ b/news/de/2014121901.xml @@ -1,11 +1,11 @@ <news> - <date>December 19, 2014</date> - <title>World Wine News Issue 382</title> + <date>19. Dezember 2014</date> + <title>World Wine News Ausgabe 382</title> <body> -<a href="{$root}/wwn/382">WWN Issue 382</a> was released today. +<a href="{$root}/wwn/382">WWN Ausgabe 382</a> wurde heute veröffentlicht. <ul> <li><a href="{$root}/wwn/382#Donation requests">Donation requests</a></li> -<li><a href="{$root}/wwn/382#Weekly AppDB/Bugzilla Status Changes">Weekly AppDB/Bugzilla Status Changes</a></li> +<li><a href="{$root}/wwn/382#Weekly AppDB/Bugzilla Status Changes">Wöchentliche AppDB/Bugzilla Statusänderungen</a></li> </ul> </body> </news>

1 0