October 2019 - Wine-devel - list.winehq.org

[PATCH 2/4] user32/tests: Move rawinput tests into input.c
by Andrew Eikum 30 Oct '19

30 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Or we could move the rawinput tests out of input.c into rawinput.c dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/input.c | 71 ++++++++++++++++++++++++ dlls/user32/tests/rawinput.c | 101 ---------------------------------- 3 files changed, 71 insertions(+), 102 deletions(-) delete mode 100644 dlls/user32/tests/rawinput.c diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 26bc3b2bc6d..7149dc824ea 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ menu.c \ monitor.c \ msg.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c5cf9556ede..5723af3fd2b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1,6 +1,7 @@ /* Test Key event to Key message translation * * Copyright 2003 Rein Klazes + * Copyright 2019 Remi Bernon for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1712,6 +1713,75 @@ static void test_GetRawInputData(void) ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); } +static void test_RegisterRawInputDevices(void) +{ + HWND hwnd; + RAWINPUTDEVICE raw_devices[1]; + BOOL res; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + + res = RegisterRawInputDevices(NULL, 0, 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + + + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_REMOVE requires hwndTarget == NULL */ + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices failed\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + + /* RIDEV_INPUTSINK requires hwndTarget != NULL */ + raw_devices[0].dwFlags = RIDEV_INPUTSINK; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + todo_wine + ok(res == FALSE, "RegisterRawInputDevices failed\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + raw_devices[0].hwndTarget = hwnd; + + SetLastError(0xdeadbeef); + res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + + DestroyWindow(hwnd); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2902,6 +2972,7 @@ START_TEST(input) test_GetKeyState(); test_OemKeyScan(); test_GetRawInputData(); + test_RegisterRawInputDevices(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/user32/tests/rawinput.c b/dlls/user32/tests/rawinput.c deleted file mode 100644 index f4c8eb6738b..00000000000 --- a/dlls/user32/tests/rawinput.c +++ /dev/null @@ -1,101 +0,0 @@ -/* Unit test suite for rawinput. - * - * Copyright 2019 Remi Bernon for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdio.h> - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include "wine/test.h" - -static void test_RegisterRawInputDevices(void) -{ - HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; - BOOL res; - - raw_devices[0].usUsagePage = 0x01; - raw_devices[0].usUsage = 0x05; - - hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); - ok(hwnd != NULL, "CreateWindowExA failed\n"); - - - res = RegisterRawInputDevices(NULL, 0, 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - - - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_REMOVE requires hwndTarget == NULL */ - raw_devices[0].dwFlags = RIDEV_REMOVE; - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices failed\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - - /* RIDEV_INPUTSINK requires hwndTarget != NULL */ - raw_devices[0].dwFlags = RIDEV_INPUTSINK; - raw_devices[0].hwndTarget = 0; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - todo_wine - ok(res == FALSE, "RegisterRawInputDevices failed\n"); - todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - raw_devices[0].hwndTarget = hwnd; - - SetLastError(0xdeadbeef); - res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); - ok(res == TRUE, "RegisterRawInputDevices succeeded\n"); - ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); - - DestroyWindow(hwnd); -} - -START_TEST(rawinput) -{ - test_RegisterRawInputDevices(); -} -- 2.23.0

2 1

[PATCH 3/4] user32: Clean up GetRawInputDeviceInfo
by Andrew Eikum 30 Oct '19

30 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/rawinput.c | 89 ++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 94cf7a9a5d2..770ec910963 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -404,80 +404,83 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const WCHAR mouse_name[] = {'\\','\\','?','\\','W','I','N','E','_','M','O','U','S','E',0}; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; - struct hid_device *hid_device; - const WCHAR *name = NULL; - RID_DEVICE_INFO *info; - UINT s; + + RID_DEVICE_INFO info; + struct hid_device *hid_device = device; + const void *to_copy; + UINT to_copy_bytes, avail_bytes; TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); if (!data_size) return ~0U; + /* each case below must set: + * *data_size: length (meaning defined by command) of data we want to copy + * avail_bytes: number of bytes available in user buffer + * to_copy_bytes: number of bytes we want to copy into user buffer + * to_copy: pointer to data we want to copy into user buffer + */ switch (command) { case RIDI_DEVICENAME: + /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ + avail_bytes = *data_size * sizeof(WCHAR); if (device == WINE_MOUSE_HANDLE) { - s = ARRAY_SIZE(mouse_name); - name = mouse_name; + *data_size = ARRAY_SIZE(mouse_name); + to_copy = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = ARRAY_SIZE(keyboard_name); - name = keyboard_name; + *data_size = ARRAY_SIZE(keyboard_name); + to_copy = keyboard_name; } else { - hid_device = device; - s = strlenW(hid_device->path) + 1; - name = hid_device->path; + *data_size = strlenW(hid_device->path) + 1; + to_copy = hid_device->path; } + to_copy_bytes = *data_size * sizeof(WCHAR); break; + case RIDI_DEVICEINFO: - s = sizeof(*info); + avail_bytes = *data_size; + info.cbSize = sizeof(info); + if (device == WINE_MOUSE_HANDLE) + { + info.dwType = RIM_TYPEMOUSE; + info.u.mouse = mouse_info; + } + else if (device == WINE_KEYBOARD_HANDLE) + { + info.dwType = RIM_TYPEKEYBOARD; + info.u.keyboard = keyboard_info; + } + else + { + info.dwType = RIM_TYPEHID; + info.u.hid = hid_device->info; + } + to_copy_bytes = sizeof(info); + *data_size = to_copy_bytes; + to_copy = &info; break; + default: + FIXME("command %#x not supported\n", command); return ~0U; } if (!data) - { - *data_size = s; return 0; - } - if (*data_size < s) - { - *data_size = s; + if (avail_bytes < to_copy_bytes) return ~0U; - } - if (command == RIDI_DEVICENAME) - { - memcpy(data, name, s * sizeof(WCHAR)); - return s; - } + memcpy(data, to_copy, to_copy_bytes); - info = data; - info->cbSize = sizeof(*info); - if (device == WINE_MOUSE_HANDLE) - { - info->dwType = RIM_TYPEMOUSE; - info->u.mouse = mouse_info; - } - else if (device == WINE_KEYBOARD_HANDLE) - { - info->dwType = RIM_TYPEKEYBOARD; - info->u.keyboard = keyboard_info; - } - else - { - hid_device = device; - info->dwType = RIM_TYPEHID; - info->u.hid = hid_device->info; - } - return s; + return *data_size; } /*********************************************************************** -- 2.23.0

1 0

[PATCH 1/4] hid: Move preparsed data definition to global header
by Andrew Eikum 30 Oct '19

30 Oct '19

PHIDP_PREPARSED_DATA is supposed to be an opaque pointer, but the size is accessible through user32.GetRawInputDeviceInfo(RIDI_PREPARSEDDATA), so we will need to know the struct layout in user32, too. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- This was already duplicated in both hid and hidclass.sys. dlls/hid/hidp.c | 2 +- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/parse.h | 69 -------------------------- dlls/hid/parse.h => include/wine/hid.h | 0 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 dlls/hidclass.sys/parse.h rename dlls/hid/parse.h => include/wine/hid.h (100%) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59a4078c6c5..9d631912c85 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -32,7 +32,7 @@ #include "hidusage.h" #include "ddk/hidpi.h" -#include "parse.h" +#include "wine/hid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hidp); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 86d7bdf98f1..36d13c009d7 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -29,7 +29,7 @@ #include "ddk/hidpi.h" #include "cfgmgr32.h" #include "wine/list.h" -#include "parse.h" +#include "wine/hid.h" #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 diff --git a/dlls/hidclass.sys/parse.h b/dlls/hidclass.sys/parse.h deleted file mode 100644 index 319105d286e..00000000000 --- a/dlls/hidclass.sys/parse.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Wine internal HID structures - * - * Copyright 2015 Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_PARSE_H -#define __WINE_PARSE_H - -#define HID_MAGIC 0x8491759 - -typedef enum __WINE_ELEMENT_TYPE { - UnknownElement = 0, - ButtonElement, - ValueElement, -} WINE_ELEMENT_TYPE; - -typedef struct __WINE_ELEMENT -{ - WINE_ELEMENT_TYPE ElementType; - UINT valueStartBit; - UINT bitCount; - union { - HIDP_VALUE_CAPS value; - HIDP_BUTTON_CAPS button; - } caps; -} WINE_HID_ELEMENT; - -typedef struct __WINE_HID_REPORT -{ - UCHAR reportID; - DWORD bitSize; - DWORD elementCount; - DWORD elementIdx; -} WINE_HID_REPORT; - -typedef struct __WINE_HIDP_PREPARSED_DATA -{ - DWORD magic; - DWORD dwSize; - HIDP_CAPS caps; - - DWORD elementOffset; - DWORD reportCount[3]; - BYTE reportIdx[3][256]; - - WINE_HID_REPORT reports[1]; -} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; - -#define HID_INPUT_REPORTS(d) ((d)->reports) -#define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0]) -#define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1]) -#define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) - -#endif /* __WINE_PARSE_H */ diff --git a/dlls/hid/parse.h b/include/wine/hid.h similarity index 100% rename from dlls/hid/parse.h rename to include/wine/hid.h -- 2.23.0

