- Wine-Devel - list.winehq.org

[PATCH 4/6] inetcomm/tests: Use nameless unions.
by Jacek Caban March 27, 2021

March 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/inetcomm/tests/Makefile.in | 1 - dlls/inetcomm/tests/mimeintl.c | 16 ++++---- dlls/inetcomm/tests/mimeole.c | 66 ++++++++++++++++----------------- 3 files changed, 41 insertions(+), 42 deletions(-)

1 0

[PATCH 3/6] inetcomm: Use nameless unions.
by Jacek Caban March 27, 2021

March 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/inetcomm/Makefile.in | 1 - dlls/inetcomm/mimeintl.c | 20 ++++++++++---------- dlls/inetcomm/mimeole.c | 24 ++++++++++++------------ dlls/inetcomm/pop3transport.c | 12 ++++++------ dlls/inetcomm/protocol.c | 4 ++-- 5 files changed, 30 insertions(+), 31 deletions(-)

1 0

[PATCH 2/6] propsys/tests: Use nameless unions.
by Jacek Caban March 27, 2021

March 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/propsys/tests/Makefile.in | 1 - dlls/propsys/tests/propsys.c | 248 ++++++++++++++++----------------- 2 files changed, 124 insertions(+), 125 deletions(-)

1 0

[PATCH 1/6] propsys: Use nameless unions.
by Jacek Caban March 27, 2021

March 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/propsys/Makefile.in | 1 - dlls/propsys/propvar.c | 140 +++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 71 deletions(-)

1 0

[PATCH] Do not transfer primitive explicit binding handles to the server
by Eric Kohl March 27, 2021

March 27, 2021

This patch fixes an incompatibility with MIDL. WIDL must not generate code that passes explicit primitive binding handles to the server. Calls to such functions fail on Windows XP. Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> --- tools/widl/typegen.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä March 26, 2021

March 26, 2021

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 191 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 145 insertions(+), 46 deletions(-) diff --git a/po/fi.po b/po/fi.po index 69a07195ba5..a0cb77c8191 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14196,17 +14196,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14222,7 +14211,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, IMPORT, EXPORT, QUERY\n" +" ADD, DELETE, EXPORT, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -14277,6 +14266,51 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <avain> [/v arvon_nimi | /ve] [/t laji] [/s erotin] [/d data] [/f]\n" +"\n" +" Lisää avaimen rekisteriin tai lisää uuden arvon rekisteriavaimeen.\n" +"\n" +" <avain>\n" +" Rekisteriavain, joka lisätään, tai jos [/v] tai [/ve] on annettu,\n" +" avain, johon uusi data lisätään.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Lisättävän rekisteriarvon nimi.\n" +"\n" +" /ve\n" +" Lisää nimetön rekisteriarvo. Tämä muokkaa (Oletus)-rekisteriarvoa.\n" +"\n" +" /t <laji>\n" +" Lisättävän datan laji. Jos [/t] annetaan, lajin pitää olla jokin\n" +" seuraavista:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Jos parametria [/t] ei anneta, datan laji on oletuksena REG_SZ.\n" +"\n" +" /s <erotin>\n" +" Merkki, jolla erotetaan merkkijonot tyypin REG_MULTI_SZ datassa.\n" +" Jos parametria [/s] ei anneta, erotin on oletuksena \\0.\n" +"\n" +" /d <data>\n" +" Rekisteriarvoon lisättävä data.\n" +"\n" +" /f\n" +" Muokkaa rekisteriä kysymättä vahvistusta.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14316,6 +14350,40 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <avain> [/v arvon_nimi | /ve | /va] [/f]\n" +"\n" +" Poistaa rekisteriavaimen (mukaan lukien aliavaimet ja arvot), tai poistaa\n" +" yhden tai useamman arvon annetusta rekisteriavaimesta.\n" +"\n" +" <avain>\n" +" Poistettava rekisteriavain tai, jos [/v], [/ve] tai [/va] on annettu,\n" +" rekisteriavain, josta arvo tai arvot poistetaan.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Poistettavan rekisteriarvon nimi.\n" +"\n" +" /ve\n" +" Poista nimetön rekisteriarvo. Tämä poistaa (Oletus)-rekisteriarvon.\n" +"\n" +" /va\n" +" Poista kaikki arvot annetusta rekisteriavaimesta.\n" +"\n" +" /f\n" +" Poista rekisteriavain (mukaan lukien aliavaimet ja arvot) kysymättä\n" +" vahvistusta.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14351,16 +14419,44 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <avain> [/v arvon_nimi | /ve] [/s]\n" +"\n" +" Hakee annetun rekisteriavaimen ja listaa sen välittömät aliavaimet, arvot\n" +" ja datan. Parametri [/s] hakee rekursiivisesti myös aliavainten sisällön.\n" +"\n" +" <avain>\n" +" Rekisteriavain, joka haetaan.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Haettavan rekisteriarvon nimi. Jos ei anneta parametria [/v] eikä [/ve],\n" +" kaikki rekisteriavaimen alaiset arvot haetaan.\n" +"\n" +" /ve\n" +" Hae nimetön rekisteriarvo. Tämä hakee (Oletus)-rekisteriarvon.\n" +"\n" +" /s\n" +" Listaa kaikki rekisterin kohdat avaimen ja sen aliavainten alla.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "Toiminnon suorittaminen onnistui\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "reg: Rekisteriavain ei kelpaa\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14469,6 +14565,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <tiedosto> [/y]\n" +"\n" +" Tuo avaimet, arvot ja datan tiedostosta rekisteriin.\n" +"\n" +" <tiedosto>\n" +" Tuotavan rekisteritiedoston nimi ja polku.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14512,6 +14615,32 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <avain> <tiedosto> [/y]\n" +"\n" +" Vie rekisteriavaimen (mukaan lukien aliavaimet ja arvot) tiedostoon.\n" +"\n" +" <avain>\n" +" Vietävä rekisteriavain.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" <tiedosto>\n" +" Luotavan rekisteritiedoston nimi ja polku. Tiedostonimen tulee olla\n" +" .reg-päätteinen.\n" +"\n" +" /y\n" +" Ylikirjoita tiedosto kysymättä vahvistusta.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n" @@ -15188,37 +15317,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL:n '%1' asennus purettu\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -15273,6 +15371,7 @@ msgstr "" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" "/unix Käytä Unix-tiedostonimeä ja avaa tiedosto siten, kuin\n" " Windows Explorer avaisi sen.\n" +"/exec Käynnistä exec-funktiolla (Winen sisäistä käyttöä varten).\n" "/ProgIDOpen Avaa dokumentti määrätyllä progID:llä.\n" "/? Näytä tämä ohje ja lopeta.\n" -- 2.31.0

