December 2021 - Wine-Commits

Alexandre Julliard : advapi32/tests: Skip event log tests on Windows when access is not allowed.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: ea7eb95682be3894a8aed81ac497036562aa6f15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7eb95682be3894a8aed81a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 20:29:30 2021 +0100 advapi32/tests: Skip event log tests on Windows when access is not allowed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 0c5d1e2523f..7e66e9ad8d7 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -65,6 +65,11 @@ static BOOL create_backup(const char *filename) DWORD rc, attribs; handle = OpenEventLogA(NULL, "Application"); + if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) + { + win_skip( "Can't open event log\n" ); + return FALSE; + } ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); DeleteFileA(filename); @@ -274,6 +279,11 @@ static void test_oldest(void) ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); handle = OpenEventLogA(NULL, "Application"); + if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) + { + win_skip( "Can't open event log\n" ); + return; + } ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -327,6 +337,11 @@ static void test_backup(void) ok(GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); handle = OpenEventLogA(NULL, "Application"); + if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) + { + win_skip( "Can't open event log\n" ); + return; + } ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -439,6 +454,11 @@ static void test_read(void) HeapFree(GetProcessHeap(), 0, buf); handle = OpenEventLogA(NULL, "Application"); + if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) + { + win_skip( "Can't open event log\n" ); + return; + } ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); /* Show that we need the proper dwFlags with a (for the rest) proper call */ @@ -537,7 +557,10 @@ static void test_openbackup(void) SetLastError(0xdeadbeef); handle = OpenBackupEventLogA(NULL, "idontexist.evt"); ok(handle == NULL, "Didn't expect a handle\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE, + "got %d\n", GetLastError()); SetLastError(0xdeadbeef); handle = OpenBackupEventLogA("IDontExist", NULL); @@ -593,8 +616,10 @@ static void test_openbackup(void) handle = OpenBackupEventLogA(NULL, backup); ok(handle == NULL, "Didn't expect a handle\n"); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE || GetLastError() == ERROR_EVENTLOG_FILE_CORRUPT, /* Vista and Win7 */ - "Expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + "got %d\n", GetLastError()); CloseEventLog(handle); DeleteFileA(backup); @@ -604,7 +629,10 @@ static void test_openbackup(void) SetLastError(0xdeadbeef); handle = OpenBackupEventLogA(NULL, backup); ok(handle == NULL, "Didn't expect a handle\n"); - ok(GetLastError() == ERROR_EVENTLOG_FILE_CORRUPT, "Expected ERROR_EVENTLOG_FILE_CORRUPT, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_EVENTLOG_FILE_CORRUPT || + GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE, + "got %d\n", GetLastError()); CloseEventLog(handle); DeleteFileA(backup); }

1 0

Alexandre Julliard : kernel32/tests: Fix some test failures on Windows.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 1431702f5a0085fabdb8e22651dce18defd07148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1431702f5a0085fabdb8e226… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 17:04:46 2021 +0100 kernel32/tests: Fix some test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 10 +++++++--- dlls/kernel32/tests/loader.c | 3 ++- dlls/kernel32/tests/locale.c | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b4c7adacf7e..60fe532adc2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2709,7 +2709,7 @@ static void test_FindFirstFileA(void) /* try FindFirstFileA on "C:\foo\" */ SetLastError( 0xdeadbeaf ); - if (!GetTempFileNameA( buffer, "foo", 0, nonexistent ) && GetLastError() == ERROR_ACCESS_DENIED) + if (!GetTempFileNameA( buffer, "foo", 0, nonexistent )) { char tmp[MAX_PATH]; GetTempPathA( sizeof(tmp), tmp ); @@ -2825,8 +2825,12 @@ static void test_FindFirstFileA(void) strcat(buffer2, "foo\\bar\\nul"); handle = FindFirstFileA(buffer2, &data); err = GetLastError(); - ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); - ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + ok( handle == INVALID_HANDLE_VALUE || broken(1), /* win8 */ + "FindFirstFile on %s should fail\n", buffer2 ); + if (handle == INVALID_HANDLE_VALUE) + ok( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + else + CloseHandle( handle ); /* try FindFirstFileA on "c:\foo\nul\bar" */ SetLastError( 0xdeadbeaf ); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 308cf1a44a0..c5857174403 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -718,7 +718,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG else { ok( ldr_status == expect_status || - broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), + broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT) || + broken(nt_header->Signature == IMAGE_OS2_SIGNATURE && ldr_status == STATUS_INVALID_IMAGE_NE_FORMAT), "%u: wrong status %x/%x\n", line, ldr_status, expect_status ); ok( !expect_fallback || broken(il_only) || broken(wrong_machine), "%u: failed with %x expected fallback\n", line, ldr_status ); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f529b11a1a7..1f30547df5b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6774,13 +6774,13 @@ static void test_NLSVersion(void) ok( !ret, "IsValidNLSVersion succeeded\n" ); ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); - info.dwNLSVersion -= 0x200; + info.dwNLSVersion -= 0x800; SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info ); ok( !ret, "IsValidNLSVersion succeeded\n" ); ok( GetLastError() == 0, "wrong error %u\n", GetLastError() ); - info.dwNLSVersion += 0x100; + info.dwNLSVersion += 0x700; info.dwDefinedVersion += 0x100; SetLastError( 0xdeadbeef ); ret = pIsValidNLSVersion( COMPARE_STRING, L"en-US", &info );

