February 2017 - Wine-commits

Francois Gouget : netprofm: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 44b7ff8b71b3913d5fd80dc6d05e9c08daf69e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b7ff8b71b3913d5fd80dc6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:24 2017 +0100 netprofm: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its formatting, type names, etc. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 33b2fa6..8847758 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -41,14 +41,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } struct network

1 0

Francois Gouget : msident: Add a __WINE_ALLOC_SIZE attribute to heap_alloc ().
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: f78afbb1638226ec7805e9e42c266af0abb69122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78afbb1638226ec7805e9e42… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:37 2017 +0100 msident: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msident/msident.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index c12c19b..3efb190 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -27,9 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msident); -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : hlink: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: d5c3a316165002701551282f4a702972bc099500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c3a316165002701551282f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:22:00 2017 +0100 hlink: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index e0ff09e..33b58ac 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -32,14 +32,14 @@ extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : dnsapi: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 773cfc2a88812cb9c90794821cde6998672bbc88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773cfc2a88812cb9c90794821… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:22:19 2017 +0100 dnsapi: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their type names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index e94b26b..8a02521 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -22,19 +22,19 @@ # error You must include config.h to use this header #endif -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline BOOL heap_free( LPVOID mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline LPSTR dns_strdup_a( LPCSTR src )

1 0