1 0

[PATCH 7/7] mshtml: Fix navigator.toString() in IE9+ compat modes.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 6/7] mshtml: Use "Netscape" as appName in IE11 compat mode.
by Jacek Caban March 26, 2021

March 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-)

2 1

[PATCH] ddraw: Allow texture without DDSCAPS_TEXTURE for ddraw4 and earlier on software device.
by Paul Gofman March 26, 2021

March 26, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/device.c | 8 ++- dlls/ddraw/tests/ddraw1.c | 117 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++ 5 files changed, 418 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c99eafc7524..656d2d35f4a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4858,19 +4858,21 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice3(iface); struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture); - HRESULT hr; + struct wined3d_texture *wined3d_texture = NULL; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); wined3d_mutex_lock(); - hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface); + if (tex && ((tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) || !device->hardware_device)) + wined3d_texture = tex->draw_texture ? tex->draw_texture : tex->wined3d_texture;; + wined3d_stateblock_set_texture(device->state, stage, wined3d_texture); fixup_texture_alpha_op(device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static const struct tss_lookup diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8a53f73d18d..0e0a198add2 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14332,6 +14332,122 @@ static void run_for_each_device_type(void (*test_func)(const GUID *)) test_func(&IID_IDirect3DRGBDevice); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static D3DTLVERTEX quad[] = + { + {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, + {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirect3DExecuteBuffer *execute_buffer; + IDirectDrawSurface *surface, *rt; + D3DTEXTUREHANDLE texture_handle; + D3DCOLOR color, expected_color; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + IDirect3DTexture *texture; + unsigned int inst_length; + IDirect3DDevice *device; + IDirectDraw *ddraw; + DDSURFACEDESC ddsd; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DTexture, (void **)&texture); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &texture_handle); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + background = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + viewport_set_background(device, viewport, background); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (is_software_device_type(device_guid)) + fill_surface(rt, 0xffff0000); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(quad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(quad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + set_execute_data(execute_buffer, 4, sizeof(quad), inst_length); + + hr = IDirect3DDevice_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff; + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, expected_color, 1), "Got color 0x%08x, expected 0x%08x.\n", color, expected_color); + + IDirect3DTexture_Release(texture); + IDirectDrawSurface_Release(surface); + IDirectDrawSurface_Release(rt); + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_material(background); + destroy_viewport(device, viewport); + + IDirect3DDevice_Release(device); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -14448,4 +14564,5 @@ START_TEST(ddraw1) test_vtbl_protection(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e3d1438b14c..5536625abdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15285,6 +15285,101 @@ done: IDirectDraw2_Release(ddraw); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {0.0f}, {1.0f}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {0.0f}, {0.0f}}, + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {1.0f}, {1.0f}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {1.0f}, {0.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirectDrawSurface *surface, *rt; + D3DTEXTUREHANDLE texture_handle; + D3DCOLOR color, expected_color; + IDirect3DMaterial2 *background; + IDirect3DViewport2 *viewport; + IDirect3DTexture2 *texture; + IDirect3DDevice2 *device; + IDirectDraw2 *ddraw; + DDSURFACEDESC ddsd; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture2_GetHandle(texture, device, &texture_handle); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + viewport_set_background(device, viewport, background); + + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (is_software_device_type(device_guid)) + fill_surface(rt, 0xffff0000); + + hr = IDirect3DDevice2_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff; + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, expected_color, 1), "Got color 0x%08x, expected 0x%08x.\n", color, expected_color); + + IDirect3DTexture2_Release(texture); + IDirectDrawSurface_Release(surface); + IDirectDrawSurface_Release(rt); + destroy_viewport(device, viewport); + destroy_material(background); + IDirectDraw2_Release(ddraw); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(&IID_IDirect3DHALDevice); @@ -15413,4 +15508,5 @@ START_TEST(ddraw2) test_cursor_clipping(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5af824c3f78..6b514b15e25 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18326,6 +18326,109 @@ static void run_for_each_device_type(void (*test_func)(const GUID *)) test_func(&IID_IDirect3DRGBDevice); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirectDrawSurface4 *surface, *rt; + D3DCOLOR color, expected_color; + IDirect3DViewport3 *viewport; + IDirect3DTexture2 *texture; + IDirect3DDevice3 *device; + IDirectDraw4 *ddraw; + DDSURFACEDESC2 ddsd; + IDirect3D3 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTexture(device, 0, texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_TEX1, quad, 4, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff; + color = get_surface_color(rt, 320, 240); + ok(color == expected_color, "Got color 0x%08x, expected 0x%08x.\n", color, expected_color); + + IDirect3DTexture2_Release(texture); + IDirectDrawSurface4_Release(surface); + IDirectDrawSurface4_Release(rt); + destroy_viewport(device, viewport); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -18464,4 +18567,5 @@ START_TEST(ddraw4) test_cursor_clipping(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d641595baa2..4c42d6f4b64 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18587,6 +18587,101 @@ done: IDirectDraw7_Release(ddraw); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + IDirectDrawSurface7 *surface, *rt; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + DDSURFACEDESC2 ddsd; + IDirect3D7 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetTexture(device, 0, surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (is_software_device_type(device_guid)) + fill_surface(rt, 0x000000ff); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_TEX1, quad, 4, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(color == 0, "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface7_Release(surface); + IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(hw_device_guid); @@ -18763,4 +18858,5 @@ START_TEST(ddraw7) test_cursor_clipping(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } -- 2.30.2

3 2

[PATCH] ddraw: Request read only texture access for read only maps.
by Paul Gofman March 26, 2021

March 26, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 19a1ae3d2d2..08e3811436d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1027,6 +1027,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, DWORD flags, HANDLE h) { struct wined3d_map_desc map_desc; + unsigned int wined3d_flags; struct wined3d_box box; HRESULT hr = DD_OK; @@ -1061,9 +1062,12 @@ static HRESULT surface_lock(struct ddraw_surface *surface, if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); if (SUCCEEDED(hr)) + { + wined3d_flags = wined3dmapflags_from_ddrawmapflags(flags); hr = wined3d_resource_map(wined3d_texture_get_resource - (ddraw_surface_get_default_texture(surface, DDRAW_SURFACE_RW)), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, wined3dmapflags_from_ddrawmapflags(flags)); + (ddraw_surface_get_default_texture(surface, wined3d_flags & WINED3D_MAP_WRITE ? DDRAW_SURFACE_RW + : DDRAW_SURFACE_READ)), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, wined3d_flags); + } if (FAILED(hr)) { wined3d_mutex_unlock(); -- 2.30.2

3 2