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

[PATCH] testbot: Check for 32/64 bit VMs before creating the WineTest Job.
by Francois Gouget June 3, 2018

June 3, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 46 +++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index ff8c30c23..20eacec63 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,6 +65,28 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $VMs = CreateVMs(); + if ($Bits == 64) + { + $VMs->AddFilter("Type", ["win64"]); + $VMs->AddFilter("Role", ["base", "winetest"]); + } + elsif ($BaseJob) + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["base"]); + } + else + { + $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Role", ["winetest"]); + } + if ($VMs->GetItemsCount() == 0) + { + # There is nothing to do + return 1; + } + # Create a hard link in staging so it can then be moved into the job # directory. This is ok because the latest file is never overwritten. my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", @@ -90,38 +112,14 @@ sub AddJob($$$) # Add a task for each VM my $Tasks = $NewStep->Tasks; - my $HasTasks = !1; - my $VMs = CreateVMs(); - if ($Bits == 64) - { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); - } - elsif ($BaseJob) - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); - } foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); - $HasTasks = 1; } # Now save the whole thing - if (!$HasTasks) - { - unlink($StagingFileName); - return 1; - } - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { -- 2.17.0

1 0

Help with running Wine
by mrt303xx＠aol.com June 2, 2018

June 2, 2018

I installed Wine, built and compiled Wine 3.9, and ran Winetricks to add the MS dependencies but nothing runs, not even a basic "Hello World" Windows app with NO MFC. Can somebody point me in the right direction?

1 0

[PATCH] propsys/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/tests/propsys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a6c7023527..e899ff9dc4 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -133,7 +133,7 @@ static void test_PSStringFromPropertyKey(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].psz) memcpy(testcases[i].psz, fillerW, PKEYSTR_MAX * sizeof(WCHAR)); @@ -413,7 +413,7 @@ static void test_PSPropertyKeyFromString(void) int i; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { if (testcases[i].pkey) *testcases[i].pkey = out_init; @@ -480,7 +480,7 @@ static void test_InitPropVariantFromGUIDAsString(void) InitVariantFromGUIDAsString(&IID_NULL, NULL); } - for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + for(i=0; i < ARRAY_SIZE(testcases); i++) { memset(&propvar, 0, sizeof(PROPVARIANT)); hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); -- 2.14.4

1 0

[PATCH] pdh/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pdh/tests/pdh.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 573bcc3a10..0a17906afb 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -700,21 +700,21 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(processor_time), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || ret == PDH_MORE_DATA, /* win2k3 */ "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(uptime), "PdhLookupPerfNameByIndexW failed %d\n", size); } static void test_PdhValidatePathA( void ) -- 2.14.4

1 0

