- Wine-Commits - list.winehq.org

Zebediah Figura : ddraw: Forbid DDSCAPS_COMPLEX without any caps that merit a complex surface.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 9bfdd9141c18f42cfe0de95cf7c1679a5edfe5c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bfdd9141c18f42cfe0de95cf7c167… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 21:33:10 2022 -0600 ddraw: Forbid DDSCAPS_COMPLEX without any caps that merit a complex surface. --- dlls/ddraw/surface.c | 9 +++++++++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4a95067996f..cdb1cfe109d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6117,6 +6117,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ /* Ensure DDSD_CAPS is always set. */ desc->dwFlags |= DDSD_CAPS; + if ((desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX) + && !(desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_MIPMAP)) + && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) + { + WARN("DDSCAPS_COMPLEX specified for a surface which is neither flippable, mipmapped, nor a cubemap.\n"); + heap_free(texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_FLIP) { if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->u5.dwBackBufferCount) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 258670f1db5..2d7d350517e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6323,7 +6323,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9427dea535e..5733c879b4e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7452,7 +7452,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aca9a456078..81bf170711d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9353,7 +9353,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e9574cdec2c..229448d135a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9197,7 +9197,7 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 1 || i == 4 || i == 7 || i == 8) + todo_wine_if (i == 7 || i == 8) ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue;

1 0

Zebediah Figura : ddraw/tests: Add more tests for mipmap surface creation flags.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: df8c73e9065bf287f07119ea7feff63a9469bcec URL: https://gitlab.winehq.org/wine/wine/-/commit/df8c73e9065bf287f07119ea7feff6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 20:19:07 2022 -0600 ddraw/tests: Add more tests for mipmap surface creation flags. --- dlls/ddraw/tests/ddraw1.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw2.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 21 +++++++++++++++++---- 4 files changed, 68 insertions(+), 16 deletions(-)

1 0

Zebediah Figura : ddraw: Forbid DDSD_MIPMAPCOUNT without DDSCAPS_COMPLEX.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: c86263aa5d3bea75f089fd5deeba6235e1d122f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c86263aa5d3bea75f089fd5deeba62… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 21:44:43 2022 -0600 ddraw: Forbid DDSD_MIPMAPCOUNT without DDSCAPS_COMPLEX. --- dlls/ddraw/surface.c | 8 ++++++++ dlls/ddraw/tests/ddraw1.c | 9 +-------- dlls/ddraw/tests/ddraw2.c | 9 +-------- dlls/ddraw/tests/ddraw4.c | 9 +-------- dlls/ddraw/tests/ddraw7.c | 9 +-------- 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cdb1cfe109d..ddbe08f2260 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6126,6 +6126,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if ((desc->dwFlags & DDSD_MIPMAPCOUNT) && !(desc->ddsCaps.dwCaps & DDSCAPS_COMPLEX)) + { + /* This is illegal even if there is only one mipmap level. */ + WARN("DDSD_MIPMAPCOUNT specified without DDSCAPS_COMPLEX.\n"); + heap_free(texture); + return DDERR_INVALIDCAPS; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_FLIP) { if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->u5.dwBackBufferCount) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2d7d350517e..4f950d775b2 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6323,17 +6323,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface_Release(surface); - continue; - } - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5733c879b4e..476531d41a5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7452,17 +7452,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface_Release(surface); - continue; - } - hr = IDirectDrawSurface_QueryInterface(surface1, &IID_IDirectDrawSurface2, (void **)&surface); ok(SUCCEEDED(hr), "Test %u: Failed to get IDirectDrawSurface2 interface, hr %#lx.\n", i, hr); IDirectDrawSurface_Release(surface1); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 81bf170711d..71052214baf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9353,17 +9353,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface4_Release(surface); - continue; - } - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 229448d135a..8ac62b303e1 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9197,17 +9197,10 @@ static void test_mipmap(void) if (tests[i].flags & DDSD_MIPMAPCOUNT) U2(surface_desc).dwMipMapCount = tests[i].mipmap_count_in; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if (i == 7 || i == 8) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (FAILED(hr)) continue; - if (FAILED(tests[i].hr)) - { - IDirectDrawSurface7_Release(surface); - continue; - } - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc);

1 0

