September 2023 - Wine-commits

Rémi Bernon : dswave: Use CRT allocation functions.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 8bcaec25529104d1e53fdd1242cb5ae211db411e URL: https://gitlab.winehq.org/wine/wine/-/commit/8bcaec25529104d1e53fdd1242cb5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:30:46 2023 +0200 dswave: Use CRT allocation functions. --- dlls/dswave/dswave.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 8e06fc8d13d..5bdd83dfa2c 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -84,9 +84,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -179,11 +177,8 @@ HRESULT create_dswave(REFIID lpcGUID, void **ppobj) IDirectMusicWaveImpl *obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectMusicWaveImpl)); - if (!obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IUnknown_iface.lpVtbl = &unknown_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectSoundWave, &obj->IUnknown_iface);

1 0

Rémi Bernon : dswave: Use PARENTSRC with dmusic.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: b27a036eaf9ca599e24d840f4b3aa0dab9a0040a URL: https://gitlab.winehq.org/wine/wine/-/commit/b27a036eaf9ca599e24d840f4b3aa0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:52:16 2023 +0200 dswave: Use PARENTSRC with dmusic. --- dlls/dswave/Makefile.in | 1 + dlls/dswave/dmobject.c | 733 ------------------------------------------------ dlls/dswave/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 857 deletions(-)

1 0

Rémi Bernon : dmstyle: Awlays return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 994bcb48421c94949eed9f931aeae965dad2a9a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/994bcb48421c94949eed9f931aeae9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:43:30 2023 +0200 dmstyle: Awlays return S_FALSE from DllCanUnloadNow. --- dlls/dmstyle/auditiontrack.c | 2 -- dlls/dmstyle/chordtrack.c | 2 -- dlls/dmstyle/commandtrack.c | 2 -- dlls/dmstyle/dmstyle_main.c | 21 --------------------- dlls/dmstyle/dmstyle_private.h | 7 ------- dlls/dmstyle/motiftrack.c | 2 -- dlls/dmstyle/mutetrack.c | 2 -- dlls/dmstyle/style.c | 2 -- dlls/dmstyle/styletrack.c | 2 -- 9 files changed, 42 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 0bf1c818f6c..f324d18cecc 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -332,7 +331,6 @@ HRESULT create_dmauditiontrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index fdaecac1240..01511963a40 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -82,7 +82,6 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -431,7 +430,6 @@ HRESULT create_dmchordtrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 32e0bbe8c0d..02b32bc41e6 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -81,7 +81,6 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -385,7 +384,6 @@ HRESULT create_dmcommandtrack(REFIID lpcGUID, void **ppobj) track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Commands); - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 8f951ece5ae..9d96ab3930e 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -LONG DMSTYLE_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); @@ -81,15 +79,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMSTYLE_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMSTYLE_UnlockModule(); - return 1; /* non-heap based object */ } @@ -111,12 +105,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMSTYLE_LockModule(); - else - DMSTYLE_UnlockModule(); - return S_OK; } @@ -137,15 +125,6 @@ static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, create_dmmotiftr static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, create_dmauditiontrack}; static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, create_dmmutetrack}; -/****************************************************************** - * DllCanUnloadNow (DMSTYLE.1) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) { - return DMSTYLE_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMSTYLE.@) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 2807e98fe61..5237368b44e 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -61,13 +61,6 @@ typedef struct _DMUS_PRIVATE_COMMAND { IDirectMusicCollection* ppReferenceCollection; } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND; -/********************************************************************** - * Dll lifetime tracking declaration for dmstyle.dll - */ -extern LONG DMSTYLE_refCount; -static inline void DMSTYLE_LockModule(void) { InterlockedIncrement( &DMSTYLE_refCount ); } -static inline void DMSTYLE_UnlockModule(void) { InterlockedDecrement( &DMSTYLE_refCount ); } - /***************************************************************************** * Misc. */ diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 5efe90706e0..93bfd821e56 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -304,7 +303,6 @@ HRESULT create_dmmotiftrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 2248d7151dd..3f632709397 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -79,7 +79,6 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMSTYLE_UnlockModule(); } return ref; @@ -313,7 +312,6 @@ HRESULT create_dmmutetrack(REFIID lpcGUID, void **ppobj) (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 23e32a75fd0..57350470e81 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -127,7 +127,6 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) heap_free(motif); } heap_free(This); - DMSTYLE_UnlockModule(); } return ref; @@ -991,7 +990,6 @@ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) list_init(&obj->bands); list_init(&obj->motifs); - DMSTYLE_LockModule(); hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 83b03807ddf..3618483749c 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -96,7 +96,6 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) } heap_free(This); - DMSTYLE_UnlockModule(); } return ref; @@ -403,7 +402,6 @@ HRESULT create_dmstyletrack(REFIID lpcGUID, void **ppobj) track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Items); - DMSTYLE_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