1 0

[PATCH] po: Fix Russian strings for page setup dialog.
by Nikolay Sivov 30 Oct '19

30 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9dabdc22c5..cd03d2d5e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -803,15 +803,15 @@ msgstr "&Слева:" #: comdlg32.rc:447 notepad.rc:112 msgid "&Right:" -msgstr "&Правое:" +msgstr "Сп&рава:" #: comdlg32.rc:449 msgid "T&op:" -msgstr "Спр&ава:" +msgstr "Св&ерху:" #: comdlg32.rc:451 notepad.rc:114 msgid "&Bottom:" -msgstr "&Нижнее:" +msgstr "С&низу:" #: comdlg32.rc:455 msgid "P&rinter..." -- 2.24.0.rc1

1 0

[PATCH v2 1/3] d3dx10_43: Add D3DX10_TEXTURE_LOAD_INFO struct def.
by Connor McAdams 30 Oct '19

30 Oct '19

Adds definition for D3DX10_TEXTURE_LOAD_INFO structure, used by function D3DX10LoadTextureFromTexture. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- include/d3dx10tex.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 25ad490949..0f67b6016f 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -103,6 +103,36 @@ typedef struct D3DX10_IMAGE_LOAD_INFO #endif } D3DX10_IMAGE_LOAD_INFO; +typedef struct _D3DX10_TEXTURE_LOAD_INFO +{ + D3D10_BOX *pSrcBox; + D3D10_BOX *pDstBox; + UINT SrcFirstMip; + UINT DstFirstMip; + UINT NumMips; + UINT SrcFirstElement; + UINT DstFirstElement; + UINT NumElements; + UINT Filter; + UINT MipFilter; + +#ifdef __cplusplus + _D3DX10_TEXTURE_LOAD_INFO() + { + pSrcBox = NULL; + pDstBox = NULL; + SrcFirstMip = 0; + DstFirstMip = 0; + NumMips = D3DX10_DEFAULT; + SrcFirstElement = 0; + DstFirstElement = 0; + NumElements = D3DX10_DEFAULT; + Filter = D3DX10_DEFAULT; + MipFilter = D3DX10_DEFAULT; + } +#endif +} D3DX10_TEXTURE_LOAD_INFO; + #ifdef __cplusplus extern "C" { #endif -- 2.20.1

