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

[PATCH] wer/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wer/tests/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index b10a8191c7..11a02fb18e 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -66,7 +66,7 @@ static void test_WerAddExcludedApplication(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { /* the last part from the path is added to the inclusion list */ hr = WerAddExcludedApplication(buffer, FALSE); @@ -118,7 +118,7 @@ static void test_WerRemoveExcludedApplication(void) "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); /* appname has a path */ - res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + res = GetWindowsDirectoryW(buffer, ARRAY_SIZE(buffer)); if (res > 0) { hr = WerRemoveExcludedApplication(buffer, FALSE); ok((hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), @@ -223,7 +223,7 @@ static void test_WerReportCreate(void) /* multiple active reports are possible */ memset(table, 0, sizeof(table)); - for (i = 0; i < (sizeof(table) / sizeof(table[0]) -1); i++) { + for (i = 0; i < (ARRAY_SIZE(table) - 1); i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); -- 2.14.3

1 0

[PATCH] xinput/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f26fda90eb..e5eb504d52 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -292,7 +292,7 @@ START_TEST(xinput) void *pXInputGetStateEx_Ordinal; int i; - for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) + for (i = 0; i < ARRAY_SIZE(libs); i++) { hXinput = LoadLibraryA( libs[i].name ); -- 2.14.3

1 0

[PATCH] wintrust/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(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 6e7913f710..81153a28cc 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 }; -- 2.14.3

1 0

[PATCH] mlang/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(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 bcb2fd07db..b5d6fc6114 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); -- 2.14.3

1 0

[PATCH] evr/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/evr/tests/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c index 3bae738f5f..84fff6df82 100644 --- a/dlls/evr/tests/filter.c +++ b/dlls/evr/tests/filter.c @@ -163,7 +163,7 @@ static void test_evr_filter_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_EnhancedVideoRenderer, *iids[i], "filter", i); } -- 2.14.3

1 0