Zebediah Figura : ddraw/tests: Test that surface properties are retained across SetSurfaceDesc() calls.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 1cea45a183559d9b7f6f43c3f4a63b42558b450b URL: https://gitlab.winehq.org/wine/wine/-/commit/1cea45a183559d9b7f6f43c3f4a63b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 11 19:59:42 2022 -0600 ddraw/tests: Test that surface properties are retained across SetSurfaceDesc() calls. --- dlls/ddraw/tests/ddraw2.c | 28 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index eddf846e54b..e48d4c54f1c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6203,6 +6203,34 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Got hr %#lx.\n", hr); + /* Check that other surface properties are retained. */ + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff00ff; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface3_SetColorKey(surface3, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + U1(ddsd).lPitch = 8 * 2; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xf800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001f; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&ddsd.ddckCKSrcBlt, 0xcc, sizeof(ddsd.ddckCKSrcBlt)); + hr = IDirectDrawSurface3_GetColorKey(surface3, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00ff00ff, + "Got low color key value %#lx.\n", ddsd.ddckCKSrcBlt.dwColorSpaceLowValue); + IDirectDrawSurface3_Release(surface3); /* Test mipmap texture. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a658de37b94..657ea982154 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7861,6 +7861,34 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Got hr %#lx.\n", hr); + /* Check that other surface properties are retained. */ + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff00ff; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface4_SetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + U1(ddsd).lPitch = 8 * 2; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xf800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001f; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&ddsd.ddckCKSrcBlt, 0xcc, sizeof(ddsd.ddckCKSrcBlt)); + hr = IDirectDrawSurface4_GetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00ff00ff, + "Got low color key value %#lx.\n", ddsd.ddckCKSrcBlt.dwColorSpaceLowValue); + IDirectDrawSurface4_Release(surface); /* Test mipmap texture. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index a1c791a9116..d642a644e97 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7718,6 +7718,34 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Got hr %#lx.\n", hr); + /* Check that other surface properties are retained. */ + + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff00ff; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface7_SetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_PITCH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.dwWidth = 8; + U1(ddsd).lPitch = 8 * 2; + ddsd.dwHeight = 8; + ddsd.lpSurface = data; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xf800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001f; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + memset(&ddsd.ddckCKSrcBlt, 0xcc, sizeof(ddsd.ddckCKSrcBlt)); + hr = IDirectDrawSurface7_GetColorKey(surface, DDCKEY_SRCBLT, &ddsd.ddckCKSrcBlt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ddsd.ddckCKSrcBlt.dwColorSpaceLowValue == 0x00ff00ff, + "Got low color key value %#lx.\n", ddsd.ddckCKSrcBlt.dwColorSpaceLowValue); + IDirectDrawSurface7_Release(surface); /* Test mipmap texture. */

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP14 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 7997efa35fa886f8a45c4d0378b43f845a96f9ce URL: https://gitlab.winehq.org/wine/wine/-/commit/7997efa35fa886f8a45c4d0378b43f… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 16:43:54 2022 -0600 wined3d: Move the WINED3D_RS_WRAP14 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 870b9a9ac27..fea8b450500 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -112,7 +112,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5f4c8146249..b44732a7044 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP14: case WINED3D_RS_WRAP15: { static unsigned int once; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9006194dd12..c893fb44070 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2825,7 +2825,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d086b5f5fff..0526a29248b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4695,7 +4695,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP11), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP12), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP13), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP14), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5483,7 +5482,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {205, 209}, + {204, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP15 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 549612fd5fe267056401e3d2636d787c94b44aa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/549612fd5fe267056401e3d2636d78… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 16:41:22 2022 -0600 wined3d: Move the WINED3D_RS_WRAP15 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3e09191d1e2..870b9a9ac27 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -113,7 +113,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP15), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8de89b01bb4..5f4c8146249 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP15: + { + static unsigned int once; + + if ((state->rs[idx]) && !once++) + FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); + break; + } + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 986032ec6e0..9006194dd12 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2826,7 +2826,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP14), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP15), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f83af5b8c0e..d086b5f5fff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4696,7 +4696,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP12), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP13), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP14), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP15), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5484,7 +5483,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {206, 209}, + {205, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP13 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: d1b0343d3b6a8bf4fd7e9a0261b9d79852f15e10 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1b0343d3b6a8bf4fd7e9a0261b9d7… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 16:56:48 2022 -0600 wined3d: Move the WINED3D_RS_WRAP13 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fea8b450500..a9481f24249 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -111,7 +111,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP10), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b44732a7044..98f1e472a51 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP13: case WINED3D_RS_WRAP14: case WINED3D_RS_WRAP15: { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c893fb44070..55f2f70e3fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2824,7 +2824,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP10), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP11), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP12), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP13), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0526a29248b..e39fa95d525 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4694,7 +4694,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP10), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP11), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP12), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP13), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5482,7 +5481,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {174, 177}, {185, 193}, {195, 197}, - {204, 209}, + {203, 209}, { 0, 0}, }; static const unsigned int simple_states[] =

