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

Roderick Colenbrander : wined3d: Move the 8-bit palette shader code over to the blit_shader backend.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: c0ef7a1a931e68ea7bf92e9bd9dc3b38adec5cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ef7a1a931e68ea7bf92e9bd… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 2 18:46:43 2010 +0100 wined3d: Move the 8-bit palette shader code over to the blit_shader backend. --- dlls/wined3d/arb_program_shader.c | 81 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 8 ---- dlls/wined3d/surface.c | 37 +++-------------- dlls/wined3d/utils.c | 4 ++ dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 90 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ef7a1a931e68ea7bf92…

1 0

David Hedberg : user32: Fix case where EM_SCROLL with page down results in trying to scroll up past the beginning .
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 5a1f8c57a819286f3885d9e05a456d5da522a9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1f8c57a819286f3885d9e05… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Mar 3 13:19:47 2010 +0100 user32: Fix case where EM_SCROLL with page down results in trying to scroll up past the beginning. --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 35f8285..9898bc4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1632,7 +1632,7 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) INT vlc = get_vertical_line_count(es); /* check if we are going to move too far */ if(es->y_offset + dy > es->line_count - vlc) - dy = es->line_count - vlc - es->y_offset; + dy = max(es->line_count - vlc, 0) - es->y_offset; /* Notification is done in EDIT_EM_LineScroll */ if(dy) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6d3afb8..ee181f2 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1320,6 +1320,7 @@ static void test_edit_control_limittext(void) static void test_edit_control_scroll(void) { static const char *single_line_str = "a"; + static const char *multiline_str = "Test\r\nText"; HWND hwEdit; LONG ret; @@ -1348,6 +1349,22 @@ static void test_edit_control_scroll(void) ok(!ret, "Returned %x, expected 0.\n", ret); DestroyWindow (hwEdit); + + /* SB_PAGEDOWN while at the beginning of a buffer with few lines + should not cause EM_SCROLL to return a negative value of + scrolled lines that would put us "before" the beginning. */ + hwEdit = CreateWindow( + "EDIT", + multiline_str, + WS_VSCROLL | ES_MULTILINE, + 0, 0, 100, 100, + NULL, NULL, hinst, NULL); + assert(hwEdit); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); } static void test_margins(void)

1 0

Alexandre Julliard : user32: Pass HWND_BOTTOM unmodified to the server in PeekMessage.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 4d33d4982f72840b5e2eba1a1a01817986a63b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d33d4982f72840b5e2eba1a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 13:18:33 2010 +0100 user32: Pass HWND_BOTTOM unmodified to the server in PeekMessage. --- dlls/user32/message.c | 3 +-- server/queue.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fedb917..498b521 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2034,8 +2034,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; if (!first && !last) last = ~0; - if (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST || hwnd == HWND_BOTTOM) - hwnd = (HWND)-1; + if (hwnd == HWND_BROADCAST) hwnd = HWND_TOPMOST; for (;;) { diff --git a/server/queue.c b/server/queue.c index cfe9818..938d7cf 100644 --- a/server/queue.c +++ b/server/queue.c @@ -636,7 +636,7 @@ static void reply_message( struct msg_queue *queue, lparam_t result, static int match_window( user_handle_t win, user_handle_t msg_win ) { if (!win) return 1; - if (win == (user_handle_t)-1) return !msg_win; + if (win == -1 || win == 1) return !msg_win; if (msg_win == win) return 1; return is_child_window( win, msg_win ); }

1 0

Alexandre Julliard : server: Set the idle event when PeekMessage is called with -1 as window filter.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: b0760fc2e91d22cd262601a4080d6f8c66e4e32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0760fc2e91d22cd262601a40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 13:19:13 2010 +0100 server: Set the idle event when PeekMessage is called with -1 as window filter. --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 1 + 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 492de62..714e57f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12080,6 +12080,13 @@ static const struct { 0, 0, FALSE }, { 0, WAIT_TIMEOUT, FALSE }, { 0, 0, FALSE }, + { 0, 0, FALSE }, +/* 15 */ { 0, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, +/* 20 */ { WAIT_TIMEOUT, 0, FALSE }, }; static DWORD CALLBACK do_wait_idle_child_thread( void *arg ) @@ -12205,6 +12212,41 @@ static void do_wait_idle_child( int arg ) WaitForSingleObject( thread, 10000 ); CloseHandle( thread ); break; + case 14: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_TOPMOST, 0, 0, PM_NOREMOVE ); + break; + case 15: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_BROADCAST, 0, 0, PM_NOREMOVE ); + break; + case 16: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_BOTTOM, 0, 0, PM_NOREMOVE ); + break; + case 17: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, (HWND)0xdeadbeef, 0, 0, PM_NOREMOVE ); + break; + case 18: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_NOTOPMOST, 0, 0, PM_NOREMOVE ); + break; + case 19: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, HWND_MESSAGE, 0, 0, PM_NOREMOVE ); + break; + case 20: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, GetDesktopWindow(), 0, 0, PM_NOREMOVE ); + break; } WaitForSingleObject( end_event, 2000 ); CloseHandle( start_event ); diff --git a/server/queue.c b/server/queue.c index 938d7cf..b2bc603 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1819,6 +1819,7 @@ DECL_HANDLER(get_message) return; } + if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event ); queue->wake_mask = req->wake_mask; queue->changed_mask = req->changed_mask; set_error( STATUS_PENDING ); /* FIXME */

