July 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Implement NtWow64GetNativeSystemInformation().
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 04264305633ce75b8a1aadd1401cc646cfd872df URL: https://source.winehq.org/git/wine.git/?a=commit;h=04264305633ce75b8a1aadd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 5 12:09:54 2021 +0200 ntdll: Implement NtWow64GetNativeSystemInformation(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/wow64.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 23 ++++++++++++++++ include/winternl.h | 1 + 4 files changed, 95 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1067bbca96f..85fa37fddb3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -431,6 +431,7 @@ @ stub NtWaitHighEventPair @ stub NtWaitLowEventPair @ stdcall -syscall -arch=win32 NtWow64AllocateVirtualMemory64(long ptr int64 ptr long long) +@ stdcall -syscall -arch=win32 NtWow64GetNativeSystemInformation(long ptr long ptr) @ stdcall -syscall -arch=win32 NtWow64ReadVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall -arch=win32 NtWow64WriteVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @@ -1450,6 +1451,7 @@ @ stub ZwWaitHighEventPair @ stub ZwWaitLowEventPair @ stdcall -syscall -arch=win32 ZwWow64AllocateVirtualMemory64(long ptr int64 ptr long long) NtWow64AllocateVirtualMemory64 +@ stdcall -syscall -arch=win32 ZwWow64GetNativeSystemInformation(long ptr long ptr) NtWow64GetNativeSystemInformation @ stdcall -syscall -arch=win32 ZwWow64ReadVirtualMemory64(long int64 ptr int64 ptr) NtWow64ReadVirtualMemory64 @ stdcall -syscall -arch=win32 ZwWow64WriteVirtualMemory64(long int64 ptr int64 ptr) NtWow64WriteVirtualMemory64 @ stdcall -private -syscall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 82543c250af..807d5486a15 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -21,7 +21,9 @@ #include "ntdll_test.h" +static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); static NTSTATUS (WINAPI *pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); +static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); static USHORT (WINAPI *pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI *pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE,WOW64_CONTEXT*); @@ -31,6 +33,7 @@ static NTSTATUS (WINAPI *pRtlWow64GetCpuAreaInfo)(WOW64_CPURESERVED*,ULONG,WOW64 static NTSTATUS (WINAPI *pRtlWow64GetThreadSelectorEntry)(HANDLE,THREAD_DESCRIPTOR_INFORMATION*,ULONG,ULONG*); #else static NTSTATUS (WINAPI *pNtWow64AllocateVirtualMemory64)(HANDLE,ULONG64*,ULONG64,ULONG64*,ULONG,ULONG); +static NTSTATUS (WINAPI *pNtWow64GetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); static NTSTATUS (WINAPI *pNtWow64ReadVirtualMemory64)(HANDLE,ULONG64,void*,ULONG64,ULONG64*); static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void *,ULONG64,ULONG64*); #endif @@ -45,7 +48,9 @@ static void init(void) if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; #define GET_PROC(func) p##func = (void *)GetProcAddress( ntdll, #func ) + GET_PROC( NtQuerySystemInformation ); GET_PROC( NtQuerySystemInformationEx ); + GET_PROC( RtlGetNativeSystemInformation ); GET_PROC( RtlWow64GetCurrentMachine ); GET_PROC( RtlWow64GetProcessMachines ); GET_PROC( RtlWow64GetThreadContext ); @@ -55,6 +60,7 @@ static void init(void) GET_PROC( RtlWow64GetThreadSelectorEntry ); #else GET_PROC( NtWow64AllocateVirtualMemory64 ); + GET_PROC( NtWow64GetNativeSystemInformation ); GET_PROC( NtWow64ReadVirtualMemory64 ); GET_PROC( NtWow64WriteVirtualMemory64 ); #endif @@ -884,6 +890,69 @@ static void test_nt_wow64(void) } else win_skip( "NtWow64AllocateVirtualMemory64 not supported\n" ); + if (pNtWow64GetNativeSystemInformation) + { + ULONG i, len; + SYSTEM_BASIC_INFORMATION sbi, sbi2, sbi3; + + memset( &sbi, 0xcc, sizeof(sbi) ); + status = pNtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), &len ); + ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( len == sizeof(sbi), "wrong length %d\n", len ); + + memset( &sbi2, 0xcc, sizeof(sbi2) ); + status = pRtlGetNativeSystemInformation( SystemBasicInformation, &sbi2, sizeof(sbi2), &len ); + ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( len == sizeof(sbi2), "wrong length %d\n", len ); + + ok( sbi.HighestUserAddress == (void *)0x7ffeffff, "wrong limit %p\n", sbi.HighestUserAddress); + todo_wine_if( is_wow64 ) + ok( sbi2.HighestUserAddress == (is_wow64 ? (void *)0xfffeffff : (void *)0x7ffeffff), + "wrong limit %p\n", sbi.HighestUserAddress); + + memset( &sbi3, 0xcc, sizeof(sbi3) ); + status = pNtWow64GetNativeSystemInformation( SystemBasicInformation, &sbi3, sizeof(sbi3), &len ); + ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( len == sizeof(sbi3), "wrong length %d\n", len ); + ok( !memcmp( &sbi2, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), + "info is different\n" ); + + memset( &sbi3, 0xcc, sizeof(sbi3) ); + status = pNtWow64GetNativeSystemInformation( SystemEmulationBasicInformation, &sbi3, sizeof(sbi3), &len ); + ok( status == STATUS_SUCCESS, "failed %x\n", status ); + ok( len == sizeof(sbi3), "wrong length %d\n", len ); + ok( !memcmp( &sbi, &sbi3, offsetof(SYSTEM_BASIC_INFORMATION,NumberOfProcessors)+1 ), + "info is different\n" ); + + for (i = 0; i < 256; i++) + { + NTSTATUS expect = pNtQuerySystemInformation( i, NULL, 0, &len ); + status = pNtWow64GetNativeSystemInformation( i, NULL, 0, &len ); + switch (i) + { + case SystemNativeBasicInformation: + ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_INFO_LENGTH_MISMATCH || + broken(status == STATUS_NOT_IMPLEMENTED) /* vista */, "%u: %x / %x\n", i, status, expect ); + break; + case SystemBasicInformation: + case SystemCpuInformation: + case SystemEmulationBasicInformation: + case SystemEmulationProcessorInformation: + ok( status == expect, "%u: %x / %x\n", i, status, expect ); + break; + default: + if (is_wow64) /* only a few info classes are supported on Wow64 */ + ok( status == STATUS_INVALID_INFO_CLASS || + broken(status == STATUS_NOT_IMPLEMENTED), /* vista */ + "%u: %x\n", i, status ); + else + ok( status == expect, "%u: %x / %x\n", i, status, expect ); + break; + } + } + } + else win_skip( "NtWow64GetNativeSystemInformation not supported\n" ); + NtClose( process ); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c99cb424b57..1838e9d9791 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4988,4 +4988,27 @@ NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const return status; } + +/*********************************************************************** + * NtWow64GetNativeSystemInformation (NTDLL.@) + * ZwWow64GetNativeSystemInformation (NTDLL.@) + */ +NTSTATUS WINAPI NtWow64GetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, + ULONG len, ULONG *retlen ) +{ + switch (class) + { + case SystemBasicInformation: + case SystemCpuInformation: + case SystemEmulationBasicInformation: + case SystemEmulationProcessorInformation: + return NtQuerySystemInformation( class, info, len, retlen ); + case SystemNativeBasicInformation: + return NtQuerySystemInformation( SystemBasicInformation, info, len, retlen ); + default: + if (is_wow64) return STATUS_INVALID_INFO_CLASS; + return NtQuerySystemInformation( class, info, len, retlen ); + } +} + #endif /* _WIN64 */ diff --git a/include/winternl.h b/include/winternl.h index 6716b5fe699..6dc88fee343 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4410,6 +4410,7 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry(HANDLE,THREAD_DESCRIPTO NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); #else NTSYSAPI NTSTATUS WINAPI NtWow64AllocateVirtualMemory64(HANDLE,ULONG64*,ULONG64,ULONG64*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtWow64GetNativeSystemInformation(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtWow64ReadVirtualMemory64(HANDLE,ULONG64,void*,ULONG64,ULONG64*); NTSYSAPI NTSTATUS WINAPI NtWow64WriteVirtualMemory64(HANDLE,ULONG64,const void*,ULONG64,ULONG64*); NTSYSAPI LONGLONG WINAPI RtlConvertLongToLargeInteger(LONG);

