April 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : kernel32: Add more process shutdown tests.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 3de89e8500ce753a06943846a2f4262b2ae0529e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de89e8500ce753a06943846a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 17:44:16 2013 +0900 kernel32: Add more process shutdown tests. --- dlls/kernel32/tests/loader.c | 134 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 458b836..ca33ef7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1042,6 +1042,7 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore; static DWORD attached_thread_count; +static LONG noop_thread_started; static int test_dll_phase; static DWORD WINAPI mutex_thread_proc(void *param) @@ -1082,6 +1083,14 @@ static DWORD WINAPI semaphore_thread_proc(void *param) return 196; } +static DWORD WINAPI noop_thread_proc(void *param) +{ + InterlockedIncrement(&noop_thread_started); + + trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); + return 196; +} + static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { DWORD ret; @@ -1098,6 +1107,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) case DLL_PROCESS_DETACH: { DWORD code, expected_code, i; + HANDLE handle, process; + void *addr; + SIZE_T size; + LARGE_INTEGER offset; + DEBUG_EVENT de; trace("dll: %p, DLL_PROCESS_DETACH, %p\n", hinst, param); @@ -1160,12 +1174,123 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } + /* win7 doesn't allow to create a thread during process shutdown, + * earlier Windows versions allow it. + */ + noop_thread_started = 0; + SetLastError(0xdeadbeef); + handle = CreateThread(NULL, 0, noop_thread_proc, NULL, 0, &ret); + /* manual call to LdrShutdownProcess doesn't prevent thread creation */ + if (param && test_dll_phase != 4) + { +todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); + if (!handle) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + CloseHandle(handle); + } + else + { + ok(handle != 0, "CreateThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 4) todo_wine + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + else + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + CloseHandle(handle); + } + + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId()); + ok(process != NULL, "OpenProcess error %d\n", GetLastError()); + + noop_thread_started = 0; + SetLastError(0xdeadbeef); + handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, NULL, 0, &ret); + /* manual call to LdrShutdownProcess doesn't prevent thread creation */ + if (param && test_dll_phase != 4) + { +todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); + if (!handle) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + CloseHandle(handle); + } + else + { + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); + /* FIXME: remove once Wine is fixed */ + if (test_dll_phase == 4) todo_wine + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + else + { + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); + ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + } + } + + SetLastError(0xdeadbeef); + handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); + ok(handle != 0, "CreateFileMapping error %d\n", GetLastError()); + + offset.u.LowPart = 0; + offset.u.HighPart = 0; + addr = NULL; + size = 0; + ret = pNtMapViewOfSection(handle, process, &addr, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY); + ok(ret == STATUS_SUCCESS, "NtMapViewOfSection error %#x\n", ret); + ret = pNtUnmapViewOfSection(process, addr); + ok(ret == STATUS_SUCCESS, "NtUnmapViewOfSection error %#x\n", ret); + + CloseHandle(handle); + CloseHandle(process); + + SetLastError(0xdeadbeef); + handle = GetModuleHandle("winver.exe"); + ok(!handle, "winver.exe shouldn't be loaded yet\n"); + handle = LoadLibrary("winver.exe"); + ok(handle != 0, "LoadLibrary error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = FreeLibrary(handle); + ok(ret, "LoadLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForDebugEvent(&de, 0); + ok(!ret, "WaitForDebugEvent should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DebugActiveProcess(GetCurrentProcessId()); + ok(!ret, "DebugActiveProcess should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WaitForDebugEvent(&de, 0); + ok(!ret, "WaitForDebugEvent should fail\n"); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "expected ERROR_SEM_TIMEOUT, got %d\n", GetLastError()); + if (test_dll_phase == 2) { trace("dll: call ExitProcess()\n"); *child_failures = winetest_get_failures(); ExitProcess(197); } + trace("dll: %p, DLL_PROCESS_DETACH, %p => DONE\n", hinst, param); break; } case DLL_THREAD_ATTACH: @@ -1185,7 +1310,14 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); ret = pRtlDllShutdownInProgress(); - ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + /* win7 doesn't allow to create a thread during process shutdown, + * earlier Windows versions allow it, and DLL_THREAD_DETACH is + * sent on thread exit, but DLL_THREAD_ATTACH is never received. + */ + if (noop_thread_started) + ok(ret, "RtlDllShutdownInProgress returned %d\n", ret); + else + ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); break; default:

1 0

Dmitry Timoshkov : mountmgr.sys: Add a missing entry for DEVICE_DVD to match mountmgr.h enumeration types.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: aa96c58db5628c6da93a05b4d796a4e64cccf5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa96c58db5628c6da93a05b4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 12:39:11 2013 +0900 mountmgr.sys: Add a missing entry for DEVICE_DVD to match mountmgr.h enumeration types. --- dlls/mountmgr.sys/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8367cba..005ec5e 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -48,6 +48,7 @@ static const WCHAR drive_types[][8] = {'h','d',0}, /* DEVICE_HARDDISK_VOL */ {'f','l','o','p','p','y',0}, /* DEVICE_FLOPPY */ {'c','d','r','o','m',0}, /* DEVICE_CDROM */ + {'c','d','r','o','m',0}, /* DEVICE_DVD */ {'n','e','t','w','o','r','k',0}, /* DEVICE_NETWORK */ {'r','a','m','d','i','s','k',0} /* DEVICE_RAMDISK */ };

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE3.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 2c557b9b5f8bab5b50479ebd33383787a8cac2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c557b9b5f8bab5b50479ebd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:15 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE3. --- dlls/d3drm/d3drm.c | 25 +++++++++---------------- dlls/d3drm/viewport.c | 19 ++++++------------- include/d3drm.h | 6 +++--- include/d3drmobj.h | 6 +++--- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 719a438..94628b1 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1040,14 +1040,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVA return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3 *iface, + DWORD width, DWORD height, IDirect3DRMDevice3 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%d,%d,%p): partial stub\n", iface, This, width, height, device); + FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *pGUID, @@ -1106,18 +1104,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateTextureFromSurface(IDirect3DRM3 *if return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3* iface, - LPDIRECT3DRMDEVICE3 Device, - LPDIRECT3DRMFRAME3 frame, DWORD xpos, - DWORD ypos, DWORD width, DWORD height, - LPDIRECT3DRMVIEWPORT2* viewport) +static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevice3 *device, + IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%p,%d,%d,%d,%d,%p): stub\n", iface, This, Device, frame, xpos, ypos, width, - height, viewport); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", + iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown**)viewport); + return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown **)viewport); } static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3* iface, D3DRMWRAPTYPE type, diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 007fd07..859edcc 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -607,15 +607,11 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2 } /*** IDirect3DRMViewport methods ***/ -static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2* iface, - LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, - DWORD xpos, DWORD ypos, - DWORD width, DWORD height) +static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 *device, + IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p, %p, %u, %u, %u, %u): stub\n", iface, This, dev, camera, - xpos, ypos, width, height); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u stub!\n", + iface, device, camera, x, y, width, height); return E_NOTIMPL; } @@ -764,12 +760,9 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetCamera(IDirect3DRMViewport2* i return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2* iface, - LPDIRECT3DRMDEVICE3 * device) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 **device) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, device); + FIXME("iface %p, device %p stub!\n", iface, device); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index b140efb..da88dab 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -343,7 +343,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, @@ -354,8 +354,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMSHADOW2 *) PURE; - STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DRMDEVICE3, LPDIRECT3DRMFRAME3, DWORD, DWORD, DWORD, DWORD, - LPDIRECT3DRMVIEWPORT2 *) PURE; + STDMETHOD(CreateViewport)(THIS_ IDirect3DRMDevice3 *device, IDirect3DRMFrame3 *camera, + DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) PURE; STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME3, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, LPDIRECT3DRMWRAP *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index a3676d3..fa3559e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -948,8 +948,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMViewport2 methods ***/ - STDMETHOD(Init) (THIS_ LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, DWORD xpos, DWORD ypos, - DWORD width, DWORD height) PURE; + STDMETHOD(Init) (THIS_ IDirect3DRMDevice3 *device, struct IDirect3DRMFrame3 *camera, + DWORD x, DWORD y, DWORD width, DWORD height) PURE; STDMETHOD(Clear)(THIS_ DWORD flags) PURE; STDMETHOD(Render)(THIS_ LPDIRECT3DRMFRAME3) PURE; STDMETHOD(SetFront)(THIS_ D3DVALUE) PURE; @@ -964,7 +964,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(ForceUpdate)(THIS_ DWORD x1, DWORD y1, DWORD x2, DWORD y2) PURE; STDMETHOD(SetPlane)(THIS_ D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) PURE; STDMETHOD(GetCamera)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; - STDMETHOD(GetDevice)(THIS_ LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE;