[PATCH] packager/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1f81cb5404..1ce54eda7e 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -457,7 +457,7 @@ static void test_packager(void) ok(hr == S_OK, "Load failed: %08x\n", hr); if(extended){ - len = GetTempPathW(sizeof(filename) / sizeof(*filename), filename); + len = GetTempPathW(ARRAY_SIZE(filename), filename); lstrcpyW(filename + len, filename3W); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, -- 2.14.4

1 0

[PATCH] opengl32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8126fbf96d..b69d91caf9 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -525,7 +525,7 @@ static void test_colorbits(HDC hdc) { const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; BOOL res; @@ -545,8 +545,8 @@ static void test_colorbits(HDC hdc) return; } - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), iAttribList, + iAttribRet); if(res == FALSE) { skip("wglGetPixelFormatAttribivARB failed\n"); @@ -560,7 +560,7 @@ static void test_colorbits(HDC hdc) static void test_gdi_dbuf(HDC hdc) { const int iAttribList[] = { WGL_SUPPORT_GDI_ARB, WGL_DOUBLE_BUFFER_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; BOOL res; @@ -574,9 +574,8 @@ static void test_gdi_dbuf(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1;iPixelFormat <= nFormats;iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; @@ -588,7 +587,7 @@ static void test_gdi_dbuf(HDC hdc) static void test_acceleration(HDC hdc) { const int iAttribList[] = { WGL_ACCELERATION_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; int res; @@ -603,9 +602,8 @@ static void test_acceleration(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; -- 2.14.4

1 0

[PATCH] oledlg/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledlg/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index 5d452f1b09..cef55eb9ca 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -385,7 +385,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STATE|MIIM_ID|MIIM_STRING|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 3, TRUE, &info); ok(ret, "got %d\n", ret); ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); @@ -406,7 +406,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STRING|MIIM_STATE|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, @@ -462,7 +462,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); buffW[0] = 0; - GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + GetMenuStringW(hMenu, 0, buffW, ARRAY_SIZE(buffW), MF_BYPOSITION); ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); verbmenu = NULL; @@ -475,7 +475,7 @@ static void test_OleUIAddVerbMenu(void) info.fMask = MIIM_STRING|MIIM_STATE; buffW[0] = 0; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); -- 2.14.4

1 0

[PATCH] oledb32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/tests/convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 08256242fd..441624048a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -221,8 +221,8 @@ static void test_canconvert(void) return; } - for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) - for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) + for(src_idx = 0; src_idx < ARRAY_SIZE(simple_convert); src_idx++) + for(dst_idx = 0; dst_idx < ARRAY_SIZE(simple_convert); dst_idx++) { BOOL expect, simple_expect; simple_expect = (simple_convert[src_idx].can_convert_to >> dst_idx) & 1; @@ -1479,7 +1479,7 @@ static void test_converttowstr(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_w) * 4, "got %ld\n", dst_len); ok(!lstrcmpW(hexunpacked_w, dst), "got %s\n", wine_dbgstr_w(dst)); - ok(dst[sizeof(hexpacked_w)/sizeof(WCHAR) * 4 + 1] == 0xcccc, "clobbered buffer\n"); + ok(dst[ARRAY_SIZE(hexpacked_w) * 4 + 1] == 0xcccc, "clobbered buffer\n"); memcpy(src, hexpacked_w, sizeof(hexpacked_w)); memset(dst, 0xcc, sizeof(dst)); @@ -2045,7 +2045,7 @@ static void test_converttostr(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(hexpacked_a) * 2, "got %ld\n", dst_len); ok(!lstrcmpA(hexunpacked_a, dst), "got %s\n", dst); - ok(dst[sizeof(hexpacked_a)/sizeof(char) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); + ok(dst[ARRAY_SIZE(hexpacked_a) * 4 + 1] == (char)0xcc, "clobbered buffer\n"); memcpy(src, hexpacked_a, sizeof(hexpacked_a)); memset(dst, 0xcc, sizeof(dst)); -- 2.14.4

1 0

[PATCH] hlink/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 1, 2018

June 1, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/tests/hlink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 265dea3f45..52b5c57f9e 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -120,7 +120,7 @@ static void test_HlinkIsShortcut(void) {NULL, E_INVALIDARG} }; - for(i=0; i<sizeof(shortcut_test)/sizeof(shortcut_test[0]); i++) { + for (i=0; i < ARRAY_SIZE(shortcut_test); i++) { hres = HlinkIsShortcut(shortcut_test[i].file); ok(hres == shortcut_test[i].hres, "[%d] HlinkIsShortcut returned %08x, expected %08x\n", i, hres, shortcut_test[i].hres); @@ -651,7 +651,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, winehq_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(winehq_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(winehq_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); @@ -667,7 +667,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, clsid_nameW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(clsid_nameW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(clsid_nameW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_IsSystemMoniker(mon, &issys); @@ -678,7 +678,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, invalid_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(invalid_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(invalid_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); @@ -694,7 +694,7 @@ static void test_HlinkParseDisplayName(void) hres = HlinkParseDisplayName(bctx, file_urlW, FALSE, &eaten, &mon); ok(hres == S_OK, "HlinkParseDisplayName failed: %08x\n", hres); - ok(eaten == sizeof(file_urlW)/sizeof(WCHAR)-1, "eaten=%d\n", eaten); + ok(eaten == ARRAY_SIZE(file_urlW)-1, "eaten=%d\n", eaten); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, bctx, 0, &name); -- 2.14.4

1 0

[PATCH v3 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Zebediah Figura June 1, 2018

June 1, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 12 +----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..4857d29 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,7 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

2 1

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Zebediah Figura June 1, 2018

June 1, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..ea5dffe 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

2 1

[PATCH v2 2/2] msvcrt: Avoid using inline assembly in __ExceptionPtrCopyException() and copy_exception().
by Zebediah Figura June 1, 2018

June 1, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 30 +++++++++++++++++++----------- dlls/msvcrt/except_i386.c | 30 +++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3402d13..ea5dffe 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1820,17 +1820,25 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) #if _MSVCR_VER >= 100 #ifdef __i386__ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "m" (func), "c" (this), "m" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); #else static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5121301..fad5227 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -154,17 +154,25 @@ static inline void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) -{ - TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); - if (has_vbase) - /* in that case copy ctor takes an extra bool indicating whether to copy the base class */ - __asm__ __volatile__("pushl $1; pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); - else - __asm__ __volatile__("pushl %2; call *%0" - : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); -} +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); + +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "cmpl $0, 20(%ebp)\n\t" + "jz 1f\n\t" + "pushl $1\n\t" + "1:\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) -- 2.7.4

1 0

[PATCH 1/2] msvcrt: Avoid using inline assembly in __ExceptionPtrDestroy().
by Zebediah Figura June 1, 2018

June 1, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 07cde75..3402d13 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1718,10 +1718,12 @@ void __cdecl __ExceptionPtrCreate(exception_ptr *ep) } #ifdef __i386__ -static inline void call_dtor(const cxx_exception_type *type, void *func, void *object) -{ - __asm__ __volatile__("call *%0" : : "m" (func), "c" (object) : "eax", "edx", "memory"); -} +extern void call_dtor(const cxx_exception_type *type, void *func, void *object); + +__ASM_GLOBAL_FUNC( call_dtor, + "movl 12(%esp),%ecx\n\t" + "call *8(%esp)\n\t" + "ret" ); #elif __x86_64__ static inline void call_dtor(const cxx_exception_type *type, unsigned int dtor, void *object) { -- 2.7.4

3 4

[PATCH 1/5] dxgi: Translate VkResults to HRESULTs.
by Józef Kucia June 1, 2018

June 1, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..a775df2446e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -847,6 +847,21 @@ struct dxgi_vk_funcs PFN_vkDestroyFence p_vkDestroyFence; }; +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + return E_OUTOFMEMORY; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + struct d3d12_swapchain { IDXGISwapChain3 IDXGISwapChain3_iface; @@ -1187,18 +1202,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) < 0) + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { - ERR("Failed to wait for fences, vr %d.\n", vr); - return E_FAIL; + ERR("Failed to wait for fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) { ERR("Failed to reset fence, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } return S_OK; @@ -1574,7 +1589,7 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, { WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); heap_free(formats); - return DXGI_ERROR_INVALID_CALL; + return hresult_from_vk_result(vr); } for (i = 0; i < format_count; ++i) @@ -1612,11 +1627,11 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkInstance vk_instance; - HRESULT hr = E_FAIL; VkBool32 supported; VkDevice vk_device; VkFormat vk_format; VkResult vr; + HRESULT hr; swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1; @@ -1674,6 +1689,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) { WARN("Failed to create Vulkan surface, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1682,17 +1698,18 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI queue_family_index, vk_surface, &supported)) < 0 || !supported) { FIXME("Queue family does not support presentation, vr %d.\n", vr); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) goto fail; - hr = E_FAIL; if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, vk_surface, &surface_caps)) < 0) { WARN("Failed to get surface capabilities, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1701,6 +1718,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1718,6 +1736,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1743,6 +1762,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) { WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1752,21 +1772,27 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); if (image_count > ARRAY_SIZE(vk_images)) + { + hr = E_FAIL; goto fail; + } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } -- 2.16.4

3 10

[PATCH] dxgi: Fix a trailing '\n' in a FIXME() trace.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b..5f151a86579 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1037,7 +1037,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain3 *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!n", iface, fullscreen, target); + FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); return E_NOTIMPL; } -- 2.17.0

2 1

[PATCH v2] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)
by Alex Henrie June 1, 2018

