June 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Use the defined external lib variables also when building the libs themselves.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: e2d96342df3c4f7ae9d13a550a8a95ea94736cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2d96342df3c4f7ae9d13a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 09:33:15 2022 +0200 makefiles: Use the defined external lib variables also when building the libs themselves. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + libs/faudio/Makefile.in | 2 +- libs/gsm/Makefile.in | 2 +- libs/jxr/Makefile.in | 3 ++- libs/lcms2/Makefile.in | 2 +- libs/mpg123/Makefile.in | 2 +- libs/tiff/Makefile.in | 2 +- libs/vkd3d/Makefile.in | 2 +- tools/makedep.c | 12 +++++++++++- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d03c6d9412a..d5f389b506a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -429,6 +429,7 @@ SOURCES = \ mimeole.idl \ minidumpapiset.h \ minmax.h \ + minschannel.h \ mlang.idl \ mmc.idl \ mmddk.h \ diff --git a/libs/faudio/Makefile.in b/libs/faudio/Makefile.in index 3a9bb591227..639cd2cbff0 100644 --- a/libs/faudio/Makefile.in +++ b/libs/faudio/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libfaudio.a -EXTRAINCL = -I$(srcdir)/include +EXTRAINCL = $(FAUDIO_PE_CFLAGS) EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC -DNDEBUG C_SRCS = \ diff --git a/libs/gsm/Makefile.in b/libs/gsm/Makefile.in index 36c749aa60f..d2aefc937f9 100644 --- a/libs/gsm/Makefile.in +++ b/libs/gsm/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libgsm.a -EXTRAINCL = -I$(srcdir)/inc +EXTRAINCL = $(GSM_PE_CFLAGS) EXTRADEFS = -DWAV49 C_SRCS = \ diff --git a/libs/jxr/Makefile.in b/libs/jxr/Makefile.in index 5203dc970aa..3162cfca263 100644 --- a/libs/jxr/Makefile.in +++ b/libs/jxr/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libjxr.a -EXTRAINCL = -I$(srcdir)/jxrgluelib -I$(srcdir)/image/sys -DDISABLE_PERF_MEASUREMENT +EXTRAINCL = $(JXR_PE_CFLAGS) +EXTRADEFS = -DDISABLE_PERF_MEASUREMENT C_SRCS = \ image/decode/JXRTranscode.c \ diff --git a/libs/lcms2/Makefile.in b/libs/lcms2/Makefile.in index 6549d5718b5..c2aafa9c70a 100644 --- a/libs/lcms2/Makefile.in +++ b/libs/lcms2/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = liblcms2.a -EXTRAINCL = -I$(srcdir)/include +EXTRAINCL = $(LCMS2_PE_CFLAGS) C_SRCS = \ src/cmsalpha.c \ diff --git a/libs/mpg123/Makefile.in b/libs/mpg123/Makefile.in index 6859f66f68a..7974c34ed91 100644 --- a/libs/mpg123/Makefile.in +++ b/libs/mpg123/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libmpg123.a -EXTRAINCL = -I$(srcdir)/src -I$(srcdir)/src/compat -I$(srcdir)/src/libmpg123 +EXTRAINCL = -I$(srcdir)/src -I$(srcdir)/src/compat $(MPG123_PE_CFLAGS) EXTRADEFS = -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DNO_CATCHSIGNAL -DMPG123_NO_LARGENAME C_SRCS = \ diff --git a/libs/tiff/Makefile.in b/libs/tiff/Makefile.in index f8ceb5006d4..7c793f3e2f9 100644 --- a/libs/tiff/Makefile.in +++ b/libs/tiff/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libtiff.a -EXTRAINCL = -I$(srcdir)/libtiff $(JPEG_PE_CFLAGS) $(ZLIB_PE_CFLAGS) +EXTRAINCL = $(TIFF_PE_CFLAGS) $(JPEG_PE_CFLAGS) $(ZLIB_PE_CFLAGS) C_SRCS = \ libtiff/tif_aux.c \ diff --git a/libs/vkd3d/Makefile.in b/libs/vkd3d/Makefile.in index c912f97165e..0ed4e27ad83 100644 --- a/libs/vkd3d/Makefile.in +++ b/libs/vkd3d/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libvkd3d.a -EXTRAINCL = -I$(srcdir)/include -I$(srcdir)/include/private -I$(srcdir)/libs/vkd3d -I$(srcdir)/libs/vkd3d-shader +EXTRAINCL = $(VKD3D_PE_CFLAGS) -I$(srcdir)/include/private -I$(srcdir)/libs/vkd3d -I$(srcdir)/libs/vkd3d-shader EXTRADEFS = \ -DWINE_NO_NAMELESS_EXTENSION \ -DCONST_VTABLE \ diff --git a/tools/makedep.c b/tools/makedep.c index 81e9c20fd4f..fb09e6acc8a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4152,10 +4152,20 @@ static void load_sources( struct makefile *make ) value = get_expanded_make_var_array( make, "EXTRAINCL" ); for (i = 0; i < value.count; i++) + { if (!strncmp( value.str[i], "-I", 2 )) - strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); + { + const char *dir = value.str[i] + 2; + if (!strncmp( dir, "./", 2 )) + { + dir += 2; + while (*dir == '/') dir++; + } + strarray_add_uniq( &make->include_paths, dir ); + } else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 )) strarray_add_uniq( &make->define_args, value.str[i] ); + } strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" )); strarray_add( &make->include_args, strmake( "-I%s", obj_dir_path( make, "" )));

