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

Zebediah Figura : kernel32: Allow GetModuleFileNameEx() to succeed on a WoW64 process.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 54f287d88a13d99f3aa49528024378478988afa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f287d88a13d99f3aa49528… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 09:33:05 2018 -0500 kernel32: Allow GetModuleFileNameEx() to succeed on a WoW64 process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 29 ++++++++++++++++++++++++----- dlls/psapi/tests/psapi_main.c | 5 +++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 41080aa..01d28a8 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1812,17 +1812,36 @@ DWORD WINAPI K32GetModuleFileNameExW(HANDLE process, HMODULE module, LPWSTR file_name, DWORD size) { LDR_MODULE ldr_module; + BOOL wow64; DWORD len; if (!size) return 0; - if(!get_ldr_module(process, module, &ldr_module)) + if (!IsWow64Process(process, &wow64)) return 0; - len = ldr_module.FullDllName.Length / sizeof(WCHAR); - if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, - file_name, min( len, size ) * sizeof(WCHAR), NULL)) - return 0; + if (sizeof(void *) == 8 && wow64) + { + LDR_MODULE32 ldr_module32; + + if (!get_ldr_module32(process, module, &ldr_module32)) + return 0; + + len = ldr_module32.FullDllName.Length / sizeof(WCHAR); + if (!ReadProcessMemory(process, (void *)(DWORD_PTR)ldr_module32.FullDllName.Buffer, + file_name, min( len, size ) * sizeof(WCHAR), NULL)) + return 0; + } + else + { + if (!get_ldr_module(process, module, &ldr_module)) + return 0; + + len = ldr_module.FullDllName.Length / sizeof(WCHAR); + if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, + file_name, min( len, size ) * sizeof(WCHAR), NULL)) + return 0; + } if (len < size) { diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index cc38706..fccf82d 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -202,6 +202,11 @@ static void test_EnumProcessModules(void) ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(name, "notepad.exe"), "got %s\n", name); + ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ok(ret, "got error %u\n", GetLastError()); +todo_wine + ok(!strcmp(name, buffer), "got %s\n", name); + TerminateProcess(pi.hProcess, 0); } else if (wow64)

1 0

