wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Alexandre Julliard : wineandroid: Create a pseudo-device to handle ioctl calls.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 481e9ff8ba7e20731f4597c5c08e1cbeed1baa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481e9ff8ba7e20731f4597c5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:39:20 2017 +0200 wineandroid: Create a pseudo-device to handle ioctl calls. This will allow using ioctls to perform operations in the context of the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/android.h | 7 +++ dlls/wineandroid.drv/device.c | 132 +++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index f83d494..f03f09a 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,7 +1,8 @@ MODULE = wineandroid.drv -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 ntoskrnl C_SRCS = \ + device.c \ init.c \ window.c diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 9fefb11..9cafe26 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -44,6 +44,13 @@ DECL_FUNCPTR( __android_log_print ); /************************************************************************** + * Android pseudo-device + */ + +extern void start_android_device(void) DECLSPEC_HIDDEN; + + +/************************************************************************** * USER driver */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c new file mode 100644 index 0000000..3180d69 --- /dev/null +++ b/dlls/wineandroid.drv/device.c @@ -0,0 +1,132 @@ +/* + * Android pseudo-device handling + * + * Copyright 2014-2017 Alexandre Julliard + * + * 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 "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <errno.h> +#include <stdio.h> +#include <stdarg.h> +#include <sys/ioctl.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "android.h" +#include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(android); + +extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); +static HANDLE stop_event; +static HANDLE thread; +static JNIEnv *jni_env; + +#ifdef __i386__ +static WORD orig_fs, java_fs; +#endif /* __i386__ */ + +static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static NTSTATUS CALLBACK init_android_driver( DRIVER_OBJECT *driver, UNICODE_STRING *name ) +{ + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + static const WCHAR device_linkW[] = {'\\','?','?','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + + UNICODE_STRING nameW, linkW; + DEVICE_OBJECT *device; + NTSTATUS status; + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ioctl_callback; + + RtlInitUnicodeString( &nameW, device_nameW ); + RtlInitUnicodeString( &linkW, device_linkW ); + + if ((status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) return status; + return IoCreateSymbolicLink( &linkW, &nameW ); +} + +static DWORD CALLBACK device_thread( void *arg ) +{ + static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + + HANDLE start_event = arg; + UNICODE_STRING nameW; + NTSTATUS status; + JavaVM *java_vm; + DWORD ret; + + TRACE( "starting process %x\n", GetCurrentProcessId() ); + + if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ + +#ifdef __i386__ + orig_fs = wine_get_fs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + java_fs = wine_get_fs(); + wine_set_fs( orig_fs ); + if (java_fs != orig_fs) TRACE( "%%fs changed from %04x to %04x by Java VM\n", orig_fs, java_fs ); +#else + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); +#endif + + RtlInitUnicodeString( &nameW, driver_nameW ); + if ((status = IoCreateDriver( &nameW, init_android_driver ))) + { + FIXME( "failed to create driver error %x\n", status ); + return status; + } + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + SetEvent( start_event ); + + ret = wine_ntoskrnl_main_loop( stop_event ); + + (*java_vm)->DetachCurrentThread( java_vm ); + return ret; +} + +void start_android_device(void) +{ + HANDLE handles[2]; + + handles[0] = CreateEventW( NULL, TRUE, FALSE, NULL ); + handles[1] = thread = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); + WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); + CloseHandle( handles[0] ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index cf35215..971fd56 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -307,6 +307,7 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) if (hwnd == GetDesktopWindow()) { init_event_queue(); + start_android_device(); } return TRUE; }

1 0

Nikolay Sivov : mf: Added MFCreateTopology and stub IMFTopology implementation.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 8323871f55dcfe87dd987c666c6f2dd041fe213a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8323871f55dcfe87dd987c666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 09:56:27 2017 +0300 mf: Added MFCreateTopology and stub IMFTopology implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/mf/Makefile.in | 4 +- dlls/mf/mf.spec | 2 +- dlls/mf/tests/Makefile.in | 5 + dlls/mf/tests/mf.c | 49 +++++ dlls/mf/topology.c | 523 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 8 files changed, 586 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8323871f55dcfe87dd987…

1 0

Nikolay Sivov : comctl32/taskdialog: Added TaskDialog() export.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 9e3ebed4a417cc32e58ca5ac255c066b0a00a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ebed4a417cc32e58ca5ac2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 09:38:14 2017 +0300 comctl32/taskdialog: Added TaskDialog() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/taskdialog.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 8 ++++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 9287346..4e1aead 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -61,6 +61,7 @@ 340 stdcall -ordinal DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) +344 stdcall -ordinal TaskDialog(long long wstr wstr wstr long wstr ptr) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) 350 stdcall -noname -private StrChrA(str long) 351 stdcall -noname -private StrRChrA(str str long) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index fcc7db7..dc90160 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -22,6 +22,8 @@ #include <stdarg.h> #include <string.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -384,3 +386,26 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto return S_OK; } + +/*********************************************************************** + * TaskDialog [COMCTL32.@] + */ +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button) +{ + TASKDIALOGCONFIG taskconfig; + + TRACE("%p, %p, %s, %s, %s, %#x, %s, %p\n", owner, hinst, debugstr_w(title), debugstr_w(main_instruction), + debugstr_w(content), common_buttons, debugstr_w(icon), button); + + memset(&taskconfig, 0, sizeof(taskconfig)); + taskconfig.cbSize = sizeof(taskconfig); + taskconfig.hwndParent = owner; + taskconfig.hInstance = hinst; + taskconfig.dwCommonButtons = common_buttons; + taskconfig.pszWindowTitle = title; + taskconfig.u.pszMainIcon = icon; + taskconfig.pszMainInstruction = main_instruction; + taskconfig.pszContent = content; + return TaskDialogIndirect(&taskconfig, button, NULL, NULL); +} diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8a9d164..c937127 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -28,6 +28,8 @@ #include "v6util.h" static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); +static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, + TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); START_TEST(taskdialog) { @@ -50,6 +52,12 @@ START_TEST(taskdialog) return; } + pTaskDialog = (void *)GetProcAddress(hinst, "TaskDialog"); + + ptr_ordinal = GetProcAddress(hinst, (const char *)344); + ok(pTaskDialog == ptr_ordinal, "got wrong pointer for ordinal 344, %p expected %p\n", + ptr_ordinal, pTaskDialog); + ptr_ordinal = GetProcAddress(hinst, (const char *)345); ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect);

