- Wine-Commits - list.winehq.org

Alex Henrie : dsound: Dynamically allocate the global device GUID arrays.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 5a81b6ac43e1057c0c6f9953fd5cbb1bc5d0f11b URL: https://gitlab.winehq.org/wine/wine/-/commit/5a81b6ac43e1057c0c6f9953fd5cbb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 22:39:07 2023 -0600 dsound: Dynamically allocate the global device GUID arrays. This removes the arbitrary limit on the number of renderers and capturers while satisfying applications that expect the GUIDs to remain valid after DirectSoundCaptureEnumerate returns. --- dlls/dsound/dsound_main.c | 15 +++++++++++++-- dlls/dsound/dsound_private.h | 4 ++-- include/mmsystem.h | 6 ------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 84a118f43aa..bb373a4304d 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -73,8 +73,11 @@ static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = }; CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; -GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; -GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; +/* Some applications expect the GUID pointers emitted from DirectSoundCaptureEnumerate to remain + * valid at least until the next time DirectSoundCaptureEnumerate is called, so we store them in + * these dynamically allocated arrays. */ +GUID *DSOUND_renderer_guids; +GUID *DSOUND_capture_guids; const WCHAR wine_vxd_drv[] = L"winemm.vxd"; @@ -461,11 +464,19 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } + free(guids); if(count == 0){ IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); + guids = NULL; return DS_OK; } + guids = malloc((count + 1) * sizeof(GUID)); + if(!guids){ + IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); + return E_OUTOFMEMORY; + } TRACE("Calling back with NULL (Primary Sound Driver)\n"); keep_going = cb(NULL, L"Primary Sound Driver", L"", user); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 46c150fc9fc..34498125317 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -255,8 +255,8 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** extern CRITICAL_SECTION DSOUND_renderers_lock; extern struct list DSOUND_renderers; -extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; -extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; +extern GUID *DSOUND_renderer_guids; +extern GUID *DSOUND_capture_guids; extern const WCHAR wine_vxd_drv[]; diff --git a/include/mmsystem.h b/include/mmsystem.h index 691e5bce887..a80716ef949 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -60,12 +60,6 @@ typedef HWAVEOUT *LPHWAVEOUT; typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); -#define MAXWAVEDRIVERS 10 -#define MAXMIDIDRIVERS 10 -#define MAXAUXDRIVERS 10 -#define MAXMCIDRIVERS 32 -#define MAXMIXERDRIVERS 10 - #define MAXPNAMELEN 32 /* max product name length (including NULL) */ #define MAXERRORLENGTH 256 /* max error text length (including NULL) */ #define MAX_JOYSTICKOEMVXDNAME 260

1 0

