May 2006 - Wine-commits - list.winehq.org

Ivan Gyurdiev : wined3d: Remove dead shader code.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: dbf545098240feb185113d7e1d6043076d401eb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbf545098240feb185113d7… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Mon Apr 24 04:30:59 2006 -0400 wined3d: Remove dead shader code. --- dlls/wined3d/drawprim.c | 77 ----------------------------------------------- 1 files changed, 0 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8dd23db..d6b2d07 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2086,57 +2086,6 @@ void drawPrimitive(IWineD3DDevice *iface /* Ok, we will be updating the screen from here onwards so grab the lock */ ENTER_GL(); -#if 0 /* TODO: vertex and pixel shaders */ - /* If we will be using a pixel, do some initialization for it */ - if ((pixel_shader = PIXEL_SHADER(This->stateBlock->PixelShader))) { - TRACE("drawing with pixel shader handle %p\n", pixel_shader); - memset(&pixel_shader->input, 0, sizeof(PSHADERINPUTDATA8)); - - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixel_shader->prgId)); - checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixel_shader->prgId);"); - glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - - /* init Constants */ - if (This->stateBlock->Changed.pixelShaderConstant) { - TRACE_(d3d_shader)("pixel shader initializing constants %p\n",pixel_shader); - IDirect3DPixelShaderImpl_SetConstantF(pixel_shader, 0, (CONST FLOAT*) &This->stateBlock->pixelShaderConstant[0], 8); - } - /* Update the constants */ - for (i = 0; i < D3D8_PSHADER_MAX_CONSTANTS; ++i) { - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i, (GLfloat *)&This->stateBlock->pixelShaderConstant[i])); - checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB"); - } - } -#endif /* TODO: vertex and pixel shaders */ - -#if 0 /* TODO: vertex and pixel shaders */ - /* If we will be using a pixel, do some initialization for it */ - if ((pixel_shader = PIXEL_SHADER(This->stateBlock->PixelShader))) { - TRACE("drawing with pixel shader handle %p\n", pixel_shader); - memset(&pixel_shader->input, 0, sizeof(PSHADERINPUTDATA8)); - - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixel_shader->prgId)); - checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixel_shader->prgId);"); - glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - - /* init Constants */ - if (This->stateBlock->Changed.pixelShaderConstant) { - TRACE_(d3d_shader)("pixel shader initializing constants %p\n",pixel_shader); - IDirect3DPixelShaderImpl_SetConstantF(pixel_shader, 0, (CONST FLOAT*) - &This->stateBlock->pixelShaderConstant[0], 8); - } - /* Update the constants */ - for (i = 0; i < D3D8_PSHADER_MAX_CONSTANTS; ++i) { - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, i, - (GLfloat *)&This->stateBlock->pixelShaderConstant[i])); - - checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB"); - } - } -#endif /* TODO: vertex and pixel shaders */ - /* Initialize all values to null */ memset(&dataLocations, 0x00, sizeof(dataLocations)); /* convert the FVF or vertexDeclaration into a strided stream (this should be done when the fvf or declaration is created) */ @@ -2198,32 +2147,6 @@ #endif TRACE("Restored lighting to original state\n"); } -#if 0 /* TODO: vertex and pixel shaders */ - if (pixel_shader) - { -#if 0 - GLint errPos; - glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &errPos ); - if (errPos != -1) - FIXME("HW PixelShader Error at position: %d\n%s\n", errPos, glGetString( GL_PROGRAM_ERROR_STRING_ARB) ); -#endif - glDisable(GL_FRAGMENT_PROGRAM_ARB); - } -#endif - -#if 0 /* TODO: vertex and pixel shaders */ - if (pixel_shader) - { -#if 0 - GLint errPos; - glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &errPos ); - if (errPos != -1) - FIXME("HW PixelShader Error at position: %d\n%s\n", errPos, glGetString( GL_PROGRAM_ERROR_STRING_ARB) ); -#endif - glDisable(GL_FRAGMENT_PROGRAM_ARB); - } -#endif - /* Finshed updating the screen, restore lock */ LEAVE_GL(); TRACE("Done all gl drawing\n");

1 0

qingdoa daoo : comctl32: Update first visible when appropiate in the TVI_SORT case.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: 53654c6938cc1193301ba1ae9f0d5d5781a8162d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53654c6938cc1193301ba1a… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Apr 25 11:27:29 2006 +0800 comctl32: Update first visible when appropiate in the TVI_SORT case. --- dlls/comctl32/treeview.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b333fa3..a6aadf5 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1299,6 +1299,7 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *info { TREEVIEW_ITEM *aChild; TREEVIEW_ITEM *previousChild = NULL; + TREEVIEW_ITEM *originalFirst = parentItem->firstChild; BOOL bItemInserted = FALSE; aChild = parentItem->firstChild; @@ -1317,6 +1318,9 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *info if (comp < 0) /* we are smaller than the current one */ { TREEVIEW_InsertBefore(newItem, aChild, parentItem); + if (infoPtr->firstVisible == originalFirst && + aChild == originalFirst) + TREEVIEW_SetFirstVisible(infoPtr, newItem, TRUE); bItemInserted = TRUE; break; }

1 0

Juris Smotrovs : user: Test cases demonstrating position changes for MDI children.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: 256d0c0b48cc35365c8b22afd7237d7441bb9880 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=256d0c0b48cc35365c8b22a… Author: Juris Smotrovs <juris.smotrovs(a)sets.lv> Date: Tue Apr 25 19:06:10 2006 +0300 user: Test cases demonstrating position changes for MDI children. --- dlls/user/tests/msg.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index b11ed2f..791acaa 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -1483,6 +1483,22 @@ static const struct message WmCreateMDIc { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; +/* ShowWindow(SW_SHOW) for MDI client window */ +static const struct message WmShowMDIclientSeq[] = { + { WM_SHOWWINDOW, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0 } +}; +/* ShowWindow(SW_HIDE) for MDI client window */ +static const struct message WmHideMDIclientSeq[] = { + { WM_SHOWWINDOW, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0 } +}; /* DestroyWindow for MDI client window, initially visible */ static const struct message WmDestroyMDIclientSeq[] = { { HCBT_DESTROYWND, hook }, @@ -1536,6 +1552,40 @@ static const struct message WmCreateMDIc { WM_MDIACTIVATE, sent|defwinproc }, { 0 } }; +/* CreateWindow for MDI child window with invisible parent */ +static const struct message WmCreateMDIchildInvisibleParentSeq[] = { + { HCBT_CREATEWND, hook }, + { WM_GETMINMAXINFO, sent }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent }, + { WM_MOVE, sent }, + { WM_PARENTNOTIFY, sent /*|wparam, WM_CREATE*/ }, /* in MDI client */ + { WM_SHOWWINDOW, sent|wparam, 1 }, + { WM_MDIREFRESHMENU, sent }, /* in MDI client */ + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE }, + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + + /* Win9x: message sequence terminates here. */ + + { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, + { HCBT_SETFOCUS, hook }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ + { WM_IME_NOTIFY, sent|wparam|optional, 2 }, /* in MDI client */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent }, /* in MDI client */ + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_MDIACTIVATE, sent|defwinproc }, + { 0 } +}; /* DestroyWindow for MDI child window, initially visible */ static const struct message WmDestroyMDIchildVisibleSeq[] = { { HCBT_DESTROYWND, hook }, @@ -2139,6 +2189,44 @@ static const struct message WmMaximizeMD { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ { 0 } }; +/* WM_MDIMAXIMIZE for an MDI child window with invisible parent */ +static const struct message WmMaximizeMDIchildInvisibleParentSeq[] = { + { WM_MDIMAXIMIZE, sent }, /* in MDI client */ + { HCBT_MINMAX, hook }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|0x8000 }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CHILDACTIVATE, sent|wparam|lparam, 0, 0 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOZORDER|0x8000 }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, + + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER }, + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + /* in MDI frame */ + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI frame */ + /* in MDI client */ + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_NOZORDER }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW|SWP_NOCLIENTMOVE }, + { WM_SIZE, sent }, + /* in MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOZORDER }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOREDRAW|SWP_NOCLIENTMOVE }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + { 0 } +}; /* ShowWindow(SW_MAXIMIZE) for a visible MDI child window */ static const struct message WmMaximizeMDIchildVisibleSeq[] = { { HCBT_MINMAX, hook }, @@ -2756,6 +2844,39 @@ static void test_mdi_messages(void) DestroyWindow(mdi_client); ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE); + /* test maximization of MDI child with invisible parent */ + client_cs.hWindowMenu = 0; + mdi_client = CreateWindow("MDI_client_class", + NULL, + WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL | WS_VISIBLE, + 0, 0, 662, 432, + mdi_frame, 0, GetModuleHandleA(0), &client_cs); + ok_sequence(WmCreateMDIclientSeq, "Create MDI client window", FALSE); + + ShowWindow(mdi_client, SW_HIDE); + ok_sequence(WmHideMDIclientSeq, "Hide MDI client window", FALSE); + + mdi_child = CreateWindowExA(WS_EX_MDICHILD, "MDI_child_class", "MDI child", + WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL, + 0, 0, 654, 443, + mdi_client, 0, GetModuleHandleA(0), NULL); + ok_sequence(WmCreateMDIchildInvisibleParentSeq, "Create MDI child window with invisible parent", FALSE); + + SendMessage(mdi_client, WM_MDIMAXIMIZE, (WPARAM) mdi_child, 0); + ok_sequence(WmMaximizeMDIchildInvisibleParentSeq, "Maximize MDI child window with invisible parent", TRUE); + zoomed = IsZoomed(mdi_child); + ok(zoomed, "wrong zoomed state %d\n", zoomed); + + ShowWindow(mdi_client, SW_SHOW); + ok_sequence(WmShowMDIclientSeq, "Show MDI client window", FALSE); + + DestroyWindow(mdi_child); + ok_sequence(WmDestroyMDIchildVisibleSeq, "Destroy visible maximized MDI child window", TRUE); + + DestroyWindow(mdi_client); + ok_sequence(WmDestroyMDIclientSeq, "Destroy MDI client window", FALSE); + /* end of test for maximization of MDI child with invisible parent */ + DestroyWindow(mdi_frame); ok_sequence(WmDestroyMDIframeSeq, "Destroy MDI frame window", FALSE); }