1 0

Nikolay Sivov : include: Add some missing Common Controls definitions.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 15c7e654a570899f08507e698998fb40715169b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c7e654a570899f08507e698… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 09:38:13 2017 +0300 include: Add some missing Common Controls definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index d176b4f..587caae 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2165,6 +2165,7 @@ static const WCHAR TRACKBAR_CLASSW[] = { 'm','s','c','t','l','s','_', #define TBM_SETTIPSIDE (WM_USER+31) #define TBM_SETBUDDY (WM_USER+32) #define TBM_GETBUDDY (WM_USER+33) +#define TBM_SETPOSNOTIFY (WM_USER+34) #define TBM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT @@ -3285,6 +3286,14 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_MAPINDEXTOID (LVM_FIRST + 180) #define LVM_MAPIDTOINDEX (LVM_FIRST + 181) #define LVM_ISITEMVISIBLE (LVM_FIRST + 182) +#define LVM_GETEMPTYTEXT (LVM_FIRST + 204) +#define LVM_GETFOOTERRECT (LVM_FIRST + 205) +#define LVM_GETFOOTERINFO (LVM_FIRST + 206) +#define LVM_GETFOOTERITEMRECT (LVM_FIRST + 207) +#define LVM_GETFOOTERITEM (LVM_FIRST + 208) +#define LVM_GETITEMINDEXRECT (LVM_FIRST + 209) +#define LVM_SETITEMINDEXSTATE (LVM_FIRST + 210) +#define LVM_GETNEXTITEMINDEX (LVM_FIRST + 211) #define LVN_FIRST (0U-100U) #define LVN_LAST (0U-199U) @@ -5211,6 +5220,59 @@ enum _TASKDIALOG_FLAGS }; typedef int TASKDIALOG_FLAGS; +typedef enum _TASKDIALOG_MESSAGES +{ + TDM_NAVIGATE_PAGE = WM_USER + 101, + TDM_CLICK_BUTTON = WM_USER + 102, + TDM_SET_MARQUEE_PROGRESS_BAR = WM_USER + 103, + TDM_SET_PROGRESS_BAR_STATE = WM_USER + 104, + TDM_SET_PROGRESS_BAR_RANGE = WM_USER + 105, + TDM_SET_PROGRESS_BAR_POS = WM_USER + 106, + TDM_SET_PROGRESS_BAR_MARQUEE = WM_USER + 107, + TDM_SET_ELEMENT_TEXT = WM_USER + 108, + TDM_CLICK_RADIO_BUTTON = WM_USER + 110, + TDM_ENABLE_BUTTON = WM_USER + 111, + TDM_ENABLE_RADIO_BUTTON = WM_USER + 112, + TDM_CLICK_VERIFICATION = WM_USER + 113, + TDM_UPDATE_ELEMENT_TEXT = WM_USER + 114, + TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = WM_USER + 115, + TDM_UPDATE_ICON = WM_USER + 116, +} TASKDIALOG_MESSAGES; + +typedef enum _TASKDIALOG_NOTIFICATIONS +{ + TDN_CREATED, + TDN_NAVIGATED, + TDN_BUTTON_CLICKED, + TDN_HYPERLINK_CLICKED, + TDN_TIMER, + TDN_DESTROYED, + TDN_RADIO_BUTTON_CLICKED, + TDN_DIALOG_CONSTRUCTED, + TDN_VERIFICATION_CLICKED, + TDN_HELP, + TDN_EXPANDO_BUTTON_CLICKED, +} TASKDIALOG_NOTIFICATIONS; + +typedef enum _TASKDIALOG_ELEMENTS +{ + TDE_CONTENT, + TDE_EXPANDED_INFORMATION, + TDE_FOOTER, + TDE_MAIN_INSTRUCTION, +} TASKDIALOG_ELEMENTS; + +typedef enum _TASKDIALOG_ICON_ELEMENTS +{ + TDIE_ICON_MAIN, + TDIE_ICON_FOOTER, +} TASKDIALOG_ICON_ELEMENTS; + +#define TD_WARNING_ICON MAKEINTRESOURCEW(-1) +#define TD_ERROR_ICON MAKEINTRESOURCEW(-2) +#define TD_INFORMATION_ICON MAKEINTRESOURCEW(-3) +#define TD_SHIELD_ICON MAKEINTRESOURCEW(-4) + enum _TASKDIALOG_COMMON_BUTTON_FLAGS { TDCBF_OK_BUTTON = 0x0001, @@ -5266,6 +5328,8 @@ typedef struct _TASKDIALOGCONFIG UINT cxWidth; } TASKDIALOGCONFIG; +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button); HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *); #include <poppack.h>

1 0

Paul Gofman : d3dx9: Merge constant setting for child parameters when possible.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 730832d2d87287b6891ca000bfe0763b768dfe98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730832d2d87287b6891ca000b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:32 2017 +0300 d3dx9: Merge constant setting for child parameters when possible. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 160 ++++++++++++++++++++++++++++++++---------- 2 files changed, 124 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=730832d2d87287b6891ca…

1 0

Paul Gofman : d3dx9: Don't add const setting entries with zero count.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 4c7653ef5d48670f40ee28d14df20e0631b99298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7653ef5d48670f40ee28d14… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 31 23:35:52 2017 +0200 d3dx9: Don't add const setting entries with zero count. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 5974329..7afbc03 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1226,6 +1226,11 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info); + if (!info.count) + { + TRACE("%s has zero count, skipping.\n", debugstr_a(param->name)); + return D3D_OK; + } if (table_type_from_param_type(param->type) == PRES_VT_COUNT) return D3DERR_INVALIDCALL;

