November 2012 - Wine-commits

Henri Verbeet : d3d10core: Fix the stream index in d3d10_device_IASetVertexBuffers().
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: e00f1590dba2d76604d48e1b3cee4c55104ad6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00f1590dba2d76604d48e1b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:06:00 2012 +0100 d3d10core: Fix the stream index in d3d10_device_IASetVertexBuffers(). --- dlls/d3d10core/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 84fff72..be55387 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -212,7 +212,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac { struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_set_stream_source(This->wined3d_device, start_slot, + wined3d_device_set_stream_source(This->wined3d_device, start_slot + i, buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } }

1 0

Nikolay Sivov : msi: Make it clear where script type mask comes from.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 194c30d11fdd902955eafc9ae00bfc13b79fb7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=194c30d11fdd902955eafc9ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 17:32:47 2012 -0500 msi: Make it clear where script type mask comes from. --- dlls/msi/script.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index e885a2c..bea2712 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -260,7 +260,7 @@ static HRESULT create_ActiveScriptSite(IUnknown *outer, void **obj) if( outer ) return CLASS_E_NOAGGREGATION; - object = msi_alloc_zero( sizeof(MsiActiveScriptSite) ); + object = msi_alloc( sizeof(MsiActiveScriptSite) ); object->IActiveScriptSite_iface.lpVtbl = &activescriptsitevtbl; object->ref = 1; @@ -303,9 +303,10 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function if (hr != S_OK) goto done; /* Create the scripting engine */ - if ((type & 7) == msidbCustomActionTypeJScript) + type &= msidbCustomActionTypeJScript|msidbCustomActionTypeVBScript; + if (type == msidbCustomActionTypeJScript) hr = CLSIDFromProgID(szJScript, &clsid); - else if ((type & 7) == msidbCustomActionTypeVBScript) + else if (type == msidbCustomActionTypeVBScript) hr = CLSIDFromProgID(szVBScript, &clsid); else { ERR("Unknown script type %d\n", type);

1 0

Nikolay Sivov : msi: COM cleanup for IActiveScriptSite.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: eebde117ca54a805fe93e62d7161c320dc67590d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebde117ca54a805fe93e62d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 17:08:14 2012 -0500 msi: COM cleanup for IActiveScriptSite. --- dlls/msi/script.c | 321 ++++++++++++++++++++++++++--------------------------- 1 files changed, 160 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eebde117ca54a805fe93e…

1 0

Nikolay Sivov : msi: Remove unnecessary casts and argument from script site creation helper.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 3b0179cbde19e650804cb3b5a81857627470b0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0179cbde19e650804cb3b5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 17:42:16 2012 -0500 msi: Remove unnecessary casts and argument from script site creation helper. --- dlls/msi/script.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index bea2712..8d48a94 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -59,8 +59,8 @@ static const WCHAR szSession[] = {'S','e','s','s','i','o','n',0}; */ typedef struct { IActiveScriptSite IActiveScriptSite_iface; - IDispatch *pInstaller; - IDispatch *pSession; + IDispatch *installer; + IDispatch *session; LONG ref; } MsiActiveScriptSite; @@ -144,7 +144,7 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, return hr; } else if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { - IDispatch_QueryInterface(This->pSession, &IID_IUnknown, (void **)ppiunkItem); + IDispatch_QueryInterface(This->session, &IID_IUnknown, (void **)ppiunkItem); return S_OK; } } @@ -251,23 +251,24 @@ static const struct IActiveScriptSiteVtbl activescriptsitevtbl = MsiActiveScriptSite_OnLeaveScript }; -static HRESULT create_ActiveScriptSite(IUnknown *outer, void **obj) +static HRESULT create_activescriptsite(MsiActiveScriptSite **obj) { MsiActiveScriptSite* object; - TRACE("(%p,%p)\n", outer, obj); + TRACE("(%p)\n", obj); - if( outer ) - return CLASS_E_NOAGGREGATION; + *obj = NULL; object = msi_alloc( sizeof(MsiActiveScriptSite) ); + if (!object) + return E_OUTOFMEMORY; object->IActiveScriptSite_iface.lpVtbl = &activescriptsitevtbl; object->ref = 1; - object->pInstaller = NULL; - object->pSession = NULL; + object->installer = NULL; + object->session = NULL; - *obj = &object->IActiveScriptSite_iface; + *obj = object; return S_OK; } @@ -280,7 +281,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function HRESULT hr; IActiveScript *pActiveScript = NULL; IActiveScriptParse *pActiveScriptParse = NULL; - MsiActiveScriptSite *pActiveScriptSite = NULL; + MsiActiveScriptSite *scriptsite; IDispatch *pDispatch = NULL; DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; DISPID dispid; @@ -291,15 +292,15 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function CoInitialize(NULL); /* Create MsiActiveScriptSite object */ - hr = create_ActiveScriptSite(NULL, (void **)&pActiveScriptSite); + hr = create_activescriptsite(&scriptsite); if (hr != S_OK) goto done; /* Create an installer object */ - hr = create_msiserver(NULL, (LPVOID *)&pActiveScriptSite->pInstaller); + hr = create_msiserver(NULL, (void**)&scriptsite->installer); if (hr != S_OK) goto done; /* Create a session object */ - hr = create_session(hPackage, pActiveScriptSite->pInstaller, &pActiveScriptSite->pSession); + hr = create_session(hPackage, scriptsite->installer, &scriptsite->session); if (hr != S_OK) goto done; /* Create the scripting engine */ @@ -325,7 +326,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse); if (FAILED(hr)) goto done; - hr = IActiveScript_SetScriptSite(pActiveScript, (IActiveScriptSite *)pActiveScriptSite); + hr = IActiveScript_SetScriptSite(pActiveScript, &scriptsite->IActiveScriptSite_iface); if (FAILED(hr)) goto done; hr = IActiveScriptParse_InitNew(pActiveScriptParse); @@ -372,11 +373,11 @@ done: if (pDispatch) IDispatch_Release(pDispatch); if (pActiveScript) IActiveScript_Release(pActiveScript); if (pActiveScriptParse) IActiveScriptParse_Release(pActiveScriptParse); - if (pActiveScriptSite) + if (scriptsite) { - if (pActiveScriptSite->pSession) IDispatch_Release(pActiveScriptSite->pSession); - if (pActiveScriptSite->pInstaller) IDispatch_Release(pActiveScriptSite->pInstaller); - IActiveScriptSite_Release((IActiveScriptSite *)pActiveScriptSite); + if (scriptsite->session) IDispatch_Release(scriptsite->session); + if (scriptsite->installer) IDispatch_Release(scriptsite->installer); + IActiveScriptSite_Release(&scriptsite->IActiveScriptSite_iface); } CoUninitialize(); /* must call even if CoInitialize failed */ return ret;

