March 2015 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_SetPrivateData ().
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 7531acd360c9825e5e5eeee18c5cac2c575e407d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7531acd360c9825e5e5eeee18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:54 2015 +0100 d3d10core: Implement d3d10_rasterizer_state_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/state.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2d2bf03..278e0db 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -280,6 +280,7 @@ struct d3d10_rasterizer_state ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + struct wined3d_private_store private_store; D3D10_RASTERIZER_DESC desc; struct wine_rb_entry entry; ID3D10Device1 *device; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 52360c8..2ab2c97 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -393,6 +393,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt struct d3d10_device *device = impl_from_ID3D10Device(state->device); wine_rb_remove(&device->rasterizer_states, &state->desc); ID3D10Device1_Release(state->device); + wined3d_private_store_cleanup(&state->private_store); HeapFree(GetProcessHeap(), 0, state); } @@ -423,10 +424,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, @@ -469,11 +472,13 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + wined3d_private_store_init(&state->private_store); state->desc = *desc; if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) { ERR("Failed to insert rasterizer state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); return E_FAIL; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_SetPrivateDataInterface().
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: da48976de97aa14bc7c70b52d904e3804e032313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da48976de97aa14bc7c70b52d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:55 2015 +0100 d3d10core: Implement d3d10_rasterizer_state_SetPrivateDataInterface(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 2ab2c97..3f5a61e 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -435,9 +435,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10RasterizerState methods */

1 0

Nikolay Sivov : scrrun: Fix copy-paste issue in trace message.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 49a1c60c37bddf39c438f1ab9a5a4fa544e525df URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a1c60c37bddf39c438f1ab9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 10 10:55:52 2015 +0300 scrrun: Fix copy-paste issue in trace message. --- dlls/scrrun/scrrun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 3afcd50..5201f1f 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -215,11 +215,11 @@ HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { if(IsEqualGUID(&CLSID_FileSystemObject, rclsid)) { - TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_FileSystemObject %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&FileSystemFactory, riid, ppv); } else if(IsEqualGUID(&CLSID_Dictionary, rclsid)) { - TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_Dictionary %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&DictionaryFactory, riid, ppv); }

1 0

Francois Gouget : dbghelp: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 654657b7151352699152f86c5520197f3c6e1c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=654657b7151352699152f86c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:26:31 2015 +0100 dbghelp: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/dbghelp/symbol.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3e7877a..cbe232b 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -20,7 +20,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "config.h"

1 0

Francois Gouget : cryptnet: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 16a77b89e99948690393e4384b6d5d6fe76bd0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a77b89e99948690393e4384… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:21:12 2015 +0100 cryptnet: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/cryptnet/cryptnet_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 90057d9..9d05a91 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -22,7 +22,6 @@ #include "wine/port.h" #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include <stdio.h>

1 0

Francois Gouget : crypt32: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: fc49e63d71efac9929d83a9b7dc931d87311bdae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49e63d71efac9929d83a9b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 22:21:02 2015 +0100 crypt32: Remove an uneeded NONAMELESSUNION directive. --- dlls/crypt32/ctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index c18e608..b8b728f 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -20,7 +20,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h"

1 0

Nikolay Sivov : wshom.ocx: Implement ProcessID() property.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 2a925eba2006e815218d5ec3790f7f61aff14542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a925eba2006e815218d5ec37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 20:10:47 2015 +0300 wshom.ocx: Implement ProcessID() property. --- dlls/wshom.ocx/shell.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 6d1b80b..dcf1462 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -236,9 +236,13 @@ static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) { WshExec *This = impl_from_IWshExec(iface); - FIXME("(%p)->(%p): stub\n", This, pid); + TRACE("(%p)->(%p)\n", This, pid); - return E_NOTIMPL; + if (!pid) + return E_INVALIDARG; + + *pid = This->info.dwProcessId; + return S_OK; } static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code)

1 0