1 0

Paul Gofman : d3dx9: Precompute and store a constant direct copy flag.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 1816d8a9fabc9aa0a8fd1379f1e6f6e17e8af7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1816d8a9fabc9aa0a8fd1379f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:30 2017 +0300 d3dx9: Precompute and store a constant direct copy flag. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 62213ac..ccb8e8a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -154,6 +154,7 @@ struct d3dx_const_param_eval_output enum D3DXPARAMETER_CLASS constant_class; unsigned int register_index; unsigned int register_count; + BOOL direct_copy; }; struct d3dx_const_tab diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e2bd26b..5974329 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1050,17 +1050,14 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const if (!is_param_dirty(param, const_tab->update_version)) continue; - get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - - if (table_type_from_param_type(param->type) == table_type - && !info.transpose && info.minor == info.major_stride - && info.count == get_offset_reg(table, const_set->register_count) - && info.count * sizeof(unsigned int) <= param->bytes) + if (const_set->direct_copy) { - regstore_set_values(rs, table, param->data, start_offset, info.count); + regstore_set_values(rs, table, param->data, start_offset, + get_offset_reg(table, const_set->register_count)); continue; } + get_const_upload_info(const_set, &info); for (i = 0; i < info.major_count; ++i) { @@ -1149,6 +1146,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC unsigned int const_count, param_count, i; BOOL get_element; struct d3dx_const_param_eval_output const_set; + struct const_upload_info info; + enum pres_value_type table_type; HRESULT hr; if (FAILED(get_ctab_constant_desc(ctab, hc, &desc))) @@ -1225,6 +1224,17 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC return D3DERR_INVALIDCALL; } const_set.register_count = desc.RegisterCount; + table_type = table_info[const_set.table].type; + get_const_upload_info(&const_set, &info); + + if (table_type_from_param_type(param->type) == PRES_VT_COUNT) + return D3DERR_INVALIDCALL; + + const_set.direct_copy = table_type_from_param_type(param->type) == table_type + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(const_set.table, const_set.register_count) + && info.count * sizeof(unsigned int) <= param->bytes; + if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Paul Gofman : d3dx9: Factor out table_type_from_param_type() function.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 6cefc5fa6c7c55050ee0daf43b654440086fb0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cefc5fa6c7c55050ee0daf43… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:29 2017 +0300 d3dx9: Factor out table_type_from_param_type() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 8bb2217..e2bd26b 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -193,7 +193,8 @@ enum pres_value_type PRES_VT_FLOAT, PRES_VT_DOUBLE, PRES_VT_INT, - PRES_VT_BOOL + PRES_VT_BOOL, + PRES_VT_COUNT }; static const struct @@ -269,6 +270,22 @@ struct const_upload_info unsigned int count; }; +static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) +{ + switch (type) + { + case D3DXPT_FLOAT: + return PRES_VT_FLOAT; + case D3DXPT_INT: + return PRES_VT_INT; + case D3DXPT_BOOL: + return PRES_VT_BOOL; + default: + FIXME("Unsupported type %u.\n", type); + return PRES_VT_COUNT; + } +} + static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; @@ -392,6 +409,9 @@ static void regstore_set_double(struct d3dx_regstore *rs, unsigned int table, un case PRES_VT_DOUBLE: *(double *)p = v; break; case PRES_VT_INT : *(int *)p = lrint(v); break; case PRES_VT_BOOL : *(BOOL *)p = !!v; break; + default: + FIXME("Bad type %u.\n", table_info[table].type); + break; } reg_idx = get_reg_offset(table, offset); rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] |= @@ -1033,9 +1053,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) - || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) - || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) + if (table_type_from_param_type(param->type) == table_type && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(table, const_set->register_count) && info.count * sizeof(unsigned int) <= param->bytes)