1 0

Francois Gouget : user32/tests: Fix the wording of an ok() message.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: f593babf6d357f4a425473077e2f38c59bf014ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f593babf6d357f4a42547307… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 4 15:41:02 2021 +0200 user32/tests: Fix the wording of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 469c193c1a3..9867e319d58 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5272,7 +5272,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) ret = PostMessageA(hwnd, WM_DEVICECHANGE, wparams[i], 0); if (wparams[i] & 0x8000) { - ok(ret == FALSE, "PostMessage should returned %d\n", ret); + ok(ret == FALSE, "PostMessage returned %d\n", ret); ok(GetLastError() == ERROR_MESSAGE_SYNC_ONLY, "PostMessage error %08x\n", GetLastError()); } else

1 0

Francois Gouget : shell32/tests: Use WineTest contexts to simplify shellpath.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 865029ae3f2340f8a3b5f8955586a8ab599324d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865029ae3f2340f8a3b5f895… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:42:00 2021 +0200 shell32/tests: Use WineTest contexts to simplify shellpath. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 96bfd1d94ef..07bde45a66f 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2641,8 +2641,9 @@ static void test_DoEnvironmentSubst(void) "%HOMEDRIVE%%HOMEPATH%", "%OS% %windir%"}; /* always the last entry in the table */ - for (i = 0; i < (ARRAY_SIZE(names)); i++) + for (i = 0; i < ARRAY_SIZE(names); i++) { + winetest_push_context("%d", i); memset(bufferA, '#', MAX_PATH - 1); bufferA[MAX_PATH - 1] = 0; lstrcpyA(bufferA, names[i]); @@ -2655,19 +2656,21 @@ static void test_DoEnvironmentSubst(void) if (!i && HIWORD(res) && (LOWORD(res) == (lstrlenA(bufferA)))) { win_skip("DoEnvironmentSubstA/W are broken on NT 4\n"); + winetest_pop_context(); return; } ok(HIWORD(res) && (LOWORD(res) == res2), - "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + "got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); ok(!lstrcmpA(bufferA, expectedA), - "%d: got %s (expected %s)\n", i, bufferA, expectedA); + "got %s (expected %s)\n", bufferA, expectedA); res2 = ExpandEnvironmentStringsW(bufferW, expectedW, MAX_PATH); res = DoEnvironmentSubstW(bufferW, MAX_PATH); ok(HIWORD(res) && (LOWORD(res) == res2), - "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + "got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); ok(!lstrcmpW(bufferW, expectedW), - "%d: got %s (expected %s)\n", i, wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + "got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + winetest_pop_context(); } i--; /* reuse data in the last table entry */ @@ -3002,15 +3005,17 @@ static void test_PathResolve(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { + winetest_push_context("test %d", i); lstrcpyW(path, tests[i].path); if (!tests[i].expected) SetLastError(0xdeadbeef); ret = pPathResolve(path, dirs, tests[i].flags); - ok(ret == tests[i].expected, "test %d: expected %d, got %d\n", i, tests[i].expected, ret); + ok(ret == tests[i].expected, "expected %d, got %d\n", tests[i].expected, ret); ok(!lstrcmpiW(path, tests[i].expected_path), - "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); + "expected %s, got %s\n", wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + winetest_pop_context(); } CloseHandle(file);

