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

Huw Davies : opengl32: Fix the returned metrics and add a translation vector to the end of each list .
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: ac5a024a5cceaa232ecab08c4454e79b678dfafe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac5a024a5cceaa232ecab08… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 26 12:12:54 2006 +0100 opengl32: Fix the returned metrics and add a translation vector to the end of each list. --- dlls/opengl32/wgl.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 2dd59a8..178cb6b 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -991,12 +991,13 @@ BOOL WINAPI wglUseFontOutlines_common(HD if(lpgmf) { - lpgmf->gmfBlackBoxX = gm.gmBlackBoxX / em_size; - lpgmf->gmfBlackBoxY = gm.gmBlackBoxY / em_size; - lpgmf->gmfptGlyphOrigin.x = gm.gmptGlyphOrigin.x / em_size; - lpgmf->gmfptGlyphOrigin.y = gm.gmptGlyphOrigin.y / em_size; - lpgmf->gmfCellIncX = gm.gmCellIncX / em_size; - lpgmf->gmfCellIncY = gm.gmCellIncY / em_size; + lpgmf->gmfBlackBoxX = (float)gm.gmBlackBoxX / em_size; + lpgmf->gmfBlackBoxY = (float)gm.gmBlackBoxY / em_size; + lpgmf->gmfptGlyphOrigin.x = (float)gm.gmptGlyphOrigin.x / em_size; + lpgmf->gmfptGlyphOrigin.y = (float)gm.gmptGlyphOrigin.y / em_size; + lpgmf->gmfCellIncX = (float)gm.gmCellIncX / em_size; + lpgmf->gmfCellIncY = (float)gm.gmCellIncY / em_size; + TRACE("%fx%f at %f,%f inc %f,%f\n", lpgmf->gmfBlackBoxX, lpgmf->gmfBlackBoxY, lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); lpgmf++; @@ -1063,6 +1064,7 @@ BOOL WINAPI wglUseFontOutlines_common(HD error_in_list: gluTessEndPolygon(tess); + glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); glEndList(); LEAVE_GL(); HeapFree(GetProcessHeap(), 0, buf);

1 0

Ivan Leo : msvcrt/tests: Don't leave files on the disk.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: f2bfc7b12d0461505edb3eaef8fca82d173cf902 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2bfc7b12d0461505edb3ea… Author: Ivan Leo <ivanleo(a)gmail.com> Date: Tue Jun 27 16:05:14 2006 +0100 msvcrt/tests: Don't leave files on the disk. --- dlls/msvcrt/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 61a4db9..1c0f155 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -472,14 +472,14 @@ static void test_get_osfhandle(void) DWORD bytes_written; HANDLE handle; - fd = _sopen(fname, _O_CREAT|_O_RDWR, _SH_DENYRW, 0); + fd = _sopen(fname, _O_CREAT|_O_RDWR, _SH_DENYRW, _S_IREAD | _S_IWRITE); handle = (HANDLE)_get_osfhandle(fd); WriteFile(handle, "bar", 3, &bytes_written, NULL); _close(fd); fd = _open(fname, _O_RDONLY, 0); ok(fd != -1, "Coudn't open '%s' after _get_osfhanle()\n", fname); - CloseHandle(handle); + _close(fd); _unlink(fname); }

1 0

Alexandre Julliard : server: Moved get/ set_thread_context implementation to ptrace.c.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 498742ff6cee580a82a42d5f05e8c570b4b71dc5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=498742ff6cee580a82a42d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 21:27:47 2006 +0200 server: Moved get/set_thread_context implementation to ptrace.c. --- server/context_alpha.c | 26 +---- server/context_i386.c | 210 ------------------------------------------ server/context_powerpc.c | 26 +---- server/context_sparc.c | 24 +---- server/context_x86_64.c | 187 ------------------------------------- server/ptrace.c | 231 ++++++++++++++++++++++++++++++++++++++++++---- server/thread.h | 3 - 7 files changed, 226 insertions(+), 481 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=498742ff6cee580a82a…

1 0

William Knop : dbghelp: Fix for non-elf build (undefined symbol: _elf_is_in_thunk_area).
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 289a068b4fcc61821f913f0be9c8dce2b12cce50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=289a068b4fcc61821f913f0… Author: William Knop <william.knop(a)gmail.com> Date: Tue Jun 27 02:32:38 2006 -0400 dbghelp: Fix for non-elf build (undefined symbol: _elf_is_in_thunk_area). --- dlls/dbghelp/elf_module.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 4e86ec2..11ddfb8 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1489,4 +1489,10 @@ BOOL elf_load_debug_info(struct module* { return FALSE; } + +int elf_is_in_thunk_area(unsigned long addr, + const struct elf_thunk_area* thunks) +{ + return -1; +} #endif /* __ELF__ */

1 0

Paul Vriens : uxtheme/tests: Add tests for IsThemePartDefined.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: d9c5cef339c7e169e6b9dbd96a3158f91fa9056c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9c5cef339c7e169e6b9dbd… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Jun 27 16:34:33 2006 +0200 uxtheme/tests: Add tests for IsThemePartDefined. --- dlls/uxtheme/tests/system.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index ccf10e8..ae6901c 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -30,6 +30,7 @@ static HRESULT (WINAPI * pGetCurrentThem static HTHEME (WINAPI * pGetWindowTheme)(HWND); static BOOL (WINAPI * pIsAppThemed)(VOID); static BOOL (WINAPI * pIsThemeActive)(VOID); +static BOOL (WINAPI * pIsThemePartDefined)(HTHEME, int, int); static HTHEME (WINAPI * pOpenThemeData)(HWND, LPCWSTR); static HRESULT (WINAPI * pSetWindowTheme)(HWND, LPCWSTR, LPCWSTR); @@ -57,6 +58,7 @@ static BOOL InitFunctionPtrs(void) UXTHEME_GET_PROC(GetWindowTheme) UXTHEME_GET_PROC(IsAppThemed) UXTHEME_GET_PROC(IsThemeActive) + UXTHEME_GET_PROC(IsThemePartDefined) UXTHEME_GET_PROC(OpenThemeData) UXTHEME_GET_PROC(SetWindowTheme) } @@ -64,10 +66,10 @@ static BOOL InitFunctionPtrs(void) * be checked (at some point in time) within the single tests if needed. All used functions for * now are present on WinXP, W2K3 and Wine. */ - if (!pCloseThemeData || !pGetWindowTheme || - !pIsAppThemed || !pIsThemeActive || - !pOpenThemeData || !pSetWindowTheme || - !pGetCurrentThemeName) + if (!pCloseThemeData || !pGetCurrentThemeName || + !pGetWindowTheme || !pIsAppThemed || + !pIsThemeActive || !pIsThemePartDefined || + !pOpenThemeData || !pSetWindowTheme) return FALSE; return TRUE; @@ -77,6 +79,7 @@ static void test_IsThemed(void) { BOOL bThemeActive; BOOL bAppThemed; + BOOL bTPDefined; SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); @@ -101,6 +104,13 @@ static void test_IsThemed(void) ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + bTPDefined = pIsThemePartDefined(NULL, 0 , 0); + ok( bTPDefined == FALSE, "Expected FALSE\n"); + ok( GetLastError() == E_HANDLE, + "Expected E_HANDLE, got 0x%08lx\n", + GetLastError()); } static void test_GetWindowTheme(void) @@ -174,6 +184,7 @@ static void test_OpenThemeData(void) BOOL bThemeActive; HRESULT hRes; BOOL bDestroyed; + BOOL bTPDefined; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; @@ -313,6 +324,16 @@ static void test_OpenThemeData(void) "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); + SetLastError(0xdeadbeef); + bTPDefined = pIsThemePartDefined(hTheme, 0 , 0); + todo_wine + { + ok( bTPDefined == FALSE, "Expected FALSE\n"); + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", + GetLastError()); + } + bDestroyed = DestroyWindow(hWnd); if (!bDestroyed) trace("Window %p couldn't be destroyed : 0x%08lx\n", @@ -461,7 +482,7 @@ START_TEST(system) * only show input/return behaviour */ - /* IsThemeActive and IsAppThemed */ + /* IsThemeActive, IsAppThemed and IsThemePartDefined*/ trace("Starting test_IsThemed()\n"); test_IsThemed();

1 0

Stefan Dösinger : wined3d: Vertex buffer can be locked multiple times.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: cea41b0a0ff4a68c9c0507cdec604c142c493e53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cea41b0a0ff4a68c9c0507c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jun 27 13:11:13 2006 +0200 wined3d: Vertex buffer can be locked multiple times. --- dlls/d3d8/tests/device.c | 14 ++++++++++++++ dlls/ddraw/vertexbuffer.c | 20 +++++++++++--------- dlls/wined3d/vertexbuffer.c | 25 ++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f754fe1..d821340 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -267,6 +267,20 @@ static void test_refcount(void) hr = IDirect3DDevice8_CreateAdditionalSwapChain( pDevice, &d3dpp, &pSwapChain ); CHECK_CALL( hr, "CreateAdditionalSwapChain", pDevice, refcount+1 ); + if(pVertexBuffer) + { + BYTE *data; + /* Vertex buffers can be locked multiple times */ + hr = IDirect3DVertexBuffer8_Lock(pVertexBuffer, 0, 0, &data, 0); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Lock failed with %08lx\n", hr); + hr = IDirect3DVertexBuffer8_Lock(pVertexBuffer, 0, 0, &data, 0); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Lock failed with %08lx\n", hr); + hr = IDirect3DVertexBuffer8_Unlock(pVertexBuffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08lx\n", hr); + hr = IDirect3DVertexBuffer8_Unlock(pVertexBuffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08lx\n", hr); + } + cleanup: if (pDevice) IUnknown_Release( pDevice ); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index a24bfc4..01db5d5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -214,20 +214,22 @@ IDirect3DVertexBufferImpl_Lock(IDirect3D HRESULT hr; TRACE("(%p)->(%08lx,%p,%p)\n", This, Flags, Data, Size); - /* Get the size, for returning it, and for locking */ - hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, - &Desc); - if(hr != D3D_OK) + if(*Size) { - ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08lx\n", This, hr); - return hr; + /* Get the size, for returning it, and for locking */ + hr = IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, + &Desc); + if(hr != D3D_OK) + { + ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08lx\n", This, hr); + return hr; + } + *Size = Desc.Size; } - if(Size) *Size = Desc.Size; - return IWineD3DVertexBuffer_Lock(This->wineD3DVertexBuffer, 0 /* OffsetToLock */, - Desc.Size, + 0 /* SizeToLock, 0 == Full lock */, (BYTE **) Data, Flags); } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index c669a6b..b58591c 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -145,8 +145,9 @@ static void WINAPI IWineD3DVertexBuf GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, This->resource.size, This->resource.allocatedMemory)); - checkGLcall("glUnmapBuffer glBufferSubDataARB"); + checkGLcall("glBufferSubDataARB"); LEAVE_GL(); + /* Lock directly into the VBO in the future */ HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); This->resource.allocatedMemory = NULL; This->Flags &= ~VBFLAG_DIRTY; @@ -334,12 +335,21 @@ static HRESULT WINAPI IWineD3DVertexBuf BYTE *data; TRACE("(%p)->%d, %d, %p, %08lx\n", This, OffsetToLock, SizeToLock, ppbData, Flags); + InterlockedIncrement(&This->lockcount); + if(This->Flags & VBFLAG_DIRTY) { if(This->dirtystart > OffsetToLock) This->dirtystart = OffsetToLock; - if(This->dirtyend < OffsetToLock + SizeToLock) This->dirtyend = OffsetToLock + SizeToLock; + if(SizeToLock) { + if(This->dirtyend < OffsetToLock + SizeToLock) This->dirtyend = OffsetToLock + SizeToLock; + } else { + This->dirtyend = This->resource.size; + } } else { This->dirtystart = OffsetToLock; - This->dirtyend = OffsetToLock + SizeToLock; + if(SizeToLock) + This->dirtyend = OffsetToLock + SizeToLock; + else + This->dirtyend = OffsetToLock + This->resource.size; } if(This->resource.allocatedMemory) { @@ -375,7 +385,16 @@ static HRESULT WINAPI IWineD3DVertexBuf } HRESULT WINAPI IWineD3DVertexBufferImpl_Unlock(IWineD3DVertexBuffer *iface) { IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *) iface; + LONG lockcount; TRACE("(%p)\n", This); + + lockcount = InterlockedDecrement(&This->lockcount); + if(lockcount > 0) { + /* Delay loading the buffer until everything is unlocked */ + TRACE("Ignoring the unlock\n"); + return D3D_OK; + } + if(!This->resource.allocatedMemory) { ENTER_GL(); GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbb92f5..d55b810 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -633,6 +633,7 @@ typedef struct IWineD3DVertexBufferImpl UINT stream; UINT dirtystart, dirtyend; + LONG lockcount; /* Last description of the buffer */ WineDirect3DVertexStridedData strided;

1 0

Hans Leidekker : userenv: Add a stub implementation for GetProfileType.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 3a40b175c4cb2818987adb07cff6922f3f25a734 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a40b175c4cb2818987adb0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jun 27 15:28:45 2006 +0200 userenv: Add a stub implementation for GetProfileType. --- dlls/userenv/userenv.spec | 1 + dlls/userenv/userenv_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index a278905..6cd6437 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -2,6 +2,7 @@ @ stub DestroyEnvironmentBlock @ stdcall GetProfilesDirectoryA(ptr ptr) @ stdcall GetProfilesDirectoryW(ptr ptr) +@ stdcall GetProfileType(ptr) @ stdcall GetUserProfileDirectoryA(ptr ptr ptr) @ stdcall GetUserProfileDirectoryW(ptr ptr ptr) @ stdcall LoadUserProfileA(ptr ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 9c55874..dc79387 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -79,6 +79,18 @@ BOOL WINAPI GetProfilesDirectoryW( LPWST return FALSE; } +/* FIXME: these belong in userenv.h */ +#define PT_TEMPORARY 0x00000001 +#define PT_ROAMING 0x00000002 +#define PT_MANDATORY 0x00000004 + +BOOL WINAPI GetProfileType( LPDWORD pdwFlags ) +{ + FIXME("%p\n", pdwFlags ); + *pdwFlags = PT_MANDATORY | PT_ROAMING | PT_TEMPORARY; + return TRUE; +} + BOOL WINAPI LoadUserProfileA( HANDLE hToken, LPPROFILEINFOA lpProfileInfo ) { FIXME("%p %p\n", hToken, lpProfileInfo );

1 0

Huw Davies : msxml3: Always have a libxml doc associated with a domdoc object, even if the object has no nodes.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 54c85d3d044127bfc946de75e53f9c7ac3acf8d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54c85d3d044127bfc946de7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 27 10:54:40 2006 +0100 msxml3: Always have a libxml doc associated with a domdoc object, even if the object has no nodes. This means we don't need to add checks for NULL libxml node ptrs in our node implementation. --- dlls/msxml3/domdoc.c | 93 +++++++++++++++++++++++--------------------- dlls/msxml3/tests/domdoc.c | 8 ++++ 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 39e4768..b837288 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -664,12 +664,7 @@ static HRESULT WINAPI domdoc_get_documen *DOMElement = NULL; - if ( !This->node ) - return S_FALSE; - xmldoc = get_doc( This ); - if ( !xmldoc ) - return S_FALSE; root = xmlDocGetRootElement( xmldoc ); if ( !root ) @@ -811,7 +806,6 @@ static HRESULT WINAPI domdoc_createNode( DOMNodeType node_type; xmlNodePtr xmlnode = NULL; xmlChar *xml_name; - xmlDocPtr xmldoc; TRACE("(%p)->(type,%s,%s,%p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); @@ -820,13 +814,6 @@ static HRESULT WINAPI domdoc_createNode( xml_name = xmlChar_from_wchar((WCHAR*)name); - if(!get_doc(This)) - { - xmldoc = xmlNewDoc(NULL); - xmldoc->_private = 0; - attach_xmlnode(This->node, (xmlNodePtr) xmldoc); - } - switch(node_type) { case NODE_ELEMENT: @@ -959,7 +946,8 @@ static HRESULT WINAPI domdoc_load( { domdoc *This = impl_from_IXMLDOMDocument( iface ); LPWSTR filename = NULL; - xmlDocPtr xmldoc; + xmlDocPtr xmldoc = NULL; + HRESULT hr = S_FALSE; TRACE("type %d\n", V_VT(&xmlSource) ); @@ -975,22 +963,26 @@ static HRESULT WINAPI domdoc_load( filename = V_BSTR(&xmlSource); } - if ( !filename ) - return S_FALSE; - - xmldoc = doread( filename ); - if ( !xmldoc ) + if ( filename ) { - This->error = E_FAIL; - return S_FALSE; + xmldoc = doread( filename ); + + if ( !xmldoc ) + This->error = E_FAIL; + else + { + hr = This->error = S_OK; + *isSuccessful = VARIANT_TRUE; + } } - This->error = S_OK; + if(!xmldoc) + xmldoc = xmlNewDoc(NULL); + xmldoc->_private = 0; attach_xmlnode(This->node, (xmlNodePtr) xmldoc); - *isSuccessful = VARIANT_TRUE; - return S_OK; + return hr; } @@ -1084,9 +1076,10 @@ static HRESULT WINAPI domdoc_loadXML( VARIANT_BOOL* isSuccessful ) { domdoc *This = impl_from_IXMLDOMDocument( iface ); - xmlDocPtr xmldoc; + xmlDocPtr xmldoc = NULL; char *str; int len; + HRESULT hr = S_FALSE; TRACE("%p %s %p\n", This, debugstr_w( bstrXML ), isSuccessful ); @@ -1094,31 +1087,30 @@ static HRESULT WINAPI domdoc_loadXML( attach_xmlnode( This->node, NULL ); - if ( !isSuccessful ) - return S_FALSE; - - *isSuccessful = VARIANT_FALSE; - - if ( !bstrXML ) - return S_FALSE; - - if ( !bstr_to_utf8( bstrXML, &str, &len ) ) - return S_FALSE; - - xmldoc = doparse( str, len ); - HeapFree( GetProcessHeap(), 0, str ); - if ( !xmldoc ) + if ( isSuccessful ) { - This->error = E_FAIL; - return S_FALSE; + *isSuccessful = VARIANT_FALSE; + + if ( bstrXML && bstr_to_utf8( bstrXML, &str, &len ) ) + { + xmldoc = doparse( str, len ); + HeapFree( GetProcessHeap(), 0, str ); + if ( !xmldoc ) + This->error = E_FAIL; + else + { + hr = This->error = S_OK; + *isSuccessful = VARIANT_TRUE; + } + } } + if(!xmldoc) + xmldoc = xmlNewDoc(NULL); - This->error = S_OK; xmldoc->_private = 0; attach_xmlnode( This->node, (xmlNodePtr) xmldoc ); - *isSuccessful = VARIANT_TRUE; - return S_OK; + return hr; } @@ -1325,6 +1317,7 @@ HRESULT DOMDocument_create(IUnknown *pUn { domdoc *doc; HRESULT hr; + xmlDocPtr xmldoc; TRACE("(%p,%p)\n", pUnkOuter, ppObj); @@ -1337,9 +1330,19 @@ HRESULT DOMDocument_create(IUnknown *pUn doc->async = 0; doc->error = S_OK; - doc->node_unk = create_basic_node( NULL, (IUnknown*)&doc->lpVtbl ); + xmldoc = xmlNewDoc(NULL); + if(!xmldoc) + { + HeapFree(GetProcessHeap(), 0, doc); + return E_OUTOFMEMORY; + } + + xmldoc->_private = 0; + + doc->node_unk = create_basic_node( (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl ); if(!doc->node_unk) { + xmlFreeDoc(xmldoc); HeapFree(GetProcessHeap(), 0, doc); return E_FAIL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 68f1d1b..808ad93 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -98,6 +98,7 @@ void test_domdoc( void ) IXMLDOMDocument *doc = NULL; IXMLDOMParseError *error; IXMLDOMElement *element = NULL; + IXMLDOMNode *node; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -142,6 +143,13 @@ void test_domdoc( void ) r = IXMLDOMDocument_get_documentElement( doc, &element ); ok( r == S_FALSE, "should be no document element\n"); + /* try finding a node */ + node = NULL; + str = SysAllocString( szstr1 ); + r = IXMLDOMDocument_selectSingleNode( doc, str, &node ); + ok( r == S_FALSE, "ret %08lx\n", r ); + SysFreeString( str ); + b = VARIANT_TRUE; str = SysAllocString( szIncomplete ); r = IXMLDOMDocument_loadXML( doc, str, &b );

1 0

Alexandre Julliard : ntdll: Faster critical sections on MacOS using Mach semaphores.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 27c6c83e1ef3aad395ee2421b5241990dc194010 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27c6c83e1ef3aad395ee242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 17:39:50 2006 +0200 ntdll: Faster critical sections on MacOS using Mach semaphores. --- dlls/ntdll/critsection.c | 152 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 119 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 2739129..581875f 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -90,11 +90,111 @@ static inline int use_futexes(void) return supported; } -#else /* linux */ +static inline NTSTATUS fast_wait( RTL_CRITICAL_SECTION *crit, int timeout ) +{ + int val; + struct timespec timespec; + + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + timespec.tv_sec = timeout; + timespec.tv_nsec = 0; + while ((val = interlocked_cmpxchg( (int *)&crit->LockSemaphore, 0, 1 )) != 1) + { + /* note: this may wait longer than specified in case of signals or */ + /* multiple wake-ups, but that shouldn't be a problem */ + if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -ETIMEDOUT) + return STATUS_TIMEOUT; + } + return STATUS_WAIT_0; +} + +static inline NTSTATUS fast_wake( RTL_CRITICAL_SECTION *crit ) +{ + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + *(int *)&crit->LockSemaphore = 1; + futex_wake( (int *)&crit->LockSemaphore, 1 ); + return STATUS_SUCCESS; +} + +static inline void close_semaphore( RTL_CRITICAL_SECTION *crit ) +{ + if (!use_futexes()) NtClose( crit->LockSemaphore ); +} + +#elif defined(__APPLE__) + +#include <mach/mach.h> +#include <mach/task.h> +#include <mach/semaphore.h> + +static inline semaphore_t get_mach_semaphore( RTL_CRITICAL_SECTION *crit ) +{ + semaphore_t ret = *(int *)&crit->LockSemaphore; + if (!ret) + { + semaphore_t sem; + if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) return 0; + if (!(ret = interlocked_cmpxchg( (int *)&crit->LockSemaphore, sem, 0 ))) + ret = sem; + else + semaphore_destroy( mach_task_self(), sem ); /* somebody beat us to it */ + } + return ret; +} + +static inline NTSTATUS fast_wait( RTL_CRITICAL_SECTION *crit, int timeout ) +{ + mach_timespec_t timespec; + semaphore_t sem = get_mach_semaphore( crit ); + + timespec.tv_sec = timeout; + timespec.tv_nsec = 0; + for (;;) + { + switch( semaphore_timedwait( sem, timespec )) + { + case KERN_SUCCESS: + return STATUS_WAIT_0; + case KERN_ABORTED: + continue; /* got a signal, restart */ + case KERN_OPERATION_TIMED_OUT: + return STATUS_TIMEOUT; + default: + return STATUS_INVALID_HANDLE; + } + } +} + +static inline NTSTATUS fast_wake( RTL_CRITICAL_SECTION *crit ) +{ + semaphore_t sem = get_mach_semaphore( crit ); + semaphore_signal( sem ); + return STATUS_SUCCESS; +} + +static inline void close_semaphore( RTL_CRITICAL_SECTION *crit ) +{ + semaphore_destroy( mach_task_self(), *(int *)&crit->LockSemaphore ); +} + +#else /* __APPLE__ */ + +static inline NTSTATUS fast_wait( RTL_CRITICAL_SECTION *crit, int timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} -static inline int futex_wait( int *addr, int val, struct timespec *timeout ) { return -ENOSYS; } -static inline int futex_wake( int *addr, int val ) { return -ENOSYS; } -static inline int use_futexes(void) { return 0; } +static inline NTSTATUS fast_wake( RTL_CRITICAL_SECTION *crit ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static inline void close_semaphore( RTL_CRITICAL_SECTION *crit ) +{ + NtClose( crit->LockSemaphore ); +} #endif @@ -122,30 +222,18 @@ static inline HANDLE get_semaphore( RTL_ */ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { - if (use_futexes() && crit->DebugInfo) /* debug info is cleared by MakeCriticalSectionGlobal */ - { - int val; - struct timespec timespec; + NTSTATUS ret; - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - while ((val = interlocked_cmpxchg( (int *)&crit->LockSemaphore, 0, 1 )) != 1) - { - /* note: this may wait longer than specified in case of signals or */ - /* multiple wake-ups, but that shouldn't be a problem */ - if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -ETIMEDOUT) - return STATUS_TIMEOUT; - } - return STATUS_WAIT_0; - } - else + /* debug info is cleared by MakeCriticalSectionGlobal */ + if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; time.QuadPart = timeout * (LONGLONG)-10000000; - return NtWaitForSingleObject( sem, FALSE, &time ); + ret = NtWaitForSingleObject( sem, FALSE, &time ); } + return ret; } /*********************************************************************** @@ -261,8 +349,6 @@ NTSTATUS WINAPI RtlDeleteCriticalSection crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->LockSemaphore) NtClose( crit->LockSemaphore ); - crit->LockSemaphore = 0; if (crit->DebugInfo) { /* only free the ones we made in here */ @@ -271,7 +357,10 @@ NTSTATUS WINAPI RtlDeleteCriticalSection RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } + close_semaphore( crit ); } + else NtClose( crit->LockSemaphore ); + crit->LockSemaphore = 0; return STATUS_SUCCESS; } @@ -360,19 +449,16 @@ NTSTATUS WINAPI RtlpWaitForCriticalSecti */ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) { - if (use_futexes() && crit->DebugInfo) /* debug info is cleared by MakeCriticalSectionGlobal */ - { - *(int *)&crit->LockSemaphore = 1; - futex_wake( (int *)&crit->LockSemaphore, 1 ); - return STATUS_SUCCESS; - } - else + NTSTATUS ret; + + /* debug info is cleared by MakeCriticalSectionGlobal */ + if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); - NTSTATUS res = NtReleaseSemaphore( sem, 1, NULL ); - if (res) RtlRaiseStatus( res ); - return res; + ret = NtReleaseSemaphore( sem, 1, NULL ); } + if (ret) RtlRaiseStatus( ret ); + return ret; }

1 0

James Hawkins : msiexec: Use CommandLineToArgvW instead of process_args to reduce code duplication.
by Alexandre Julliard 27 Jun '06

27 Jun '06

Module: wine Branch: refs/heads/master Commit: 7c35db000b26852fc2bf4a7a7e349953f60d183f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c35db000b26852fc2bf4a7… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 26 14:53:32 2006 -0700 msiexec: Use CommandLineToArgvW instead of process_args to reduce code duplication. --- programs/msiexec/Makefile.in | 2 - programs/msiexec/msiexec.c | 104 +----------------------------------------- 2 files changed, 4 insertions(+), 102 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 22815a0..2ddd272 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mconsole -IMPORTS = msi ole32 advapi32 user32 kernel32 +IMPORTS = msi shell32 ole32 advapi32 user32 kernel32 EXTRALIBS = $(LIBUNICODE) C_SRCS = \ diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 809b38f..d637216 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -25,6 +25,7 @@ #include <windows.h> #include <msi.h> #include <objbase.h> #include <stdio.h> +#include <shellapi.h> #include "wine/debug.h" #include "wine/unicode.h" @@ -210,14 +211,6 @@ static DWORD msi_atou(LPCWSTR str) return 0; } -static LPWSTR msi_strdup(LPCWSTR str) -{ - DWORD len = lstrlenW(str)+1; - LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); - lstrcpyW(ret, str); - return ret; -} - /* str1 is the same as str2, ignoring case */ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) { @@ -316,97 +309,6 @@ static DWORD DoDllUnregisterServer(LPCWS return 0; } -/* - * state machine to break up the command line properly - */ - -enum chomp_state -{ - cs_whitespace, - cs_token, - cs_quote -}; - -static int chomp( WCHAR *str ) -{ - enum chomp_state state = cs_whitespace; - WCHAR *p, *out; - int count = 0, ignore; - - for( p = str, out = str; *p; p++ ) - { - ignore = 1; - switch( state ) - { - case cs_whitespace: - switch( *p ) - { - case ' ': - break; - case '"': - state = cs_quote; - count++; - break; - default: - count++; - ignore = 0; - state = cs_token; - } - break; - - case cs_token: - switch( *p ) - { - case '"': - state = cs_quote; - break; - case ' ': - state = cs_whitespace; - *out++ = 0; - break; - default: - ignore = 0; - } - break; - - case cs_quote: - switch( *p ) - { - case '"': - state = cs_token; - break; - default: - ignore = 0; - } - break; - } - if( !ignore ) - *out++ = *p; - } - - *out = 0; - - return count; -} - -static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) -{ - WCHAR **argv, *p = msi_strdup(cmdline); - int i, n; - - n = chomp( p ); - argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); - for( i=0; i<n; i++ ) - { - argv[i] = p; - p += lstrlenW(p) + 1; - } - argv[i] = NULL; - - *pargc = n; - *pargv = argv; -} - static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; @@ -425,7 +327,7 @@ static BOOL process_args_from_reg( LPWST r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); if( r == ERROR_SUCCESS ) { - process_args(buf, pargc, pargv); + *pargv = CommandLineToArgvW(buf, pargc); ret = TRUE; } } @@ -471,7 +373,7 @@ int main(int argc, char **argv) LPWSTR *argvW = NULL; /* overwrite the command line */ - process_args( GetCommandLineW(), &argc, &argvW ); + argvW = CommandLineToArgvW( GetCommandLineW(), &argc ); /* * If the args begin with /@ IDENT then we need to load the real

1 0