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

Nikolay Sivov : ole32: Move share/access modes to static arrays.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: a90c1efe51491415039dbbd8e17ce73ac45bdbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90c1efe51491415039dbbd8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 17 23:55:14 2013 +0400 ole32: Move share/access modes to static arrays. --- dlls/ole32/tests/storage32.c | 83 +++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d99bda6..b9d41cd 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1808,32 +1808,36 @@ static const struct access_res create_close[16] = { TRUE, ERROR_SUCCESS } }; +static const DWORD access_modes[4] = { + 0, + GENERIC_READ, + GENERIC_WRITE, + GENERIC_READ | GENERIC_WRITE +}; + +static const DWORD share_modes[4] = { + 0, + FILE_SHARE_READ, + FILE_SHARE_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE +}; + static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD line) { - DWORD access = 0, share = 0; - DWORD lasterr; - HANDLE hfile; int i, j, idx = 0; - for (i = 0; i < 4; i++) + for (i = 0; i < sizeof(access_modes)/sizeof(access_modes[0]); i++) { - if (i == 0) access = 0; - if (i == 1) access = GENERIC_READ; - if (i == 2) access = GENERIC_WRITE; - if (i == 3) access = GENERIC_READ | GENERIC_WRITE; - - for (j = 0; j < 4; j++) + for (j = 0; j < sizeof(share_modes)/sizeof(share_modes[0]); j++) { + DWORD lasterr; + HANDLE hfile; + if (ares[idx].ignore) continue; - if (j == 0) share = 0; - if (j == 1) share = FILE_SHARE_READ; - if (j == 2) share = FILE_SHARE_WRITE; - if (j == 3) share = FILE_SHARE_READ | FILE_SHARE_WRITE; - SetLastError(0xdeadbeef); - hfile = CreateFileA(file, access, share, NULL, OPEN_EXISTING, + hfile = CreateFileA(file, access_modes[i], share_modes[j], NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); lasterr = GetLastError(); @@ -1857,32 +1861,30 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD static void test_access(void) { + static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; + static const char fileA[] = "winetest"; IStorage *stg; HRESULT hr; - static const WCHAR fileW[] = {'w','i','n','e','t','e','s','t',0}; - /* STGM_TRANSACTED */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_DIRECT */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DIRECT, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1892,70 +1894,67 @@ static void test_access(void) hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_SHARE_DENY_NONE */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_NONE | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_SHARE_DENY_READ */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_READ | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); /* STGM_SHARE_DENY_WRITE */ - hr = StgCreateDocfile(fileW, STGM_CREATE | STGM_READWRITE | STGM_SHARE_DENY_WRITE | STGM_TRANSACTED, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create_commit); + test_file_access(fileA, create_commit); IStorage_Release(stg); - test_file_access("winetest", create_close); + test_file_access(fileA, create_close); - DeleteFileA("winetest"); + DeleteFileA(fileA); } static void test_readonly(void)

1 0

Michael Stefaniuc : mlang: Remove left over "stub" from a TRACE().
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 5de81e24bb7d5920fa5a8b762afe91fd7605bdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5de81e24bb7d5920fa5a8b762… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 18 11:53:27 2013 +0200 mlang: Remove left over "stub" from a TRACE(). --- dlls/mlang/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 63e35e9..6ebe627 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1764,7 +1764,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, EnumScript_impl *es; UINT i; - TRACE("%p, %08x, %04x, %p: stub!\n", mlang, dwFlags, LangId, ppEnumScript); + TRACE("%p, %08x, %04x, %p\n", mlang, dwFlags, LangId, ppEnumScript); if (!dwFlags) /* enumerate all available scripts */ dwFlags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM;

1 0

Austin English : msvcr110: Forward __crtSetUnhandledExceptionFilter to kernel32. SetUnhandledExceptionFilter.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 852e0457aabd121a64f22f84898b02c4813693c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852e0457aabd121a64f22f848… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 18 00:59:58 2013 -0700 msvcr110: Forward __crtSetUnhandledExceptionFilter to kernel32.SetUnhandledExceptionFilter. --- dlls/msvcr110/msvcr110.c | 5 +++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index ba943b0..1049e2a 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -39,3 +39,8 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter) +{ + return SetUnhandledExceptionFilter(filter); +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 29c7186..40f1470 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -928,7 +928,7 @@ @ stub -arch=i386,win64 __crtLCMapStringEx @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub -arch=i386,win64 __crtSetThreadStackGuarantee -@ stub __crtSetUnhandledExceptionFilter +@ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter @ stub -arch=i386,win64 __crtTerminateProcess @ stub -arch=i386,win64 __crtUnhandledException @ cdecl __daylight() msvcrt.__daylight

1 0

Dmitry Timoshkov : kernel32: Count precise amount of child process failures .
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: b632f0966d5a51f85e791b990493ec46864972de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b632f0966d5a51f85e791b990… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 17:44:43 2013 +0900 kernel32: Count precise amount of child process failures. --- dlls/kernel32/tests/loader.c | 30 +++++++++++++++++++++++++----- include/wine/test.h | 7 +++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ca33ef7..20ae3ec 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1615,7 +1615,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1628,7 +1632,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1641,7 +1649,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 197, "expected exit code 197, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1654,7 +1666,11 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); ok(ret == 195, "expected exit code 195, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -1668,7 +1684,11 @@ static void test_ExitProcess(void) GetExitCodeProcess(pi.hProcess, &ret); todo_wine ok(ret == 0 || broken(ret == 195) /* before win7 */, "expected exit code 0, got %u\n", ret); - ok(!*child_failures, "%u failures in child process\n", *child_failures); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/include/wine/test.h b/include/wine/test.h index 0bd4db5..373fe76 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); +extern void winetest_add_failures( LONG new_failures ); extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); @@ -434,6 +435,12 @@ LONG winetest_get_failures(void) return failures; } +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} + void winetest_wait_child_process( HANDLE process ) { DWORD exit_code = 1;

1 0

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

April 18, 2013

Module: wine Branch: master Commit: 00393fd804f2a1afddcca9aeb1f3987ab35b29ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00393fd804f2a1afddcca9aeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:14 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ include/d3drm.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4356041..719a438 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -606,14 +606,12 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVA return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2 *iface, + DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%u,%u,%p): partial stub\n", iface, This, width, height, ppDevice); + FIXME("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *pGUID, diff --git a/include/d3drm.h b/include/d3drm.h index b5e6815..b140efb 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -204,7 +204,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device,