1 0

Rémi Bernon : dmstyle: Use CRT allocation functions.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: d18ec193de842e80b4ca1ab01cb217f782329675 URL: https://gitlab.winehq.org/wine/wine/-/commit/d18ec193de842e80b4ca1ab01cb217… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:27:19 2023 +0200 dmstyle: Use CRT allocation functions. --- dlls/dmstyle/auditiontrack.c | 11 +++-------- dlls/dmstyle/chordtrack.c | 11 +++-------- dlls/dmstyle/commandtrack.c | 13 ++++--------- dlls/dmstyle/dmobject.c | 7 +++---- dlls/dmstyle/motiftrack.c | 11 +++-------- dlls/dmstyle/mutetrack.c | 11 +++-------- dlls/dmstyle/style.c | 34 +++++++++------------------------- dlls/dmstyle/styletrack.c | 11 +++-------- 8 files changed, 31 insertions(+), 78 deletions(-)

1 0

Rémi Bernon : dmstyle: Use PARENTSRC with dmusic.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 31980e74501b39490d20782bd36693ae2370668f URL: https://gitlab.winehq.org/wine/wine/-/commit/31980e74501b39490d20782bd36693… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:53:42 2023 +0200 dmstyle: Use PARENTSRC with dmusic. --- dlls/dmstyle/Makefile.in | 1 + dlls/dmstyle/dmobject.c | 732 ----------------------------------------------- dlls/dmstyle/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Hans Leidekker : iphlpapi/tests: Use CRT allocation functions.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 5f7016d3f018a42065a475a2f40002a5085e5429 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f7016d3f018a42065a475a2f40002… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 11:50:45 2023 +0200 iphlpapi/tests: Use CRT allocation functions. --- dlls/iphlpapi/tests/iphlpapi.c | 92 +++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 46 deletions(-)

1 0

Hans Leidekker : iphlpapi/tests: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: ad0f483d8be2f66cc4c3db05ab85a891fe9ca5b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad0f483d8be2f66cc4c3db05ab85a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 12:05:14 2023 +0200 iphlpapi/tests: Call GetAdaptersAddresses() in a loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54588 --- dlls/iphlpapi/tests/iphlpapi.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 372ec01a56a..090cd2c9ff9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2080,16 +2080,32 @@ static void test_CreateSortedAddressPairs(void) FreeMibTable( pair ); } +static IP_ADAPTER_ADDRESSES *get_adapters( ULONG flags ) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static DWORD get_interface_index(void) { - DWORD size = 0, ret = 0; + DWORD ret = 0; IP_ADAPTER_ADDRESSES *buf, *aa; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) - return 0; + buf = get_adapters( 0 ); + if (!buf) return 0; - buf = malloc( size ); - GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); for (aa = buf; aa; aa = aa->Next) { if (aa->IfType == IF_TYPE_ETHERNET_CSMACD) @@ -2455,7 +2471,7 @@ static void test_GetUnicastIpAddressEntry(void) { IP_ADAPTER_ADDRESSES *aa, *ptr; MIB_UNICASTIPADDRESS_ROW row; - DWORD ret, size; + DWORD ret; if (!pGetUnicastIpAddressEntry) { @@ -2498,13 +2514,8 @@ static void test_GetUnicastIpAddressEntry(void) ret = pGetUnicastIpAddressEntry( &row ); ok( ret == ERROR_FILE_NOT_FOUND, "got %lu\n", ret ); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); - ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %lu\n", ret); - if (ret != ERROR_BUFFER_OVERFLOW) return; - - ptr = malloc(size); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); - ok(!ret, "expected ERROR_SUCCESS got %lu\n", ret); + ptr = get_adapters( GAA_FLAG_INCLUDE_ALL_INTERFACES ); + ok(ptr != NULL, "can't get adapters\n"); for (aa = ptr; !ret && aa; aa = aa->Next) {

1 0

Ryan Hendrickson : regedit: Export hex(4) instead of dword if size isn't 4 bytes.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: cd3ebad1ae926d72dec239f120a6f8ffa8ba35e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd3ebad1ae926d72dec239f120a6f8… Author: Ryan Hendrickson <ryan.hendrickson(a)alum.mit.edu> Date: Tue Sep 12 03:14:07 2023 -0400 regedit: Export hex(4) instead of dword if size isn't 4 bytes. --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 30106380241..199cd3b6d80 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1282,7 +1282,7 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type export_string_data(&buf, data, size); break; case REG_DWORD: - if (size) + if (size == sizeof(DWORD)) { export_dword_data(&buf, data); break; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bc0c9870464..7dde63b449e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3466,6 +3466,7 @@ static void test_export(void) { HKEY hkey, subkey; DWORD dword; + DWORD64 dword64; BYTE hex[4]; const char *empty_key_test = @@ -3540,7 +3541,8 @@ static void test_export(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" "\"Wine3a\"=\"Value\"\r\n" "\"Wine3b\"=hex:12,34,56,78\r\n" - "\"Wine3c\"=dword:10203040\r\n\r\n"; + "\"Wine3c\"=dword:10203040\r\n" + "\"Wine3d\"=hex(4):80,70,60,50,40,30,20,10\r\n\r\n"; const char *embedded_null_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -3680,18 +3682,21 @@ static void test_export(void) ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); - /* Test registry export with embedded null characters */ + /* Test registry export with embedded null characters, improperly-sized DWORD */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine3b\"=hex(3):12,34,56,78\n" - "\"Wine3c\"=hex(4):40,30,20,10\n\n"); + "\"Wine3c\"=hex(4):40,30,20,10\n" + "\"Wine3d\"=hex(4):80,70,60,50,40,30,20,10\n\n"); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4); verify_reg(hkey, "Wine3b", REG_BINARY, hex, 4, 0); dword = 0x10203040; verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0); + dword64 = 0x1020304050607080; + verify_reg(hkey, "Wine3d", REG_DWORD, &dword64, sizeof(dword64), 0); close_key(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE);