1 0

Nikolay Sivov : shell32/tests: Minor test file cleanup.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 721be7135f827e7a09525294d2286c8e847bb9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721be7135f827e7a09525294d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 00:00:52 2010 +0300 shell32/tests: Minor test file cleanup. --- dlls/shell32/tests/shlfolder.c | 66 ++++++++++++++++++++++++---------------- 1 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 31ae05a..27c6ee8 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -62,17 +62,23 @@ static void init_function_pointers(void) HRESULT hr; hmod = GetModuleHandleA("shell32.dll"); - pSHBindToParent = (void*)GetProcAddress(hmod, "SHBindToParent"); - pSHGetFolderPathA = (void*)GetProcAddress(hmod, "SHGetFolderPathA"); - pSHGetFolderPathAndSubDirA = (void*)GetProcAddress(hmod, "SHGetFolderPathAndSubDirA"); - pSHGetPathFromIDListW = (void*)GetProcAddress(hmod, "SHGetPathFromIDListW"); - pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); - pSHGetSpecialFolderPathW = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathW"); - pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); - pILFree = (void*)GetProcAddress(hmod, (LPSTR)155); - pILIsEqual = (void*)GetProcAddress(hmod, (LPSTR)21); - pSHCreateShellItem = (void*)GetProcAddress(hmod, "SHCreateShellItem"); - pILCombine = (void*)GetProcAddress(hmod, (LPSTR)25); + +#define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) + MAKEFUNC(SHBindToParent); + MAKEFUNC(SHCreateShellItem); + MAKEFUNC(SHGetFolderPathA); + MAKEFUNC(SHGetFolderPathAndSubDirA); + MAKEFUNC(SHGetPathFromIDListW); + MAKEFUNC(SHGetSpecialFolderPathA); + MAKEFUNC(SHGetSpecialFolderPathW); +#undef MAKEFUNC + +#define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) + MAKEFUNC_ORD(ILFindLastID, 16); + MAKEFUNC_ORD(ILIsEqual, 21); + MAKEFUNC_ORD(ILCombine, 25); + MAKEFUNC_ORD(ILFree, 155); +#undef MAKEFUNC_ORD hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); @@ -331,11 +337,12 @@ static void test_BindToObject(void) hr = IShellFolder_BindToObject(psfMyComputer, pidlEmpty, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with empty pidl! hr = %08x\n", hr); -#if 0 +if (0) +{ /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfMyComputer, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with NULL pidl! hr = %08x\n", hr); -#endif +} cChars = GetSystemDirectoryA(szSystemDir, MAX_PATH); ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %u\n", GetLastError()); @@ -361,13 +368,14 @@ static void test_BindToObject(void) hr = IShellFolder_BindToObject(psfSystemDir, pidlEmpty, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with empty pidl! hr = %08x\n", hr); - -#if 0 + +if (0) +{ /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfSystemDir, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); - ok (hr == E_INVALIDARG, + ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with NULL pidl! hr = %08x\n", hr); -#endif +} IShellFolder_Release(psfSystemDir); } @@ -1564,7 +1572,7 @@ static void test_ITEMIDLIST_format(void) { IShellFolder_Release(psfPersonal); } -static void testSHGetFolderPathAndSubDirA(void) +static void test_SHGetFolderPathAndSubDirA(void) { HRESULT ret; BOOL delret; @@ -1576,6 +1584,12 @@ static void testSHGetFolderPathAndSubDirA(void) static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1]; + if(!pSHGetFolderPathAndSubDirA) + { + win_skip("SHGetFolderPathAndSubDirA not present!\n"); + return; + } + if(!pSHGetFolderPathA) { win_skip("SHGetFolderPathA not present!\n"); return; @@ -1797,6 +1811,12 @@ static void test_SHCreateShellItem(void) GetCurrentDirectoryA(MAX_PATH, curdirA); + if (!pSHCreateShellItem) + { + win_skip("SHCreateShellItem isn't available\n"); + return; + } + if (!lstrlenA(curdirA)) { win_skip("GetCurrentDirectoryA returned empty string, skipping test_SHCreateShellItem\n"); @@ -1958,15 +1978,9 @@ START_TEST(shlfolder) test_CallForAttributes(); test_FolderShortcut(); test_ITEMIDLIST_format(); - if(pSHGetFolderPathAndSubDirA) - testSHGetFolderPathAndSubDirA(); - else - win_skip("SHGetFolderPathAndSubDirA not present\n"); + test_SHGetFolderPathAndSubDirA(); test_LocalizedNames(); - if(pSHCreateShellItem) - test_SHCreateShellItem(); - else - win_skip("SHCreateShellItem not present\n"); + test_SHCreateShellItem(); OleUninitialize(); }