Alex Henrie : Revert "dsound: Get rid of the global device GUID arrays.".
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 73654470abd9dc3094e3270df592c214be4c7c15 URL: https://gitlab.winehq.org/wine/wine/-/commit/73654470abd9dc3094e3270df592c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 21:47:52 2023 -0600 Revert "dsound: Get rid of the global device GUID arrays.". This reverts commit e1f0318ec4fe83fdc86407303d55f4ee5ba3d2e7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55608 --- dlls/dsound/dsound_main.c | 31 ++++++++++++++++++++----------- dlls/dsound/dsound_private.h | 6 +++++- dlls/dsound/propset.c | 12 ++++++++---- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 810ae616308..84a118f43aa 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -73,6 +73,9 @@ static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = }; CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; +GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; +GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; + const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ @@ -385,13 +388,13 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) return DSERR_INVALIDPARAM; } -static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) +static BOOL send_device(IMMDevice *device, GUID *guid, + LPDSENUMCALLBACKW cb, void *user) { IPropertyStore *ps; PROPVARIANT pv; BOOL keep_going; HRESULT hr; - GUID guid; PropVariantInit(&pv); @@ -401,7 +404,7 @@ static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) return TRUE; } - hr = get_mmdevice_guid(device, ps, &guid); + hr = get_mmdevice_guid(device, ps, guid); if(FAILED(hr)){ IPropertyStore_Release(ps); return TRUE; @@ -415,10 +418,10 @@ static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) return TRUE; } - TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(&guid), + TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid), wine_dbgstr_w(pv.pwszVal)); - keep_going = cb(&guid, pv.pwszVal, wine_vxd_drv, user); + keep_going = cb(guid, pv.pwszVal, wine_vxd_drv, user); PropVariantClear(&pv); IPropertyStore_Release(ps); @@ -428,12 +431,13 @@ static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) /* S_FALSE means the callback returned FALSE at some point * S_OK means the callback always returned TRUE */ -HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) +HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, + LPDSENUMCALLBACKW cb, void *user) { IMMDeviceEnumerator *devenum; IMMDeviceCollection *coll; IMMDevice *defdev = NULL; - UINT count, i; + UINT count, i, n; BOOL keep_going; HRESULT hr, init_hr; @@ -472,8 +476,10 @@ HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) eMultimedia, &defdev); if(FAILED(hr)){ defdev = NULL; + n = 0; }else{ - keep_going = send_device(defdev, cb, user); + keep_going = send_device(defdev, &guids[0], cb, user); + n = 1; } } @@ -487,7 +493,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) } if(device != defdev){ - keep_going = send_device(device, cb, user); + keep_going = send_device(device, &guids[n], cb, user); + ++n; } IMMDevice_Release(device); @@ -530,7 +537,8 @@ HRESULT WINAPI DirectSoundEnumerateW( setup_dsound_options(); - hr = enumerate_mmdevices(eRender, lpDSEnumCallback, lpContext); + hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, + lpDSEnumCallback, lpContext); return SUCCEEDED(hr) ? DS_OK : hr; } @@ -593,7 +601,8 @@ DirectSoundCaptureEnumerateW( setup_dsound_options(); - hr = enumerate_mmdevices(eCapture, lpDSEnumCallback, lpContext); + hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, + lpDSEnumCallback, lpContext); return SUCCEEDED(hr) ? DS_OK : hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 6c3eb672f31..46c150fc9fc 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -255,6 +255,9 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** extern CRITICAL_SECTION DSOUND_renderers_lock; extern struct list DSOUND_renderers; +extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; +extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; + extern const WCHAR wine_vxd_drv[]; void setup_dsound_options(void); @@ -263,4 +266,5 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device); BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels); -HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user); +HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, + LPDSENUMCALLBACKW cb, void *user); diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 5d9ad45b01b..be284a6dda5 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -134,9 +134,11 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( search.found_guid = &ppd->DeviceId; if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) - hr = enumerate_mmdevices(eRender, search_callback, &search); + hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, + search_callback, &search); else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) - hr = enumerate_mmdevices(eCapture, search_callback, &search); + hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, + search_callback, &search); else return DSERR_INVALIDPARAM; @@ -314,10 +316,12 @@ static HRESULT DSPROPERTY_EnumerateW( return E_PROP_ID_UNSUPPORTED; } - hr = enumerate_mmdevices(eRender, enum_callback, ppd); + hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, + enum_callback, ppd); if(hr == S_OK) - hr = enumerate_mmdevices(eCapture, enum_callback, ppd); + hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, + enum_callback, ppd); return SUCCEEDED(hr) ? DS_OK : hr; }

1 0

Paul Gofman : user32: Return empty string from LoadStringW() if resource is not found.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 726027d60182db021edfdf83f1ec39f17486fd5d URL: https://gitlab.winehq.org/wine/wine/-/commit/726027d60182db021edfdf83f1ec39… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:32:04 2023 -0600 user32: Return empty string from LoadStringW() if resource is not found. --- dlls/user32/resource.c | 13 +++++++------ dlls/user32/tests/resource.c | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 3714b05ce8d..d2937988765 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -161,12 +161,13 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, if(buffer == NULL) return 0; - /* Use loword (incremented by 1) as resourceid */ - hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), - (LPWSTR)RT_STRING ); - if (!hrsrc) return 0; - hmem = LoadResource( instance, hrsrc ); - if (!hmem) return 0; + if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING )) || + !(hmem = LoadResource( instance, hrsrc ))) + { + TRACE( "Failed to load string.\n" ); + if (buflen > 0) buffer[0] = 0; + return 0; + } p = LockResource(hmem); string_num = resource_id & 0x000f; diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 2369aef2a09..da4efd2465f 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -120,6 +120,33 @@ static void test_LoadStringW(void) winetest_pop_context(); } } + + /* Test missing resource. */ + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, ARRAY_SIZE(returnedstringw)); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_FOUND) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, 0); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_LOADED) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(returnedstringw[0] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, 1); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_LOADED) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); } static void test_LoadStringA (void)

