December 2022 - Wine-Commits

Rémi Bernon : inetcomm: Allocate PROPVARIANT value with CoTaskMemAlloc.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 87cf8129c60761fd51ee741b4a6c94cf5450c8a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/87cf8129c60761fd51ee741b4a6c94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 21:08:09 2022 +0100 inetcomm: Allocate PROPVARIANT value with CoTaskMemAlloc. --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a64bc7c1d5d..977cdfa16d9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -714,7 +714,7 @@ static void read_value(header_t *header, char **cur) } while(*end == ' ' || *end == '\t'); len = end - *cur; - value = malloc(len + 1); + value = CoTaskMemAlloc(len + 1); memcpy(value, *cur, len); value[len] = '\0';

1 0

Rémi Bernon : inetcomm: Free IMoniker_GetDisplayName value with CoTaskMemFree.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 1523b15ae30e2bcd63301606248d8fa46c93db12 URL: https://gitlab.winehq.org/wine/wine/-/commit/1523b15ae30e2bcd63301606248d8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 21:08:32 2022 +0100 inetcomm: Free IMoniker_GetDisplayName value with CoTaskMemFree. --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 977cdfa16d9..ceacf5ded42 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3707,7 +3707,7 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx lstrcpyW(mhtml_url, L"mhtml:"); lstrcatW(mhtml_url, display_name); - free(display_name); + CoTaskMemFree(display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); free(mhtml_url);

1 0