1 0

Roderick Colenbrander : wined3d: Rename yuv to complex in order to prepare for 8-bit palette fixups using the same code .
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 922ad80f42e54dddf5ac889e271d048ca0e9c613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922ad80f42e54dddf5ac889e2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 2 16:21:45 2010 +0100 wined3d: Rename yuv to complex in order to prepare for 8-bit palette fixups using the same code. --- dlls/wined3d/arb_program_shader.c | 62 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 8 ++-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 26 ++++++++-------- dlls/wined3d/wined3d_private.h | 40 ++++++++++++------------ 5 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=922ad80f42e54dddf5ac8…

1 0

David Hedberg : user32: Fix return value of EDIT_EM_Scroll.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 598052b4ad2254af22e9bfc65c567a8d5b07e4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=598052b4ad2254af22e9bfc65… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Mar 3 13:19:46 2010 +0100 user32: Fix return value of EDIT_EM_Scroll. --- dlls/user32/edit.c | 7 +++++-- dlls/user32/tests/edit.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0c9287c..35f8285 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1635,10 +1635,13 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) dy = es->line_count - vlc - es->y_offset; /* Notification is done in EDIT_EM_LineScroll */ - if(dy) + if(dy) { EDIT_EM_LineScroll(es, 0, dy); + return MAKELONG(dy, TRUE); + } + } - return MAKELONG(dy, TRUE); + return (LRESULT)FALSE; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 7ecee13..6d3afb8 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1316,6 +1316,40 @@ static void test_edit_control_limittext(void) DestroyWindow(hwEdit); } +/* Test EM_SCROLL */ +static void test_edit_control_scroll(void) +{ + static const char *single_line_str = "a"; + HWND hwEdit; + LONG ret; + + /* Check the return value when EM_SCROLL doesn't scroll + * anything. Should not return true unless any lines were actually + * scrolled. */ + hwEdit = CreateWindow( + "EDIT", + single_line_str, + WS_VSCROLL | ES_MULTILINE, + 1, 1, 100, 100, + NULL, NULL, hinst, NULL); + + assert(hwEdit); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_LINEUP, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + ret = SendMessage(hwEdit, EM_SCROLL, SB_LINEDOWN, 0); + ok(!ret, "Returned %x, expected 0.\n", ret); + + DestroyWindow (hwEdit); +} + static void test_margins(void) { HWND hwEdit; @@ -2319,6 +2353,7 @@ START_TEST(edit) test_edit_control_5(); test_edit_control_6(); test_edit_control_limittext(); + test_edit_control_scroll(); test_margins(); test_margins_font_change(); test_text_position();

1 0

Alexandre Julliard : krnl386.exe: Don' t try to free again an already freed global block.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: f8a89aa0833e213eeb5cf91f16628ee5480fd263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a89aa0833e213eeb5cf91f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 11:52:59 2010 +0100 krnl386.exe: Don't try to free again an already freed global block. --- dlls/krnl386.exe16/global.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index db07477..ba4d7df 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -182,6 +182,11 @@ BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ) sel = GlobalHandleToSel16( handle ); if (!VALID_HANDLE(sel)) return FALSE; pArena = GET_ARENA_PTR(sel); + if (!pArena->size) + { + WARN( "already free %x\n", handle ); + return FALSE; + } SELECTOR_FreeBlock( sel ); memset( pArena, 0, sizeof(GLOBALARENA) ); return TRUE;