Francois Gouget : user32/tests: Occasional spelling fixes in comments.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: a3f36a045f8e039a9e6c20cf7f54c5a9acd6e8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f36a045f8e039a9e6c20cf7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:23:19 2017 +0100 user32/tests: Occasional spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e95d435..0d5aec7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -985,7 +985,7 @@ static const struct message WmShowPopupExtremeLocationSeq[] = { { WM_NCPAINT, sent|wparam, 1 }, { WM_ERASEBKGND, sent }, { WM_WINDOWPOSCHANGED, sent }, - /* ocasionally received on test machines */ + /* occasionally received on test machines */ { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, { 0 } @@ -1018,7 +1018,7 @@ static const struct message WmShowPopupFirstDrawSeq_1[] = { { WM_ERASEBKGND, sent }, { WM_WINDOWPOSCHANGED, sent }, { WM_PAINT, sent }, - /* ocasionally received on test machines */ + /* occasionally received on test machines */ { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } @@ -1058,7 +1058,7 @@ static const struct message WmShowPopupFirstDrawSeq_2[] = { { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc, 0 }, { WM_PAINT, sent}, - /* ocasionally received on test machines */ + /* occasionally received on test machines */ { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } @@ -1189,7 +1189,7 @@ static const struct message WmFirstDrawChildSeq1[] = { static const struct message WmFirstDrawChildSeq2[] = { { WM_NCPAINT, sent|wparam, 1 }, { WM_ERASEBKGND, sent }, - /* ocasionally received on test machines */ + /* occasionally received on test machines */ { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, { 0 }

1 0

Nikolay Sivov : regedit: Sort each of top level branches separately.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: a9bae9629c7496724fa5ed7fac222441df082024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bae9629c7496724fa5ed7fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 17 18:09:53 2017 +0300 regedit: Sort each of top level branches separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d07399d..378657d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -461,6 +461,17 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) return TRUE; } +static void treeview_sort_item(HWND hWnd, HTREEITEM item) +{ + HTREEITEM child = (HTREEITEM)SendMessageW(hWnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + while (child != NULL) { + treeview_sort_item(hWnd, child); + child = (HTREEITEM)SendMessageW(hWnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)child); + } + SendMessageW(hWnd, TVM_SORTCHILDREN, 0, (LPARAM)item); +} + BOOL RefreshTreeView(HWND hwndTV) { HTREEITEM hItem; @@ -477,12 +488,12 @@ BOOL RefreshTreeView(HWND hwndTV) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hRoot); while (hItem) { RefreshTreeItem(hwndTV, hItem); + treeview_sort_item(hwndTV, hItem); hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hItem); } SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); - SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Zebediah Figura : compobj.dll16: Implement CoGetClassObject16().
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 6c2a5ee9172511ed26e5512bd3104771f46a0672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2a5ee9172511ed26e5512bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 17 16:32:12 2017 -0600 compobj.dll16: Implement CoGetClassObject16(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 69 ++++++++++++++++++++++++++++++++--- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index b934a06..af69bf8 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -714,15 +714,74 @@ HRESULT WINAPI CoFileTimeNow16( FILETIME *lpFileTime ) * */ HRESULT WINAPI CoGetClassObject16( - REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, - REFIID iid, LPVOID *ppv) + SEGPTR rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, + SEGPTR riid, SEGPTR ppv) { - FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + LPVOID *ppvl = MapSL(ppv); + + TRACE("CLSID: %s, IID: %s\n", debugstr_guid(MapSL(rclsid)), debugstr_guid(MapSL(riid))); + + *ppvl = NULL; if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); + FIXME("pServerInfo->name=%s pAuthInfo=%p\n", + debugstr_w(pServerInfo->pwszName), pServerInfo->pAuthInfo); + } + + if (CLSCTX_INPROC_SERVER & dwClsContext) + { + char idstr[CHARS_IN_GUID]; + char buf_key[CHARS_IN_GUID+19], dllpath[MAX_PATH+1]; + LONG dllpath_len = sizeof(dllpath); + + HMODULE16 dll; + FARPROC16 DllGetClassObject; + + WORD args[6]; + DWORD dwRet; + + StringFromGUID216(MapSL(rclsid), idstr, CHARS_IN_GUID); + sprintf(buf_key, "CLSID\\%s\\InprocServer", idstr); + if (RegQueryValueA(HKEY_CLASSES_ROOT, buf_key, dllpath, &dllpath_len)) + { + ERR("class %s not registered\n", debugstr_guid(MapSL(rclsid))); + return REGDB_E_CLASSNOTREG; + } + + dll = LoadLibrary16(dllpath); + if (!dll) + { + ERR("couldn't load in-process dll %s\n", debugstr_a(dllpath)); + return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ + } + + DllGetClassObject = GetProcAddress16(dll, "DllGetClassObject"); + if (!DllGetClassObject) + { + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_a(dllpath)); + FreeLibrary16(dll); + return CO_E_DLLNOTFOUND; + } + + TRACE("calling DllGetClassObject %p\n", DllGetClassObject); + args[5] = SELECTOROF(rclsid); + args[4] = OFFSETOF(rclsid); + args[3] = SELECTOROF(riid); + args[2] = OFFSETOF(riid); + args[1] = SELECTOROF(ppv); + args[0] = OFFSETOF(ppv); + WOWCallback16Ex((DWORD) DllGetClassObject, WCB16_PASCAL, sizeof(args), args, &dwRet); + if (dwRet != S_OK) + { + ERR("DllGetClassObject returned error 0x%08x\n", dwRet); + FreeLibrary16(dll); + return dwRet; + } + + return S_OK; } + + FIXME("semi-stub\n"); return E_NOTIMPL; } diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 85dfc42..71dba80 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -4,7 +4,7 @@ 4 pascal CoGetMalloc(long ptr) CoGetMalloc16 5 pascal CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject16 6 pascal CoRevokeClassObject(long) CoRevokeClassObject16 -7 pascal CoGetClassObject(ptr long ptr ptr ptr) CoGetClassObject16 +7 pascal CoGetClassObject(segptr long ptr segptr segptr) CoGetClassObject16 8 stub COMARSHALINTERFACE 9 stub COUNMARSHALINTERFACE 10 stub COLOADLIBRARY

1 0