1 0

Paul Gofman : user32: Put 0 to output string even for 1 char buffer in LoadStringW().
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: ad9303d888aa0b463f07f16059ce801d8da10ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad9303d888aa0b463f07f16059ce80… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:56:17 2023 -0600 user32: Put 0 to output string even for 1 char buffer in LoadStringW(). --- dlls/user32/resource.c | 13 +++---------- dlls/user32/tests/resource.c | 9 +++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index d2937988765..b050e1eba8c 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -185,17 +185,10 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, } i = min(buflen - 1, *p); - if (i > 0) { - memcpy(buffer, p + 1, i * sizeof (WCHAR)); - buffer[i] = 0; - } else { - if (buflen > 1) { - buffer[0] = 0; - return 0; - } - } + memcpy(buffer, p + 1, i * sizeof(WCHAR)); + buffer[i] = 0; - TRACE("%s loaded !\n", debugstr_w(buffer)); + TRACE("returning %s\n", debugstr_w(buffer)); return i; } diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index da4efd2465f..de4bb2c8a53 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -147,6 +147,15 @@ static void test_LoadStringW(void) "got %lu.\n", GetLastError()); ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + /* Test short buffer */ + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 2, returnedstringw, 1); /* get resource string */ + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == 0xdeadbeef, "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); } static void test_LoadStringA (void)

1 0

Paul Gofman : kernelbase: Put 0 to output string even for 1 char buffer in LoadStringW().
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: ed7aca011c800c60bf59bf3a1f10b06e7eedbeb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed7aca011c800c60bf59bf3a1f10b0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:58:41 2023 -0600 kernelbase: Put 0 to output string even for 1 char buffer in LoadStringW(). --- dlls/kernelbase/string.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index a372605bee0..f83ae35f19a 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -1253,19 +1253,8 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L } i = min(buflen - 1, *p); - if (i > 0) - { - memcpy(buffer, p + 1, i * sizeof (WCHAR)); - buffer[i] = 0; - } - else - { - if (buflen > 1) - { - buffer[0] = 0; - return 0; - } - } + memcpy(buffer, p + 1, i * sizeof(WCHAR)); + buffer[i] = 0; TRACE("returning %s\n", debugstr_w(buffer)); return i;

1 0