June 1, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Moved the declaration of WCHAR into the if statement to be with all the other declarations dlls/gdi32/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..9f47578a70 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2823,6 +2823,7 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, UINT cp; int len; char mbchs[2]; + WCHAR wChar = 0; cp = GdiGetCodePage(hdc); if (IsDBCSLeadByteEx(cp, uChar >> 8)) { @@ -2833,8 +2834,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

1 0

[PATCH] winevulkan: Introduce WINE_VK_HOST to explicitly request 'host' Vulkan headers.
by Józef Kucia June 1, 2018

June 1, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 2 +- dlls/dxgi/swapchain.c | 3 +-- dlls/winevulkan/make_vulkan | 7 ++++++- dlls/winex11.drv/vulkan.c | 3 +-- include/wine/vulkan.h | 7 ++++++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 91525b49a790..be0bd7acdf74 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -23,7 +23,7 @@ #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..080541c90462 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -24,11 +24,10 @@ #ifdef SONAME_LIBVKD3D #define VK_NO_PROTOTYPES -#define VKAPI_CALL #define VKD3D_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/library.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f0583b400385..2265ddc80b7d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2009,6 +2009,12 @@ class VkGenerator(object): f.write("#include <windef.h>\n") f.write("#include <stdint.h>\n\n") + f.write("/* Define WINE_VK_HOST to get 'host' headers. */\n") + f.write("#ifdef WINE_VK_HOST\n") + f.write("#define VKAPI_CALL\n") + f.write('#define WINE_VK_ALIGN(x)\n') + f.write("#endif\n\n") + f.write("#ifndef VKAPI_CALL\n") f.write("#define VKAPI_CALL __stdcall\n") f.write("#endif\n\n") @@ -2017,7 +2023,6 @@ class VkGenerator(object): f.write("#define VKAPI_PTR VKAPI_CALL\n") f.write("#endif\n\n") - f.write("/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */\n") f.write("#ifndef WINE_VK_ALIGN\n") f.write("#define WINE_VK_ALIGN DECLSPEC_ALIGN\n") f.write("#endif\n\n") diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index a72be33be341..7e252326b5ac 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -31,9 +31,8 @@ #include "wine/library.h" #include "x11drv.h" -/* We only want host compatible structures and don't need alignment. */ -#define WINE_VK_ALIGN(x) #define VK_NO_PROTOTYPES +#define WINE_VK_HOST #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7c938cd88fb2..d44687fabf7b 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -6,6 +6,12 @@ #include <windef.h> #include <stdint.h> +/* Define WINE_VK_HOST to get 'host' headers. */ +#ifdef WINE_VK_HOST +#define VKAPI_CALL +#define WINE_VK_ALIGN(x) +#endif + #ifndef VKAPI_CALL #define VKAPI_CALL __stdcall #endif @@ -14,7 +20,6 @@ #define VKAPI_PTR VKAPI_CALL #endif -/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */ #ifndef WINE_VK_ALIGN #define WINE_VK_ALIGN DECLSPEC_ALIGN #endif -- 2.16.4

1 0

[PATCH] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)
by Alex Henrie June 1, 2018