1 2

[PATCH v2] d3dx9: Correctly handle NULL constant state for objects on 64 bit arch.
by Paul Gofman 30 Oct '19

30 Oct '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - increase parameter size in d3dx_parse_state() instead of checking the size during state application. dlls/d3dx9_36/effect.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7d686a435d..592df91eca 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5343,8 +5343,11 @@ static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects) { - DWORD offset; + struct d3dx_parameter *param = &state->parameter; + enum STATE_CLASS state_class; const char *ptr2; + void *new_data; + DWORD offset; HRESULT hr; state->type = ST_CONSTANT; @@ -5358,7 +5361,7 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx_parse_effect_typedef(effect, &state->parameter, data, &ptr2, NULL, 0); + hr = d3dx_parse_effect_typedef(effect, param, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5367,18 +5370,40 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx_parse_init_value(effect, &state->parameter, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, param, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); goto err_out; } + if (((state_class = state_table[state->operation].class) == SC_VERTEXSHADER + || state_class == SC_PIXELSHADER || state_class == SC_TEXTURE) + && param->bytes < sizeof(void *)) + { + if (param->type != D3DXPT_INT || *(unsigned int *)param->data) + { + FIXME("Unexpected parameter for object, param->type %#x, param->class %#x, *param->data %#x.\n", + param->type, param->class, *(unsigned int *)param->data); + hr = D3DXERR_INVALIDDATA; + goto err_out; + } + + new_data = heap_realloc(param->data, param->bytes = sizeof(void *)); + if (!new_data) + { + ERR("Out of memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + memset(param->data = new_data, 0, param->bytes); + } + return D3D_OK; err_out: - free_parameter(&state->parameter, FALSE, FALSE); + free_parameter(param, FALSE, FALSE); return hr; } -- 2.23.0