1 0

Paul Gofman : d3dx9: Factor out get_const_upload_info() function.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 09e089cc66c1303d43e8ae1c5c523c2621bd2c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e089cc66c1303d43e8ae1c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:28 2017 +0300 d3dx9: Factor out get_const_upload_info() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 78 +++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 29a2346..8bb2217 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -260,6 +260,15 @@ struct d3dx_pres_ins struct d3dx_pres_operand output; }; +struct const_upload_info +{ + BOOL transpose; + unsigned int major, minor; + unsigned int major_stride; + unsigned int major_count; + unsigned int count; +}; + static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; @@ -979,6 +988,30 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) HeapFree(GetProcessHeap(), 0, peval); } +static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set, + struct const_upload_info *info) +{ + struct d3dx_parameter *param = const_set->param; + unsigned int table = const_set->table; + + info->transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) + || (param->class == D3DXPC_MATRIX_COLUMNS && const_set->constant_class == D3DXPC_MATRIX_ROWS); + if (const_set->constant_class == D3DXPC_MATRIX_COLUMNS) + { + info->major = param->columns; + info->minor = param->rows; + } + else + { + info->major = param->rows; + info->minor = param->columns; + } + info->major_stride = max(info->minor, get_offset_reg(table, 1)); + info->major_count = min(info->major * info->major_stride, + get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; + info->count = info->major_count * info->minor; +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -990,51 +1023,36 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; enum pres_value_type table_type = table_info[table].type; - unsigned int i, j, n, start_offset; - unsigned int minor, major, major_stride, param_offset; - BOOL transpose; - unsigned int count; + unsigned int i, j, start_offset; + unsigned int param_offset; + struct const_upload_info info; if (!is_param_dirty(param, const_tab->update_version)) continue; - transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) - || (param->class == D3DXPC_MATRIX_COLUMNS && const_set->constant_class == D3DXPC_MATRIX_ROWS); - if (const_set->constant_class == D3DXPC_MATRIX_COLUMNS) - { - major = param->columns; - minor = param->rows; - } - else - { - major = param->rows; - minor = param->columns; - } + get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - major_stride = max(minor, get_offset_reg(table, 1)); - n = min(major * major_stride, - get_offset_reg(table, const_set->register_count) + major_stride - 1) / major_stride; - count = n * minor; + if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) - && !transpose && minor == major_stride - && count == get_offset_reg(table, const_set->register_count) - && count * sizeof(unsigned int) <= param->bytes) + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(table, const_set->register_count) + && info.count * sizeof(unsigned int) <= param->bytes) { - regstore_set_values(rs, table, param->data, start_offset, count); + regstore_set_values(rs, table, param->data, start_offset, info.count); continue; } - for (i = 0; i < n; ++i) + for (i = 0; i < info.major_count; ++i) { - for (j = 0; j < minor; ++j) + for (j = 0; j < info.minor; ++j) { unsigned int out; unsigned int *in; unsigned int offset; - offset = start_offset + i * major_stride + j; + offset = start_offset + i * info.major_stride + j; if (get_reg_offset(table, offset) >= rs->table_sizes[table]) { if (table != PRES_REGTAB_OBCONST) @@ -1042,10 +1060,10 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const debugstr_a(param->name), i); break; } - if (transpose) - param_offset = i + j * major; + if (info.transpose) + param_offset = i + j * info.major; else - param_offset = i * minor + j; + param_offset = i * info.minor + j; if (param_offset * sizeof(unsigned int) >= param->bytes) { WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i);

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHScale().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: e56adf98847e0518b1f6f51e77a221c7d0ca52f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56adf98847e0518b1f6f51e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:39 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHScale(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 15fb945..8882907 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3586,7 +3586,7 @@ static void test_D3DXSHScale(void) unsigned int i, order; BOOL equal; - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = i; b[i] = i; @@ -3597,7 +3597,7 @@ static void test_D3DXSHScale(void) received_array = D3DXSHScale(b, order, a, 5.0f); ok(received_array == b, "Expected %p, received %p\n", b, received_array); - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(b); ++i) { if (i < order * order) expected = 5.0f * a[i];

1 0

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 June 2017