Jacek Caban : mshtml: Use proper document mode for document fragment objects.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: d3a71dec7ee99e9c65630d080c02d7d4182e61a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a71dec7ee99e9c65630d08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 19:49:51 2018 +0200 mshtml: Use proper document mode for document fragment objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/tests/documentmode.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8cee880..6030681 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5197,6 +5197,7 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode, &HTMLDocumentNode_dispex); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; + doc_frag->document_mode = lock_document_mode(doc_node); *ret = doc_frag; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 663cce7..aa5954b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -70,6 +70,23 @@ function test_doc_props() { next_test(); } +function test_docfrag_props() { + var docfrag = document.createDocumentFragment(); + + function test_exposed(prop, expect) { + if(expect) + ok(prop in docfrag, prop + " not found in document fragent."); + else + ok(!(prop in docfrag), prop + " found in document fragent."); + } + + var v = document.documentMode; + + test_exposed("compareDocumentPosition", v >= 9); + + next_test(); +} + function test_window_props() { function test_exposed(prop, expect) { if(expect) @@ -247,6 +264,7 @@ var tests = [ test_iframe_doc_mode, test_elem_props, test_doc_props, + test_docfrag_props, test_window_props, test_javascript, test_xhr_props,

1 0

Józef Kucia : dxgi: Introduce ARRAY_SIZE() macro.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: c377644ca7a5eaf48d19d0e5c08dd715a3422ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c377644ca7a5eaf48d19d0e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:35 2018 +0200 dxgi: Introduce ARRAY_SIZE() macro. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 547bd19..c8dc67f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -40,6 +40,8 @@ #include "wine/wined3d.h" #include "wine/winedxgi.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + enum dxgi_frame_latency { DXGI_FRAME_LATENCY_DEFAULT = 3, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 063ec5a..73c3cf2 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -655,7 +655,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion); for (i = 0; i < level_count; ++i) { - for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) + for (j = 0; j < ARRAY_SIZE(feature_levels_sm); ++j) { if (feature_levels[i] == feature_levels_sm[j].feature_level) { @@ -671,7 +671,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, if (selected_feature_level) break; - if (j == sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0])) + if (j == ARRAY_SIZE(feature_levels_sm)) FIXME("Unexpected feature level %#x.\n", feature_levels[i]); else TRACE("Feature level %s not supported, trying next fallback if available.\n",

1 0

Józef Kucia : dxgi: Forbid multisampling with flip swap effects.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 79a189b9adb11ee63ef7a2401ae1c7a3ad769d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=79a189b9adb11ee63ef7a240… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:34 2018 +0200 dxgi: Forbid multisampling with flip swap effects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 57ce3e1..cc9075a 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -246,7 +246,7 @@ static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IWineDXGIFact } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFactory *iface, - IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { @@ -255,23 +255,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa IWineDXGIDevice *dxgi_device; HRESULT hr; - TRACE("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p.\n", - iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); + TRACE("iface %p, device %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", + iface, device, window, desc, fullscreen_desc, output, swapchain); - if (!device || !window || !swapchain_desc || !swapchain) + if (!device || !window || !desc || !swapchain) { WARN("Invalid pointer.\n"); return DXGI_ERROR_INVALID_CALL; } - if (swapchain_desc->Stereo) + if (desc->Stereo) { FIXME("Stereo swapchains are not supported.\n"); return DXGI_ERROR_UNSUPPORTED; } - switch (swapchain_desc->SwapEffect) + switch (desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: case DXGI_SWAP_EFFECT_SEQUENTIAL: @@ -281,16 +280,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa case DXGI_SWAP_EFFECT_FLIP_DISCARD: case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; + + if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) + { + WARN("Invalid sample desc %u, %u for swap effect %#x.\n", + desc->SampleDesc.Count, desc->SampleDesc.Quality, desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } break; default: - WARN("Invalid swap effect %u used.\n", swapchain_desc->SwapEffect); + WARN("Invalid swap effect %u used.\n", desc->SwapEffect); return DXGI_ERROR_INVALID_CALL; } - if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) + if (desc->BufferCount < min_buffer_count || desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) { - WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); + WARN("BufferCount is %u.\n", desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } @@ -299,14 +305,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { - hr = d3d11_swapchain_create(dxgi_device, window, swapchain_desc, fullscreen_desc, swapchain); + hr = d3d11_swapchain_create(dxgi_device, window, desc, fullscreen_desc, swapchain); IWineDXGIDevice_Release(dxgi_device); return hr; } if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_ID3D12CommandQueue, (void **)&command_queue))) { - hr = d3d12_swapchain_create(iface, command_queue, window, swapchain_desc, fullscreen_desc, swapchain); + hr = d3d12_swapchain_create(iface, command_queue, window, desc, fullscreen_desc, swapchain); ID3D12CommandQueue_Release(command_queue); return hr; }

1 0

