wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Hugh McMaster : reg/tests: Add more data tests for the 'copy' command.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: baf0254bbb617c3b21c5b068e645615418a5be19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf0254bbb617c3b21c5b068… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 14 22:58:02 2021 +1000 reg/tests: Add more data tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 93 +++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 58 +++++++++++++-------------- programs/reg/tests/reg_test.h | 3 ++ 3 files changed, 125 insertions(+), 29 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 579d91a35ab..3ed75acad4d 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -395,6 +395,96 @@ static void test_copy_hex_data(void) todo_wine ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); } +static void test_copy_embedded_null_values(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" COPY_SRC "]\n" + "\"Wine4a\"=dword:00000005\n" + "\"Wine4b\"=hex(1):00,00,00,00,00,00,00,00\n" + "\"Wine4c\"=\"Value\"\n" + "\"Wine4d\"=hex(1):00,00,61,00,62,00,63,00\n" + "\"Wine4e\"=dword:00000100\n" + "\"Wine4f\"=hex(1):00,00,56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine4g\"=\"Value2\"\n" + "\"Wine4h\"=hex(1):61,00,62,00,63,00,00,00, \\\n" + " 64,00,65,00,66,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); +} + +static void test_copy_slashes(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_key(hkey, "https://winehq.org", NULL); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", slashes_test, 0), "compare_export() failed\n"); +} + +static void test_copy_escaped_null_values(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\\0\\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\\0\\0\\0\\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\\0Value5", 9); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, COPY_SRC); + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); +} + START_TEST(copy) { DWORD r; @@ -409,4 +499,7 @@ START_TEST(copy) test_copy_simple_data(); test_copy_complex_data(); test_copy_hex_data(); + test_copy_embedded_null_values(); + test_copy_slashes(); + test_copy_escaped_null_values(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 8ea9bda3f1c..be1d9ea4f86 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -125,6 +125,35 @@ const char *hex_types_test = "\"Wine3b\"=hex:12,34,56,78\r\n" "\"Wine3c\"=dword:10203040\r\n\r\n"; +const char *embedded_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine4a\"=dword:00000005\r\n" + "\"Wine4b\"=\"\"\r\n" + "\"Wine4c\"=\"Value\"\r\n" + "\"Wine4d\"=\"\"\r\n" + "\"Wine4e\"=dword:00000100\r\n" + "\"Wine4f\"=\"\"\r\n" + "\"Wine4g\"=\"Value2\"\r\n" + "\"Wine4h\"=\"abc\"\r\n\r\n"; + +const char *slashes_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"count/up\"=\"one/two/three\"\r\n" + "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + +const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine5a\"=\"\\\\0\"\r\n" + "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" + "\"Wine5c\"=\"Value1\\\\0\"\r\n" + "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" + "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" + "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; + /* Unit tests */ @@ -147,35 +176,6 @@ static void test_export(void) "\"Value 2\"=\"I was added first!\"\r\n" "\"Value 1\"=\"I was added second!\"\r\n\r\n"; - const char *embedded_null_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"Wine4a\"=dword:00000005\r\n" - "\"Wine4b\"=\"\"\r\n" - "\"Wine4c\"=\"Value\"\r\n" - "\"Wine4d\"=\"\"\r\n" - "\"Wine4e\"=dword:00000100\r\n" - "\"Wine4f\"=\"\"\r\n" - "\"Wine4g\"=\"Value2\"\r\n" - "\"Wine4h\"=\"abc\"\r\n\r\n"; - - const char *slashes_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"count/up\"=\"one/two/three\"\r\n" - "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; - - const char *escaped_null_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"Wine5a\"=\"\\\\0\"\r\n" - "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" - "\"Wine5c\"=\"Value1\\\\0\"\r\n" - "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" - "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" - "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 40880fa6c0a..14636b4edc9 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -84,6 +84,9 @@ extern const char *complex_data_test; extern const char *empty_hex_test; extern const char *empty_hex_test2; extern const char *hex_types_test; +extern const char *slashes_test; +extern const char *embedded_null_test; +extern const char *escaped_null_test; /* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r)

1 0

Hugh McMaster : reg/tests: Add complex data and hex type tests for the 'copy' command.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 3115276367e61f98436f8ba2feee9da491f7d69f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3115276367e61f98436f8ba2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 14 22:58:01 2021 +1000 reg/tests: Add complex data and hex type tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 141 ++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 106 +++++++++++++++---------------- programs/reg/tests/reg_test.h | 4 ++ 3 files changed, 198 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3115276367e61f98436f…

1 0

Hugh McMaster : reg/tests: Add missing return code checks.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 48cd2588be54f7ab659ae3733456c826101f4c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cd2588be54f7ab659ae373… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 14 22:58:00 2021 +1000 reg/tests: Add missing return code checks. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 27d70b6a663..d2598dd8d48 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -335,6 +335,7 @@ static void test_export(void) "\"Wine2a\"=hex(1):\n" "\"Wine2b\"=hex(3):\n" "\"Wine2c\"=hex(4):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); @@ -351,6 +352,7 @@ static void test_export(void) "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine3b\"=hex(3):12,34,56,78\n" "\"Wine3c\"=hex(4):40,30,20,10\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4);

1 0