[PATCH] dxdiagn/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index e5afba7028..936707632a 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -158,7 +158,7 @@ static void test_EnumChildContainerNames(void) ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); - hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); @@ -178,7 +178,7 @@ static void test_EnumChildContainerNames(void) "Expected the container buffer to be untouched, got %s\n", wine_dbgstr_w(container)); memcpy(container, testW, sizeof(testW)); - hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); ok(!memcmp(container, zerotestW, sizeof(zerotestW)), @@ -221,7 +221,7 @@ static void test_EnumChildContainerNames(void) "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); /* Get the container name to compare against. */ - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, sizeof(temp)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, ARRAY_SIZE(temp)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); @@ -293,7 +293,7 @@ static void test_GetChildContainer(void) ok(child == NULL, "Expected output pointer to be NULL, got %p\n", child); /* Get the name of a suitable child container. */ - hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) @@ -367,7 +367,7 @@ static void test_dot_parsing(void) { IDxDiagContainer *child; - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, sizeof(containerbufW)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, ARRAY_SIZE(containerbufW)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -380,7 +380,7 @@ static void test_dot_parsing(void) if (SUCCEEDED(hr)) { - hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, sizeof(childbufW)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, ARRAY_SIZE(childbufW)); ok(hr == S_OK || hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); IDxDiagContainer_Release(child); @@ -399,7 +399,7 @@ static void test_dot_parsing(void) trace("Testing IDxDiagContainer::GetChildContainer dot parsing with container %s and child container %s.\n", wine_dbgstr_w(containerbufW), wine_dbgstr_w(childbufW)); - for (i = 0; i < sizeof(test_strings)/sizeof(test_strings[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_strings); i++) { IDxDiagContainer *child; char containerbufA[256]; @@ -410,7 +410,7 @@ static void test_dot_parsing(void) WideCharToMultiByte(CP_ACP, 0, containerbufW, -1, containerbufA, sizeof(containerbufA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, childbufW, -1, childbufA, sizeof(childbufA), NULL, NULL); sprintf(dotbufferA, test_strings[i].format, containerbufA, childbufA); - MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, sizeof(dotbufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, ARRAY_SIZE(dotbufferW)); trace("Trying container name %s\n", wine_dbgstr_w(dotbufferW)); hr = IDxDiagContainer_GetChildContainer(pddc, dotbufferW, &child); @@ -451,7 +451,7 @@ static void test_EnumPropNames(void) for (index = 0; index < count; index++) { - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -493,7 +493,7 @@ static void test_EnumPropNames(void) "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); memcpy(property, testW, sizeof(testW)); - hr = IDxDiagContainer_EnumPropNames(child, ~0, property, sizeof(property)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, ~0, property, ARRAY_SIZE(property)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG, got 0x%08x\n", hr); ok(!memcmp(property, testW, sizeof(testW)), "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); @@ -526,7 +526,7 @@ static void test_EnumPropNames(void) ok(property[0] == '\0', "Expected the property buffer string to be empty, got %s\n", wine_dbgstr_w(property)); - hr = IDxDiagContainer_EnumPropNames(child, index, temp, sizeof(temp)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, index, temp, ARRAY_SIZE(temp)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumPropNames to return S_OK, got 0x%08x\n", hr); @@ -596,7 +596,7 @@ static void test_GetProp(void) for (index = 0; index < count; index++) { - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -609,7 +609,7 @@ static void test_GetProp(void) if (SUCCEEDED(hr)) { - hr = IDxDiagContainer_EnumPropNames(child, 0, property, sizeof(property)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, 0, property, ARRAY_SIZE(property)); ok(hr == S_OK || hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); @@ -745,10 +745,10 @@ static void test_root_children(void) goto cleanup; } - ok(count == sizeof(root_children)/sizeof(root_children[0]), + ok(count == ARRAY_SIZE(root_children), "Got unexpected count %u for the number of child containers\n", count); - if (count != sizeof(root_children)/sizeof(root_children[0])) + if (count != ARRAY_SIZE(root_children)) { skip("Received unexpected number of child containers\n"); goto cleanup; @@ -758,7 +758,7 @@ static void test_root_children(void) { WCHAR container[256]; - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); if (hr == E_INVALIDARG) { ok(index == count, @@ -911,7 +911,7 @@ static void test_DxDiag_SystemInfo(void) if (hr == S_OK) { trace("Testing container DxDiag_SystemInfo\n"); - test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + test_container_properties(container, property_tests, ARRAY_SIZE(property_tests)); IDxDiagContainer_Release(container); } @@ -1002,7 +1002,7 @@ static void test_DxDiag_DisplayDevices(void) WCHAR child_container[256]; IDxDiagContainer *child; - hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, ARRAY_SIZE(child_container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); hr = IDxDiagContainer_GetChildContainer(display_cont, child_container, &child); @@ -1011,7 +1011,7 @@ static void test_DxDiag_DisplayDevices(void) if (hr == S_OK) { trace("Testing container %s\n", wine_dbgstr_w(child_container)); - test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); } IDxDiagContainer_Release(child); } -- 2.14.3

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras May 29, 2018

May 29, 2018

1 0

[PATCH] include: Add ID2D1DeviceContext definition.
by Henri Verbeet May 29, 2018

May 29, 2018

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/d2d1_1.idl | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 16 +++ 2 files changed, 300 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4b6224afe3b..11182263103 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -27,7 +27,18 @@ interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; interface IWICImagingFactory; +interface IWICColorContext; interface ID2D1ColorContext; +interface ID2D1Effect; +interface ID2D1GradientStopCollection1; +interface ID2D1ImageBrush; +interface ID2D1BitmapBrush1; +interface ID2D1CommandList; + +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __dwrite_h__ */") typedef enum D2D1_DEVICE_CONTEXT_OPTIONS { @@ -96,7 +107,63 @@ typedef enum D2D1_MAP_OPTIONS D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff, } D2D1_MAP_OPTIONS; +typedef enum D2D1_BUFFER_PRECISION +{ + D2D1_BUFFER_PRECISION_UNKNOWN = 0x0, + D2D1_BUFFER_PRECISION_8BPC_UNORM = 0x1, + D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB = 0x2, + D2D1_BUFFER_PRECISION_16BPC_UNORM = 0x3, + D2D1_BUFFER_PRECISION_16BPC_FLOAT = 0x4, + D2D1_BUFFER_PRECISION_32BPC_FLOAT = 0x5, + D2D1_BUFFER_PRECISION_FORCE_DWORD = 0xffffffff, +} D2D1_BUFFER_PRECISION; + +typedef enum D2D1_COLOR_INTERPOLATION_MODE +{ + D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0x0, + D2D1_COLOR_INTERPOLATION_MODE_PREMULTIPLIED = 0x1, + D2D1_COLOR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_INTERPOLATION_MODE; + +typedef enum D2D1_INTERPOLATION_MODE +{ + D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_INTERPOLATION_MODE_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC, + D2D1_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR, + D2D1_INTERPOLATION_MODE_ANISOTROPIC = D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC, + D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC, + D2D1_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_MODE +{ + D2D1_COMPOSITE_MODE_SOURCE_OVER = 0x0, + D2D1_COMPOSITE_MODE_DESTINATION_OVER = 0x1, + D2D1_COMPOSITE_MODE_SOURCE_IN = 0x2, + D2D1_COMPOSITE_MODE_DESTINATION_IN = 0x3, + D2D1_COMPOSITE_MODE_SOURCE_OUT = 0x4, + D2D1_COMPOSITE_MODE_DESTINATION_OUT = 0x5, + D2D1_COMPOSITE_MODE_SOURCE_ATOP = 0x6, + D2D1_COMPOSITE_MODE_DESTINATION_ATOP = 0x7, + D2D1_COMPOSITE_MODE_XOR = 0x8, + D2D1_COMPOSITE_MODE_PLUS = 0x9, + D2D1_COMPOSITE_MODE_SOURCE_COPY = 0xa, + D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY = 0xb, + D2D1_COMPOSITE_MODE_MASK_INVERT = 0xc, + D2D1_COMPOSITE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMPOSITE_MODE; + +typedef enum D2D1_LAYER_OPTIONS1 +{ + D2D1_LAYER_OPTIONS1_NONE = 0x0, + D2D1_LAYER_OPTIONS1_INITIALIZE_FROM_BACKGROUND = 0x1, + D2D1_LAYER_OPTIONS1_IGNORE_ALPHA = 0x2, + D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, +} D2D1_LAYER_OPTIONS1; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { @@ -134,6 +201,54 @@ typedef struct D2D1_MAPPED_RECT BYTE *bits; } D2D1_MAPPED_RECT; +typedef struct D2D1_BITMAP_PROPERTIES1 +{ + D2D1_PIXEL_FORMAT pixelFormat; + float dpiX; + float dpiY; + D2D1_BITMAP_OPTIONS bitmapOptions; + ID2D1ColorContext *colorContext; +} D2D1_BITMAP_PROPERTIES1; + +typedef struct D2D1_IMAGE_BRUSH_PROPERTIES +{ + D2D1_RECT_F sourceRectangle; + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_IMAGE_BRUSH_PROPERTIES; + +typedef struct D2D1_BITMAP_BRUSH_PROPERTIES1 +{ + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_BITMAP_BRUSH_PROPERTIES1; + +typedef struct D2D1_RENDERING_CONTROLS +{ + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_SIZE_U tileSize; +} D2D1_RENDERING_CONTROLS; + +typedef struct D2D1_LAYER_PARAMETERS1 +{ + D2D1_RECT_F contentBounds; + ID2D1Geometry *geometricMask; + D2D1_ANTIALIAS_MODE maskAntialiasMode; + D2D1_MATRIX_3X2_F maskTransform; + float opacity; + ID2D1Brush *opacityBrush; + D2D1_LAYER_OPTIONS1 layerOptions; +} D2D1_LAYER_PARAMETERS1; + +typedef struct D2D1_EFFECT_INPUT_DESCRIPTION +{ + ID2D1Effect *effect; + UINT32 inputIndex; + D2D1_RECT_F inputRectangle; +} D2D1_EFFECT_INPUT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ @@ -185,6 +300,175 @@ interface ID2D1Device : ID2D1Resource [ object, + uuid(e8f7fe7a-191c-466d-ad95-975678bda998), + local, +] +interface ID2D1DeviceContext : ID2D1RenderTarget +{ + HRESULT CreateBitmap( + [in] D2D1_SIZE_U size, + [in] const void *src_data, + [in] UINT32 pitch, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateBitmapFromWicBitmap( + [in] IWICBitmapSource *bitmap_source, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateBitmapFromDxgiSurface( + [in] IDXGISurface *surface, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateEffect( + [in] REFCLSID effect_id, + [out] ID2D1Effect **effect + ); + HRESULT CreateGradientStopCollection( + [in] const D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count, + [in] D2D1_COLOR_SPACE preinterpolation_space, + [in] D2D1_COLOR_SPACE postinterpolation_space, + [in] D2D1_BUFFER_PRECISION buffer_precision, + [in] D2D1_EXTEND_MODE extend_mode, + [in] D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, + [out] ID2D1GradientStopCollection1 **gradient + ); + HRESULT CreateImageBrush( + [in] ID2D1Image *image, + [in] const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1ImageBrush **brush + ); + HRESULT CreateBitmapBrush( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1BitmapBrush1 **bitmap_brush + ); + HRESULT CreateCommandList( + [out] ID2D1CommandList **command_list + ); + BOOL IsDxgiFormatSupported( + [in] DXGI_FORMAT format + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION buffer_precision + ); + void GetImageLocalBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *local_bounds + ); + HRESULT GetImageWorldBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *world_bounds + ); + HRESULT GetGlyphRunWorldBounds( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [out] D2D1_RECT_F *bounds + ); + void GetDevice( + [out] ID2D1Device **device + ); + void SetTarget( + [in] ID2D1Image *target + ); + void GetTarget( + [out] ID2D1Image **target + ); + void SetRenderingControls( + [in] const D2D1_RENDERING_CONTROLS *rendering_controls + ); + void GetRenderingControls( + [out] D2D1_RENDERING_CONTROLS *rendering_controls + ); + void SetPrimitiveBlend( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); + D2D1_PRIMITIVE_BLEND GetPrimitiveBlend(); + void SetUnitMode( + [in] D2D1_UNIT_MODE unit_mode + ); + D2D1_UNIT_MODE GetUnitMode(); + void DrawGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, + [in] ID2D1Brush *brush, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawImage( + [in] ID2D1Image *image, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_COMPOSITE_MODE composite_mode + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *metafile, + [in] const D2D1_POINT_2F *target_offset + ); + void DrawBitmap( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_F *dst_rect, + [in] float opacity, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] const D2D1_RECT_F *src_rect, + [in] const D2D1_MATRIX_4X4_F *perspective_transform + ); + void PushLayer( + [in] const D2D1_LAYER_PARAMETERS1 *layer_parameters, + [in] ID2D1Layer *layer + ); + HRESULT InvalidateEffectInputRectangle( + [in] ID2D1Effect *effect, + [in] UINT32 input, + [in] const D2D1_RECT_F *input_rect + ); + HRESULT GetEffectInvalidRectangleCount( + [in] ID2D1Effect *effect, + [out] UINT32 *rect_count + ); + HRESULT GetEffectInvalidRectangles( + [in] ID2D1Effect *effect, + [out] D2D1_RECT_F *rectangles, + [in] UINT32 rect_count + ); + HRESULT GetEffectRequiredInputRectangles( + [in] ID2D1Effect *effect, + [in] const D2D1_RECT_F *image_rect, + [in] const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + [out] D2D1_RECT_F *input_rect, + [in] UINT32 input_count + ); + void FillOpacityMask( + [in] ID2D1Bitmap *mask, + [in] ID2D1Brush *brush, + [in] const D2D1_RECT_F *dst_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + +[ + object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), local, ] diff --git a/include/dcommon.idl b/include/dcommon.idl index db5055d202e..88f97c56a47 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -61,3 +61,19 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; + +typedef struct D2D_MATRIX_4X4_F +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + + float m[4][4]; + }; +} D2D_MATRIX_4X4_F; -- 2.11.0

1 0

[PATCH v2 1/4] kernel32: Allow EnumProcessModules() to succeed on a WoW64 process.
by Zebediah Figura May 29, 2018

May 29, 2018

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/module.c | 91 ++++++++++++++++++++++++++++++++++++++++++- dlls/psapi/tests/Makefile.in | 1 + dlls/psapi/tests/psapi_main.c | 67 +++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 6f123ca..ac1f45f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1493,10 +1493,56 @@ FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ) return NULL; } +typedef struct _PEB32 +{ + BOOLEAN InheritedAddressSpace; + BOOLEAN ReadImageFileExecOptions; + BOOLEAN BeingDebugged; + BOOLEAN SpareBool; + DWORD Mutant; + DWORD ImageBaseAddress; + DWORD LdrData; +} PEB32; + +typedef struct _LIST_ENTRY32 +{ + DWORD Flink; + DWORD Blink; +} LIST_ENTRY32; + +typedef struct _PEB_LDR_DATA32 +{ + ULONG Length; + BOOLEAN Initialized; + DWORD SsHandle; + LIST_ENTRY32 InLoadOrderModuleList; +} PEB_LDR_DATA32; + +typedef struct _UNICODE_STRING32 +{ + USHORT Length; + USHORT MaximumLength; + DWORD Buffer; +} UNICODE_STRING32; + +typedef struct _LDR_MODULE32 +{ + LIST_ENTRY32 InLoadOrderModuleList; + LIST_ENTRY32 InMemoryOrderModuleList; + LIST_ENTRY32 InInitializationOrderModuleList; + DWORD BaseAddress; + DWORD EntryPoint; + ULONG SizeOfImage; + UNICODE_STRING32 FullDllName; + UNICODE_STRING32 BaseDllName; +} LDR_MODULE32; + typedef struct { HANDLE process; PLIST_ENTRY head, current; LDR_MODULE ldr_module; + BOOL wow64; + LDR_MODULE32 ldr_module32; } MODULE_ITERATOR; static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) @@ -1505,6 +1551,9 @@ static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) PPEB_LDR_DATA ldr_data; NTSTATUS status; + if (!IsWow64Process(process, &iter->wow64)) + return FALSE; + /* Get address of PEB */ status = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); @@ -1514,6 +1563,30 @@ static BOOL init_module_iterator(MODULE_ITERATOR *iter, HANDLE process) return FALSE; } + if (sizeof(void *) == 8 && iter->wow64) + { + PEB_LDR_DATA32 *ldr_data32_ptr; + DWORD ldr_data32, first_module; + PEB32 *peb32; + + peb32 = (PEB32 *)(DWORD_PTR)pbi.PebBaseAddress; + + if (!ReadProcessMemory(process, &peb32->LdrData, &ldr_data32, + sizeof(ldr_data32), NULL)) + return FALSE; + ldr_data32_ptr = (PEB_LDR_DATA32 *)(DWORD_PTR) ldr_data32; + + if (!ReadProcessMemory(process, + &ldr_data32_ptr->InLoadOrderModuleList.Flink, + &first_module, sizeof(first_module), NULL)) + return FALSE; + iter->head = (LIST_ENTRY *)&ldr_data32_ptr->InLoadOrderModuleList; + iter->current = (LIST_ENTRY *)(DWORD_PTR) first_module; + iter->process = process; + + return TRUE; + } + /* Read address of LdrData from PEB */ if (!ReadProcessMemory(process, &pbi.PebBaseAddress->LdrData, &ldr_data, sizeof(ldr_data), NULL)) @@ -1536,6 +1609,19 @@ static int module_iterator_next(MODULE_ITERATOR *iter) if (iter->current == iter->head) return 0; + if (sizeof(void *) == 8 && iter->wow64) + { + LIST_ENTRY32 *entry32 = (LIST_ENTRY32 *)iter->current; + + if (!ReadProcessMemory(iter->process, + CONTAINING_RECORD(entry32, LDR_MODULE32, InLoadOrderModuleList), + &iter->ldr_module32, sizeof(iter->ldr_module32), NULL)) + return -1; + + iter->current = (LIST_ENTRY *)(DWORD_PTR) iter->ldr_module32.InLoadOrderModuleList.Flink; + return 1; + } + if (!ReadProcessMemory(iter->process, CONTAINING_RECORD(iter->current, LDR_MODULE, InLoadOrderModuleList), &iter->ldr_module, sizeof(iter->ldr_module), NULL)) @@ -1594,7 +1680,10 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, { if (cb >= sizeof(HMODULE)) { - *lphModule++ = iter.ldr_module.BaseAddress; + if (sizeof(void *) == 8 && iter.wow64) + *lphModule++ = (HMODULE) (DWORD_PTR)iter.ldr_module32.BaseAddress; + else + *lphModule++ = iter.ldr_module.BaseAddress; cb -= sizeof(HMODULE); } size += sizeof(HMODULE); diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index 535fb54..980ed0a 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = psapi.dll +IMPORTS = user32 C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8638d73..169f9b0 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -33,6 +33,7 @@ #include "winnt.h" #include "winternl.h" #include "winnls.h" +#include "winuser.h" #include "psapi.h" #include "wine/test.h" @@ -62,6 +63,11 @@ static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); + +static BOOL wow64; static BOOL InitFunctionPtrs(HMODULE hpsapi) { @@ -87,6 +93,9 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "Wow64RevertWow64FsRedirection"); return TRUE; } @@ -110,6 +119,10 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { + char buffer[200] = "C:\\windows\\system32\\notepad.exe"; + PROCESS_INFORMATION pi = {0}; + STARTUPINFOA si = {0}; + void *cookie; HMODULE hMod; DWORD ret, cbNeeded = 0xdeadbeef; @@ -151,6 +164,57 @@ static void test_EnumProcessModules(void) ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); + + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + + ret = WaitForInputIdle(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + hMod = NULL; + ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); + ok(!!hMod, "expeced non-NULL module\n"); + ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); + + TerminateProcess(pi.hProcess, 0); + + if (sizeof(void *) == 8) + { + strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + + ret = WaitForInputIdle(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + hMod = NULL; + ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(ret == 1, "got %d, error %u\n", ret, GetLastError()); + ok(!!hMod, "expeced non-NULL module\n"); + ok(cbNeeded % sizeof(hMod) == 0, "got %u\n", cbNeeded); + + TerminateProcess(pi.hProcess, 0); + } + else if (wow64) + { + pWow64DisableWow64FsRedirection(&cookie); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + pWow64RevertWow64FsRedirection(cookie); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + + ret = WaitForInputIdle(pi.hProcess, 1000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + ret = pEnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + } } static void test_GetModuleInformation(void) @@ -781,6 +845,9 @@ START_TEST(psapi_main) { DWORD pid = GetCurrentProcessId(); + if (pIsWow64Process) + IsWow64Process(GetCurrentProcess(), &wow64); + hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid); -- 2.7.4

2 5

[PATCH] ole32/tests: Fixed tests on win64.
by Jacek Caban May 29, 2018

May 29, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1