June 1, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- CID 713109 (#1 of 1): Reliance on integer endianness (INCOMPATIBLE_CAST) incompatible_cast: Pointer &uChar points to an object whose effective type is unsigned int (32 bits, unsigned) but is dereferenced as a narrower unsigned short (16 bits, unsigned). This may lead to unexpected results depending on machine endianness. dlls/gdi32/font.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..3347c9208c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2817,6 +2817,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm, DWORD cbBuffer, LPVOID lpBuffer, const MAT2 *lpmat2 ) { + WCHAR wChar; + if (!lpmat2) return GDI_ERROR; if(!(fuFormat & GGO_GLYPH_INDEX)) { @@ -2833,8 +2835,9 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + wChar = 0; + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

2 3

[PATCH] wsdapi/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/tests/discovery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index cfdd41fe83c..96c2ead7f9a 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -540,7 +540,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, "pSoap->Header.Action == '%s'\n", wine_dbgstr_w(pSoap->Header.Action)); - ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL\n"); /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) -- 2.17.0

1 0

[PATCH] schedsvc: Add a trailing '\n' to some ERR() messages.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/schedsvc/svc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 9342b50e4b9..22989261935 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -39,7 +39,7 @@ static HANDLE done_event, hjob_queue; void add_process_to_queue(HANDLE process) { if (!AssignProcessToJobObject(hjob_queue, process)) - ERR("AssignProcessToJobObject failed"); + ERR("AssignProcessToJobObject failed\n"); } static DWORD WINAPI tasks_monitor_thread(void *arg) @@ -69,14 +69,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) hjob_queue = CreateJobObjectW(NULL, NULL); if (!hjob_queue) { - ERR("CreateJobObject failed"); + ERR("CreateJobObject failed\n"); return -1; } hport = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); if (!hport) { - ERR("CreateIoCompletionPort failed"); + ERR("CreateIoCompletionPort failed\n"); return -1; } @@ -84,7 +84,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) info.CompletionPort = hport; if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) { - ERR("SetInformationJobObject failed"); + ERR("SetInformationJobObject failed\n"); return -1; } -- 2.17.0