Rémi Bernon : user32/tests: Recreate the window to make it more likely to have focus.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: acecfc6336e0b08c2da9f457acc83b0f1f862f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=acecfc6336e0b08c2da9f457… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 16:04:47 2021 +0200 user32/tests: Recreate the window to make it more likely to have focus. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1679048794b..654cabb76d9 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2763,6 +2763,10 @@ static void test_rawinput(const char* argv0) { case 14: case 15: + DestroyWindow(hwnd); + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); SetForegroundWindow(hwnd); empty_message_queue();

1 0

Rémi Bernon : user32/tests: Initialize the cursor position in test_GetRawInputBuffer.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 516c7e0dd8189b021c86da234bec2079956909c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516c7e0dd8189b021c86da23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 16:04:46 2021 +0200 user32/tests: Initialize the cursor position in test_GetRawInputBuffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d10a7f6504d..1679048794b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2236,10 +2236,15 @@ static void test_GetRawInputBuffer(void) UINT size, count, rawinput_size; HWND hwnd; BOOL ret; + POINT pt; if (is_wow64) rawinput_size = sizeof(RAWINPUT64); else rawinput_size = sizeof(RAWINPUT); + SetCursorPos(300, 300); + GetCursorPos(&pt); + ok(pt.x == 300 && pt.y == 300, "Unexpected cursor position pos %dx%d\n", pt.x, pt.y); + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinputbuffer_wndproc);

1 0

Rémi Bernon : user32/tests: Skip inconsistent OemKeyScan tests on non-us keyboard.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 1cfc34551edc40123a209298cd7e27493af6fa77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cfc34551edc40123a209298… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 16:04:45 2021 +0200 user32/tests: Skip inconsistent OemKeyScan tests on non-us keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3d4f0d03d0d..d10a7f6504d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4167,6 +4167,13 @@ static void test_OemKeyScan(void) WCHAR oem, wchr; char oem_char; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + skip("skipping test with inconsistent results on non-us keyboard\n"); + return; + } + for (oem = 0; oem < 0x200; oem++) { ret = OemKeyScan( oem );

1 0

Brendan Shanks : wined3d: Add GPU information for Intel UHD Graphics 630.
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: f0748625045293077e9949fdc6dc56f4aa164459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0748625045293077e9949fd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 13 13:34:20 2021 -0700 wined3d: Add GPU information for Intel UHD Graphics 630. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9883017f932..be43d2ffb86 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -601,6 +601,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD630, "Intel(R) UHD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1be36467c53..f5b1a078907 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3131,6 +3131,7 @@ enum wined3d_pci_device CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b, + CARD_INTEL_UHD630 = 0x3e9b, }; struct wined3d_fbo_ops

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: adb45b0ad80db90fcd5ce1bd31cb642f347f12e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb45b0ad80db90fcd5ce1bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:52 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7ec3c428fc4..21aaa2e54b6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2006,15 +2006,16 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_info->cutoff = op->light.cutoff; } -void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) +void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, + const struct wined3d_light_info *light) { struct wined3d_cs_set_light *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT; op->light = *light; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 905357571bf..484130b3103 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1445,7 +1445,7 @@ static void wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } - wined3d_cs_emit_set_light(device->cs, object); + wined3d_device_context_emit_set_light(&device->cs->c, object); } static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e419ed9c0f..1be36467c53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4748,7 +4748,6 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4799,6 +4798,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, + const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_material(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light_enable().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 692a3128b4c8b539fdd85fa488a4d85c62f418ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=692a3128b4c8b539fdd85fa4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:51 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light_enable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fd8ebbbd40f..7ec3c428fc4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2039,16 +2039,16 @@ static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void * } } -void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, BOOL enable) { struct wined3d_cs_set_light_enable *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT_ENABLE; op->idx = idx; op->enable = enable; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_feature_level(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751df25f559..905357571bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1469,7 +1469,7 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT } wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable); - wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); + wined3d_device_context_emit_set_light_enable(&device->cs->c, light_idx, enable); } static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, @@ -1850,7 +1850,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) { wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_cs_emit_set_light_enable(device->cs, light->OriginalIndex, light->glIndex != -1); + wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a338c39ef3c..8e419ed9c0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4749,7 +4749,6 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4800,6 +4799,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, + BOOL enable) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_material().
by Alexandre Julliard 14 May '21

14 May '21

Module: wine Branch: master Commit: 7da27fc327275f71c35b3256e2646a62d07c11b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da27fc327275f71c35b3256… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:50 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_material(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 201d8834252..fd8ebbbd40f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1957,15 +1957,16 @@ static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data device_invalidate_state(cs->c.device, STATE_MATERIAL); } -void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) +void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, + const struct wined3d_material *material) { struct wined3d_cs_set_material *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_MATERIAL; op->material = *material; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f02e904accf..751df25f559 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1525,7 +1525,7 @@ static void wined3d_device_set_material(struct wined3d_device *device, const str TRACE("device %p, material %p.\n", device, material); device->cs->c.state->material = *material; - wined3d_cs_emit_set_material(device->cs, material); + wined3d_device_context_emit_set_material(&device->cs->c, material); } void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, @@ -1840,7 +1840,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_device_context_emit_set_clip_plane(context, i, state->clip_planes + i); } - wined3d_cs_emit_set_material(device->cs, &state->material); + wined3d_device_context_emit_set_material(context, &state->material); wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12e908d341d..a338c39ef3c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4750,7 +4750,6 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4801,6 +4800,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, + const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context,

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021