November 2021 - Wine-Commits

Piotr Caban : msvcp140: Fix time_get<char>::get_monthname spec file entry.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 49d64194f3bd22ece2902c04a535bc83e8738796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49d64194f3bd22ece2902c04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 22 16:27:51 2021 +0100 msvcp140: Fix time_get<char>::get_monthname spec file entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 7c24c963acd..3945a4bfbd4 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -2514,7 +2514,7 @@ @ thiscall -arch=i386 ?get_date@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z(ptr ptr ptr long ptr long ptr ptr ptr) time_get_wchar_get_date @ cdecl -arch=win64 ?get_date@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z(ptr ptr ptr ptr ptr ptr ptr) time_get_wchar_get_date @ cdecl -arch=arm ?get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z(ptr ptr ptr long ptr long ptr ptr ptr) time_get_char_get_monthname -@ thiscall -arch=arm ?get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z(ptr ptr ptr long ptr long ptr ptr ptr) time_get_char_get_monthname +@ thiscall -arch=i386 ?get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z(ptr ptr ptr long ptr long ptr ptr ptr) time_get_char_get_monthname @ cdecl -arch=win64 ?get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z(ptr ptr ptr ptr ptr ptr ptr) time_get_char_get_monthname @ stub -arch=arm ?get_monthname@?$time_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z @ stub -arch=i386 ?get_monthname@?$time_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z

1 0