1 0

[PATCH] shell32: Fix a typo in a comment.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e18d53..04ac0b6fd3c 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -502,7 +502,7 @@ static INT_PTR CALLBACK file_properties_proc(HWND hwndDlg, UINT uMsg, WPARAM wPa ERR("failed to update file attributes of %s\n", debugstr_w(props->path)); } - /* Update filename it it was changed */ + /* Update filename if it was changed */ if (GetDlgItemTextW(hwndDlg, IDC_FPROP_PATH, newname, ARRAY_SIZE(newname)) && strcmpW(props->filename, newname) && strlenW(props->dir) + strlenW(newname) + 2 < ARRAY_SIZE(newpath)) -- 2.17.0

1 0

[PATCH] dwrite: Fix typos in a couple of idl parameter names.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/dwrite_3.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index de14b910ee3..5958e6fb1bc 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -281,7 +281,7 @@ interface IDWriteFontSet1 : IDWriteFontSet UINT32 *actual_num_ranges); HRESULT GetFontFaceReference( UINT32 index, - IDWriteFontFaceReference1 **referece); + IDWriteFontFaceReference1 **reference); HRESULT CreateFontResource( UINT32 index, IDWriteFontResource **resource); @@ -651,7 +651,7 @@ interface IDWriteFontSetBuilder2 : IDWriteFontSetBuilder1 DWRITE_FONT_AXIS_RANGE const *axis_ranges, UINT32 num_ranges, DWRITE_FONT_PROPERTY const *props, - UINT32 num_properies); + UINT32 num_properties); HRESULT AddFontFile(const WCHAR *filepath); } -- 2.17.0

1 0

[PATCH] wscript/tests: Fix a typo in the WScript.BuildVersion check.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/wscript/tests/run.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 5a5539b1734..a812a85c9e0 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -27,7 +27,7 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); -ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuildVersion) = " + typeof(WScript.BuildVersion)); ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); -- 2.17.0