1 0

Dmitry Timoshkov : server: Write terminating '\0' in the strings.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: d289dfc2c0e978a99229cae8b76b35bcdb176e3d URL: https://gitlab.winehq.org/wine/wine/-/commit/d289dfc2c0e978a99229cae8b76b35… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 28 16:27:59 2022 +0300 server: Write terminating '\0' in the strings. I have an application that creates its special registry key using NtCreateKey(parent, "Something\0"), and then expects to be able to open this key with NtOpenKey("Something\0") on start up. Currently this fails because terminating '\0' in the key name doesn't survive saving/loading the registry. parse_strW() helper already supports loading such key names. As the tests show after creating a kernel object with the name "Something\0" it's possible to only open it as "Something\0", and an attempt opening it as "Something" fails with STATUS_OBJECT_NAME_NOT_FOUND, and vice versa. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/registry.c | 2 +- server/unicode.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 3fea7dd79a4..629d67c832f 100644 --- a/server/registry.c +++ b/server/registry.c @@ -256,7 +256,7 @@ static void dump_value( const struct key_value *value, FILE *f ) if (((WCHAR *)value->data)[value->len / sizeof(WCHAR) - 1]) break; if (value->type != REG_SZ) fprintf( f, "str(%x):", value->type ); fputc( '\"', f ); - dump_strW( (WCHAR *)value->data, value->len, f, "\"\"" ); + dump_strW( (WCHAR *)value->data, value->len - sizeof(WCHAR), f, "\"\"" ); fprintf( f, "\"\n" ); return; diff --git a/server/unicode.c b/server/unicode.c index edb296be0c8..f84520580d7 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -219,7 +219,6 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] } if (*str < 32) /* octal or C escape */ { - if (!*str && len == 1) continue; /* do not output terminating NULL */ if (escapes[*str] != '.') pos += sprintf( pos, "\\%c", escapes[*str] ); else if (len > 1 && str[1] >= '0' && str[1] <= '7')

1 0

Alexandre Julliard : ntdll: Add missing backslash to query image file execution options.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: a5463c88e2ed39a56ff1e20ddcb1311b1c8d1eb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5463c88e2ed39a56ff1e20ddcb131… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:51:50 2023 +0200 ntdll: Add missing backslash to query image file execution options. --- dlls/ntdll/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index aa299535181..67104e63286 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3599,7 +3599,7 @@ static NTSTATUS query_string_option( HANDLE hkey, LPCWSTR name, ULONG type, NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LPCWSTR value, ULONG type, void *data, ULONG in_size, ULONG *out_size ) { - static const WCHAR optionsW[] = L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; + static const WCHAR optionsW[] = L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options\\"; WCHAR path[MAX_PATH + ARRAY_SIZE( optionsW )]; OBJECT_ATTRIBUTES attr; UNICODE_STRING name_str; @@ -3619,10 +3619,10 @@ NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LP while (p > key->Buffer && p[-1] != '\\') p--; len = key->Length - (p - key->Buffer) * sizeof(WCHAR); name_str.Buffer = path; - name_str.Length = sizeof(optionsW) + len; + name_str.Length = sizeof(optionsW) - sizeof(WCHAR) + len; name_str.MaximumLength = name_str.Length; memcpy( path, optionsW, sizeof(optionsW) ); - memcpy( path + ARRAY_SIZE( optionsW ), p, len ); + memcpy( path + ARRAY_SIZE( optionsW ) - 1, p, len ); if ((status = NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr ))) return status; if (type == REG_DWORD)

1 0