Zebediah Figura : d3d9/tests: Test that GetDC() records a dirty rect.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 8fa82bd1f89c669bc89be7d56413adde67638a82 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fa82bd1f89c669bc89be7d56413ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:43:55 2023 -0600 d3d9/tests: Test that GetDC() records a dirty rect. --- dlls/d3d9/tests/visual.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0ac6b58cb36..51848cecbf6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19507,6 +19507,7 @@ static void add_dirty_rect_test(void) ULONG refcount; DWORD *texel; HWND window; + HDC dc; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; static const RECT oob_rect[] = @@ -19748,6 +19749,21 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* GetDC() records a dirty rect. */ + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_src_green, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_src_green, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -19873,6 +19889,18 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* So does GetDC(). */ + fill_surface(surface_managed0, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_managed0, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_managed0, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* Tests with dynamic textures */ fill_surface(surface_dynamic, 0x0000ffff, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic);

1 0

Paul Gofman : kernelbase: Return empty string from LoadStringW() if resource is not found.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: d93e2899778fabd5e8231ca768432b47542d7b98 URL: https://gitlab.winehq.org/wine/wine/-/commit/d93e2899778fabd5e8231ca768432b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:38:10 2023 -0600 kernelbase: Return empty string from LoadStringW() if resource is not found. --- dlls/kernelbase/string.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 798bc1f3d63..a372605bee0 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -1229,11 +1229,13 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L if (!buffer) return 0; - /* Use loword (incremented by 1) as resourceid */ - hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING); - if (!hrsrc) return 0; - hmem = LoadResource(instance, hrsrc); - if (!hmem) return 0; + if (!(hrsrc = FindResourceW(instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING)) || + !(hmem = LoadResource(instance, hrsrc))) + { + TRACE( "Failed to load string.\n" ); + if (buflen > 0) buffer[0] = 0; + return 0; + } p = LockResource(hmem); string_num = resource_id & 0x000f;

1 0

Zebediah Figura : wined3d: Record a dirty rect in wined3d_texture_create_dc().
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: a32872870271083a0bd5caa55771be4ff1b2fff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a32872870271083a0bd5caa55771be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:45:07 2023 -0600 wined3d: Record a dirty rect in wined3d_texture_create_dc(). --- dlls/d3d9/tests/visual.c | 4 +-- dlls/wined3d/texture.c | 66 +++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51848cecbf6..bb8381cde3d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19760,7 +19760,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); @@ -19897,7 +19897,7 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a89fad97ed8..1f4c4b80d3c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1088,6 +1088,37 @@ static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture checkGLcall("allocate immutable storage"); } +static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, + unsigned int layer, const struct wined3d_box *box) +{ + struct wined3d_dirty_regions *regions; + unsigned int count; + + if (!texture->dirty_regions) + return; + + regions = &texture->dirty_regions[layer]; + count = regions->box_count + 1; + if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box + || (!box->left && !box->top && !box->front + && box->right == texture->resource.width + && box->bottom == texture->resource.height + && box->back == texture->resource.depth)) + { + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) + { + ERR("Failed to grow boxes array, marking entire texture dirty.\n"); + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + regions->boxes[regions->box_count++] = *box; +} + void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -1150,6 +1181,10 @@ static void wined3d_texture_create_dc(void *object) context = context_acquire(device, NULL, 0); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } + + if (texture->dirty_regions) + wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, NULL); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, texture->resource.map_binding); @@ -2123,37 +2158,6 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str return &texture->sub_resources[sub_resource_idx]; } -static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, - unsigned int layer, const struct wined3d_box *box) -{ - struct wined3d_dirty_regions *regions; - unsigned int count; - - if (!texture->dirty_regions) - return; - - regions = &texture->dirty_regions[layer]; - count = regions->box_count + 1; - if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box - || (!box->left && !box->top && !box->front - && box->right == texture->resource.width - && box->bottom == texture->resource.height - && box->back == texture->resource.depth)) - { - regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; - return; - } - - if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) - { - WARN("Failed to grow boxes array, marking entire texture dirty.\n"); - regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; - return; - } - - regions->boxes[regions->box_count++] = *box; -} - HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) {

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for IMMCONST64 registers.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: vkd3d Branch: master Commit: 0c5c18bdce35efc460d6eb4dff4b6dfd90228237 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c5c18bdce35efc460d6eb4dff4b6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:17:39 2023 +0100 vkd3d-shader/ir: Validate index count for IMMCONST64 registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index ffc505cd..2a334399 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1554,6 +1554,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx_count); break; + case VKD3DSPR_IMMCONST64: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a IMMCONST64 register.", + reg->idx_count); + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for IMMCONST registers.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: vkd3d Branch: master Commit: b74470b9d2bba1278f656e597ac40e26013c3f6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b74470b9d2bba1278f656e597ac40… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:17:05 2023 +0100 vkd3d-shader/ir: Validate index count for IMMCONST registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 0f8d596b..ffc505cd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1548,6 +1548,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx_count); break; + case VKD3DSPR_IMMCONST: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a IMMCONST register.", + reg->idx_count); + break; + default: break; }

1 0