1 0

[PATCH v2 1/8] vbscript: Unlink the code list from the script dispatch when it's released.
by Gabriel Ivăncescu 30 Oct '19

30 Oct '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Unlink persistent code from the list when it is released and only re-execute after the script dispatch is released, not every time after the script is paused. This is mostly needed for the next patch to work properly, since some of the code lists will have more limited lifespans (code that is not persistent). These patches correct the implementation so that it passes the tests at the end of the series. Note that I haven't sent the linked list->array conversion yet, because that is not a functional change, just an optimization, so it will come after this behavior is corrected first (so some of it is just moved temporarily). dlls/vbscript/compile.c | 3 +++ dlls/vbscript/vbscript.c | 8 ++++++++ dlls/vbscript/vbscript.h | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0727979..417faf4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1960,6 +1960,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli var->next = script->global_vars; script->global_vars = ctx.global_vars; + code->last_global_var = var; } if(ctx.funcs) { @@ -1967,6 +1968,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli new_func->next = script->global_funcs; script->global_funcs = ctx.funcs; + code->last_func = new_func; } if(ctx.classes) { @@ -1981,6 +1983,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli class->next = script->classes; script->classes = ctx.classes; + code->last_class = class; } if(TRACE_ON(vbscript_disas)) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 56c53b4..cff2ef5 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -131,6 +131,7 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; + vbscode_t *code; collect_objects(ctx); clear_ei(&ctx->ei); @@ -178,6 +179,13 @@ static void release_script(script_ctx_t *ctx) IDispatchEx_Release(&script_obj->IDispatchEx_iface); } + LIST_FOR_EACH_ENTRY(code, &ctx->code_list, vbscode_t, entry) + { + if (code->last_global_var) code->last_global_var->next = NULL; + if (code->last_func) code->last_func->next = NULL; + if (code->last_class) code->last_class->next = NULL; + } + detach_global_objects(ctx); heap_pool_free(&ctx->heap); heap_pool_init(&ctx->heap); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index fefed63..cfc9f65 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -347,6 +347,10 @@ struct _vbscode_t { unsigned bstr_cnt; heap_pool_t heap; + dynamic_var_t *last_global_var; + function_t *last_func; + class_desc_t *last_class; + struct list entry; }; -- 2.21.0

2 15

[PATCH 2/5] dxgi: Implement dxgi_output_TakeOwnership().
by Henri Verbeet 30 Oct '19