1 0

Alexandre Julliard : makefiles: Add separate variables for Unix flags and libraries.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 194e09baeca42b369b391d87c9605338b8fbc978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194e09baeca42b369b391d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:06:16 2022 +0200 makefiles: Add separate variables for Unix flags and libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 2 +- dlls/capi2032/Makefile.in | 4 ++-- dlls/crypt32/Makefile.in | 4 ++-- dlls/dnsapi/Makefile.in | 2 +- dlls/dwrite/Makefile.in | 2 +- dlls/gphoto2.ds/Makefile.in | 5 +++-- dlls/kerberos/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 4 ++-- dlls/nsiproxy.sys/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 4 ++-- dlls/openal32/Makefile.in | 2 +- dlls/opencl/Makefile.in | 2 +- dlls/sane.ds/Makefile.in | 4 ++-- dlls/secur32/Makefile.in | 2 +- dlls/win32u/Makefile.in | 4 ++-- dlls/winealsa.drv/Makefile.in | 2 +- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/winebus.sys/Makefile.in | 4 ++-- dlls/winecoreaudio.drv/Makefile.in | 2 +- dlls/winegstreamer/Makefile.in | 4 ++-- dlls/winemac.drv/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 4 ++-- dlls/winepulse.drv/Makefile.in | 4 ++-- dlls/wineusb.sys/Makefile.in | 4 ++-- dlls/winevulkan/Makefile.in | 2 +- dlls/winex11.drv/Makefile.in | 4 ++-- dlls/winspool.drv/Makefile.in | 4 ++-- dlls/wldap32/Makefile.in | 4 ++-- dlls/wpcap/Makefile.in | 2 +- libs/wine/Makefile.in | 2 +- server/Makefile.in | 2 +- tools/makedep.c | 20 +++++++++++++------- tools/sfnt2fon/Makefile.in | 5 ++--- tools/wmc/Makefile.in | 3 +-- tools/wrc/Makefile.in | 2 +- 35 files changed, 64 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=194e09baeca42b369b39…

1 0