Henri Verbeet : wined3d: Send light updates through the command stream.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 2fd3aaddc1e73c267c48e2ca439f0f69bff71a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd3aaddc1e73c267c48e2ca4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 18:16:35 2017 +0100 wined3d: Send light updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 53 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bbae5ad..a3ea648 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -54,6 +54,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_CLIP_PLANE, WINED3D_CS_OP_SET_COLOR_KEY, WINED3D_CS_OP_SET_MATERIAL, + WINED3D_CS_OP_SET_LIGHT, WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_CALLBACK, WINED3D_CS_OP_QUERY_ISSUE, @@ -278,6 +279,12 @@ struct wined3d_cs_set_material struct wined3d_material material; }; +struct wined3d_cs_set_light +{ + enum wined3d_cs_op opcode; + struct wined3d_light_info light; +}; + struct wined3d_cs_reset_state { enum wined3d_cs_op opcode; @@ -1369,6 +1376,47 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma cs->ops->submit(cs); } +static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_light *op = data; + struct wined3d_light_info *light_info; + unsigned int light_idx, hash_idx; + + light_idx = op->light.OriginalIndex; + + if (!(light_info = wined3d_state_get_light(&cs->state, light_idx))) + { + TRACE("Adding new light.\n"); + if (!(light_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*light_info)))) + { + ERR("Failed to allocate light info.\n"); + return; + } + + hash_idx = LIGHTMAP_HASHFUNC(light_idx); + list_add_head(&cs->state.light_map[hash_idx], &light_info->entry); + light_info->glIndex = -1; + light_info->OriginalIndex = light_idx; + } + + light_info->OriginalParms = op->light.OriginalParms; + light_info->position = op->light.position; + light_info->direction = op->light.direction; + light_info->exponent = op->light.exponent; + light_info->cutoff = op->light.cutoff; +} + +void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) +{ + struct wined3d_cs_set_light *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_LIGHT; + op->light = *light; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { struct wined3d_adapter *adapter = cs->device->adapter; @@ -1565,6 +1613,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, /* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, + /* WINED3D_CS_OP_SET_LIGHT */ wined3d_cs_exec_set_light, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_CALLBACK */ wined3d_cs_exec_callback, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2c8da30..4c10f99 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1655,6 +1655,9 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } + if (!device->recording) + wined3d_cs_emit_set_light(device->cs, object); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c70c97..23f15df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3203,6 +3203,7 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) 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_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send light enable updates through the command stream.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 1881bad4ddfc5d73337b8f09528c3b8131d3bc74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1881bad4ddfc5d73337b8f095… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 18:16:36 2017 +0100 wined3d: Send light enable updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 17 ++------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a3ea648..ca851da 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -55,6 +55,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_COLOR_KEY, WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_SET_LIGHT, + WINED3D_CS_OP_SET_LIGHT_ENABLE, WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_CALLBACK, WINED3D_CS_OP_QUERY_ISSUE, @@ -285,6 +286,13 @@ struct wined3d_cs_set_light struct wined3d_light_info light; }; +struct wined3d_cs_set_light_enable +{ + enum wined3d_cs_op opcode; + unsigned int idx; + BOOL enable; +}; + struct wined3d_cs_reset_state { enum wined3d_cs_op opcode; @@ -1399,6 +1407,13 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_info->OriginalIndex = light_idx; } + if (light_info->glIndex != -1) + { + if (light_info->OriginalParms.type != op->light.OriginalParms.type) + device_invalidate_state(cs->device, STATE_LIGHT_TYPE); + device_invalidate_state(cs->device, STATE_ACTIVELIGHT(light_info->glIndex)); + } + light_info->OriginalParms = op->light.OriginalParms; light_info->position = op->light.position; light_info->direction = op->light.direction; @@ -1417,6 +1432,40 @@ void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light cs->ops->submit(cs); } +static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_light_enable *op = data; + struct wined3d_device *device = cs->device; + struct wined3d_light_info *light_info; + int prev_idx; + + if (!(light_info = wined3d_state_get_light(&cs->state, op->idx))) + { + ERR("Light doesn't exist.\n"); + return; + } + + prev_idx = light_info->glIndex; + wined3d_state_enable_light(&cs->state, &device->adapter->d3d_info, light_info, op->enable); + if (light_info->glIndex != prev_idx) + { + device_invalidate_state(device, STATE_LIGHT_TYPE); + device_invalidate_state(device, STATE_ACTIVELIGHT(op->enable ? light_info->glIndex : prev_idx)); + } +} + +void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) +{ + struct wined3d_cs_set_light_enable *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_LIGHT_ENABLE; + op->idx = idx; + op->enable = enable; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { struct wined3d_adapter *adapter = cs->device->adapter; @@ -1614,6 +1663,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, /* WINED3D_CS_OP_SET_LIGHT */ wined3d_cs_exec_set_light, + /* WINED3D_CS_OP_SET_LIGHT_ENABLE */ wined3d_cs_exec_set_light_enable, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_CALLBACK */ wined3d_cs_exec_callback, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4c10f99..2005341 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1568,14 +1568,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, light->direction.x, light->direction.y, light->direction.z, light->range, light->falloff, light->theta, light->phi); - /* Update the live definitions if the light is currently assigned a glIndex. */ - if (object->glIndex != -1 && !device->recording) - { - if (object->OriginalParms.type != light->type) - device_invalidate_state(device, STATE_LIGHT_TYPE); - device_invalidate_state(device, STATE_ACTIVELIGHT(object->glIndex)); - } - /* Save away the information. */ object->OriginalParms = *light; @@ -1681,7 +1673,6 @@ HRESULT CDECL wined3d_device_get_light(const struct wined3d_device *device, HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { struct wined3d_light_info *light_info; - int prev_idx; TRACE("device %p, light_idx %u, enable %#x.\n", device, light_idx, enable); @@ -1698,13 +1689,9 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN } } - prev_idx = light_info->glIndex; wined3d_state_enable_light(device->update_state, &device->adapter->d3d_info, light_info, enable); - if (!device->recording && light_info->glIndex != prev_idx) - { - device_invalidate_state(device, STATE_LIGHT_TYPE); - device_invalidate_state(device, STATE_ACTIVELIGHT(enable ? light_info->glIndex : prev_idx)); - } + if (!device->recording) + wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23f15df..3190d87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3204,6 +3204,7 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) 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_predication(struct wined3d_cs *cs, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : oledlg: Use W-functions to access window property.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 0028360d4be1f90c6d584f19782639dd0e32d5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0028360d4be1f90c6d584f197… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 21:21:32 2017 +0300 oledlg: Use W-functions to access window property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/insobjdlg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 7cbea4e..506196e 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -72,7 +72,8 @@ static void UIINSERTOBJECTDLG_AddControl(InsertObjectDlgInfo* pdlgInfo); typedef HRESULT (*DLLREGISTER) (void); extern HINSTANCE OLEDLG_hInstance; -static const char OleUIInsertObjectInfoStr[] = "OleUIInsertObjectInfoStr"; +static const WCHAR OleUIInsertObjectInfoStr[] = {'O','l','e','U','I','I','n','s','e','r','t','O','b','j','e','c','t', + 'I','n','f','o','S','t','r',0}; /*********************************************************************** * OleUIInsertObjectA (OLEDLG.3) @@ -124,7 +125,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject) */ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); + InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr); switch(uMsg) { @@ -134,7 +135,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR pdlgInfo->hwndSelf = hwnd; - SetPropA(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); + SetPropW(hwnd, OleUIInsertObjectInfoStr, pdlgInfo); UIINSERTOBJECTDLG_InitDialog(pdlgInfo); @@ -147,7 +148,7 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR case WM_DESTROY: if (pdlgInfo) UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo); - RemovePropA(hwnd, OleUIInsertObjectInfoStr); + RemovePropW(hwnd, OleUIInsertObjectInfoStr); return FALSE; default : @@ -163,9 +164,9 @@ INT_PTR CALLBACK UIInsertObjectDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR */ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) { + InsertObjectDlgInfo* pdlgInfo = GetPropW(hwnd, OleUIInsertObjectInfoStr); WORD wNotifyCode = HIWORD(wParam); WORD wID = LOWORD(wParam); - InsertObjectDlgInfo* pdlgInfo = GetPropA(hwnd,OleUIInsertObjectInfoStr); switch(wID) {

1 0