1 0

Zhan Jianyu : vbscript: Fix a typo: jscript -> vbscript.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: a8e70fa8838433cd7cad10747fc984de54ff2ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e70fa8838433cd7cad10747… Author: Zhan Jianyu <nasa4836(a)gmail.com> Date: Wed Apr 17 21:46:13 2013 +0800 vbscript: Fix a typo: jscript -> vbscript. --- dlls/vbscript/regexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/regexp.c b/dlls/vbscript/regexp.c index c74ded5..ede9364 100644 --- a/dlls/vbscript/regexp.c +++ b/dlls/vbscript/regexp.c @@ -38,7 +38,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); /* FIXME: Better error handling */ #define ReportRegExpError(a,b,c)

1 0

Henri Verbeet : wined3d: Add a performance warning for mapping a dynamic surface without WINED3D_MAP_DISCARD .
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 0e32c9a247d11c432a7360a185ce0734bfd6a08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e32c9a247d11c432a7360a18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:11 2013 +0200 wined3d: Add a performance warning for mapping a dynamic surface without WINED3D_MAP_DISCARD. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f7e99ab..e9c0b52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -894,6 +894,9 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD } else { + if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); + /* surface_load_location() does not check if the rectangle specifies * the full surface. Most callers don't need that, so do it here. */ if (rect && !rect->top && !rect->left

1 0

Nikolay Sivov : ole32: Stub for IDirectWriterLock.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: a06db6cce5f75339082ef6cd8156e65154ee3817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06db6cce5f75339082ef6cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 10:04:40 2013 +0400 ole32: Stub for IDirectWriterLock. --- dlls/ole32/storage32.c | 65 ++++++++++++++++++++++++++++++++++++++++- dlls/ole32/storage32.h | 1 + dlls/ole32/tests/storage32.c | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 249d4d2..aa82b66 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -71,6 +71,11 @@ static inline StorageBaseImpl *impl_from_IStorage( IStorage *iface ) return CONTAINING_RECORD(iface, StorageBaseImpl, IStorage_iface); } +static inline StorageBaseImpl *impl_from_IDirectWriterLock( IDirectWriterLock *iface ) +{ + return CONTAINING_RECORD(iface, StorageBaseImpl, IDirectWriterLock_iface); +} + /**************************************************************************** * Storage32InternalImpl definitions. * @@ -380,6 +385,12 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( { *ppvObject = &This->IPropertySetStorage_iface; } + /* locking interface is report for writer only */ + else if (IsEqualGUID(&IID_IDirectWriterLock, riid) && + (This->openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE))) + { + *ppvObject = &This->IDirectWriterLock_iface; + } else return E_NOINTERFACE; @@ -2648,6 +2659,55 @@ static HRESULT StorageImpl_GetFilename(StorageBaseImpl* iface, LPWSTR *result) return hr; } +static HRESULT WINAPI directwriterlock_QueryInterface(IDirectWriterLock *iface, REFIID riid, void **obj) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + return IStorage_QueryInterface(&This->IStorage_iface, riid, obj); +} + +static ULONG WINAPI directwriterlock_AddRef(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + return IStorage_AddRef(&This->IStorage_iface); +} + +static ULONG WINAPI directwriterlock_Release(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + return IStorage_Release(&This->IStorage_iface); +} + +static HRESULT WINAPI directwriterlock_WaitForWriteAccess(IDirectWriterLock *iface, DWORD timeout) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + FIXME("(%p)->(%d): stub\n", This, timeout); + return E_NOTIMPL; +} + +static HRESULT WINAPI directwriterlock_ReleaseWriteAccess(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI directwriterlock_HaveWriteAccess(IDirectWriterLock *iface) +{ + StorageBaseImpl *This = impl_from_IDirectWriterLock(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IDirectWriterLockVtbl DirectWriterLockVtbl = +{ + directwriterlock_QueryInterface, + directwriterlock_AddRef, + directwriterlock_Release, + directwriterlock_WaitForWriteAccess, + directwriterlock_ReleaseWriteAccess, + directwriterlock_HaveWriteAccess +}; + /* * Virtual function table for the IStorage32Impl class. */ @@ -2719,6 +2779,7 @@ static HRESULT StorageImpl_Construct( This->base.IStorage_iface.lpVtbl = &Storage32Impl_Vtbl; This->base.IPropertySetStorage_iface.lpVtbl = &IPropertySetStorage_Vtbl; + This->base.IDirectWriterLock_iface.lpVtbl = &DirectWriterLockVtbl; This->base.baseVtbl = &StorageImpl_BaseVtbl; This->base.openFlags = (openFlags & ~STGM_CREATE); This->base.ref = 1; @@ -7631,10 +7692,10 @@ HRESULT WINAPI StgOpenStorage( goto end; } - /* shared reading requires transacted mode */ + /* shared reading requires transacted or single writer mode */ if( STGM_SHARE_MODE(grfMode) == STGM_SHARE_DENY_WRITE && STGM_ACCESS_MODE(grfMode) == STGM_READWRITE && - !(grfMode&STGM_TRANSACTED) ) + !(grfMode & STGM_TRANSACTED) && !(grfMode & STGM_DIRECT_SWMR)) { hr = STG_E_INVALIDFLAG; goto end; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index f2061f3..b037847 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -177,6 +177,7 @@ struct StorageBaseImpl { IStorage IStorage_iface; IPropertySetStorage IPropertySetStorage_iface; /* interface for adding a properties stream */ + IDirectWriterLock IDirectWriterLock_iface; LONG ref; /* diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d6640c2..4f12d8b 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3046,6 +3046,55 @@ static void test_convert(void) DeleteFileW(filename); } +static void test_direct_swmr(void) +{ + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + IDirectWriterLock *dwlock; + ULONG ref, ref2; + IStorage *stg; + HRESULT hr; + + /* it's possible to create in writer mode */ + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_DIRECT_SWMR, 0, &stg); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); +if (hr == S_OK) { + IStorage_Release(stg); + DeleteFileW(fileW); +} + + hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_TRANSACTED, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + IStorage_Release(stg); + + /* reader mode */ + hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IStorage_Release(stg); + + /* writer mode */ + hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + + ref = IStorage_AddRef(stg); + IStorage_Release(stg); + + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == S_OK, "got %08x\n", hr); + + ref2 = IStorage_AddRef(stg); + IStorage_Release(stg); + ok(ref2 == ref + 1, "got %u\n", ref2); + + IDirectWriterLock_Release(dwlock); + IStorage_Release(stg); + + DeleteFileW(fileW); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3090,4 +3139,5 @@ START_TEST(storage32) test_copyto_recursive(); test_hglobal_storage_creation(); test_convert(); + test_direct_swmr(); }

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: ffdeda566c7dc2457ca0e0c1a27b1bf3deedd8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdeda566c7dc2457ca0e0c1a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:10:53 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby. --- dlls/dplayx/dplobby.c | 151 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 6 +- 2 files changed, 151 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffdeda566c7dc2457ca0e…

1 0

Michael Stefaniuc : dplayx: Get rid of the LPDIRECTPLAYLOBBY usage.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: f6e4aa77626849f0589a63c0439e3a5675fbc81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e4aa77626849f0589a63c04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:09:15 2013 +0200 dplayx: Get rid of the LPDIRECTPLAYLOBBY usage. --- dlls/dplayx/dplobby.c | 31 ++++++++++++------------------- dlls/dplayx/tests/dplayx.c | 6 +++--- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index ea4ecfe..c6b02c8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1365,9 +1365,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ConnectEx( IDirectPlayLobby3 *iface, return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); } -static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFIID riid, - LPVOID* lplpDP, IUnknown* pUnk ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx( IDirectPlayLobby3A *iface, DWORD dwFlags, + REFIID riid, void **lplpDP, IUnknown *pUnk ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); @@ -1380,8 +1379,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_RegisterApplication( IDirectPlayLobb return DP_OK; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_RegisterApplication -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, LPDPAPPLICATIONDESC lpAppDesc ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_RegisterApplication( IDirectPlayLobby3A *iface, + DWORD flags, DPAPPLICATIONDESC *appdesc ) { FIXME(":stub\n"); return DP_OK; @@ -1394,8 +1393,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_UnregisterApplication( IDirectPlayLo return DP_OK; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_UnregisterApplication -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFGUID lpAppDesc ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_UnregisterApplication( IDirectPlayLobby3A *iface, + DWORD flags, REFGUID appdesc ) { FIXME(":stub\n"); return DP_OK; @@ -1418,8 +1417,8 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_WaitForConnectionSettings( IDirectPl return hr; } -static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings -( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings( IDirectPlayLobby3A *iface, + DWORD dwFlags ) { HRESULT hr = DP_OK; BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL); @@ -1518,11 +1517,8 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) * DirectPlayLobbyCreateA (DPLAYX.4) * */ -HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, - LPDIRECTPLAYLOBBYA *lplpDPL, - IUnknown *lpUnk, - LPVOID lpData, - DWORD dwDataSize ) +HRESULT WINAPI DirectPlayLobbyCreateA( GUID *lpGUIDDSP, IDirectPlayLobbyA **lplpDPL, + IUnknown *lpUnk, void *lpData, DWORD dwDataSize ) { TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n", lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); @@ -1550,11 +1546,8 @@ HRESULT WINAPI DirectPlayLobbyCreateA( LPGUID lpGUIDDSP, * DirectPlayLobbyCreateW (DPLAYX.5) * */ -HRESULT WINAPI DirectPlayLobbyCreateW( LPGUID lpGUIDDSP, - LPDIRECTPLAYLOBBY *lplpDPL, - IUnknown *lpUnk, - LPVOID lpData, - DWORD dwDataSize ) +HRESULT WINAPI DirectPlayLobbyCreateW( GUID *lpGUIDDSP, IDirectPlayLobby **lplpDPL, + IUnknown *lpUnk, void *lpData, DWORD dwDataSize ) { TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08x\n", lpGUIDDSP,lplpDPL,lpUnk,lpData,dwDataSize); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 991b3c6..d22583e 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -652,7 +652,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W DPCOMPOUNDADDRESSELEMENT addressElements[3]; LPVOID pAddress = NULL; DWORD dwAddressSize = 0; - LPDIRECTPLAYLOBBY3 pDPL; + IDirectPlayLobby3 *pDPL; HRESULT hr; hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, @@ -799,7 +799,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, { lpCallbackData callbackData = lpContext; - LPDIRECTPLAYLOBBY pDPL; + IDirectPlayLobby *pDPL; HRESULT hr; @@ -2877,7 +2877,7 @@ static void test_GetPlayerAddress(void) { IDirectPlay4 *pDP[2]; - LPDIRECTPLAYLOBBY3 pDPL; + IDirectPlayLobby3 *pDPL; DPSESSIONDESC2 dpsd; DPID dpid[2]; CallbackData callbackData;

1 0

Detlef Riekenberg : gdiplus: Implement GdipSetCustomLineCapWidthScale.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: da7fe7ab5513a2db839aba413ebca07642c2b225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7fe7ab5513a2db839aba413… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 17 22:41:41 2013 +0200 gdiplus: Implement GdipSetCustomLineCapWidthScale. --- dlls/gdiplus/customlinecap.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 00c228b..597ac01 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -221,17 +221,16 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, return Ok; } -GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, - REAL width) +GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, REAL width) { - static int calls; - TRACE("(%p,%0.2f)\n", custom, width); - if(!(calls++)) - FIXME("not implemented\n"); + if(!custom) + return InvalidParameter; - return NotImplemented; + custom->scale = width; + + return Ok; } GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLineCap *baseCap)

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayLobbyImpl aliases.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: d9d1b6ade71f92b4323ecae5f500781e7afb16fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d1b6ade71f92b4323ecae5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:10:08 2013 +0200 dplayx: Get rid of the IDirectPlayLobbyImpl aliases. --- dlls/dplayx/dplobby.c | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index c6b02c8..85a9ea2 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -36,16 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/***************************************************************************** - * Predeclare the interface implementation structures - */ -typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2AImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2WImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3AImpl; -typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3WImpl; - /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface )DECLSPEC_HIDDEN; @@ -102,7 +92,7 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob static BOOL DPL_CreateLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = lpDPL; + IDirectPlayLobbyImpl *This = lpDPL; This->dpl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl) ) ); if ( This->dpl == NULL ) @@ -117,7 +107,7 @@ static BOOL DPL_CreateLobby1( LPVOID lpDPL ) static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) { - IDirectPlayLobbyAImpl *This = lpDPL; + IDirectPlayLobbyImpl *This = lpDPL; if( This->dpl->dwMsgThread ) { @@ -259,12 +249,8 @@ static ULONG WINAPI IDirectPlayLobby3Impl_Release(IDirectPlayLobby3 *iface) * Returns an IDirectPlay interface. * */ -static HRESULT DPL_ConnectEx -( IDirectPlayLobbyAImpl* This, - DWORD dwFlags, - REFIID riid, - LPVOID* lplpDP, - IUnknown* pUnk) +static HRESULT DPL_ConnectEx( IDirectPlayLobbyImpl *This, DWORD dwFlags, REFIID riid, void **lplpDP, + IUnknown* pUnk) { HRESULT hr; DWORD dwOpenFlags = 0; @@ -789,7 +775,7 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_ReceiveLobbyMessage( IDirectPlayLobb typedef struct tagRunApplicationEnumStruct { - IDirectPlayLobbyAImpl* This; + IDirectPlayLobbyImpl *This; GUID appGUID; LPSTR lpszPath;

1 0