Nick Fox : kernel32: Add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 85723b920899e5f6482d268379b3536fbd33fbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85723b920899e5f6482d2683… Author: Nick Fox <nick(a)foxsec.net> Date: Fri Oct 29 03:16:54 2021 +0000 kernel32: Add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH. Signed-off-by: Nick Fox <nick(a)foxsec.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 73 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f49af6d5bfe..86d604f6a96 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2409,10 +2409,12 @@ static void test_SetSearchPathMode(void) static const WCHAR pathW[] = {'P','A','T','H',0}; -static void build_search_path( WCHAR *buffer, UINT size, const WCHAR *dlldir, BOOL safe ) +static void build_search_path( WCHAR *buffer, UINT size, const WCHAR *module, const WCHAR *dlldir, BOOL safe ) { WCHAR *p; - GetModuleFileNameW( NULL, buffer, size ); + + if (module) lstrcpynW( buffer, module, size ); + else GetModuleFileNameW( NULL, buffer, size ); if (!(p = wcsrchr( buffer, '\\' ))) return; *p++ = ';'; if (dlldir) @@ -2471,7 +2473,7 @@ static void test_RtlGetSearchPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2479,7 +2481,7 @@ static void test_RtlGetSearchPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2489,7 +2491,7 @@ static void test_RtlGetSearchPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetSearchPath( &path ); ok( !ret, "RtlGetSearchPath failed %x\n", ret ); @@ -2520,14 +2522,14 @@ static void test_RtlGetExePath(void) lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", NULL ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2536,14 +2538,14 @@ static void test_RtlGetExePath(void) SetEnvironmentVariableA( "NoDefaultCurrentDirectoryInExePath", "yes" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); - build_search_path( buffer, ARRAY_SIZE(buffer), emptyW, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, emptyW, TRUE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW + 1, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2551,7 +2553,7 @@ static void test_RtlGetExePath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2561,7 +2563,7 @@ static void test_RtlGetExePath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, FALSE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, FALSE ); path = (WCHAR *)0xdeadbeef; ret = pRtlGetExePath( fooW, &path ); ok( !ret, "RtlGetExePath failed %x\n", ret ); @@ -2589,7 +2591,7 @@ static void test_LdrGetDllPath(void) GetWindowsDirectoryW( buffer, ARRAY_SIZE(buffer) ); lstrcpynW( dlldir, buffer, ARRAY_SIZE(dlldir) ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); path = unknown_ptr = (WCHAR *)0xdeadbeef; ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); @@ -2599,7 +2601,7 @@ static void test_LdrGetDllPath(void) pRtlReleasePath( path ); SetEnvironmentVariableA( "PATH", "foo" ); - build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2609,7 +2611,7 @@ static void test_LdrGetDllPath(void) if (pSetDllDirectoryW) { ok( pSetDllDirectoryW( dlldir ), "SetDllDirectoryW failed\n" ); - build_search_path( buffer, ARRAY_SIZE(buffer), dlldir, TRUE ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, dlldir, TRUE ); ret = pLdrGetDllPath( 0, 0, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); @@ -2654,6 +2656,49 @@ static void test_LdrGetDllPath(void) ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); pRtlReleasePath( path ); + ret = pLdrGetDllPath( fooW, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + todo_wine + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"temp/foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + todo_wine + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L".\\foo\\foobar", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), L".\\foo\\foobar", NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"temp\\foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), L"temp\\foo", NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"c:\\temp\\foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), L"c:\\temp\\foo", NULL, TRUE ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( ret == STATUS_INVALID_PARAMETER, "got %x expected %x\n", ret, STATUS_INVALID_PARAMETER ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\';

1 0

Huw Davies : winecoreaudio: Pass the stream directly to silence_buffer().
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 0136bf7acd25bc6ecbac84e628639e045769cc23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0136bf7acd25bc6ecbac84e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:34 2021 +0000 winecoreaudio: Pass the stream directly to silence_buffer(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 56f533f8bc1..abe77d11ee9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -877,16 +877,16 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, memcpy(dst + dst_offs, src, src_bytes); } -static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->stream->fmt; - if((This->stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); +static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); + memset(buffer, 0, frames * stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -919,7 +919,7 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, to_copy_bytes = to_copy_frames = 0; if(nframes > to_copy_frames) - silence_buffer(This, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); + silence_buffer(This->stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); OSSpinLockUnlock(&This->stream->lock); @@ -1344,7 +1344,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); + silence_buffer(This->stream, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); @@ -2318,7 +2318,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->stream->getbuf_last = frames; } - silence_buffer(This, *data, frames); + silence_buffer(This->stream, *data, frames); OSSpinLockUnlock(&This->stream->lock); @@ -2357,7 +2357,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This, buffer, frames); + silence_buffer(This->stream, buffer, frames); if(This->stream->getbuf_last < 0) ca_wrap_buffer(This->stream->local_buffer,

1 0

Hugh McMaster : kernel32/tests: Test whether every element of the CPINFO.LeadByte array is NUL.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 381ea5413c29efc104c0b7fcb914e13ac6afd685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=381ea5413c29efc104c0b7fc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 22 22:43:28 2021 +1100 kernel32/tests: Test whether every element of the CPINFO.LeadByte array is NUL. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fa0ec374d34..4fb30eb5318 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3962,6 +3962,7 @@ static void test_GetCPInfo(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF7, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) @@ -3970,14 +3971,19 @@ static void test_GetCPInfo(void) } else { + unsigned int i; + ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + for (i = 2; i < sizeof(cpinfo.LeadByte); i++) + todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); } + memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF8, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) @@ -3986,11 +3992,15 @@ static void test_GetCPInfo(void) } else { + unsigned int i; + ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + for (i = 2; i < sizeof(cpinfo.LeadByte); i++) + todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, "expected 4, got %u\n", cpinfo.MaxCharSize); }

1 0