30 Oct '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 172271. dlls/dxgi/output.c | 17 +++++++++++++++-- dlls/dxgi/tests/dxgi.c | 20 ++++++++++++-------- dlls/wined3d/directx.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index db5c106948c..a2331358e69 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -364,9 +364,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_TakeOwnership(IDXGIOutput4 *iface, IUnknown *device, BOOL exclusive) { - FIXME("iface %p, device %p, exclusive %d stub!\n", iface, device, exclusive); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_output *wined3d_output; + HRESULT hr = DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + TRACE("iface %p, device %p, exclusive %d.\n", iface, device, exclusive); + + if (!device) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + if ((wined3d_output = wined3d_get_adapter_output(output->adapter->factory->wined3d, + output->adapter->ordinal))) + hr = wined3d_output_take_ownership(wined3d_output, exclusive); + wined3d_mutex_unlock(); + + return hr; } static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cbb5806e2d2..b05e7f8bf96 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5611,10 +5611,14 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); else wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); @@ -5624,16 +5628,16 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -5646,11 +5650,11 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); IDXGIOutput_ReleaseOwnership(output); wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce4ffd3a565..7c0443cd6e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,6 +72,37 @@ void CDECL wined3d_output_release_ownership(const struct wined3d_output *output) D3DKMTSetVidPnSourceOwner(&set_owner_desc); } +HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + NTSTATUS status; + + TRACE("output %p, exclusive %#x.\n", output, exclusive); + + owner_type = exclusive ? D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE : D3DKMT_VIDPNSOURCEOWNER_SHARED; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &output->vidpn_source_id; + set_owner_desc.VidPnSourceCount = 1; + set_owner_desc.hDevice = output->kmt_device; + status = D3DKMTSetVidPnSourceOwner(&set_owner_desc); + + switch (status) + { + case STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + case STATUS_INVALID_PARAMETER: + return E_INVALIDARG; + case STATUS_PROCEDURE_NOT_FOUND: + return E_NOINTERFACE; + case STATUS_SUCCESS: + return S_OK; + default: + FIXME("Unhandled error %#x.\n", status); + return E_FAIL; + } +} + static void wined3d_output_cleanup(const struct wined3d_output *output) { D3DKMT_DESTROYDEVICE destroy_device_desc; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8fda4801409..d9e4cfb6d91 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -193,6 +193,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) +@ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index eba61d0777e..ce24eb3feff 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2490,6 +2490,7 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); +HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags, unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); -- 2.11.0

2 1

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_clip_plane().
by Zebediah Figura 30 Oct '19

30 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 16 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 41c97b5020..98986c735b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1521,6 +1521,22 @@ void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *statebloc stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); } +HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, + UINT plane_idx, const struct wined3d_vec4 *plane) +{ + TRACE("stateblock %p, plane_idx %u, plane %p.\n", stateblock, plane_idx, plane); + + if (plane_idx >= stateblock->device->adapter->d3d_info.limits.max_clip_distances) + { + TRACE("Application has requested clipplane this device doesn't support.\n"); + return WINED3DERR_INVALIDCALL; + } + + stateblock->stateblock_state.clip_planes[plane_idx] = *plane; + stateblock->changed.clipplane |= 1u << plane_idx; + return S_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 297d3a0410..2b5b6c7667 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) +@ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 298cb3b270..cedbb09eba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, const struct wined3d_color *blend_factor); +HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, + UINT plane_idx, const struct wined3d_vec4 *plane); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); -- 2.23.0

4 10

[PATCH] ddraw: Fix vertex buffer offset in d3d_execute_buffer_execute().
by Paul Gofman 30 Oct '19

30 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34666 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/executebuffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 80dbdfd88b..9f0fdb85e5 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -107,7 +107,6 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d } index_count = count * primitive_size; - if (buffer->index_size < index_count) { unsigned int new_size = max(buffer->index_size * 2, index_count); @@ -302,7 +301,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: wined3d_device_set_stream_source(device->wined3d_device, 0, - buffer->src_vertex_buffer, buffer->src_vertex_pos, sizeof(D3DVERTEX)); + buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, op == D3DPROCESSVERTICES_TRANSFORMLIGHT && !!device->material); wined3d_device_set_vertex_declaration(device->wined3d_device, -- 2.21.0

2 1