1 0

Alexandre Julliard : ntdll/tests: Mark a failing test as todo.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: b75caec103ae5dd827674872afdbcf1537f95144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75caec103ae5dd827674872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 16:15:13 2021 +0100 ntdll/tests: Mark a failing test as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 9e09c60c32c..efe51dd507b 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -39,6 +39,7 @@ static NTSTATUS (WINAPI *pNtWow64ReadVirtualMemory64)(HANDLE,ULONG64,void*,ULONG static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void *,ULONG64,ULONG64*); #endif +static BOOL is_win64 = (sizeof(void *) > sizeof(int)); static BOOL is_wow64; static void *code_mem; @@ -234,6 +235,7 @@ static void test_peb_teb(void) NTSTATUS status; void *redir; SIZE_T res; + BOOL ret; TEB teb; PEB peb; TEB32 teb32; @@ -326,15 +328,17 @@ static void test_peb_teb(void) params32.EnvironmentSize, params.EnvironmentSize ); } - ok( DebugActiveProcess( pi.dwProcessId ), "debugging failed\n" ); + ret = DebugActiveProcess( pi.dwProcessId ); + todo_wine_if( is_win64 ) + ok( ret, "debugging failed\n" ); if (!ReadProcessMemory( pi.hProcess, proc_info.PebBaseAddress, &peb, sizeof(peb), &res )) res = 0; ok( res == sizeof(peb), "wrong len %lx\n", res ); - ok( peb.BeingDebugged == 1, "BeingDebugged is %u\n", peb.BeingDebugged ); + ok( peb.BeingDebugged == !!ret, "BeingDebugged is %u\n", peb.BeingDebugged ); if (!is_wow64) { if (!ReadProcessMemory( pi.hProcess, ULongToPtr(teb32.Peb), &peb32, sizeof(peb32), &res )) res = 0; ok( res == sizeof(peb32), "wrong len %lx\n", res ); - ok( peb32.BeingDebugged == 1, "BeingDebugged is %u\n", peb32.BeingDebugged ); + ok( peb32.BeingDebugged == !!ret, "BeingDebugged is %u\n", peb32.BeingDebugged ); } TerminateProcess( pi.hProcess, 0 );

1 0

Zebediah Figura : user32: Free the created icon handle when using LR_COPYFROMRESOURCE.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 97bf2e7e1edcee9600badf4b708bfe2463d2c28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=97bf2e7e1edcee9600badf4b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 16 11:58:38 2021 -0600 user32: Free the created icon handle when using LR_COPYFROMRESOURCE. Spotted by John Sullivan. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52207 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 582b2612688..d163d1a7360 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3103,6 +3103,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, struct cursoricon_frame *frame; struct cursoricon_object *icon; int depth = (flags & LR_MONOCHROME) ? 1 : get_display_bpp(); + HICON resource_icon = NULL; ICONINFO info; HICON res; @@ -3110,10 +3111,14 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) { - hnd = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth, - !icon->is_icon, flags ); + resource_icon = CURSORICON_Load( icon->module, icon->resname, desiredx, + desiredy, depth, !icon->is_icon, flags ); release_user_handle_ptr( icon ); - if (!(icon = get_icon_ptr( hnd ))) return 0; + if (!(icon = get_icon_ptr( resource_icon ))) + { + if (resource_icon) DestroyIcon( resource_icon ); + return 0; + } } frame = get_icon_frame( icon, 0 ); @@ -3146,6 +3151,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, { release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); + if (resource_icon) DestroyIcon( resource_icon ); return 0; } stretch_bitmap( info.hbmColor, frame->color, desiredx, desiredy, @@ -3156,6 +3162,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, DeleteObject( info.hbmColor ); release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); + if (resource_icon) DestroyIcon( resource_icon ); return 0; } stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy, @@ -3168,6 +3175,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (!(info.hbmMask = CreateBitmap( desiredx, desiredy * 2, 1, 1, NULL ))) { release_user_handle_ptr( icon ); + if (resource_icon) DestroyIcon( resource_icon ); return 0; } stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy * 2, @@ -3184,6 +3192,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, release_user_handle_ptr( icon ); if (res && (flags & LR_COPYDELETEORG)) DestroyIcon( hnd ); + if (resource_icon) DestroyIcon( resource_icon ); return res; } }