Józef Kucia : dxgi: Use DXGI_MAX_SWAP_CHAIN_BUFFERS.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: cc07f20965e936b1334423105af5fe87ce19cf21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc07f20965e936b133442310… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 12:18:33 2018 +0200 dxgi: Use DXGI_MAX_SWAP_CHAIN_BUFFERS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 4fe684b..57ce3e1 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -288,7 +288,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa return DXGI_ERROR_INVALID_CALL; } - if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > 16) + if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > DXGI_MAX_SWAP_CHAIN_BUFFERS) { WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL;

1 0

Michael Stefaniuc : mlang/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 032af1923cf620d79439fd4b861ad1949c7fed22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032af1923cf620d79439fd4b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:31 2018 +0200 mlang/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index bcb2fd0..b5d6fc6 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -577,7 +577,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = 0; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == 0, "expected lenA 0, got %u\n", lenA); @@ -585,12 +585,12 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = -1; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); - if (lenW < sizeof(bufW)/sizeof(bufW[0])) { + if (lenW < ARRAY_SIZE(bufW)) { /* can only happen if the convert call fails */ ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); bufW[lenW] = 0; /* -1 doesn't include 0 terminator */ @@ -608,7 +608,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = -1; - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, CP_UNICODE, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); @@ -628,7 +628,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) memset(bufW, 'x', sizeof(bufW)); lenA = lstrlenA(stringA); - lenW = sizeof(bufW)/sizeof(bufW[0]); + lenW = ARRAY_SIZE(bufW); ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW); ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); @@ -1039,7 +1039,7 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml) HRESULT hr; int i; - for (i = 0; i < sizeof(other)/sizeof(*other); i++) + for (i = 0; i < ARRAY_SIZE(other); i++) { hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); @@ -1356,7 +1356,7 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) static WCHAR english[] = { 'e','n','g','l','i','s','h',0 }; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { lcid = -1; MultiByteToWideChar(CP_ACP, 0, lcid_table[i].rfc1766, -1, rfc1766W, MAX_RFC1766_NAME); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, rfc1766W); @@ -1410,7 +1410,7 @@ static void test_Rfc1766ToLcid(void) HRESULT ret; DWORD i; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { lcid = -1; ret = pRfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); @@ -1454,7 +1454,7 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) HRESULT hr; BSTR rfcstr; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { buffer[0] = '\0'; rfcstr = NULL; @@ -1488,7 +1488,7 @@ static void test_LcidToRfc1766(void) HRESULT hr; DWORD i; - for(i = 0; i < sizeof(lcid_table) / sizeof(lcid_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(lcid_table); i++) { memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; @@ -1542,7 +1542,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) HRESULT ret; DWORD i; - for(i = 0; i < sizeof(info_table) / sizeof(info_table[0]); i++) { + for(i = 0; i < ARRAY_SIZE(info_table); i++) { memset(buffer, 'x', sizeof(RFC1766INFO) + 2); buffer[sizeof(buffer) -1] = 0; buffer[sizeof(buffer) -2] = 0; @@ -2167,7 +2167,7 @@ static void test_CodePageToScriptID(IMLangFontLink2 *font_link) {CP_UNICODE, 0, E_FAIL} }; - for (i = 0; i < sizeof(cp_sid)/sizeof(cp_sid[0]); i++) + for (i = 0; i < ARRAY_SIZE(cp_sid); i++) { hr = IMLangFontLink2_CodePageToScriptID(font_link, cp_sid[i].cp, &sid); ok(hr == cp_sid[i].hr, "%u CodePageToScriptID failed 0x%08x %u\n", i, hr, GetLastError()); @@ -2460,21 +2460,21 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), NULL, &nb_detected, NULL); + ARRAY_SIZE(preferred), NULL, &nb_detected, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); ok(nb_detected == 1, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2483,7 +2483,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 2, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2493,7 +2493,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2504,7 +2504,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, - sizeof(preferred)/sizeof(preferred[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2516,7 +2516,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred2, - sizeof(preferred2)/sizeof(preferred2[0]), detected, &nb_detected, NULL); + ARRAY_SIZE(preferred2), detected, &nb_detected, NULL); ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2536,7 +2536,7 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) HRESULT ret; test_data = iml2_cpinfo_data; - test_data_num = sizeof(iml2_cpinfo_data) / sizeof(iml2_cpinfo_data[0]); + test_data_num = ARRAY_SIZE(iml2_cpinfo_data); for (i = 0; i < test_data_num; i++) { ret = IMultiLanguage2_GetCodePageInfo(iML2, test_data[i].cpinfo.uiCodePage, LANG_NEUTRAL, &cpinfo);

1 0

Michael Stefaniuc : gameux/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 3be472e1ceb4cb96dd2cae0c17004de98a176ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3be472e1ceb4cb96dd2cae0c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:30 2018 +0200 gameux/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 8 ++++---- dlls/gameux/tests/gamestatistics.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 05c2a11..0a23586 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -143,7 +143,7 @@ static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, if(gameInstanceId) { if(SUCCEEDED(hr)) - hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameInstanceId, sInstanceId, ARRAY_SIZE(sInstanceId)) ? S_OK : E_FAIL); if(SUCCEEDED(hr)) { @@ -294,7 +294,7 @@ static void _validateGameRegistryValues(int line, HRESULT hr; WCHAR sGameApplicationId[40]; - hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, sizeof(sGameApplicationId)/sizeof(sGameApplicationId[0])) ? S_OK : E_FAIL); + hr = (StringFromGUID2(gameApplicationId, sGameApplicationId, ARRAY_SIZE(sGameApplicationId)) ? S_OK : E_FAIL); ok_(__FILE__, line)(hr == S_OK, "cannot convert game application id to string\n"); /* these values exist up from Vista */ @@ -547,7 +547,7 @@ static void test_add_remove_game(void) if(ge) { /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); bstrExeName = SysAllocString(sExeName); @@ -625,7 +625,7 @@ static void test_install_uninstall_game(void) if(ge2) { /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index ff247fc..d823af1 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -44,7 +44,7 @@ static void test_register_game(IGameExplorer **explorer) BSTR bstrExeName, bstrExePath; /* prepare path to binary */ - GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + GetModuleFileNameW(NULL, sExeName, ARRAY_SIZE(sExeName)); lstrcpyW(pathW, sExeName); PathRemoveFileSpecW(pathW); @@ -101,7 +101,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) - hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); + hr = (StringFromGUID2(guidApplicationId, sGuid, ARRAY_SIZE(sGuid)) != 0 ? S_OK : E_FAIL); if(SUCCEEDED(hr)) {

1 0

Michael Stefaniuc : wintrust/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 6ff4365fb3092ce2390c5f243a68ad2f2d6adeee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff4365fb3092ce2390c5f24… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:32 2018 +0200 wintrust/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 6e7913f..81153a2 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -287,7 +287,7 @@ static HANDLE create_temp_file(WCHAR *temp_file) HANDLE file = INVALID_HANDLE_VALUE; WCHAR temp_path[MAX_PATH]; - if (GetTempPathW(sizeof(temp_path) / sizeof(temp_path[0]), temp_path)) + if (GetTempPathW(ARRAY_SIZE(temp_path), temp_path)) { static const WCHAR img[] = { 'i','m','g',0 };

1 0

Zebediah Figura : widl: Prefer types defined in the same typelib to imported types.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: d5a1d6134b1898b6fa5ad0285e630879a806e3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a1d6134b1898b6fa5ad028… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 21:25:50 2018 -0500 widl: Prefer types defined in the same typelib to imported types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 56 +++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 52c68b4..f7e53e4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -993,7 +993,13 @@ static int encode_type( importinfo_t *importinfo; int typeinfo_offset; - if ((importinfo = find_importinfo(typelib, type->name))) + if (type->typelib_idx > -1) + { + chat("encode_type: VT_USERDEFINED - found already defined type %s at %d\n", + type->name, type->typelib_idx); + typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx]; + } + else if ((importinfo = find_importinfo(typelib, type->name))) { chat("encode_type: VT_USERDEFINED - found imported type %s in %s\n", type->name, importinfo->importlib->name); @@ -1003,36 +1009,32 @@ static int encode_type( else { /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) + while (type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) type = type_alias_get_aliasee(type); - chat("encode_type: VT_USERDEFINED - type %p name = %s real type %d idx %d\n", type, - type->name, type_get_type(type), type->typelib_idx); + chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", + type->name, type_get_type(type)); - if (type->typelib_idx == -1) + switch (type_get_type(type)) { - chat("encode_type: trying to ref not added type\n"); - switch (type_get_type(type)) - { - case TYPE_STRUCT: - add_structure_typeinfo(typelib, type); - break; - case TYPE_INTERFACE: - add_interface_typeinfo(typelib, type); - break; - case TYPE_ENUM: - add_enum_typeinfo(typelib, type); - break; - case TYPE_UNION: - add_union_typeinfo(typelib, type); - break; - case TYPE_COCLASS: - add_coclass_typeinfo(typelib, type); - break; - default: - error("encode_type: VT_USERDEFINED - unhandled type %d\n", - type_get_type(type)); - } + case TYPE_STRUCT: + add_structure_typeinfo(typelib, type); + break; + case TYPE_INTERFACE: + add_interface_typeinfo(typelib, type); + break; + case TYPE_ENUM: + add_enum_typeinfo(typelib, type); + break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; + case TYPE_COCLASS: + add_coclass_typeinfo(typelib, type); + break; + default: + error("encode_type: VT_USERDEFINED - unhandled type %d\n", + type_get_type(type)); } typeinfo_offset = typelib->typelib_typeinfo_offsets[type->typelib_idx];

1 0

Józef Kucia : winex11: Get rid of unnecessary assignments.
by Alexandre Julliard May 30, 2018

May 30, 2018

Module: wine Branch: master Commit: 1e37d61eb934a64ee917e08b584292f7560cb779 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e37d61eb934a64ee917e08b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 30 13:00:27 2018 +0200 winex11: Get rid of unnecessary assignments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xvidmode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f055c3a..ba9cdf7 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -368,7 +368,7 @@ static void interpolate_gamma_ramp(WORD *dst_r, WORD *dst_g, WORD *dst_b, unsign static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -378,7 +378,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size; @@ -397,7 +397,7 @@ static BOOL xf86vm_get_gamma_ramp(struct x11drv_gamma_ramp *ramp) static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) { WORD *red, *green, *blue; - BOOL ret = FALSE; + BOOL ret; if (xf86vm_gammaramp_size == GAMMA_RAMP_SIZE) { @@ -407,7 +407,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) } else { - if (!(red = heap_calloc(3 * xf86vm_gammaramp_size, sizeof(*red)))) + if (!(red = heap_calloc(xf86vm_gammaramp_size, 3 * sizeof(*red)))) return FALSE; green = red + xf86vm_gammaramp_size; blue = green + xf86vm_gammaramp_size;

1 0