1 0

Huw Davies : maintainers: Add a Network Store Interface section.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 151ae36abc1f5529d1e8931f9832c68a915400e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151ae36abc1f5529d1e8931f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 5 08:51:11 2021 +0100 maintainers: Add a Network Store Interface section. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bc8658e02..e85151e9bd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,9 +181,14 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> -F: dlls/iphlpapi/ F: dlls/ws2_32/ +Network Store Interface +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/iphlpapi/ +F: dlls/nsi/ +F: dlls/nsiproxy.sys/ + OLE Embedding M: Huw Davies <huw(a)codeweavers.com> F: dlls/ole32/clipboard.c

1 0

Francois Gouget : shell32/tests: Fix the PathResolve() tests on Windows 8.1, early 10.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 0e64e056005a6a729fd10cf591b8127d9c5b0eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e64e056005a6a729fd10cf5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jul 4 15:42:03 2021 +0200 shell32/tests: Fix the PathResolve() tests on Windows 8.1, early 10. Some Windows 8.1 and Windows 10 1507 versions return PATH_NOT_FOUND instead of FILE_NOT_FOUND. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 07bde45a66f..df9d4ecc949 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3014,7 +3014,9 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "expected %s, got %s\n", wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_PATH_NOT_FOUND /* some win 8.1 & 10 */), + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); winetest_pop_context(); }