1 0

Nikolay Sivov : msi: Cache ITypeInfo instances for automation objects instead of reloading every time .
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: e726b54c87b613ec727d675e883eb6f073bc6600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e726b54c87b613ec727d675e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 13 23:45:02 2012 -0500 msi: Cache ITypeInfo instances for automation objects instead of reloading every time. --- dlls/msi/automation.c | 196 ++++++++++++++++++++++++++++++++----------------- dlls/msi/msi_main.c | 1 + dlls/msi/msipriv.h | 14 +++- dlls/msi/script.c | 8 ++- 4 files changed, 147 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e726b54c87b613ec727d6…

1 0

Nikolay Sivov : msi: Store object function pointers with type id.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: e87c3b4b005433a5c34f1048aae077de2b4a42fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87c3b4b005433a5c34f1048a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 00:26:14 2012 -0500 msi: Store object function pointers with type id. --- dlls/msi/automation.c | 120 +++++++++++++++++++++++++++--------------------- 1 files changed, 67 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e87c3b4b005433a5c34f1…

1 0

Detlef Riekenberg : netapi32/tests: Fix an access test failure on XP.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1f0908984c5fb5d77570e9223e67078e853c8345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0908984c5fb5d77570e9223… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 23:50:14 2012 +0100 netapi32/tests: Fix an access test failure on XP. --- dlls/netapi32/tests/access.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 9726c8d..a8c43c3 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -160,6 +160,7 @@ static void run_usergetinfo_tests(void) ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE || rc == RPC_S_SERVER_UNAVAILABLE || + rc == NERR_WkstaNotStarted || /* workstation service not running */ rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ "Bad Network Path: rc=%d\n",rc); }