1 0

Paul Chitescu : quartz: Silence the FIXME that AsyncReader does not implement IBasicAudio.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: af2bed44f89bcbf31748e95fe1eb696ae1cab916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2bed44f89bcbf31748e95fe… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Mar 2 11:46:43 2010 -0800 quartz: Silence the FIXME that AsyncReader does not implement IBasicAudio. --- dlls/quartz/filesource.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8bb9cfd..110415d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -395,7 +395,8 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && !IsEqualIID(riid, &IID_IVideoWindow)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && + !IsEqualIID(riid, &IID_IVideoWindow) && !IsEqualIID(riid, &IID_IBasicAudio)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE;

1 0

Vincent Povirk : ole32: Add a test showing IStorage_CopyTo ignores open objects in the source.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 11abad24ddea054b95fb751c5673cb8842e52cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=11abad24ddea054b95fb751c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 2 16:07:07 2010 -0600 ole32: Add a test showing IStorage_CopyTo ignores open objects in the source. --- dlls/ole32/tests/storage32.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e598fe0..7cbfd49 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2720,6 +2720,57 @@ static void test_substorage_enum(void) ok( r == TRUE, "deleted file\n"); } +static void test_copyto_locking(void) +{ + IStorage *stg, *stg2, *stg3, *stg4; + IStream *stm; + HRESULT r; + static const WCHAR stgname[] = { 'S','T','G','1',0 }; + static const WCHAR stgname2[] = { 'S','T','G','2',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* create another substorage */ + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* add a stream, and leave it open */ + r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); + + /* Try to copy the storage while the stream is open */ + r = IStorage_CopyTo(stg2, 0, NULL, NULL, stg3); + todo_wine ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); + + IStream_Release(stm); + + /* create a substorage */ + r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg4); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* Try to copy the storage while the substorage is open */ + r = IStorage_CopyTo(stg2, 0, NULL, NULL, stg3); + todo_wine ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); + + IStorage_Release(stg4); + IStorage_Release(stg3); + IStorage_Release(stg2); + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2759,4 +2810,5 @@ START_TEST(storage32) test_rename(); test_toplevel_stat(); test_substorage_enum(); + test_copyto_locking(); }

1 0