1 0

Robert Shearman : setupapi: Fix parsing of UCS-16 files.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 4d7946464a104f49b12e059fbafbe56c843484cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d7946464a104f49b12e059… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:42:14 2006 +0100 setupapi: Fix parsing of UCS-16 files. Fix parsing of UCS-16 files prefixed with the Unicode BOM. Based on a patch by Hervé Poussineau. --- dlls/setupapi/parser.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index e6587c7..514e85a 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -967,7 +967,14 @@ static struct inf_file *parse_file( HAND HeapFree( GetProcessHeap(), 0, new_buff ); } } - else err = parse_buffer( file, buffer, (WCHAR *)((char *)buffer + size), error_line ); + else + { + WCHAR *new_buff = (WCHAR *)buffer; + /* UCS-16 files should start with the Unicode BOM; we should skip it */ + if (*new_buff == 0xfeff) + new_buff++; + err = parse_buffer( file, new_buff, (WCHAR *)((char *)buffer + size), error_line ); + } if (!err) /* now check signature */ {

1 0

Robert Shearman : ole32: IPersistStream is also implemented by any object that implements IStream.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 32d39ea6ed40c38d5096fc349efeba6cb8ec06b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32d39ea6ed40c38d5096fc3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 22:23:52 2006 +0100 ole32: IPersistStream is also implemented by any object that implements IStream. --- dlls/ole32/stg_stream.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 9bbb9a8..66fbaaa 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -122,6 +122,7 @@ static HRESULT WINAPI StgStreamImpl_Quer * Compare the riid with the interface IDs implemented by this object. */ if (IsEqualGUID(&IID_IUnknown, riid)|| + IsEqualGUID(&IID_IPersistStream, riid)|| IsEqualGUID(&IID_IStream, riid)) { *ppvObject = (IStream*)This;

1 0

Robert Shearman : ole32: Fix typos in StgCreateStorageEx and StgOpenStorageEx.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: d9b7c36009934eae1017701339544161a295bd1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9b7c36009934eae1017701… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 22:23:29 2006 +0100 ole32: Fix typos in StgCreateStorageEx and StgOpenStorageEx. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ae1fd80..fdb3946 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5792,7 +5792,7 @@ HRESULT WINAPI StgCreateStorageEx(const return STG_E_INVALIDPARAMETER; } - if (stgfmt != STGFMT_FILE && grfAttrs != 0 && grfAttrs != FILE_FLAG_NO_BUFFERING) + if (stgfmt == STGFMT_FILE && grfAttrs != 0 && grfAttrs != FILE_FLAG_NO_BUFFERING) { ERR("grfAttrs must be 0 or FILE_FLAG_NO_BUFFERING if stgfmt == STGFMT_FILE\n"); return STG_E_INVALIDPARAMETER; @@ -5845,7 +5845,7 @@ HRESULT WINAPI StgOpenStorageEx(const WC return STG_E_INVALIDPARAMETER; } - if (stgfmt != STGFMT_DOCFILE && grfAttrs != 0 && grfAttrs != FILE_FLAG_NO_BUFFERING) + if (stgfmt == STGFMT_DOCFILE && grfAttrs != 0 && grfAttrs != FILE_FLAG_NO_BUFFERING) { ERR("grfAttrs must be 0 or FILE_FLAG_NO_BUFFERING if stgfmt == STGFMT_DOCFILE\n"); return STG_E_INVALIDPARAMETER;

1 0

Robert Shearman : ole32: STGM_PRIORITY allows other IStorage objects to be opened in transacted mode with read /write access.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 6dd5dbef64037e6b68c8a0ecdcaaa31ffa8b1da7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6dd5dbef64037e6b68c8a0e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 22:23:12 2006 +0100 ole32: STGM_PRIORITY allows other IStorage objects to be opened in transacted mode with read/write access. --- dlls/ole32/storage32.c | 12 +++++++++--- dlls/ole32/tests/storage32.c | 20 ++++++++++++++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 18f248c..ae1fd80 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5914,7 +5914,6 @@ HRESULT WINAPI StgOpenStorage( goto end; } - /* STGM_PRIORITY implies exclusive access */ if (grfMode & STGM_PRIORITY) { if (grfMode & (STGM_TRANSACTED|STGM_SIMPLE|STGM_NOSCRATCH|STGM_NOSNAPSHOT)) @@ -5924,13 +5923,20 @@ HRESULT WINAPI StgOpenStorage( if(STGM_ACCESS_MODE(grfMode) != STGM_READ) return STG_E_INVALIDFLAG; grfMode &= ~0xf0; /* remove the existing sharing mode */ - grfMode |= STGM_SHARE_DENY_WRITE; + grfMode |= STGM_SHARE_DENY_NONE; + + /* STGM_PRIORITY stops other IStorage objects on the same file from + * committing until the STGM_PRIORITY IStorage is closed. it also + * stops non-transacted mode StgOpenStorage calls with write access from + * succeeding. obviously, both of these cannot be achieved through just + * file share flags */ + FIXME("STGM_PRIORITY mode not implemented correctly\n"); } /* * Validate the sharing mode */ - if (!(grfMode & STGM_TRANSACTED)) + 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 1936150..7085089 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -626,6 +626,7 @@ static void test_storage_refcount(void) static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; IStorage *stg = NULL; + IStorage *stgprio = NULL; HRESULT r; IStream *stm = NULL; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; @@ -673,10 +674,24 @@ static void test_storage_refcount(void) r = IStream_Release(stm); ok (r == 0, "stream not released\n"); - /* test for grfMode open issue */ + /* tests that STGM_PRIORITY doesn't prevent readwrite access from other + * StgOpenStorage calls in transacted mode */ + r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stgprio); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08lx\n", r); + + todo_wine { + /* non-transacted mode read/write fails */ + r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg); + ok(r==STG_E_LOCKVIOLATION, "StgOpenStorage should return STG_E_LOCKVIOLATION instead of 0x%08lx\n", r); + } + + /* non-transacted mode read-only succeeds */ + r = StgOpenStorage( filename, NULL, STGM_SHARE_DENY_WRITE|STGM_READ, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08lx\n", r); + IStorage_Release(stg); r = StgOpenStorage( filename, NULL, STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE, NULL, 0, &stg); - ok(r==S_OK, "StgOpenStorage failed\n"); + ok(r==S_OK, "StgOpenStorage failed with error 0x%08lx\n", r); if(stg) { static const WCHAR stgname[] = { ' ',' ',' ','2','9',0 }; @@ -727,6 +742,7 @@ static void test_storage_refcount(void) r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); } + IStorage_Release(stgprio); DeleteFileW(filename); }

1 0

Robert Shearman : oleaut32: Check the return value from VariantCopy when copying values
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 6c6ce70260c0b3fd2ad5c61a318c1a2ccae8c102 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c6ce70260c0b3fd2ad5c61… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 22:22:27 2006 +0100 oleaut32: Check the return value from VariantCopy when copying values for VT_VARIANT typed parameters for ITypeInfo::Invoke. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9902cf9..0eb48b4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5239,7 +5239,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke dump_Variant(src_arg); if (rgvt[i] == VT_VARIANT) - VariantCopy(&rgvarg[i], src_arg); + hres = VariantCopy(&rgvarg[i], src_arg); else if (rgvt[i] == (VT_VARIANT | VT_BYREF)) { if (rgvt[i] == V_VT(src_arg))

1 0

Robert Shearman : oleaut32: Support values being passed into VT_VARIANT|VT_BYREF typed parameters in ITypeInfo ::Invoke.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 5e8c877f96434db9c9dc3002d8f771986edbbed3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e8c877f96434db9c9dc300… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 22:22:08 2006 +0100 oleaut32: Support values being passed into VT_VARIANT|VT_BYREF typed parameters in ITypeInfo::Invoke. --- dlls/oleaut32/typelib.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 43dfb73..9902cf9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5240,6 +5240,18 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (rgvt[i] == VT_VARIANT) VariantCopy(&rgvarg[i], src_arg); + else if (rgvt[i] == (VT_VARIANT | VT_BYREF)) + { + if (rgvt[i] == V_VT(src_arg)) + V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg); + else + { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); + hres = VariantCopy(&missing_arg[i], src_arg); + V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; + } + V_VT(&rgvarg[i]) = rgvt[i]; + } else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams);