1 0

Detlef Riekenberg : kernel32/tests: Fix 32-bit thread test failures on NT 5 .x 64bit.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5c1e6cf7cdfd791e3ec98142979a1912b0e7da21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1e6cf7cdfd791e3ec981429… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 23:50:13 2012 +0100 kernel32/tests: Fix 32-bit thread test failures on NT 5.x 64bit. --- dlls/kernel32/tests/thread.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 19726af..76a7a33 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -961,16 +961,19 @@ static void test_SetThreadContext(void) ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef); ret = GetThreadContext( thread, &ctx ); - ok( !ret, "GetThreadContext succeeded\n" ); - ok( GetLastError() == ERROR_GEN_FAILURE || broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ - "wrong error %u\n", GetLastError() ); + ok( (!ret && (GetLastError() == ERROR_GEN_FAILURE)) || + (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ + broken(ret), /* 32bit application on NT 5.x 64bit */ + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE)\n", + ret, GetLastError() ); SetLastError(0xdeadbeef); ret = SetThreadContext( thread, &ctx ); - ok( !ret, "SetThreadContext succeeded\n" ); - ok( GetLastError() == ERROR_GEN_FAILURE || GetLastError() == ERROR_ACCESS_DENIED || - broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ - "wrong error %u\n", GetLastError() ); + ok( (!ret && ((GetLastError() == ERROR_GEN_FAILURE) || (GetLastError() == ERROR_ACCESS_DENIED))) || + (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ + broken(ret), /* 32bit application on NT 5.x 64bit */ + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE or ERROR_ACCESS_DENIED)\n", + ret, GetLastError() ); CloseHandle( thread ); }

1 0

Detlef Riekenberg : netapi32/tests: Fix workstation test failures on XP.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1e6ffc9c326b9b10fe80f68b50625c15e00c7a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6ffc9c326b9b10fe80f68b5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 23:50:15 2012 +0100 netapi32/tests: Fix workstation test failures on XP. --- dlls/netapi32/tests/wksta.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 54c25e5..5d1d8ac 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -79,12 +79,17 @@ static void run_wkstausergetinfo_tests(void) LPWKSTA_USER_INFO_1 ui1 = NULL; LPWKSTA_USER_INFO_1101 ui1101 = NULL; DWORD dwSize; + NET_API_STATUS rc; /* Level 0 */ - ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, - "NetWkstaUserGetInfo is unsuccessful\n"); + rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0); + if (rc == NERR_WkstaNotStarted) + { + skip("Workstation service not running\n"); + return; + } + ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); - ok(ui0 != NULL, "ui0 is NULL\n"); /* This failure occurred when I ran sshd as service and didn't authenticate * Since the test dereferences ui0, the rest of this test is worthless */ @@ -168,7 +173,7 @@ static void run_wkstatransportenum_tests(void) /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); - ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE, + ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted, "NetWkstaTransportEnum returned %d\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVIEWPORT.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 785033d19d6d910cdb10bfee331cff5c6d7a818d URL: http://source.winehq.org/git/wine.git/?a=commit;h=785033d19d6d910cdb10bfee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:19 2012 +0100 ddraw: Avoid LPDIRECT3DVIEWPORT. --- include/d3d.h | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index c7c7838..7911497 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -215,7 +215,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; - STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT *lplpD3DViewport, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; }; #undef INTERFACE @@ -944,9 +944,10 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(Execute)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags) PURE; - STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE; - STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE; - STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT *lplpDirect3DViewport, DWORD dwFlags) PURE; + STDMETHOD(AddViewport)(THIS_ IDirect3DViewport *viewport) PURE; + STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport *viewport) PURE; + STDMETHOD(NextViewport)(THIS_ IDirect3DViewport *ref, + IDirect3DViewport **viewport, DWORD flags) PURE; STDMETHOD(Pick)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags, D3DRECT *rect) PURE; STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE;

1 0