Zhiyi Zhang : uxtheme/tests: Add dialog procedure message tests.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: 2a6a2b04fe153e9327b588022b5d1c9334d6a0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6a2b04fe153e9327b58802… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 27 17:55:45 2022 +0800 uxtheme/tests: Add dialog procedure message tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index aa566f554ff..4301a0f76f2 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1614,6 +1614,37 @@ static const struct message empty_seq[] = {0} }; +static const struct message wm_erasebkgnd_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_CTLCOLORDLG, sent}, + {0} +}; + +static const struct message wm_ctlcolormsgbox_seq[] = +{ + {WM_CTLCOLORMSGBOX, sent}, + {0} +}; + +static const struct message wm_ctlcolorbtn_seq[] = +{ + {WM_CTLCOLORBTN, sent}, + {0} +}; + +static const struct message wm_ctlcolordlg_seq[] = +{ + {WM_CTLCOLORDLG, sent}, + {0} +}; + +static const struct message wm_ctlcolorstatic_seq[] = +{ + {WM_CTLCOLORSTATIC, sent}, + {0} +}; + static HWND dialog_child; static DWORD dialog_init_flag; static BOOL handle_WM_ERASEBKGND; @@ -1673,6 +1704,7 @@ static void test_EnableThemeDialogTexture(void) HBRUSH brush, brush2; HDC child_hdc, hdc; LOGBRUSH log_brush; + char buffer[32]; ULONG_PTR proc; WNDCLASSA cls; HTHEME theme; @@ -1779,6 +1811,20 @@ static void test_EnableThemeDialogTexture(void) {{WC_SCROLLBARA}}, }; + static const struct message_test + { + UINT msg; + const struct message *msg_seq; + } + message_tests[] = + { + {WM_ERASEBKGND, wm_erasebkgnd_seq}, + {WM_CTLCOLORMSGBOX, wm_ctlcolormsgbox_seq}, + {WM_CTLCOLORBTN, wm_ctlcolorbtn_seq}, + {WM_CTLCOLORDLG, wm_ctlcolordlg_seq}, + {WM_CTLCOLORSTATIC, wm_ctlcolorstatic_seq}, + }; + if (!IsThemeActive()) { skip("Theming is inactive.\n"); @@ -2260,6 +2306,24 @@ static void test_EnableThemeDialogTexture(void) DestroyWindow(hwnd2); DestroyWindow(hwnd); + /* Test that application dialog procedures should be called only once for each message */ + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)&param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %ld.\n", GetLastError()); + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %ld.\n", GetLastError()); + child_hdc = GetDC(child); + for (i = 0; i < ARRAY_SIZE(message_tests); ++i) + { + sprintf(buffer, "message %#x\n", message_tests[i].msg); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageW(dialog, message_tests[i].msg, (WPARAM)child_hdc, (LPARAM)child); + ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, TRUE); + } + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + UnregisterClassA(cls.lpszClassName, GetModuleHandleA(NULL)); }

1 0

Zhiyi Zhang : uxtheme: Avoid calling application dialog procedures repeatedly.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: d461cca19a4a2883e5e3000afe79bc4e15626b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d461cca19a4a2883e5e3000a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 27 17:13:56 2022 +0800 uxtheme: Avoid calling application dialog procedures repeatedly. Application dialog procedures are called in UXTHEME_DefDlgProc(), then may be called again in USER_DefDlgProcA/W(). Lotus Approach doesn't expect this and run into infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52586 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 21 +++++++++++++++++---- dlls/uxtheme/tests/system.c | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 13943d753bb..a27382af784 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -131,12 +131,25 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); - if (lr) + if (lr || !IsWindow(hwnd)) return GetWindowLongPtrW(hwnd, DWLP_MSGRESULT); brush = get_dialog_background_brush(hwnd, TRUE); if (!brush) - break; + { + /* Copied from DEFDLG_Proc() */ + brush = (HBRUSH)SendMessageW(hwnd, WM_CTLCOLORDLG, wp, (LPARAM)hwnd); + if (!brush) + brush = (HBRUSH)DefWindowProcW(hwnd, WM_CTLCOLORDLG, wp, (LPARAM)hwnd); + if (brush) + { + hdc = (HDC)wp; + GetClientRect(hwnd, &rect); + DPtoLP(hdc, (LPPOINT)&rect, 2); + FillRect(hdc, &rect, brush); + } + return TRUE; + } /* Using FillRect() to draw background could introduce a tiling effect if the destination * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is @@ -157,12 +170,12 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); - if (lr) + if (lr || !IsWindow(hwnd)) return lr; brush = get_dialog_background_brush(hwnd, FALSE); if (!brush) - break; + return DefWindowProcW(hwnd, msg, wp, lp); hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 4301a0f76f2..29fe5ec047d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2319,7 +2319,7 @@ static void test_EnableThemeDialogTexture(void) sprintf(buffer, "message %#x\n", message_tests[i].msg); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, message_tests[i].msg, (WPARAM)child_hdc, (LPARAM)child); - ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, FALSE); } ReleaseDC(child, child_hdc); EndDialog(dialog, 0);

1 0

Jinoh Kang : windowscodecs: Fix non-zero alpha detection in ImagingFactory_CreateBitmapFromHICON.
by Alexandre Julliard June 29, 2022

June 29, 2022