1 0

[PATCH] Revert "testbot/web: Tweak VMDetails.pl to save the Item directly."
by Francois Gouget June 1, 2018

June 1, 2018

Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the VMDetails page is also used to create new VMs so we have no choice but to go through the collection. This reverts commit 71a9602bb6eab2b54e930080b8ef728064d6a664. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 057147157..9603e346a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -62,7 +62,8 @@ sub Save($) } } - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + my $ErrKey; + ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); return ! defined($self->{ErrMessage}); } -- 2.17.0

1 0

[PATCH] dbghelp: Add a missing include to fix the build.
by Huw Davies June 1, 2018

June 1, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4018c9dbf2..7c40801d89 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -51,6 +51,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #include "image_private.h" #ifdef HAVE_MACH_O_LOADER_H -- 2.16.2

1 0

[PATCH] testbot/web: Fix the Submit.pl TestExecutable validation.
by Francois Gouget June 1, 2018

June 1, 2018

Fix the parentheses and also make sure it does not contain a path. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2a4521edc..757efd1f5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -476,12 +476,13 @@ sub Validate($) elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { if (($self->GetParam("FileType") eq "patchdlls" && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+_test\.exe/)) || - ($self->GetParam("FileType") eq "patchprograms") && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+\.exe_test\.exe/)) + $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || + ($self->GetParam("FileType") eq "patchprograms" && + $self->GetParam("TestExecutable") !~ m/^[\w_.]+\.exe_test\.exe$/) || + ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) { - $self->{ErrMessage} = "Invalid name for Test executable"; $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "Invalid test executable filename"; return !1; } -- 2.17.0

1 0

[PATCH] testbot/web: Don't trust the Submit.pl File / FileName field.
by Francois Gouget June 1, 2018

June 1, 2018