Paul Gofman : advapi32: Improve PerfSetCounterRefValue() stub.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 8cfbb1772481db3ff2f615a7706aa503a92d3f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfbb1772481db3ff2f615a7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 22 17:07:59 2021 +0300 advapi32: Improve PerfSetCounterRefValue() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/perf.c | 10 +++++----- dlls/kernelbase/main.c | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c index 9236ea8bb75..a0862e65ea4 100644 --- a/dlls/advapi32/tests/perf.c +++ b/dlls/advapi32/tests/perf.c @@ -155,16 +155,16 @@ void test_provider_init(void) ok(size == instance->dwSize, "Got unexpected size %u, instance->dwSize %u.\n", size, instance->dwSize); ret = PerfSetCounterRefValue(prov, instance, 1, &counter1); - todo_wine ok(!ret, "Got unexpected ret %u.\n", ret); + ok(!ret, "Got unexpected ret %u.\n", ret); ret = PerfSetCounterRefValue(prov, instance, 2, &counter2); - todo_wine ok(!ret, "Got unexpected ret %u.\n", ret); + ok(!ret, "Got unexpected ret %u.\n", ret); ret = PerfSetCounterRefValue(prov, instance, 0, &counter2); - todo_wine ok(ret == ERROR_NOT_FOUND, "Got unexpected ret %u.\n", ret); + ok(ret == ERROR_NOT_FOUND, "Got unexpected ret %u.\n", ret); - todo_wine ok(*(void **)(instance + 1) == &counter1, "Got unexpected counter value %p.\n", + ok(*(void **)(instance + 1) == &counter1, "Got unexpected counter value %p.\n", *(void **)(instance + 1)); - todo_wine ok(*(void **)((BYTE *)instance + sizeof(*instance) + sizeof(UINT64)) == &counter2, + ok(*(void **)((BYTE *)instance + sizeof(*instance) + sizeof(UINT64)) == &counter2, "Got unexpected counter value %p.\n", *(void **)(instance + 1)); ret = PerfDeleteInstance(prov, instance); diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index d90bedcc637..775c1c2ac07 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -312,11 +312,29 @@ ULONG WINAPI PerfSetCounterSetInfo( HANDLE handle, PERF_COUNTERSET_INFO *templat /*********************************************************************** * PerfSetCounterRefValue (KERNELBASE.@) */ -ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PERF_COUNTERSET_INSTANCE *instance, ULONG counterid, void *address) { - FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov = perf_provider_from_handle( provider ); + struct counterset_template *template; + struct counterset_instance *inst; + unsigned int i; + + FIXME( "provider %p, instance %p, counterid %u, address %p semi-stub.\n", + provider, instance, counterid, address ); + + if (!prov || !instance || !address) return ERROR_INVALID_PARAMETER; + + inst = CONTAINING_RECORD(instance, struct counterset_instance, instance); + template = inst->template; + + for (i = 0; i < template->counterset.NumCounters; ++i) + if (template->counter[i].CounterId == counterid) break; + + if (i == template->counterset.NumCounters) return ERROR_NOT_FOUND; + *(void **)((BYTE *)&inst->instance + sizeof(PERF_COUNTERSET_INSTANCE) + template->counter[i].Offset) = address; + + return STATUS_SUCCESS; } /***********************************************************************

1 0

Zebediah Figura : win32u: Do not free user memory when deleting dibs created with NtGdiDdDDICreateDCFromMemory().
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 220b0a7c060e71a7a414cd89542769451274e873 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220b0a7c060e71a7a414cd89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 19 18:30:51 2021 -0600 win32u: Do not free user memory when deleting dibs created with NtGdiDdDDICreateDCFromMemory(). This fixes a test crash in ddraw:ddraw1 introduced by 7d2a7b94aad8a776a2ee3031a18bb3b53d5925cd. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 6 +++--- dlls/win32u/dib.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a244414660b..93793ad7108 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5969,11 +5969,11 @@ static void test_D3DKMTCreateDCFromMemory( void ) size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); - todo_wine ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); - todo_wine ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); ret = VirtualFree( alloc_data, 0, MEM_RELEASE ); - todo_wine ok(ret, "Failed to free memory, error %u.\n", GetLastError()); + ok(ret, "Failed to free memory, error %u.\n", GetLastError()); } START_TEST(bitmap) diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index b27b341d470..ee82d1a8ed8 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -1574,6 +1574,24 @@ error: } +static BOOL memory_dib_DeleteObject( HGDIOBJ handle ) +{ + BITMAPOBJ *bmp; + + if (!(bmp = free_gdi_handle( handle ))) return FALSE; + + free( bmp->color_table ); + free( bmp ); + return TRUE; +} + + +static const struct gdi_obj_funcs memory_dib_funcs = +{ + .pGetObjectW = DIB_GetObject, + .pDeleteObject = memory_dib_DeleteObject, +}; + /*********************************************************************** * NtGdiDdDDICreateDCFromMemory (win32u.@) */ @@ -1673,7 +1691,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) } } - if (!(bitmap = alloc_gdi_handle( &bmp->obj, NTGDI_OBJ_BITMAP, &dib_funcs ))) goto error; + if (!(bitmap = alloc_gdi_handle( &bmp->obj, NTGDI_OBJ_BITMAP, &memory_dib_funcs ))) goto error; desc->hDc = dc; desc->hBitmap = bitmap;

1 0

