wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Eric Pouech : winedump: Explore a bit more TPI hash elements.
by Alexandre Julliard 28 Jun '22

28 Jun '22

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 28 Jun '22

28 Jun '22

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

Arkadiusz Hiler : winepulse.drv: Set device path for all devices.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 3180ed32377a5109c6d986e291d28053562360a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3180ed32377a5109c6d986e2… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Jun 27 16:57:32 2022 +0300 winepulse.drv: Set device path for all devices. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 0e504b6b6dd..42d73db45f9 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2207,27 +2207,26 @@ static BOOL get_device_path(PhysDevice *dev, struct get_prop_value_params *param { const GUID *guid = params->guid; UINT serial_number; - const char *fmt; char path[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]; + switch (dev->bus_type) { case phys_device_bus_pci: - fmt = "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X"; + len = sprintf(path, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", dev->vendor_id, dev->product_id, dev->index, serial_number); break; case phys_device_bus_usb: - fmt = "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X"; + len = sprintf(path, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", dev->vendor_id, dev->product_id, dev->index, serial_number); break; default: - return FALSE; + len = sprintf(path, "{1}.ROOT\\MEDIA\\%04u", dev->index); + break; } - /* 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]; - - len = sprintf(path, fmt, dev->vendor_id, dev->product_id, dev->index, serial_number); ntdll_umbstowcs(path, len + 1, params->wstr, ARRAY_SIZE(params->wstr)); params->vt = VT_LPWSTR;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 39edda8a67070c012e7ae177fce58cd64afb6251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39edda8a67070c012e7ae177… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 28 13:22:41 2022 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 78 +++++++++------------------------------------------------------- 1 file changed, 10 insertions(+), 68 deletions(-) diff --git a/po/de.po b/po/de.po index 9c989dc4bc0..61958c125fe 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-11 16:51+0200\n" +"PO-Revision-Date: 2022-06-28 13:20+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -4000,10 +4000,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Nicht-schreibbare Eigenschaft '|' kann nicht geändert werden" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' ist kein Map-Objekt" +msgstr "'this' ist kein |-Objekt" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -15928,56 +15926,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -16061,7 +16009,7 @@ msgstr "" " muss <Typ> einer der folgenden sein:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " Falls [/t] nicht angegeben wird, ist der Standardtyp REG_SZ.\n" "\n" @@ -16511,10 +16459,8 @@ msgstr "&DWORD-Wert" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD-Wert" +msgstr "&QWORD-Wert" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16615,7 +16561,7 @@ msgstr "Von den Favoriten entfernen" #: programs/regedit/regedit.rc:318 msgid "Edit String" -msgstr "Zeichenfolge editieren" +msgstr "Zeichenfolge bearbeiten" #: programs/regedit/regedit.rc:321 programs/regedit/regedit.rc:334 #: programs/regedit/regedit.rc:350 programs/regedit/regedit.rc:363 @@ -16629,7 +16575,7 @@ msgstr "Daten:" #: programs/regedit/regedit.rc:331 msgid "Edit DWORD" -msgstr "DWORD-Wert editieren" +msgstr "DWORD bearbeiten" #: programs/regedit/regedit.rc:338 msgid "Base" @@ -16645,11 +16591,11 @@ msgstr "Dezimal" #: programs/regedit/regedit.rc:347 msgid "Edit Binary" -msgstr "Binären Wert editieren" +msgstr "Binären Wert bearbeiten" #: programs/regedit/regedit.rc:360 msgid "Edit Multi-String" -msgstr "Mehrteilige Zeichenfolge editieren" +msgstr "Mehrteilige Zeichenfolge bearbeiten" #: programs/regedit/regedit.rc:162 msgid "Contains commands for working with the whole registry" @@ -17079,16 +17025,12 @@ msgid "Collapse" msgstr "Reduzieren" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Fügt einen neuen 32-Bit-Wert hinzu" +msgstr "Fügt einen neuen 64-Bit-Wert hinzu" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD-Wert editieren" +msgstr "QWORD bearbeiten" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Zebediah Figura : ntdll/tests: Test setting the return value via alertable NtContinue().
by Alexandre Julliard 28 Jun '22

28 Jun '22

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 28 Jun '22

28 Jun '22

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

Zebediah Figura : ntdll/tests: Fix test_user_apc() on i386.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 6775a20f4e58d07e166438f99f92143b288e4967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6775a20f4e58d07e166438f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jun 25 20:05:54 2022 -0500 ntdll/tests: Fix test_user_apc() on i386. --- dlls/ntdll/tests/exception.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 820e435bc1b..86f2f5d6cb2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8784,7 +8784,27 @@ static void test_user_apc(void) pass = 0; InterlockedIncrement(&pass); +#ifdef __i386__ + { + /* RtlCaptureContext puts the return address of the caller's stack + * frame into %eip, so we need a thunk to get it to return here */ + static const BYTE code[] = + { + 0x55, /* pushl %ebp */ + 0x89, 0xe5, /* movl %esp, %ebp */ + 0xff, 0x75, 0x0c, /* pushl 0xc(%ebp) */ + 0xff, 0x55, 0x08, /* call *0x8(%ebp) */ + 0xc9, /* leave */ + 0xc3, /* ret */ + }; + void (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; + + memcpy(code_mem, code, sizeof(code)); + func(RtlCaptureContext, &context); + } +#else RtlCaptureContext(&context); +#endif InterlockedIncrement(&pass); if (pass == 2)

1 0

Stefan Dösinger : winecfg: Support color profiles larger than MAX_PATH chars.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 021eefdee03ce3efc111039085789a6bbc59707f URL: https://source.winehq.org/git/wine.git/?a=commit;h=021eefdee03ce3efc1110390… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 28 13:55:00 2022 +0300 winecfg: Support color profiles larger than MAX_PATH chars. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- programs/winecfg/theme.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 9c8737caf64..78bbf71dbfa 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -22,6 +22,7 @@ * */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -554,15 +555,25 @@ static void set_color_from_theme(const WCHAR *keyName, COLORREF color) static void do_parse_theme(WCHAR *file) { - WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; + WCHAR *keyName, keyNameValue[MAX_PATH]; + DWORD len, allocLen = 512; WCHAR *keyNamePtr = NULL; int red = 0, green = 0, blue = 0; COLORREF color; WINE_TRACE("%s\n", wine_dbgstr_w(file)); + keyName = malloc(sizeof(*keyName) * allocLen); + for (;;) + { + assert(keyName); + len = GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, + allocLen, file); + if (len < allocLen - 2) + break; - GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, - MAX_PATH, file); + allocLen *= 2; + keyName = realloc(keyName, sizeof(*keyName) * allocLen); + } keyNamePtr = keyName; while (*keyNamePtr!=0) { @@ -580,6 +591,7 @@ static void do_parse_theme(WCHAR *file) keyNamePtr+=lstrlenW(keyNamePtr); keyNamePtr++; } + free(keyName); } static void on_theme_install(HWND dialog)

1 0

Dmitry Timoshkov : comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 905dbb8f8b2522b85446d9e18d7c7c77ffcef8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=905dbb8f8b2522b85446d9e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 14 10:51:24 2022 +0800 comctl32/listview: Add partial support for LVM_SETBKIMAGE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 90 +++++++++++++++++++++++++++++++++++++----- dlls/comctl32/tests/listview.c | 78 ++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..ab328b3e798 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4551,6 +4552,21 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) return nItem; } +static void LISTVIEW_DrawBackgroundBitmap(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +{ + HDC mem_hdc; + + if (!infoPtr->hBkBitmap) + return; + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + mem_hdc = CreateCompatibleDC(hdc); + SelectObject(mem_hdc, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, mem_hdc, lprcBox->left, lprcBox->top, SRCCOPY); + DeleteDC(mem_hdc); +} /*** * DESCRIPTION: @@ -4565,13 +4581,17 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, lprcBox); + return TRUE; } /* Draw main item or subitem */ @@ -8028,7 +8048,53 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx, %p, %p, %u, %d, %d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("unsupported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("unsupported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + { + infoPtr->hBkBitmap = image->hbm; + return TRUE; + } + break; + } + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -9641,10 +9707,11 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (infoPtr->clrBk == CLR_NONE) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) - return SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, - (WPARAM)hdc, PRF_ERASEBKGND); + SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, (WPARAM)hdc, PRF_ERASEBKGND); else - return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, &rc); + return TRUE; } /* for double buffered controls we need to do this during refresh */ @@ -10406,6 +10473,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11622,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..ed5222a5ee8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,81 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(BOOL is_v6) +{ + LVBKIMAGEA image; + HBITMAP hbmp; + BITMAP bm; + HWND hwnd; + int ret; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7063,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -7034,6 +7111,7 @@ START_TEST(listview) test_item_state_change(); test_selected_column(); test_LVM_GETNEXTITEMINDEX(); + test_LVM_SETBKIMAGE(TRUE); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : advapi32: Implement RegRenameKey().
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: ebbee24c5d493569f56a935251114a5f46a46a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebbee24c5d493569f56a9352… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 22:54:16 2022 +0300 advapi32: Implement RegRenameKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/advapi32/registry.c | 22 +++++++++++++++++++--- dlls/advapi32/tests/registry.c | 14 -------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 730ca850c2b..85e883bdcc9 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -510,10 +510,26 @@ LSTATUS WINAPI RegReplaceKeyW( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile, * RegRenameKey [ADVAPI32.@] * */ -LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewName ) +LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR subkey_name, LPCWSTR new_name ) { - FIXME("(%p,%s,%s): stub\n", hkey, debugstr_w(lpSubKey), debugstr_w(lpNewName)); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING str; + LSTATUS ret; + HKEY subkey; + + TRACE("%p, %s, %s.\n", hkey, debugstr_w(subkey_name), debugstr_w(new_name)); + + RtlInitUnicodeString(&str, new_name); + + if (!subkey_name) + return RtlNtStatusToDosError( NtRenameKey( hkey, &str )); + + if ((ret = RegOpenKeyExW( hkey, subkey_name, 0, KEY_WRITE, &subkey ))) + return ret; + + ret = RtlNtStatusToDosError( NtRenameKey( subkey, &str )); + RegCloseKey( subkey ); + + return ret; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c2e78192f2e..cae9fc98734 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4481,22 +4481,17 @@ static void test_RegRenameKey(void) LSTATUS ret; ret = RegRenameKey(NULL, NULL, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(NULL, NULL, L"newname"); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(NULL, L"oldname", NULL); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(NULL, L"oldname", L"newname"); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_READ, NULL, &key, NULL); ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, NULL, L"TestNewRenameKey"); - todo_wine ok(ret == ERROR_ACCESS_DENIED, "Unexpected return value %ld.\n", ret); RegCloseKey(key); @@ -4504,28 +4499,22 @@ static void test_RegRenameKey(void) ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, NULL, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, NULL, L"TestNewRenameKey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); RegCloseKey(key); ret = RegDeleteKeyA(hkey_main, "TestNewRenameKey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegDeleteKeyA(hkey_main, "TestRenameKey"); - todo_wine ok(ret, "Unexpected return value %ld.\n", ret); /* Subkey does not exist. */ ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, L"unknown_subkey", NULL); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, L"unknown_subkey", L"known_subkey"); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Unexpected return value %ld.\n", ret); /* Rename existing subkey. */ @@ -4534,14 +4523,11 @@ static void test_RegRenameKey(void) RegCloseKey(key2); ret = RegRenameKey(key, L"known_subkey", L"renamed_subkey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegDeleteKeyA(key, "renamed_subkey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegDeleteKeyA(key, "known_subkey"); - todo_wine ok(ret, "Unexpected return value %ld.\n", ret); RegCloseKey(key);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022