1 0

Jacek Caban : winebuild: Allow using clang for as command.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: f4ddcc36e97d391e841f82a07d4c06bd7c0dc701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ddcc36e97d391e841f82a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 16 17:16:51 2021 +0100 winebuild: Allow using clang for as command. Since a9b5bb326a1514e2c4185633ab34b22c9bbc9863, Wine needs get_as_command to work without cc_command available. While as is usually a GCC dependency, Clang toolchains may not contain it. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index a4393850823..42c5dca8516 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -250,7 +250,7 @@ struct strarray find_tool( const char *name, const char * const *names ) names++; } - if (!file && strcmp( name, "as" )) /* llvm-as is not a gas replacement */ + if (!file) { if (cc_command.count) file = find_clang_tool( cc_command, name ); if (!file && !(file = find_binary( "llvm", name ))) @@ -289,11 +289,36 @@ struct strarray find_link_tool(void) struct strarray get_as_command(void) { struct strarray args = empty_strarray; + const char *file; unsigned int i; + int using_cc = 0; if (cc_command.count) { strarray_addall( &args, cc_command ); + using_cc = 1; + } + else if (as_command.count) + { + strarray_addall( &args, as_command ); + } + else if ((file = find_binary( target_alias, "as" )) || (file = find_binary( target_alias, "gas "))) + { + strarray_add( &args, file ); + } + else if ((file = find_binary( NULL, "clang" ))) + { + strarray_add( &args, file ); + if (target_alias) + { + strarray_add( &args, "-target" ); + strarray_add( &args, target_alias ); + } + using_cc = 1; + } + + if (using_cc) + { strarray_add( &args, "-xassembler" ); strarray_add( &args, "-c" ); if (force_pointer_size) @@ -306,14 +331,6 @@ struct strarray get_as_command(void) return args; } - if (!as_command.count) - { - static const char * const commands[] = { "gas", "as", NULL }; - as_command = find_tool( "as", commands ); - } - - strarray_addall( &args, as_command ); - if (force_pointer_size) { switch (target.platform)

1 0

Alexandre Julliard : kernel32/tests: Remove an unreliable test.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 3f80ea69fbbb875250b91329ba12f5a842f9bfe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f80ea69fbbb875250b91329… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 18:15:42 2021 +0100 kernel32/tests: Remove an unreliable test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0d1a2f1a31d..6251ee05f94 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1644,8 +1644,6 @@ static void test_Console(void) ok(modeInC == (modeIn ^ 1), "Wrong console mode\n"); ok(modeOutC == (modeOut ^ 1), "Wrong console-SB mode\n"); - trace("cursor position(X): %d/%d\n",sbi.dwCursorPosition.X, sbiC.dwCursorPosition.X); - ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n"); release_memory(); DeleteFileA(resfile);

1 0

Zebediah Figura : user32: Do not use SetDIBits() in create_masked_bitmap().
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 197f2ee6c0e2dd70cfac6e15ede7fc0e38948188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197f2ee6c0e2dd70cfac6e15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 16:49:16 2021 -0600 user32: Do not use SetDIBits() in create_masked_bitmap(). The given bitmap is in DDB format, not DIB format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51296 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 31 +++++++++++++++------------- dlls/user32/tests/cursoricon.c | 47 +++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 827db302a30..828c88de92f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1753,22 +1753,25 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, static HBITMAP create_masked_bitmap( int width, int height, const void *and, const void *xor ) { - HDC dc = CreateCompatibleDC( 0 ); - HBITMAP bitmap; - - const BITMAPINFO bitmap_info = - { - .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), - .bmiHeader.biWidth = width, - .bmiHeader.biHeight = height * 2, - .bmiHeader.biPlanes = 1, - .bmiHeader.biBitCount = 1, - }; + HBITMAP and_bitmap, xor_bitmap, bitmap; + HDC src_dc, dst_dc; + and_bitmap = CreateBitmap( width, height, 1, 1, and ); + xor_bitmap = CreateBitmap( width, height, 1, 1, xor ); bitmap = CreateBitmap( width, height * 2, 1, 1, NULL ); - SetDIBits( dc, bitmap, 0, height, and, &bitmap_info, FALSE ); - SetDIBits( dc, bitmap, height, height, xor, &bitmap_info, FALSE ); - DeleteDC( dc ); + src_dc = CreateCompatibleDC( 0 ); + dst_dc = CreateCompatibleDC( 0 ); + + SelectObject( dst_dc, bitmap ); + SelectObject( src_dc, and_bitmap ); + BitBlt( dst_dc, 0, 0, width, height, src_dc, 0, 0, SRCCOPY ); + SelectObject( src_dc, xor_bitmap ); + BitBlt( dst_dc, 0, height, width, height, src_dc, 0, 0, SRCCOPY ); + + DeleteObject( and_bitmap ); + DeleteObject( xor_bitmap ); + DeleteDC( src_dc ); + DeleteDC( dst_dc ); return bitmap; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1bbe2591d59..3e8d7c1707f 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -769,8 +769,9 @@ static void test_initial_cursor(void) } static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, - UINT exp_mask_cy, UINT exp_bpp, UINT has_color, int line) + UINT exp_mask_cy, UINT exp_bpp, const BYTE *mask_bits, UINT has_color, int line) { + BYTE ret_bits[1024]; ICONINFO info; DWORD ret; BITMAP bmMask, bmColor; @@ -783,6 +784,15 @@ static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, ok_(__FILE__, line)(info.yHotspot == exp_cy/2, "info.yHotspot = %u\n", info.yHotspot); ok_(__FILE__, line)(info.hbmMask != 0, "info.hbmMask is NULL\n"); + if (mask_bits) + { + unsigned int exp_stride = (exp_cx + 7) / 8; + exp_stride = (exp_stride + 1) & ~1; + ret = GetBitmapBits(info.hbmMask, sizeof(ret_bits), ret_bits); + ok_(__FILE__, line)(ret == exp_stride * exp_mask_cy, "GetBitmapBits returned %u\n", ret); + ok_(__FILE__, line)(!memcmp(ret_bits, mask_bits, ret), "mask bitmap didn't match\n"); + } + ret = GetObjectA(info.hbmMask, sizeof(bmMask), &bmMask); ok_(__FILE__, line)(ret == sizeof(bmMask), "GetObject(info.hbmMask) failed, ret %u\n", ret); @@ -849,11 +859,11 @@ static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, } } -#define test_icon_info(a,b,c,d,e,f) test_icon_info_(a,b,c,d,e,f,__LINE__) +#define test_icon_info(a,b,c,d,e,f,g) test_icon_info_(a,b,c,d,e,f,g,__LINE__) static void test_CreateIcon(void) { - static const BYTE bmp_bits[1024]; + BYTE bmp_bits[1024]; HICON hIcon; HBITMAP hbmMask, hbmColor; BITMAPINFO *bmpinfo; @@ -863,6 +873,9 @@ static void test_CreateIcon(void) UINT display_bpp; int i; + for (i = 0; i < sizeof(bmp_bits); ++i) + bmp_bits[i] = 111 * i; + hdc = GetDC(0); display_bpp = GetDeviceCaps(hdc, BITSPIXEL); @@ -871,19 +884,19 @@ static void test_CreateIcon(void) hIcon = CreateIcon(0, 16, 16, 1, 1, NULL, bmp_bits); */ - hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, &bmp_bits[16 * 16 / 8]); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyIcon(hIcon); - hIcon = CreateCursor(0, 8, 8, 16, 16, bmp_bits, bmp_bits); + hIcon = CreateCursor(0, 8, 8, 16, 16, bmp_bits, &bmp_bits[16 * 16 / 8]); ok(hIcon != 0, "CreateCursor failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyCursor(hIcon); hIcon = CreateIcon(0, 16, 16, 1, display_bpp, bmp_bits, bmp_bits); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 16, display_bpp, TRUE); + test_icon_info(hIcon, 16, 16, 16, display_bpp, bmp_bits, TRUE); DestroyIcon(hIcon); hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); @@ -918,7 +931,7 @@ static void test_CreateIcon(void) info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 16, display_bpp, TRUE); + test_icon_info(hIcon, 16, 16, 16, display_bpp, bmp_bits, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -935,7 +948,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyIcon(hIcon); info.hbmMask = hbmMask; @@ -943,7 +956,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 32, 32, 1, TRUE); + test_icon_info(hIcon, 16, 32, 32, 1, bmp_bits, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -961,7 +974,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 1, i / 2, max(i,1), 1, FALSE); + test_icon_info(hIcon, 1, i / 2, max(i,1), 1, NULL, FALSE); DestroyIcon(hIcon); DeleteObject(hbmMask); } @@ -974,7 +987,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, NULL, FALSE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -1006,7 +1019,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -1024,7 +1037,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -1042,7 +1055,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -2812,7 +2825,7 @@ static void test_PrivateExtractIcons(void) ok(ret == 1, "PrivateExtractIconsA returned %u\n", ret); ok(icon != NULL, "icon == NULL\n"); - test_icon_info(icon, 32, 32, 32, 32, TRUE); + test_icon_info(icon, 32, 32, 32, 32, NULL, TRUE); DestroyIcon(icon); DeleteFileA("extract.ico");