Eric Pouech : dbghelp: Simplify code for searching alternate debug info files.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 9f1766193e87a7039072fe95b5c1bfa40974f63e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1766193e87a7039072fe95… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:21:07 2021 +0100 dbghelp: Simplify code for searching alternate debug info files. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 73 ++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 73243d80da5..5614c575cd0 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -634,6 +634,17 @@ found: return TRUE; } +static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) +{ + while (id < end) + { + *dst++ = "0123456789abcdef"[*id >> 4 ]; + *dst++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + return dst; +} + /****************************************************************** * image_load_debugaltlink * @@ -683,16 +694,14 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru if (dst) { MultiByteToWideChar(CP_UNIXCP, 0, data, -1, dst, filename_len); - ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, idlen); HeapFree(GetProcessHeap(), 0, dst); } /* Trying relative path to build-id directory */ if (!ret) { - static const WCHAR globalDebugDirW[] = - {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/','.','b','u','i','l','d','-','i','d','/'}; dst = HeapAlloc(GetProcessHeap(), 0, - sizeof(globalDebugDirW) + (3 + filename_len + idlen * 2) * sizeof(WCHAR)); + sizeof(L"/usr/lib/debug/.build-id/") + (3 + filename_len + idlen * 2) * sizeof(WCHAR)); if (dst) { WCHAR* p; @@ -702,21 +711,16 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru * where the alternate file is... * so try both */ - p = memcpy(dst, globalDebugDirW, sizeof(globalDebugDirW)); - p += ARRAY_SIZE(globalDebugDirW); + p = memcpy(dst, L"/usr/lib/debug/.build-id/", sizeof(L"/usr/lib/debug/.build-id/")); + p += wcslen(dst); MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); - ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, idlen); if (!ret) { - p = dst + ARRAY_SIZE(globalDebugDirW); - if ((const char*)id < data + sect_len) - { - *p++ = "0123456789abcdef"[*id >> 4 ]; - *p++ = "0123456789abcdef"[*id & 0x0F]; - } + p = append_hex(p, id, id + idlen); *p++ = '/'; MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); - ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, idlen); } HeapFree(GetProcessHeap(), 0, dst); } @@ -742,51 +746,38 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru */ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { - static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; - static const WCHAR buildidW[] = {'.','b','u','i','l','d','-','i','d','/'}; struct image_file_map* fmap_link = NULL; WCHAR* p; WCHAR* z; - const BYTE* idend = id + idlen; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); if (!fmap_link) return FALSE; - p = HeapAlloc(GetProcessHeap(), 0, - sizeof(globalDebugDirW) + sizeof(buildidW) + - (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); - z = p; - memcpy(z, globalDebugDirW, sizeof(globalDebugDirW)); - z += ARRAY_SIZE(globalDebugDirW); - memcpy(z, buildidW, sizeof(buildidW)); - z += ARRAY_SIZE(buildidW); - - if (id < idend) + p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); + wcscpy(p, L"/usr/lib/debug/.build-id/"); + z = p + wcslen(p); + if (idlen) { - *z++ = "0123456789abcdef"[*id >> 4 ]; - *z++ = "0123456789abcdef"[*id & 0x0F]; - id++; - } - if (id < idend) - *z++ = '/'; - while (id < idend) - { - *z++ = "0123456789abcdef"[*id >> 4 ]; - *z++ = "0123456789abcdef"[*id & 0x0F]; - id++; + z = append_hex(z, id, id + 1); + if (idlen > 1) + { + *z++ = L'/'; + z = append_hex(z, id + 1, id + idlen); + } } memcpy(z, L".debug", sizeof(L".debug")); TRACE("checking %s\n", wine_dbgstr_w(p)); - if (image_check_debug_link_gnu_id(p, fmap_link, idend - idlen, idlen)) + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) { - HeapFree(GetProcessHeap(), 0, p); + free(p); fmap->alternate = fmap_link; return TRUE; } TRACE("not found\n"); - HeapFree(GetProcessHeap(), 0, p); + free(p); HeapFree(GetProcessHeap(), 0, fmap_link); return FALSE; }

1 0

Eric Pouech : configure: Make Dwarf4 the default debug format.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 769db93d420abe34ab27f8edd04ae320c97c9209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769db93d420abe34ab27f8ed… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:21:21 2021 +0100 configure: Make Dwarf4 the default debug format. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 102 ++++++++++++----------------------------------------------- configure.ac | 6 ++-- 2 files changed, 22 insertions(+), 86 deletions(-) diff --git a/configure b/configure index ae5c8e2734e..a2298117ae1 100755 --- a/configure +++ b/configure @@ -12164,16 +12164,16 @@ fi ;; if test "x$ac_debug_format_seen" = x then case $CROSSDEBUG in - *dwarf) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5 -printf %s "checking whether the cross-compiler supports -gdwarf-2... " >&6; } -if test ${ac_cv_crosscflags__gdwarf_2+y} + *dwarf) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-4" >&5 +printf %s "checking whether the cross-compiler supports -gdwarf-4... " >&6; } +if test ${ac_cv_crosscflags__gdwarf_4+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS ac_wine_try_cflags_saved_cc=$CC ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gdwarf-2" +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gdwarf-4" CC="$CROSSCC" ac_exeext=".exe" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12182,9 +12182,9 @@ int __cdecl mainCRTStartup(void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_crosscflags__gdwarf_2=yes + ac_cv_crosscflags__gdwarf_4=yes else $as_nop - ac_cv_crosscflags__gdwarf_2=no + ac_cv_crosscflags__gdwarf_4=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12192,45 +12192,11 @@ CFLAGS=$ac_wine_try_cflags_saved CC=$ac_wine_try_cflags_saved_cc ac_exeext=$ac_wine_try_cflags_saved_exeext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gdwarf_2" >&5 -printf "%s\n" "$ac_cv_crosscflags__gdwarf_2" >&6; } -if test "x$ac_cv_crosscflags__gdwarf_2" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gdwarf_4" >&5 +printf "%s\n" "$ac_cv_crosscflags__gdwarf_4" >&6; } +if test "x$ac_cv_crosscflags__gdwarf_4" = xyes then : - EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-2" -fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gstrict-dwarf" >&5 -printf %s "checking whether the cross-compiler supports -gstrict-dwarf... " >&6; } -if test ${ac_cv_crosscflags__gstrict_dwarf+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -ac_wine_try_cflags_saved_cc=$CC -ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gstrict-dwarf" -CC="$CROSSCC" -ac_exeext=".exe" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int __cdecl mainCRTStartup(void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_crosscflags__gstrict_dwarf=yes -else $as_nop - ac_cv_crosscflags__gstrict_dwarf=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -CC=$ac_wine_try_cflags_saved_cc -ac_exeext=$ac_wine_try_cflags_saved_exeext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gstrict_dwarf" >&5 -printf "%s\n" "$ac_cv_crosscflags__gstrict_dwarf" >&6; } -if test "x$ac_cv_crosscflags__gstrict_dwarf" = xyes -then : - EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gstrict-dwarf" + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-4" fi ;; pdb) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gcodeview" >&5 printf %s "checking whether the cross-compiler supports -gcodeview... " >&6; } @@ -18588,61 +18554,33 @@ printf "%s\n" "$wine_cv_64bit_compare_swap" >&6; } done if test "x$ac_debug_format_seen" = xdefault then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 -printf %s "checking whether the compiler supports -gdwarf-2... " >&6; } -if test ${ac_cv_cflags__gdwarf_2+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -gdwarf-2" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__gdwarf_2=yes -else $as_nop - ac_cv_cflags__gdwarf_2=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gdwarf_2" >&5 -printf "%s\n" "$ac_cv_cflags__gdwarf_2" >&6; } -if test "x$ac_cv_cflags__gdwarf_2" = xyes -then : - EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2" -fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 -printf %s "checking whether the compiler supports -gstrict-dwarf... " >&6; } -if test ${ac_cv_cflags__gstrict_dwarf+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-4" >&5 +printf %s "checking whether the compiler supports -gdwarf-4... " >&6; } +if test ${ac_cv_cflags__gdwarf_4+y} then : printf %s "(cached) " >&6 else $as_nop ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -gstrict-dwarf" +CFLAGS="$CFLAGS -gdwarf-4" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_cflags__gstrict_dwarf=yes + ac_cv_cflags__gdwarf_4=yes else $as_nop - ac_cv_cflags__gstrict_dwarf=no + ac_cv_cflags__gdwarf_4=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gstrict_dwarf" >&5 -printf "%s\n" "$ac_cv_cflags__gstrict_dwarf" >&6; } -if test "x$ac_cv_cflags__gstrict_dwarf" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gdwarf_4" >&5 +printf "%s\n" "$ac_cv_cflags__gdwarf_4" >&6; } +if test "x$ac_cv_cflags__gdwarf_4" = xyes then : - EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf" + EXTRACFLAGS="$EXTRACFLAGS -gdwarf-4" fi fi diff --git a/configure.ac b/configure.ac index 9c0c8d25d29..1c716b4ec00 100644 --- a/configure.ac +++ b/configure.ac @@ -1029,8 +1029,7 @@ then if test "x$ac_debug_format_seen" = x then case $CROSSDEBUG in - *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) - WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; + *dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-4]) ;; pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; esac fi @@ -1843,8 +1842,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= done if test "x$ac_debug_format_seen" = xdefault then - WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) + WINE_TRY_CFLAGS([-gdwarf-4]) fi dnl Disable gcc builtins except for Mingw