Rémi Bernon : taskschd: Use CRT functions for remaining heap allocations.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 9f29812504db22895fd324c1f664e88cdd8b0d03 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f29812504db22895fd324c1f664e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 15:00:12 2022 +0100 taskschd: Use CRT functions for remaining heap allocations. --- dlls/taskschd/folder.c | 16 ++++++++-------- dlls/taskschd/task.c | 22 +++++++++++----------- dlls/taskschd/taskschd_private.h | 2 -- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index f7f43d9348b..87eac46f882 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -58,8 +58,8 @@ static ULONG WINAPI TaskFolder_Release(ITaskFolder *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(folder->path); - heap_free(folder); + free(folder->path); + free(folder); } return ref; @@ -211,7 +211,7 @@ WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) if (parent) len += lstrlenW(parent); /* +1 if parent is not '\' terminated */ - folder_path = heap_alloc((len + 2) * sizeof(WCHAR)); + folder_path = malloc((len + 2) * sizeof(WCHAR)); if (!folder_path) return NULL; folder_path[0] = 0; @@ -253,7 +253,7 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON if (!folder_path) return E_OUTOFMEMORY; hr = SchRpcDelete(folder_path, 0); - heap_free(folder_path); + free(folder_path); return hr; } @@ -304,7 +304,7 @@ static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG if (!folder_path) return E_OUTOFMEMORY; hr = SchRpcDelete(folder_path, 0); - heap_free(folder_path); + free(folder_path); return hr; } @@ -448,14 +448,14 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (FAILED(hr)) { - heap_free(folder_path); + free(folder_path); return hr; } - folder = heap_alloc(sizeof(*folder)); + folder = malloc(sizeof(*folder)); if (!folder) { - heap_free(folder_path); + free(folder_path); return E_OUTOFMEMORY; } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b84d693dced..d9ddf9d12b8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -310,7 +310,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) { DailyTrigger *daily_trigger; - daily_trigger = heap_alloc(sizeof(*daily_trigger)); + daily_trigger = malloc(sizeof(*daily_trigger)); if (!daily_trigger) return E_OUTOFMEMORY; @@ -809,7 +809,7 @@ static HRESULT RegistrationInfo_create(IRegistrationInfo **obj) { registration_info *reginfo; - reginfo = heap_alloc_zero(sizeof(*reginfo)); + reginfo = calloc(1, sizeof(*reginfo)); if (!reginfo) return E_OUTOFMEMORY; reginfo->IRegistrationInfo_iface.lpVtbl = &RegistrationInfo_vtbl; @@ -1442,7 +1442,7 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) { TaskSettings *taskset; - taskset = heap_alloc(sizeof(*taskset)); + taskset = malloc(sizeof(*taskset)); if (!taskset) return E_OUTOFMEMORY; taskset->ITaskSettings_iface.lpVtbl = &TaskSettings_vtbl; @@ -1650,7 +1650,7 @@ static HRESULT Principal_create(IPrincipal **obj) { Principal *principal; - principal = heap_alloc(sizeof(*principal)); + principal = malloc(sizeof(*principal)); if (!principal) return E_OUTOFMEMORY; principal->IPrincipal_iface.lpVtbl = &Principal_vtbl; @@ -1897,7 +1897,7 @@ static HRESULT ExecAction_create(IExecAction **obj) { ExecAction *action; - action = heap_alloc(sizeof(*action)); + action = malloc(sizeof(*action)); if (!action) return E_OUTOFMEMORY; action->IExecAction_iface.lpVtbl = &Action_vtbl; @@ -2086,7 +2086,7 @@ static HRESULT Actions_create(IActionCollection **obj) { Actions *actions; - actions = heap_alloc(sizeof(*actions)); + actions = malloc(sizeof(*actions)); if (!actions) return E_OUTOFMEMORY; actions->IActionCollection_iface.lpVtbl = &Actions_vtbl; @@ -2242,7 +2242,7 @@ static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITrigg { trigger_collection *collection; - collection = heap_alloc(sizeof(*collection)); + collection = malloc(sizeof(*collection)); if (!collection) return E_OUTOFMEMORY; collection->ITriggerCollection_iface.lpVtbl = &TriggerCollection_vtbl; @@ -3668,7 +3668,7 @@ HRESULT TaskDefinition_create(ITaskDefinition **obj) { TaskDefinition *taskdef; - taskdef = heap_alloc_zero(sizeof(*taskdef)); + taskdef = calloc(1, sizeof(*taskdef)); if (!taskdef) return E_OUTOFMEMORY; taskdef->ITaskDefinition_iface.lpVtbl = &TaskDefinition_vtbl; @@ -3998,7 +3998,7 @@ HRESULT TaskService_create(void **obj) { TaskService *task_svc; - task_svc = heap_alloc(sizeof(*task_svc)); + task_svc = malloc(sizeof(*task_svc)); if (!task_svc) return E_OUTOFMEMORY; task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; @@ -4013,10 +4013,10 @@ HRESULT TaskService_create(void **obj) void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { - return HeapAlloc(GetProcessHeap(), 0, n); + return malloc(n); } void __RPC_USER MIDL_user_free(void __RPC_FAR *p) { - HeapFree(GetProcessHeap(), 0, p); + free(p); } diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index e8d834edc3d..8f83c9f42bd 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -19,8 +19,6 @@ #ifndef __WINE_TASKSCHD_PRIVATE_H__ #define __WINE_TASKSCHD_PRIVATE_H__ -#include "wine/heap.h" - HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskDefinition_create(ITaskDefinition **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : mountmgr.sys: Allocate UNICODE_STRING buffers with RtlAllocateHeap.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 77d2f6ae74c64950734f08e884931d3a924ff13a URL: https://gitlab.winehq.org/wine/wine/-/commit/77d2f6ae74c64950734f08e884931d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 1 19:31:44 2022 +0100 mountmgr.sys: Allocate UNICODE_STRING buffers with RtlAllocateHeap. --- dlls/mountmgr.sys/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c95faa172f7..22c17025e87 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -631,7 +631,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** } name.MaximumLength = (lstrlenW(format) + 10) * sizeof(WCHAR); - name.Buffer = malloc( name.MaximumLength ); + name.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, name.MaximumLength ); for (i = first; i < 32; i++) { swprintf( name.Buffer, name.MaximumLength / sizeof(WCHAR), format, i ); @@ -655,7 +655,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** UNICODE_STRING symlink; symlink.MaximumLength = (lstrlenW(link_format) + 10) * sizeof(WCHAR); - if ((symlink.Buffer = malloc( symlink.MaximumLength ))) + if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength ))) { swprintf( symlink.Buffer, symlink.MaximumLength / sizeof(WCHAR), link_format, i ); symlink.Length = lstrlenW(symlink.Buffer) * sizeof(WCHAR);

1 0

Eric Pouech : configure: Log pkg-config error messages.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: ede777d11dc6a4739f7d6e10d3014929c3277240 URL: https://gitlab.winehq.org/wine/wine/-/commit/ede777d11dc6a4739f7d6e10d30149… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 23 15:58:44 2022 +0100 configure: Log pkg-config error messages. While investigating https://bugs.winehq.org/show_bug.cgi?id=53953, it may be a good idea to log any pkg-config error messages instead of ignoring them. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- aclocal.m4 | 8 ++- configure | 190 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 159 insertions(+), 39 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: f98ba4fa9b4bd451959b344d5f7dafa64c777ecb URL: https://gitlab.winehq.org/wine/wine/-/commit/f98ba4fa9b4bd451959b344d5f7daf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 1 16:57:17 2022 +0200 mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID. There is actually an "invalid" event type (sent on invalid input for example), so this avoids confusion with it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlimg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 70dbb1890b4..54cc5b5932a 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,7 +17,7 @@ */ typedef enum { - EVENTID_INVALID = -1, + EVENTID_INVALID_ID = -1, EVENTID_DOMCONTENTLOADED, EVENTID_ABORT, EVENTID_AFTERPRINT, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index d8c377413f0..c0333cab858 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -301,7 +301,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v) DOMEvent *event; /* Synchronously send load event if the image was completed immediately (such as from cache) */ - This->skip_event = EVENTID_INVALID; + This->skip_event = EVENTID_INVALID_ID; nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete); if(NS_SUCCEEDED(nsres) && complete) { @@ -707,7 +707,7 @@ static HRESULT HTMLImgElement_dispatch_nsevent_hook(HTMLDOMNode *iface, DOMEvent HTMLImg *This = impl_from_HTMLDOMNode(iface); if(event->event_id == This->skip_event) { - This->skip_event = EVENTID_INVALID; + This->skip_event = EVENTID_INVALID_ID; return S_OK; } @@ -799,7 +799,7 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTML ret->IHTMLImgElement_iface.lpVtbl = &HTMLImgElementVtbl; ret->element.node.vtbl = &HTMLImgElementImplVtbl; - ret->skip_event = EVENTID_INVALID; + ret->skip_event = EVENTID_INVALID_ID; HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex);

1 0

Nikolay Sivov : d3dx9/effect: Split parameters data from effect object.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 95bbaa62107eed168d1f5eda61eb572967082eea URL: https://gitlab.winehq.org/wine/wine/-/commit/95bbaa62107eed168d1f5eda61eb57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 11:23:04 2022 +0300 d3dx9/effect: Split parameters data from effect object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 14 +++- dlls/d3dx9_36/effect.c | 150 ++++++++++++++++++++---------------------- dlls/d3dx9_36/preshader.c | 19 +++--- 3 files changed, 95 insertions(+), 88 deletions(-)

1 0

Paul Gofman : user32: Add stub for GetPointerInfo().
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: ccfa33b0eb2d8610e752111482e99ea4d297251d URL: https://gitlab.winehq.org/wine/wine/-/commit/ccfa33b0eb2d8610e752111482e99e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 30 18:00:29 2022 -0600 user32: Add stub for GetPointerInfo(). --- dlls/user32/misc.c | 8 ++++++++ dlls/user32/tests/input.c | 13 +++++++++++-- dlls/user32/user32.spec | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 879e8b32a0f..497d40e9dc6 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -501,6 +501,14 @@ BOOL WINAPI GetPointerType(UINT32 id, POINTER_INPUT_TYPE *type) return TRUE; } +BOOL WINAPI GetPointerInfo(UINT32 id, POINTER_INFO *info) +{ + FIXME("(%d %p): stub\n", id, info); + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { if (!imm_ime_wnd_proc) return DefWindowProcA(hwnd, msg, wParam, lParam); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 09e1ca1f961..86c88520eeb 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -83,6 +83,7 @@ static struct { static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); +static BOOL (WINAPI *pGetPointerInfo)(UINT32, POINTER_INFO*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); @@ -150,6 +151,7 @@ static void init_function_pointers(void) GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); + GET_PROC(GetPointerInfo); GET_PROC(GetPointerType); GET_PROC(GetRawInputDeviceList); GET_PROC(GetRawInputDeviceInfoW); @@ -4440,10 +4442,11 @@ static void test_input_message_source(void) UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); } -static void test_GetPointerType(void) +static void test_pointer_info(void) { BOOL ret; POINTER_INPUT_TYPE type = -1; + POINTER_INFO info; UINT id = 0; SetLastError(0xdeadbeef); @@ -4463,6 +4466,12 @@ static void test_GetPointerType(void) ret = pGetPointerType(id, &type); ok(ret, "GetPointerType failed, got type %ld for %u.\n", type, id ); ok(type == PT_MOUSE, " type %ld\n", type ); + + /* GetPointerInfo always fails unless the app receives WM_POINTER messages. */ + SetLastError(0xdeadbeef); + ret = pGetPointerInfo(id, &info); + ok(!ret, "succeeded.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu.\n", GetLastError()); } static void test_UnregisterDeviceNotification(void) @@ -4643,7 +4652,7 @@ START_TEST(input) SetCursorPos( pos.x, pos.y ); if(pGetPointerType) - test_GetPointerType(); + test_pointer_info(); else win_skip("GetPointerType is not available\n"); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1130ab457cd..6f827144935 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -359,6 +359,7 @@ @ stdcall GetParent(long) @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) +@ stdcall GetPointerInfo(long ptr) @ stdcall GetPointerType(long ptr) @ stdcall GetPointerTouchInfo(long ptr) @ stdcall GetPointerTouchInfoHistory(long ptr ptr)

1 0

Alex Henrie : msi: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 7cc7a6defc08d4de7574b7a75d574c3ab1f32db8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cc7a6defc08d4de7574b7a75d574c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 22:23:19 2022 -0700 msi: Use the wcsdup function instead of reimplementing it. --- dlls/msi/action.c | 36 ++++++++++++++++++------------------ dlls/msi/appsearch.c | 18 +++++++++--------- dlls/msi/assembly.c | 6 +++--- dlls/msi/classes.c | 10 +++++----- dlls/msi/cond.y | 4 ++-- dlls/msi/custom.c | 28 ++++++++++++++-------------- dlls/msi/database.c | 14 +++++++------- dlls/msi/dialog.c | 50 +++++++++++++++++++++++++------------------------- dlls/msi/files.c | 24 ++++++++++++------------ dlls/msi/font.c | 6 +++--- dlls/msi/format.c | 8 ++++---- dlls/msi/install.c | 4 ++-- dlls/msi/media.c | 20 ++++++++++---------- dlls/msi/msi.c | 22 +++++++++++----------- dlls/msi/msipriv.h | 10 ---------- dlls/msi/package.c | 16 ++++++++-------- dlls/msi/patch.c | 6 +++--- dlls/msi/record.c | 2 +- dlls/msi/source.c | 4 ++-- dlls/msi/storages.c | 2 +- dlls/msi/table.c | 2 +- 21 files changed, 141 insertions(+), 151 deletions(-)

1 0

Nikolay Sivov : d3dx9/preshader: Handle input register table.
by Alexandre Julliard Dec. 1, 2022

Dec. 1, 2022

Module: wine Branch: master Commit: 26e1293db6ba2fa63daff1a828c26ac73432abcd URL: https://gitlab.winehq.org/wine/wine/-/commit/26e1293db6ba2fa63daff1a828c26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 19:17:08 2022 +0300 d3dx9/preshader: Handle input register table. --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 7ee754b104a..12f275e8523 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -241,6 +241,7 @@ enum pres_reg_tables { PRES_REGTAB_IMMED, PRES_REGTAB_CONST, + PRES_REGTAB_INPUT, PRES_REGTAB_OCONST, PRES_REGTAB_OBCONST, PRES_REGTAB_OICONST, diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3f9374c7d1a..12083271815 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -202,6 +202,7 @@ table_info[] = { {sizeof(double), PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_INPUT */ {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ {sizeof(BOOL), PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ {sizeof(int), PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ @@ -211,7 +212,7 @@ table_info[] = static const char *table_symbol[] = { - "imm", "c", "oc", "ob", "oi", "r", "(null)", + "imm", "c", "v", "oc", "ob", "oi", "r", "(null)", }; static const enum pres_reg_tables pres_regset2table[] = @@ -414,7 +415,7 @@ static unsigned int *parse_pres_reg(unsigned int *ptr, struct d3dx_pres_reg *reg { static const enum pres_reg_tables reg_table[8] = { - PRES_REGTAB_COUNT, PRES_REGTAB_IMMED, PRES_REGTAB_CONST, PRES_REGTAB_COUNT, + PRES_REGTAB_COUNT, PRES_REGTAB_IMMED, PRES_REGTAB_CONST, PRES_REGTAB_INPUT, PRES_REGTAB_OCONST, PRES_REGTAB_OBCONST, PRES_REGTAB_OICONST, PRES_REGTAB_TEMP }; @@ -1019,7 +1020,7 @@ static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_con static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *arg, int component_count) { static const char *xyzw_str = "xyzw"; - unsigned int i, table; + unsigned int i, table, reg_offset; table = arg->reg.table; if (table == PRES_REGTAB_IMMED && arg->index_reg.table == PRES_REGTAB_COUNT) @@ -1032,16 +1033,21 @@ static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *a } else { + reg_offset = get_reg_offset(table, arg->reg.offset); + if (arg->index_reg.table == PRES_REGTAB_COUNT) { - TRACE("%s%u.", table_symbol[table], get_reg_offset(table, arg->reg.offset)); + if (table == PRES_REGTAB_INPUT && reg_offset < 2) + TRACE("%s%s.", table_symbol[table], reg_offset ? "PSize" : "Pos"); + else + TRACE("%s%u.", table_symbol[table], reg_offset); } else { unsigned int index_reg; index_reg = get_reg_offset(arg->index_reg.table, arg->index_reg.offset); - TRACE("%s[%u + %s%u.%c].", table_symbol[table], get_reg_offset(table, arg->reg.offset), + TRACE("%s[%u + %s%u.%c].", table_symbol[table], reg_offset, table_symbol[arg->index_reg.table], index_reg, xyzw_str[arg->index_reg.offset - get_offset_reg(arg->index_reg.table, index_reg)]); }

1 0