1 0

Alexandre Julliard : wine.inf: Add keys for the platform-specific Wow64 backend.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 7611492ddc5c9707d42e6bfcea81eb0b7120e785 URL: https://gitlab.winehq.org/wine/wine/-/commit/7611492ddc5c9707d42e6bfcea81eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:12:52 2023 +0100 wine.inf: Add keys for the platform-specific Wow64 backend. --- loader/wine.inf.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 34b90ef6bbf..c5850d1e205 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -418,12 +418,15 @@ HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe" [CurrentVersionWow64.ntamd64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" +HKLM,Software\Microsoft\Wow64\x86,,2,"wow64cpu.dll" [CurrentVersionWow64.ntarm64] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"C:\Program Files (Arm)" HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"C:\Program Files (Arm)\Common Files" +HKLM,Software\Microsoft\Wow64\arm,,2,"wowarmhw.dll" +HKLM,Software\Microsoft\Wow64\x86,,2,"xtajit.dll" [CurrentVersionWow64.ntx86] HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16422%"

1 0

Max Figura : wined3d: Move the WINED3D_RS_FLUSHBATCH stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: 9ef49c4b4e02751d63454abc9bfa7814682fd1fb URL: https://gitlab.winehq.org/wine/wine/-/commit/9ef49c4b4e02751d63454abc9bfa78… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 14:13:26 2022 -0600 wined3d: Move the WINED3D_RS_FLUSHBATCH stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 9 +-------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 95f34fb25b8..406f6b0b965 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_nop}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6813f500dad..26be2e5d046 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4119,6 +4119,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_ANISOTROPY not implemented yet.\n"); break; + case WINED3D_RS_FLUSHBATCH: + if (state->rs[WINED3D_RS_FLUSHBATCH]) + FIXME("Render state WINED3D_RS_FLUSHBATCH not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 894020f8d52..2175eb388af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c83eb773de9..9b30a867891 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2042,12 +2042,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_flushbatch(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_FLUSHBATCH]) - FIXME("Render state WINED3D_RS_FLUSHBATCH not implemented yet.\n"); -} - static void state_translucentsi(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_TRANSLUCENTSORTINDEPENDENT]) @@ -4693,7 +4687,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_FLUSHBATCH), { STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_flushbatch }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),{ STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),state_translucentsi }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5489,7 +5482,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 30, 33}, { 39, 40}, { 42, 47}, - { 49, 49}, + { 49, 50}, { 52, 59}, { 61, 127}, {149, 150},

1 0

Alexandre Julliard : wow64: Get the backend dll name from the registry.
by Alexandre Julliard March 2, 2023

March 2, 2023

Module: wine Branch: master Commit: b57af3ebca6ee7e8b21b57ee1ef4c3a7143967cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b57af3ebca6ee7e8b21b57ee1ef4c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:13:38 2023 +0100 wow64: Get the backend dll name from the registry. --- dlls/wow64/syscall.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6f4f3a2dc81..dd3937640bc 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -712,16 +712,39 @@ static HMODULE load_64bit_module( const WCHAR *name ) */ static const WCHAR *get_cpu_dll_name(void) { + static ULONG buffer[32]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + const WCHAR *ret; + HANDLE key; + ULONG size; + switch (current_machine) { case IMAGE_FILE_MACHINE_I386: - return (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Wow64\\x86" ); + ret = (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); + break; case IMAGE_FILE_MACHINE_ARMNT: - return L"wowarmhw.dll"; + RtlInitUnicodeString( &nameW, L"\\Registry\\Machine\\Software\\Microsoft\\Wow64\\arm" ); + ret = L"wowarmhw.dll"; + break; default: ERR( "unsupported machine %04x\n", current_machine ); RtlExitUserProcess( 1 ); } + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (NtOpenKey( &key, KEY_READ | KEY_WOW64_64KEY, &attr )) return ret; + RtlInitUnicodeString( &nameW, L"" ); + size = sizeof(buffer) - sizeof(WCHAR); + if (!NtQueryValueKey( key, &nameW, KeyValuePartialInformation, buffer, size, &size ) && info->Type == REG_SZ) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + ret = (WCHAR *)info->Data; + } + NtClose( key ); + return ret; }

1 0