1 0

Robert Shearman : ole32: Check that the storage was opened with write access before creating a new stream or sub-storage .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 693da8c47152187d6ba210a0f63168ad95040187 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=693da8c47152187d6ba210a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:49:17 2006 +0100 ole32: Check that the storage was opened with write access before creating a new stream or sub-storage. --- dlls/ole32/storage32.c | 10 ++++++++++ dlls/ole32/tests/storage32.c | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 79362b5..18f248c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -914,6 +914,11 @@ HRESULT WINAPI StorageBaseImpl_CreateStr else return STG_E_FILEALREADYEXISTS; } + else if (STGM_ACCESS_MODE(This->openFlags) == STGM_READ) + { + WARN("read-only storage\n"); + return STG_E_ACCESSDENIED; + } /* * memset the empty property @@ -1120,6 +1125,11 @@ HRESULT WINAPI StorageImpl_CreateStorage return STG_E_FILEALREADYEXISTS; } } + else if (STGM_ACCESS_MODE(This->base.openFlags) == STGM_READ) + { + WARN("read-only storage\n"); + return STG_E_ACCESSDENIED; + } /* * memset the empty property diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 37492ed..1936150 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -719,10 +719,8 @@ static void test_storage_refcount(void) r = IStorage_CreateStorage( stg2, stgname2, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stg3 ); ok(r == STG_E_ACCESSDENIED, "CreateStorage should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r); - todo_wine { r = IStorage_CreateStream( stg2, stmname2, STGM_CREATE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); ok(r == STG_E_ACCESSDENIED, "CreateStream should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r); - } IStorage_Release(stg2);

1 0