1 0

Alexandre Julliard : kernelbase/tests: Fix some test failures on Windows.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: f08eb97c48f16c25024eb2f7b669fb3d82ffec34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f08eb97c48f16c25024eb2f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 18:03:55 2021 +0100 kernelbase/tests: Fix some test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 7aa07df6e4e..a28411f4e5b 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -63,7 +63,7 @@ static void test_CompareObjectHandles(void) CloseHandle( h1 ); - h1 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + h1 = CreateFileA( "\\\\.\\NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); h2 = NULL; @@ -76,7 +76,7 @@ static void test_CompareObjectHandles(void) CloseHandle( h2 ); - h2 = CreateFileA( "\\\\.\\NUL", GENERIC_ALL, 0, NULL, OPEN_EXISTING, 0, 0 ); + h2 = CreateFileA( "\\\\.\\NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); SetLastError(0);

1 0

Alexandre Julliard : schedsvc/tests: Fix a test failure on recent Windows versions.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 2c1a68e35c35d0d2c771d97412850d388abfc47b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1a68e35c35d0d2c771d974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 16 18:28:33 2021 +0100 schedsvc/tests: Fix a test failure on recent Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b806b97539d..a8f75ded7a5 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -520,7 +520,10 @@ todo_wine if (hr != E_ACCESSDENIED) { ok(!info, "expected NULL, info %p\n", info); - hr = IIDFromString(path, &iid); + if (path[0] == '\\') + hr = IIDFromString(path + 1, &iid); + else + hr = IIDFromString(path, &iid); ok(hr == S_OK, "IIDFromString(%s) error %#x\n", wine_dbgstr_w(path), hr); hr = SchRpcDelete(path, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Eric Pouech : dbghelp: Silence some FIXMEs.
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 6c64e6dee4dc467d240ef44f177d95068a59e7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c64e6dee4dc467d240ef44f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 15 13:32:00 2021 +0100 dbghelp: Silence some FIXMEs. Reading gecko's PDB generate a lot of those. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 894d01a4c00..317f7bb84b5 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1926,7 +1926,7 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu if (!found) { - FIXME("Couldn't find start address of inlined\n"); + WARN("Couldn't find start address of inlined\n"); return NULL; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 2443dbf7e73..d3ba4521fa0 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -612,7 +612,7 @@ BOOL symt_add_inlinesite_range(struct module* module, { struct addr_range* ar = (struct addr_range*)vector_at(&inlined->vranges, i); if (!addr_range_disjoint(ar, p) && !addr_range_inside(ar, p)) - FIXME("Added addr_range not compatible with parent\n"); + WARN("Added addr_range not compatible with parent\n"); } } }

1 0