Nikolay Sivov : wshom.ocx: Implement Exec() method.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: d9db9d8b83a29b8a75842e949937e56614384940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9db9d8b83a29b8a75842e949… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 9 20:09:00 2015 +0300 wshom.ocx: Implement Exec() method. --- dlls/wshom.ocx/shell.c | 225 ++++++++++++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/wshom.c | 13 +++ dlls/wshom.ocx/tests/wshom.idl | 4 +- dlls/wshom.ocx/wshom.idl | 4 +- dlls/wshom.ocx/wshom_main.c | 1 + dlls/wshom.ocx/wshom_private.h | 1 + 6 files changed, 242 insertions(+), 6 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index c164b70..38a07fe 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -51,6 +51,13 @@ typedef struct LONG ref; } WshEnvironment; +typedef struct +{ + IWshExec IWshExec_iface; + LONG ref; + PROCESS_INFORMATION info; +} WshExec; + static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) { return CONTAINING_RECORD(iface, WshCollection, IWshCollection_iface); @@ -66,6 +73,213 @@ static inline WshEnvironment *impl_from_IWshEnvironment( IWshEnvironment *iface return CONTAINING_RECORD(iface, WshEnvironment, IWshEnvironment_iface); } +static inline WshExec *impl_from_IWshExec( IWshExec *iface ) +{ + return CONTAINING_RECORD(iface, WshExec, IWshExec_iface); +} + +static HRESULT WINAPI WshExec_QueryInterface(IWshExec *iface, REFIID riid, void **obj) +{ + WshExec *This = impl_from_IWshExec(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshExec) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IWshExec_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI WshExec_AddRef(IWshExec *iface) +{ + WshExec *This = impl_from_IWshExec(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + return ref; +} + +static ULONG WINAPI WshExec_Release(IWshExec *iface) +{ + WshExec *This = impl_from_IWshExec(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) { + CloseHandle(This->info.hThread); + CloseHandle(This->info.hProcess); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI WshExec_GetTypeInfoCount(IWshExec *iface, UINT *pctinfo) +{ + WshExec *This = impl_from_IWshExec(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshExec_GetTypeInfo(IWshExec *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + WshExec *This = impl_from_IWshExec(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshExec_tid, ppTInfo); +} + +static HRESULT WINAPI WshExec_GetIDsOfNames(IWshExec *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WshExec *This = impl_from_IWshExec(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshExec_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshExec_Invoke(IWshExec *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WshExec *This = impl_from_IWshExec(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshExec_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWshExec_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshExec_get_Status(IWshExec *iface, WshExecStatus *status) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, status); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_StdIn(IWshExec *iface, ITextStream **stream) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_StdOut(IWshExec *iface, ITextStream **stream) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, pid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, code); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_Terminate(IWshExec *iface) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static const IWshExecVtbl WshExecVtbl = { + WshExec_QueryInterface, + WshExec_AddRef, + WshExec_Release, + WshExec_GetTypeInfoCount, + WshExec_GetTypeInfo, + WshExec_GetIDsOfNames, + WshExec_Invoke, + WshExec_get_Status, + WshExec_get_StdIn, + WshExec_get_StdOut, + WshExec_get_StdErr, + WshExec_get_ProcessID, + WshExec_get_ExitCode, + WshExec_Terminate +}; + +static HRESULT WshExec_create(BSTR command, IWshExec **ret) +{ + STARTUPINFOW si = {0}; + WshExec *This; + + *ret = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IWshExec_iface.lpVtbl = &WshExecVtbl; + This->ref = 1; + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &This->info)) { + HeapFree(GetProcessHeap(), 0, This); + return HRESULT_FROM_WIN32(GetLastError()); + } + + *ret = &This->IWshExec_iface; + return S_OK; +} + static HRESULT WINAPI WshEnvironment_QueryInterface(IWshEnvironment *iface, REFIID riid, void **obj) { WshEnvironment *This = impl_from_IWshEnvironment(iface); @@ -1323,8 +1537,15 @@ static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT * static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec **ret) { - FIXME("(%s %p): stub\n", debugstr_w(command), ret); - return E_NOTIMPL; + TRACE("(%s %p)\n", debugstr_w(command), ret); + + if (!ret) + return E_POINTER; + + if (!command) + return DISP_E_EXCEPTION; + + return WshExec_create(command, ret); } static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 0a69af3..ad0e0be 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -42,6 +42,7 @@ static void test_wshshell(void) static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; IWshEnvironment *env; + IWshExec *shexec; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -234,6 +235,18 @@ if (0) /* crashes on native */ ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); SysFreeString(str); + /* Exec */ + hr = IWshShell3_Exec(sh3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWshShell3_Exec(sh3, NULL, &shexec); + ok(hr == DISP_E_EXCEPTION, "got 0x%08x\n", hr); + + str = SysAllocString(emptyW); + hr = IWshShell3_Exec(sh3, str, &shexec); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 6647b2b..77d64ce 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -434,10 +434,10 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] long* pid); + HRESULT ProcessID([out, retval] DWORD *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] long* ExitCode); + HRESULT ExitCode([out, retval] DWORD *code); [id(0x0008)] HRESULT Terminate(); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index aade499..83f3c7e 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -436,10 +436,10 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] long* pid); + HRESULT ProcessID([out, retval] DWORD *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] long* ExitCode); + HRESULT ExitCode([out, retval] DWORD *code); [id(0x0008)] HRESULT Terminate(); diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 118b6c9..e2a30ed 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -35,6 +35,7 @@ static REFIID tid_ids[] = { &IID_NULL, &IID_IWshCollection, &IID_IWshEnvironment, + &IID_IWshExec, &IID_IWshShell3, &IID_IWshShortcut }; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 07a77b4..7cc8d0c 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -29,6 +29,7 @@ typedef enum tid_t { NULL_tid, IWshCollection_tid, IWshEnvironment_tid, + IWshExec_tid, IWshShell3_tid, IWshShortcut_tid, LAST_tid

1 0

Stefan Dösinger : wined3d: Improve the unsigned emulation of WINED3DFMT_R5G5_SNORM_L6_UNORM.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 6f2f73a456fe10493c9a79a94fbf0b48f8e563ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f73a456fe10493c9a79a94… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:36 2015 +0100 wined3d: Improve the unsigned emulation of WINED3DFMT_R5G5_SNORM_L6_UNORM. --- dlls/wined3d/utils.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5f35ffb..791ddf3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -294,25 +294,29 @@ static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT src_row UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { unsigned int x, y, z; - const WORD *Source; + unsigned char r_in, g_in, l_in; + const unsigned short *texel_in; + unsigned short *texel_out; + /* Emulating signed 5 bit values with unsigned 5 bit values has some precision problems by design: + * E.g. the signed input value 0 becomes 16. GL normalizes it to 16 / 31 = 0.516. We convert it + * back to a signed value by subtracting 0.5 and multiplying by 2.0. The resulting value is + * ((16 / 31) - 0.5) * 2.0 = 0.032, which is quite different from the intended result 0.000. */ for (z = 0; z < depth; z++) { for (y = 0; y < height; y++) { - unsigned short *Dest_s = (unsigned short *) (dst + z * dst_slice_pitch + y * dst_row_pitch); - Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); + texel_out = (unsigned short *) (dst + z * dst_slice_pitch + y * dst_row_pitch); + texel_in = (const unsigned short *)(src + z * src_slice_pitch + y * src_row_pitch); for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - short v = ((color >> 5) & 0x3e); - short u = ((color ) & 0x1f); - short v_conv = v + 16; - short u_conv = u + 16; - - *Dest_s = ((v_conv << 11) & 0xf800) | ((l << 5) & 0x7e0) | (u_conv & 0x1f); - Dest_s += 1; + l_in = (*texel_in & 0xfc00) >> 10; + g_in = (*texel_in & 0x03e0) >> 5; + r_in = *texel_in & 0x001f; + + *texel_out = ((r_in + 16) << 11) | (l_in << 5) | (g_in + 16); + texel_out++; + texel_in++; } } }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetPrivateData ().
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 3b2c28d8cf567b9da9c99f201ccafe598a452912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2c28d8cf567b9da9c99f201… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:56 2015 +0100 d3d10core: Implement d3d10_rasterizer_state_GetPrivateData(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3f5a61e..4d4c5ea 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -415,10 +415,12 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface,

1 0