Module: wine Branch: master Commit: e6155827e8b72be53fc0fa031347121ed8e73b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6155827e8b72be53fc0fa03… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jun 28 22:41:38 2022 +0900 windowscodecs: Fix non-zero alpha detection in ImagingFactory_CreateBitmapFromHICON. Increment pixel pointer for every *pixel*, not every *stride*. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/windowscodecs/imgfactory.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index c7e101e3d62..07f5b53fefd 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -901,16 +901,14 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromHICON(IWICImagingFactory2 * if (bm.bmBitsPixel == 32) { /* If any pixel has a non-zero alpha, ignore hbmMask */ - bits = (DWORD *)buffer; - for (x = 0; x < width && !has_alpha; x++, bits++) + DWORD *ptr = (DWORD *)buffer; + DWORD *end = ptr + width * height; + while (ptr != end) { - for (y = 0; y < height; y++) + if (*ptr++ & 0xff000000) { - if (*bits & 0xff000000) - { - has_alpha = TRUE; - break; - } + has_alpha = TRUE; + break; } } }

1 0

Eric Pouech : dbghelp: Rely on first/last type index from type header.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: b7c231c78f84402b47c79ba744884c32ca2a8323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7c231c78f84402b47c79ba7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:08 2022 +0200 dbghelp: Rely on first/last type index from type header. Code now follows these guidelines: - define PDB & Codeview internals in cvconst.h and mscvinfo.h (instead of having definitions in .c files, some of them being duplicate of .h content, and their "duplicate" values eventually diverged over time) - index of first type comes from PDB type header (instead of always being hardcoded as FIRST_DEFINABLE_TYPE) - use index of last typex from type header (instead of guessing the right value while parsing types, which also allows a single allocation instead of enlarging buffer while parsing). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 108 ++++++++++++++++++++++--------------------------- include/wine/mscvpdb.h | 3 +- 2 files changed, 50 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c231c78f84402b47c7…

1 0

Eric Pouech : winedump: Explore a bit more TPI hash elements.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: ba12b5ae8838beadc32a32a34b267b6629ede7c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba12b5ae8838beadc32a32a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:08 2022 +0200 winedump: Explore a bit more TPI hash elements. Rename a couple of fields in PDB structures for clarity. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 10 +-- tools/winedump/pdb.c | 189 ++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 168 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba12b5ae8838beadc32a…

1 0

Arkadiusz Hiler : winealsa.drv: Set device path for all devices.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 5d0d812dfd8d408d0cf499d96f0fb77eca278591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0d812dfd8d408d0cf499d9… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Jun 27 16:58:15 2022 +0300 winealsa.drv: Set device path for all devices. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 74 +++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b91606603a2..8439262428f 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2318,21 +2318,21 @@ static NTSTATUS get_prop_value(void *args) if(IsEqualPropertyKey(*prop, devicepath_key)) { + enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; + USHORT vendor_id = 0, product_id = 0; char uevent[MAX_PATH]; - FILE *fuevent; + FILE *fuevent = NULL; int card, device; + UINT serial_number; + char buf[128]; + int len; - /* only implemented for identifiable devices, i.e. not "default" */ - if(!sscanf(name, "plughw:%u,%u", &card, &device)){ - params->result = E_NOTIMPL; - return STATUS_SUCCESS; + if(sscanf(name, "plughw:%u,%u", &card, &device)){ + sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); + fuevent = fopen(uevent, "r"); } - sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); - fuevent = fopen(uevent, "r"); if(fuevent){ - enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; - USHORT vendor_id = 0, product_id = 0; char line[256]; while (fgets(line, sizeof(line), fuevent)) { @@ -2365,41 +2365,33 @@ static NTSTATUS get_prop_value(void *args) } fclose(fuevent); + } - if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){ - UINT serial_number; - char buf[128]; - int len; - - /* As hardly any audio devices have serial numbers, Windows instead - appears to use a persistent random number. We emulate this here - by instead using the last 8 hex digits of the GUID. */ - serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; - - if(connection == AudioDeviceConnectionType_USB) - sprintf(buf, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", - vendor_id, product_id, device, serial_number); - else /* AudioDeviceConnectionType_PCI */ - sprintf(buf, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", - vendor_id, product_id, device, serial_number); - - len = strlen(buf) + 1; - if(*params->buffer_size < len * sizeof(WCHAR)){ - params->result = E_NOT_SUFFICIENT_BUFFER; - *params->buffer_size = len * sizeof(WCHAR); - return STATUS_SUCCESS; - } - out->vt = VT_LPWSTR; - out->pwszVal = params->buffer; - ntdll_umbstowcs(buf, len, out->pwszVal, len); - params->result = S_OK; - return STATUS_SUCCESS; - } - }else{ - WARN("Could not open %s for reading\n", uevent); - params->result = E_NOTIMPL; + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + + if(connection == AudioDeviceConnectionType_USB) + sprintf(buf, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", + vendor_id, product_id, device, serial_number); + else if (connection == AudioDeviceConnectionType_PCI) + sprintf(buf, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", + vendor_id, product_id, device, serial_number); + else + sprintf(buf, "{1}.ROOT\\MEDIA\\%04u", serial_number & 0x1FF); + + len = strlen(buf) + 1; + if(*params->buffer_size < len * sizeof(WCHAR)){ + params->result = E_NOT_SUFFICIENT_BUFFER; + *params->buffer_size = len * sizeof(WCHAR); return STATUS_SUCCESS; } + out->vt = VT_LPWSTR; + out->pwszVal = params->buffer; + ntdll_umbstowcs(buf, len, out->pwszVal, len); + params->result = S_OK; + return STATUS_SUCCESS; } else if (flow != eCapture && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { unsigned int num_speakers, card, device; char hwname[255];

1 0

Zebediah Figura : ntdll/tests: Test setting the return value via alertable NtContinue().
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: e39880d9456888fec24cc2b485d779d62e14c98e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39880d9456888fec24cc2b4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jun 25 20:12:16 2022 -0500 ntdll/tests: Test setting the return value via alertable NtContinue(). This is currently broken on WoW64. --- dlls/ntdll/tests/exception.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 748ee0e52ee..753a44c769b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8775,6 +8775,7 @@ static void test_user_apc(void) NTSTATUS status; CONTEXT context; LONG pass; + int ret; if (!pNtQueueApcThread) { @@ -8797,16 +8798,20 @@ static void test_user_apc(void) 0xc9, /* leave */ 0xc3, /* ret */ }; - void (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; + int (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; memcpy(code_mem, code, sizeof(code)); - func(RtlCaptureContext, &context); + ret = func(RtlCaptureContext, &context); /* work around broken RtlCaptureContext on Windows < 7 which doesn't set * ContextFlags */ context.ContextFlags = CONTEXT_FULL; } #else - RtlCaptureContext(&context); + { + int (WINAPI *func)(CONTEXT *context) = (void *)RtlCaptureContext; + + ret = func(&context); + } #endif InterlockedIncrement(&pass); @@ -8815,6 +8820,16 @@ static void test_user_apc(void) /* Try to make sure context data is far enough below context.Esp. */ CONTEXT c[4]; +#ifdef __i386__ + context.Eax = 0xabacab; +#elif defined(__x86_64__) + context.Rax = 0xabacab; +#elif defined(__arm__) + context.R0 = 0xabacab; +#elif defined(__aarch64__) + context.X0 = 0xabacab; +#endif + c[0] = context; test_apc_called = FALSE; @@ -8830,6 +8845,7 @@ static void test_user_apc(void) ok(0, "Should not get here, status %#lx.\n", status); return; } + ok(ret == 0xabacab, "Got return value %#x.\n", ret); ok(pass == 3, "Got unexpected pass %ld.\n", pass); ok(test_apc_called, "Test user APC was not called.\n"); }

1 0

Zebediah Figura : ntdll/tests: Fix test_user_apc() on Windows < 7.
by Alexandre Julliard June 28, 2022

June 28, 2022

Module: wine Branch: master Commit: 1168dfc3c100a5074e8678b2e0c875d96c858f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1168dfc3c100a5074e8678b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 27 15:41:17 2022 -0500 ntdll/tests: Fix test_user_apc() on Windows < 7. --- dlls/ntdll/tests/exception.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 86f2f5d6cb2..748ee0e52ee 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8801,6 +8801,9 @@ static void test_user_apc(void) memcpy(code_mem, code, sizeof(code)); func(RtlCaptureContext, &context); + /* work around broken RtlCaptureContext on Windows < 7 which doesn't set + * ContextFlags */ + context.ContextFlags = CONTEXT_FULL; } #else RtlCaptureContext(&context); @@ -8824,8 +8827,7 @@ static void test_user_apc(void) ok(!status, "Got unexpected status %#lx.\n", status); status = NtContinue(&c[0], TRUE ); - /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ - ok(broken(TRUE), "Should not get here, status %#lx.\n", status); + ok(0, "Should not get here, status %#lx.\n", status); return; } ok(pass == 3, "Got unexpected pass %ld.\n", pass);

1 0