1 0

Jacek Caban : gdi32: Reimplement GetObjectA on top of GetObjectW.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 3dcb5db47f6f5b35443386cbd64bb614b672eb1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcb5db47f6f5b35443386cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:00 2021 +0200 gdi32: Reimplement GetObjectA on top of GetObjectW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 1 - dlls/gdi32/brush.c | 1 - dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 1 - dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 31 ------------------------------- dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 1 - dlls/gdi32/pen.c | 1 - dlls/gdi32/region.c | 1 - 11 files changed, 29 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index d1805beb99c..aaad76dce36 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -37,7 +37,6 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs bitmap_funcs = { - BITMAP_GetObject, /* pGetObjectA */ BITMAP_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ BITMAP_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index c7b80479594..1d4e45952c9 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -44,7 +44,6 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs brush_funcs = { - BRUSH_GetObject, /* pGetObjectA */ BRUSH_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ BRUSH_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d96285c6520..861bc97a78e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -38,7 +38,6 @@ static BOOL DC_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs dc_funcs = { - NULL, /* pGetObjectA */ NULL, /* pGetObjectW */ NULL, /* pUnrealizeObject */ DC_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 069b9e77a28..e8d99ac415d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -83,7 +83,6 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs dib_funcs = { - DIB_GetObject, /* pGetObjectA */ DIB_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ DIB_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2a51e3f7411..39f2a76255a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -180,13 +180,11 @@ static inline WCHAR *strdupW( const WCHAR *p ) return ret; } -static INT FONT_GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ); static INT FONT_GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ); static BOOL FONT_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs fontobj_funcs = { - FONT_GetObjectA, /* pGetObjectA */ FONT_GetObjectW, /* pGetObjectW */ NULL, /* pUnrealizeObject */ FONT_DeleteObject /* pDeleteObject */ @@ -4567,26 +4565,6 @@ HGDIOBJ WINAPI NtGdiSelectFont( HDC hdc, HGDIOBJ handle ) } -/*********************************************************************** - * FONT_GetObjectA - */ -static INT FONT_GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) -{ - FONTOBJ *font = GDI_GetObjPtr( handle, OBJ_FONT ); - LOGFONTA lfA; - - if (!font) return 0; - if (buffer) - { - FONT_LogFontWToA( &font->logfont, &lfA ); - if (count > sizeof(lfA)) count = sizeof(lfA); - memcpy( buffer, &lfA, count ); - } - else count = sizeof(lfA); - GDI_ReleaseObj( handle ); - return count; -} - /*********************************************************************** * FONT_GetObjectW */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a4bc141811f..02e4c9d26b0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -50,7 +50,6 @@ typedef struct { struct gdi_obj_funcs { - INT (*pGetObjectA)( HGDIOBJ handle, INT count, LPVOID buffer ); INT (*pGetObjectW)( HGDIOBJ handle, INT count, LPVOID buffer ); BOOL (*pUnrealizeObject)( HGDIOBJ handle ); BOOL (*pDeleteObject)( HGDIOBJ handle ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 67c2ddc19e6..af74071aa6d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1028,37 +1028,6 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) } -/*********************************************************************** - * GetObjectA (GDI32.@) - */ -INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) -{ - GDI_HANDLE_ENTRY *entry; - const struct gdi_obj_funcs *funcs = NULL; - INT result = 0; - - TRACE("%p %d %p\n", handle, count, buffer ); - - EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) - { - funcs = entry_obj( entry )->funcs; - handle = entry_to_handle( entry ); /* make it a full handle */ - } - LeaveCriticalSection( &gdi_section ); - - if (funcs) - { - if (!funcs->pGetObjectA) - SetLastError( ERROR_INVALID_HANDLE ); - else if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ - SetLastError( ERROR_NOACCESS ); - else - result = funcs->pGetObjectA( handle, count, buffer ); - } - return result; -} - /*********************************************************************** * NtGdiExtGetObjectW (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index af1e2a19f06..664dcf4f043 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "ntgdi.h" #include "winternl.h" @@ -140,3 +141,31 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) } return result; } + +/*********************************************************************** + * GetObjectA (GDI32.@) + */ +INT WINAPI GetObjectA( HGDIOBJ handle, INT count, void *buffer ) +{ + TRACE("%p %d %p\n", handle, count, buffer ); + + if (get_object_type( handle ) == OBJ_FONT) + { + LOGFONTA *lfA = buffer; + LOGFONTW lf; + + if (!buffer) return sizeof(*lfA); + if (!GetObjectW( handle, sizeof(lf), &lf )) return 0; + if (count > sizeof(*lfA)) count = sizeof(*lfA); + memcpy( lfA, &lf, min( count, FIELD_OFFSET(LOGFONTA, lfFaceName) )); + if (count > FIELD_OFFSET(LOGFONTA, lfFaceName)) + { + WideCharToMultiByte( CP_ACP, 0, lf.lfFaceName, -1, lfA->lfFaceName, + count - FIELD_OFFSET(LOGFONTA, lfFaceName), NULL, NULL ); + if (count == sizeof(*lfA)) lfA->lfFaceName[LF_FACESIZE - 1] = 0; + } + return count; + } + + return GetObjectW( handle, count, buffer ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index f9d5851d20e..8584011bda8 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -55,7 +55,6 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs palette_funcs = { - PALETTE_GetObject, /* pGetObjectA */ PALETTE_GetObject, /* pGetObjectW */ PALETTE_UnrealizeObject, /* pUnrealizeObject */ PALETTE_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 0cc242ead5a..8a01125b390 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -45,7 +45,6 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs pen_funcs = { - PEN_GetObject, /* pGetObjectA */ PEN_GetObject, /* pGetObjectW */ NULL, /* pUnrealizeObject */ PEN_DeleteObject /* pDeleteObject */ diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 3d0f9cfc211..2e90e82180e 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -111,7 +111,6 @@ static BOOL REGION_DeleteObject( HGDIOBJ handle ); static const struct gdi_obj_funcs region_funcs = { - NULL, /* pGetObjectA */ NULL, /* pGetObjectW */ NULL, /* pUnrealizeObject */ REGION_DeleteObject /* pDeleteObject */

1 0

Jacek Caban : gdi32: Implement CreatePenIndirect on top of CreatePen.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 4590f6fb4f87e738afd1de147e740555c4fdbd3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4590f6fb4f87e738afd1de14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:40:07 2021 +0200 gdi32: Implement CreatePenIndirect on top of CreatePen. Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/pen.c | 32 ++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 664dcf4f043..7fbb0419ec8 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -169,3 +169,11 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, void *buffer ) return GetObjectW( handle, count, buffer ); } + +/*********************************************************************** + * CreatePenIndirect (GDI32.@) + */ +HPEN WINAPI CreatePenIndirect( const LOGPEN *pen ) +{ + return CreatePen( pen->lopnStyle, pen->lopnWidth.x, pen->lopnColor ); +} diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 8a01125b390..1fbd467d105 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -56,28 +56,12 @@ static const struct gdi_obj_funcs pen_funcs = */ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) { - LOGPEN logpen; - - TRACE("%d %d %06x\n", style, width, color ); - - logpen.lopnStyle = style; - logpen.lopnWidth.x = width; - logpen.lopnWidth.y = 0; - logpen.lopnColor = color; - - return CreatePenIndirect( &logpen ); -} - - -/*********************************************************************** - * CreatePenIndirect (GDI32.@) - */ -HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) -{ - PENOBJ * penPtr; + PENOBJ *penPtr; HPEN hpen; - if (pen->lopnStyle == PS_NULL) + TRACE( "%d %d %06x\n", style, width, color ); + + if (style == PS_NULL) { hpen = GetStockObject(NULL_PEN); if (hpen) return hpen; @@ -85,12 +69,12 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) if (!(penPtr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*penPtr) ))) return 0; - penPtr->logpen.elpPenStyle = pen->lopnStyle; - penPtr->logpen.elpWidth = abs(pen->lopnWidth.x); - penPtr->logpen.elpColor = pen->lopnColor; + penPtr->logpen.elpPenStyle = style; + penPtr->logpen.elpWidth = abs(width); + penPtr->logpen.elpColor = color; penPtr->logpen.elpBrushStyle = BS_SOLID; - switch (pen->lopnStyle) + switch (style) { case PS_SOLID: case PS_DASH:

1 0

Alexandre Julliard : Wine release 6.12
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: website Branch: master Commit: bf6df5ada8e4f5f33a1aef2bf8915a74fd86559a URL: https://source.winehq.org/git/website.git/?a=commit;h=bf6df5ada8e4f5f33a1ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 2 21:46:55 2021 +0200 Wine release 6.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021070201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021070201.xml b/news/en/2021070201.xml new file mode 100644 index 00000000..8f3e0e59 --- /dev/null +++ b/news/en/2021070201.xml @@ -0,0 +1,17 @@ +<news> +<date>July 2, 2021</date> +<title>Wine 6.12 Released</title> +<body> + The Wine development release 6.12 is now available. + <a href="{$root}/announce/6.12">What's new</a> in this release: +<ul> + <li>Builtin "Blue" and "Classic Blue" themes.</li> + <li>More work towards WinSock PE conversion.</li> + <li>Beginnings of the NSI (Network Store Interface) implementation.</li> + <li>Support for 32/64-bit registry views in reg.exe.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Huw Davies : iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: 363fc54a1c2cad567e53515d589968294c37008e URL: https://source.winehq.org/git/wine.git/?a=commit;h=363fc54a1c2cad567e53515d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:36 2021 +0100 iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8540b594e53..b6b96165027 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3244,21 +3244,20 @@ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *inde */ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_T len) { - DWORD ret; - MIB_IFROW row; + DWORD err; + WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE("(%p %p %u)\n", luid, name, (DWORD)len); + TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); if (!luid) return ERROR_INVALID_PARAMETER; + if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - if (!name || len < WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, NULL, 0, NULL, NULL )) - return ERROR_NOT_ENOUGH_MEMORY; + err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); + if (err) return err; - WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, name, len, NULL, NULL ); - return NO_ERROR; + if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + err = GetLastError(); + return err; } /****************************************************************** @@ -3286,22 +3285,15 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE */ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) { - DWORD ret; - IF_INDEX index; - MIB_IFROW row; - - TRACE("(%s %p)\n", debugstr_a(name), luid); + WCHAR nameW[IF_MAX_STRING_SIZE]; - if ((ret = getInterfaceIndexByName( name, &index ))) return ERROR_INVALID_NAME; - if (!luid) return ERROR_INVALID_PARAMETER; + TRACE( "(%s %p)\n", debugstr_a(name), luid ); - row.dwIndex = index; - if ((ret = GetIfEntry( &row ))) return ret; + if (!name) return ERROR_INVALID_NAME; + if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + return GetLastError(); - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + return ConvertInterfaceNameToLuidW( nameW, luid ); } /******************************************************************

1 0

Connor Abbott : winegcc: Support -Wl,foo=... style linker options.
by Alexandre Julliard July 2, 2021

July 2, 2021

Module: wine Branch: master Commit: fcda0afdd429e11d75dc61f628e40a6c8973ce44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcda0afdd429e11d75dc61f6… Author: Connor Abbott <cwabbott0(a)gmail.com> Date: Fri Jul 2 11:48:01 2021 +0200 winegcc: Support -Wl,foo=... style linker options. In particular meson uses -Wl,--out-implib=... Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fd2d2c2a794..8c1e0d088ac 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1982,7 +1982,7 @@ int main(int argc, char **argv) if (strncmp("-Wl,", opts.args->base[i], 4) == 0) { unsigned int j; - strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ","); + strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",="); for (j = 0; j < Wl->size; j++) { if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)

1 0