1 0

Henri Verbeet : wined3d: Simplify wined3d_check_device_format().
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 3004baeb62b576aab6580ad8c13b949169e52e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3004baeb62b576aab6580ad8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:13 2013 +0200 wined3d: Simplify wined3d_check_device_format(). --- dlls/wined3d/directx.c | 461 +++++++++++------------------------------------- 1 files changed, 102 insertions(+), 359 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3004baeb62b576aab6580…

1 0

Henri Verbeet : wined3d: Properly check if a format has a conversion function in wined3d_check_device_format ().
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: ff48c3ba588c8133265b5bdbe99462f03e0da95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff48c3ba588c8133265b5bdbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:12 2013 +0200 wined3d: Properly check if a format has a conversion function in wined3d_check_device_format(). --- dlls/wined3d/directx.c | 45 +++++++++++---------------------------------- 1 files changed, 11 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3a97ae2..bb76fa6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3959,47 +3959,24 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad * it would be a big performance hit. Unless we hit an application * needing one of those formats, don't advertize them to avoid * leading applications into temptation. The windows drivers don't - * support most of those formats on volumes anyway, except for - * WINED3DFMT_R32_FLOAT. */ - switch (check_format_id) + * support most of those formats on volumes anyway. */ + if (format->convert) { - case WINED3DFMT_P8_UINT: - case WINED3DFMT_L4A4_UNORM: - case WINED3DFMT_R32_FLOAT: - case WINED3DFMT_R16_FLOAT: - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - case WINED3DFMT_R5G5_SNORM_L6_UNORM: - case WINED3DFMT_R16G16_UNORM: - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - - case WINED3DFMT_R8G8B8A8_SNORM: - case WINED3DFMT_R16G16_SNORM: - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; - - case WINED3DFMT_R8G8_SNORM: - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; + TRACE("[FAILED] - No converted formats on volumes.\n"); + return WINED3DERR_NOTAVAILABLE; + } + /* The GL_EXT_texture_compression_s3tc spec requires that loading + * an s3tc compressed texture results in an error. While the D3D + * refrast does support s3tc volumes, at least the nvidia Windows + * driver does not, so we're free not to support this format. */ + switch (check_format_id) + { case WINED3DFMT_DXT1: case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: case WINED3DFMT_DXT4: case WINED3DFMT_DXT5: - /* The GL_EXT_texture_compression_s3tc spec requires that - * loading an s3tc compressed texture results in an error. - * While the D3D refrast does support s3tc volumes, at - * least the nvidia windows driver does not, so we're free - * not to support this format. */ TRACE("[FAILED] - DXTn does not support 3D textures.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Nikolay Sivov : ole32: Merge release code to Release method.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 1b4f3ca6f75dc89d65d4c9396368ebb1dda5a1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4f3ca6f75dc89d65d4c9396… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 10:16:44 2013 +0400 ole32: Merge release code to Release method. --- dlls/ole32/stg_stream.c | 62 ++++++++++++++-------------------------------- 1 files changed, 19 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index e9fc0c0..d7abd0e 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -43,40 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); - -/*** - * This is the destructor of the StgStreamImpl class. - * - * This method will clean-up all the resources used-up by the given StgStreamImpl - * class. The pointer passed-in to this function will be freed and will not - * be valid anymore. - */ -static void StgStreamImpl_Destroy(StgStreamImpl* This) -{ - TRACE("(%p)\n", This); - - /* - * Release the reference we are holding on the parent storage. - * IStorage_Release(&This->parentStorage->IStorage_iface); - * - * No, don't do this. Some apps call IStorage_Release without - * calling IStream_Release first. If we grab a reference the - * file is not closed, and the app fails when it tries to - * reopen the file (Easy-PC, for example). Just inform the - * storage that we have closed the stream - */ - - if(This->parentStorage) { - - StorageBaseImpl_RemoveStream(This->parentStorage, This); - - } - - This->parentStorage = 0; - - HeapFree(GetProcessHeap(), 0, This); -} - /*** * This implements the IUnknown method QueryInterface for this * class @@ -126,17 +92,27 @@ static ULONG WINAPI StgStreamImpl_Release( IStream* iface) { StgStreamImpl* This = impl_from_IStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); - ULONG ref; + if (!ref) + { + TRACE("(%p)\n", This); - ref = InterlockedDecrement(&This->ref); + /* + * Release the reference we are holding on the parent storage. + * IStorage_Release(&This->parentStorage->IStorage_iface); + * + * No, don't do this. Some apps call IStorage_Release without + * calling IStream_Release first. If we grab a reference the + * file is not closed, and the app fails when it tries to + * reopen the file (Easy-PC, for example). Just inform the + * storage that we have closed the stream + */ - /* - * If the reference count goes down to 0, perform suicide. - */ - if (ref==0) - { - StgStreamImpl_Destroy(This); + if (This->parentStorage) + StorageBaseImpl_RemoveStream(This->parentStorage, This); + This->parentStorage = 0; + HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Austin English : kernel32: Fix a typo in a comment.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 758911a8da976e5f3c39f5dd67d08305e6a96446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758911a8da976e5f3c39f5dd6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 17 14:54:42 2013 -0700 kernel32: Fix a typo in a comment. --- dlls/kernel32/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1cfd850..63d977b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1641,8 +1641,8 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) * GetSystemWow64DirectoryW (KERNEL32.@) * * As seen on MSDN - * - On Win32 we should returns ERROR_CALL_NOT_IMPLEMENTED - * - On Win64 we should returns the SysWow64 (system64) directory + * - On Win32 we should return ERROR_CALL_NOT_IMPLEMENTED + * - On Win64 we should return the SysWow64 (system64) directory */ UINT WINAPI GetSystemWow64DirectoryW( LPWSTR path, UINT count ) {

1 0

Nikolay Sivov : ole32: Accept STGM_DIRECT_SWMR mode.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: c29f3dff8c05d45115627fdd25fcdd29795b9bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29f3dff8c05d45115627fdd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 18 01:25:23 2013 +0400 ole32: Accept STGM_DIRECT_SWMR mode. --- dlls/ole32/storage32.c | 11 ++++++++++- dlls/ole32/tests/storage32.c | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1d64ab0..249d4d2 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7604,7 +7604,16 @@ HRESULT WINAPI StgOpenStorage( /* * Validate the sharing mode */ - if (!(grfMode & (STGM_TRANSACTED|STGM_PRIORITY))) + if (grfMode & STGM_DIRECT_SWMR) + { + if ((STGM_SHARE_MODE(grfMode) != STGM_SHARE_DENY_WRITE) && + (STGM_SHARE_MODE(grfMode) != STGM_SHARE_DENY_NONE)) + { + hr = STG_E_INVALIDFLAG; + goto end; + } + } + else if (!(grfMode & (STGM_TRANSACTED|STGM_PRIORITY))) switch(STGM_SHARE_MODE(grfMode)) { case STGM_SHARE_EXCLUSIVE: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b9d41cd..d6640c2 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1889,7 +1889,7 @@ static void test_access(void) STGM_SHARE_EXCLUSIVE | STGM_DIRECT, 0, &stg); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - test_file_access("winetest", create); + test_file_access(fileA, create); hr = IStorage_Commit(stg, STGC_DEFAULT); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1955,6 +1955,21 @@ static void test_access(void) test_file_access(fileA, create_close); DeleteFileA(fileA); + + /* STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE - reader mode for direct SWMR mode */ + 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); + + hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); + ok(hr == S_OK, "got %08x\n", hr); + + test_file_access(fileA, create); + + IStorage_Release(stg); + test_file_access(fileA, create_close); + + DeleteFileA(fileA); } static void test_readonly(void)

1 0