1 0

Nick Fox : ntdll: Fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH without a path.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: ef26f7bd5cf36806f7b465dc1942ab6a2e0541b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef26f7bd5cf36806f7b465dc… Author: Nick Fox <nick(a)foxsec.net> Date: Fri Oct 29 03:17:03 2021 +0000 ntdll: Fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH without a path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26350 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51821 Signed-off-by: Nick Fox <nick(a)foxsec.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 2 -- dlls/ntdll/loader.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 86d604f6a96..2955be0da9c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2659,7 +2659,6 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( fooW, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); - todo_wine build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); @@ -2667,7 +2666,6 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( L"temp/foo", LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); ok( !ret, "LdrGetDllPath failed %x\n", ret ); ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); - todo_wine build_search_path( buffer, ARRAY_SIZE(buffer), NULL, NULL, TRUE ); ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); pRtlReleasePath( path ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c6d9689f408..a6d5063dcf7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4329,7 +4329,7 @@ NTSTATUS WINAPI LdrGetDllPath( PCWSTR module, ULONG flags, PWSTR *path, PWSTR *u else { const WCHAR *dlldir = dll_directory.Length ? dll_directory.Buffer : NULL; - if (!(flags & LOAD_WITH_ALTERED_SEARCH_PATH)) + if (!(flags & LOAD_WITH_ALTERED_SEARCH_PATH) || !wcschr( module, L'\\' )) module = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; status = get_dll_load_path( module, dlldir, dll_safe_mode, path ); }

1 0

Huw Davies : winecoreaudio: Use NtAllocateVirtualMemory() for local and tmp buffers.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 7d76fee5f48a3f8ddff25c23cd74aad4aaa4e910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d76fee5f48a3f8ddff25c23… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:32 2021 +0000 winecoreaudio: Use NtAllocateVirtualMemory() for local and tmp buffers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 28 ++++++++++++++++++++-------- dlls/winecoreaudio.drv/unixlib.h | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e37a2a9026..642610b4b60 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -653,9 +653,13 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - HeapFree(GetProcessHeap(), 0, This->stream->local_buffer); + if(This->stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, + &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); free(This->stream->wrap_buffer); HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); CoTaskMemFree(This->stream->fmt); @@ -1335,7 +1339,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return osstatus_to_hresult(sc); } - This->stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->bufsize_frames * fmt->nBlockAlign); + This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, + &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ @@ -2292,9 +2298,12 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ if(This->stream->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); - This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->stream->fmt->nBlockAlign); - if(!This->stream->tmp_buffer){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); + This->stream->tmp_buffer_size = frames * This->stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, + &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + This->stream->tmp_buffer_frames = 0; OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } @@ -2449,8 +2458,11 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; if(chunk_frames < This->stream->period_frames){ chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; - if(!This->stream->tmp_buffer) - This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->period_frames * This->stream->fmt->nBlockAlign); + if(!This->stream->tmp_buffer){ + This->stream->tmp_buffer_size = This->stream->period_frames * This->stream->fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, + &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + } *data = This->stream->tmp_buffer; memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 6a991f1de98..1b773b7f820 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -29,7 +29,6 @@ struct coreaudio_stream /* To be made private */ AUDCLNT_SHAREMODE share; BOOL playing; - SIZE_T local_buffer_size, tmp_buffer_size; UINT32 period_ms, period_frames; UINT32 bufsize_frames, resamp_bufsize_frames; UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; @@ -39,6 +38,7 @@ struct coreaudio_stream /* To be made private */ INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; + SIZE_T local_buffer_size, tmp_buffer_size; }; struct endpoint

1 0