Make sure the filename does not contain a path. Rename the variable to $BaseName to make that clearer. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 68 +++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 757efd1f5..ae69e7ce5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -506,6 +506,33 @@ sub Validate($) return $self->SUPER::Validate(); } +sub ValidateAndGetFileName($$) +{ + my ($self, $FieldName) = @_; + + my $FileName = $self->GetParam($FieldName); + if (!$FileName) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "You must provide a file to test"; + return undef; + } + if ($FileName =~ m=[/\\]=) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is invalid"; + return undef; + } + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is too long"; + return undef; + } + return $FileName; +} + sub DetermineFileType($$) { my ($self, $FileName) = @_; @@ -594,29 +621,13 @@ sub OnPage1Next($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); - if (! $FileName) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Must be entered"; - return !1; - } + my $BaseName = $self->ValidateAndGetFileName("File"); + return !1 if (!$BaseName); + my $Fh = $self->CGI->upload("File"); if (defined($Fh)) { - if ($FileName =~ /(\\|\/)/) - { - $FileName =~ m/^.*(\\|\/)(.*)/; - $FileName = $2; - } - my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); - if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "The filename is too long"; - return !1; - } - my $StagingFile = $self->GetTmpStagingFullPath($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($BaseName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -648,7 +659,7 @@ sub OnPage1Next($) return !1; } - $self->{FileName} = $FileName; + $self->{FileName} = $BaseName; $self->{FileType} = $FileType; if (defined($DllBaseName)) { @@ -706,10 +717,11 @@ sub OnPage2Prev($) { my ($self) = @_; - my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); - if ($StagingFileName) + my $FileName = $self->GetParam("File"); + if ($FileName) { - unlink($StagingFileName); + my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); + unlink($StagingFileName) if ($StagingFileName); } $self->{Page} = 1; @@ -737,16 +749,14 @@ sub OnSubmit($) { my ($self) = @_; - if (! $self->Validate()) - { - return !1; - } + return !1 if (!$self->Validate()); + my $BaseName = $self->ValidateAndGetFileName("FileName"); + return !1 if (!$BaseName); # Store the file in the staging directory until the relevant Job and Step # IDs are known and it can be moved to the jobs directory tree. But rename # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. - my $BaseName = $self->GetParam("FileName"); my $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); -- 2.17.0

1 0

[PATCH] testbot/build: Document the Reconfig.pl commands.
by Francois Gouget June 1, 2018

June 1, 2018

The information messages mirror those of Build.pl. They also add empty lines in the log, improving readability. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 6f461144e..f84c80458 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -41,6 +41,17 @@ sub BEGIN use WineTestBot::Config; +sub InfoMsg(@) +{ + my $OldUMask = umask(002); + if (open LOGFILE, ">>$LogDir/Reconfig.log") + { + print LOGFILE @_; + close LOGFILE; + } + umask($OldUMask); +} + sub LogMsg(@) { my $OldUMask = umask(002); @@ -61,6 +72,7 @@ sub FatalError(@) sub GitPull() { + InfoMsg "Updating the Wine source\n"; system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -105,6 +117,7 @@ sub BuildTestAgentd() # so don't rebuild it. if (! -x "$BinDir/build/testagentd") { + InfoMsg "\nBuilding the native testagentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -115,6 +128,7 @@ sub BuildTestAgentd() } } + InfoMsg "\nRebuilding the Windows TestAgentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -129,6 +143,7 @@ sub BuildTestAgentd() sub BuildTestLauncher() { + InfoMsg "\nRebuilding TestLauncher\n"; system("( cd $::RootDir/src/TestLauncher && set -x && " . " time make -j$ncpus" . ") >>$LogDir/Reconfig.log 2>&1"); @@ -146,6 +161,7 @@ sub BuildNative() mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . @@ -169,6 +185,7 @@ sub BuildCross($) mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding the $Bits-bit test executables\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . -- 2.17.0

1 0

[PATCH] testbot/build: Tweak the Build.pl information messages for readability.
by Francois Gouget June 1, 2018

June 1, 2018

Add an empty line before the information messages to make the log more readable. Also tweak the native tools build message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 03733cef6..77bc9ca9d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -89,7 +89,7 @@ sub ApplyPatch($) my $Impacts = GetPatchImpact($PatchFile, "nounits"); if ($Impacts->{Makefiles}) { - InfoMsg "Running make_makefiles\n"; + InfoMsg "\nRunning make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . " ./tools/make_makefiles " . ") >> $LogDir/Build.log 2>&1"); @@ -102,7 +102,7 @@ sub ApplyPatch($) if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { - InfoMsg "Running autoconf\n"; + InfoMsg "\nRunning autoconf\n"; system("( cd $DataDir/wine && set -x && " . " autoconf " . ") >>$LogDir/Build.log 2>&1"); @@ -131,6 +131,8 @@ sub CountCPUs() sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); @@ -157,7 +159,7 @@ sub BuildTestExecutable($$$) $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "Building the $Bits-bit test executable\n"; + InfoMsg "\nBuilding the $Bits-bit test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " time make -j$ncpus $TestsDir " . ") >>$LogDir/Build.log 2>&1"); @@ -256,7 +258,6 @@ if (!ApplyPatch($PatchFile)) CountCPUs(); -InfoMsg "Building tools\n"; if (!BuildNative()) { exit(1); -- 2.17.0

1 0

[PATCH] testbot: Remove a debug function from PatchUtils.pm.
by Francois Gouget June 1, 2018

June 1, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 611d883e4..b05fe0aa4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -109,12 +109,6 @@ sub _AddTest($$$) $Tests->{$Module}->{Files}->{$File} = $Change; } -sub dumpstr($) -{ - my ($Str) = @_; - return defined $Str ? "[$Str]" : "<undef>"; -} - =pod =over 12 -- 2.17.0

1 0