November 2006 - Wine-Commits

Markus Amsler : d3d8: Test refcount forwarding.
by Alexandre Julliard Nov. 15, 2006

Nov. 15, 2006

Module: wine Branch: master Commit: 577d5d25803411ec87d1dfd7ec9edc83b791cce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577d5d25803411ec87d1dfd7e… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Wed Nov 15 00:53:40 2006 +0100 d3d8: Test refcount forwarding. --- dlls/d3d8/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9be3381..381eedc 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -60,6 +60,13 @@ #define CHECK_RELEASE_REFCOUNT(obj,rc) \ ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ } +#define CHECK_ADDREF_REFCOUNT(obj,rc) \ + { \ + int rc_new = rc; \ + int count = IUnknown_AddRef( (IUnknown *)obj ); \ + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ + } + #define CHECK_SURFACE_CONTAINER(obj,iid,expected) \ { \ void *container_ptr = (void *)0x1337c0d3; \ @@ -254,6 +261,7 @@ static void test_refcount(void) IDirect3DCubeTexture8 *pCubeTexture = NULL; IDirect3DTexture8 *pTexture = NULL; IDirect3DVolumeTexture8 *pVolumeTexture = NULL; + IDirect3DVolume8 *pVolumeLevel = NULL; IDirect3DSurface8 *pStencilSurface = NULL; IDirect3DSurface8 *pImageSurface = NULL; IDirect3DSurface8 *pRenderTarget = NULL; @@ -315,6 +323,7 @@ static void test_refcount(void) * - the container is the device * - they hold a refernce to the device * - they are created with a refcount of 0 (Get/Release returns orignial refcount) + * - the refcount is not forwarded to the container. */ hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); @@ -322,6 +331,12 @@ static void test_refcount(void) { todo_wine CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pRenderTarget, 1); + + todo_wine CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + todo_wine CHECK_RELEASE_REFCOUNT(pRenderTarget, 1); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); todo_wine CHECK_REFCOUNT( pRenderTarget, 2); @@ -349,6 +364,12 @@ static void test_refcount(void) { CHECK_SURFACE_CONTAINER( pStencilSurface, IID_IDirect3DDevice8, pDevice); todo_wine CHECK_REFCOUNT( pStencilSurface, 1); + + todo_wine CHECK_ADDREF_REFCOUNT(pStencilSurface, 2); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + todo_wine CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); + todo_wine CHECK_REFCOUNT(pDevice, refcount); + todo_wine CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); pStencilSurface = NULL; } @@ -400,12 +421,44 @@ static void test_refcount(void) hr = IDirect3DTexture8_GetSurfaceLevel( pTexture, 1, &pTextureLevel ); CHECK_CALL( hr, "GetSurfaceLevel", pDevice, refcount ); /* But should increment texture's refcount */ - CHECK_CALL( hr, "GetSurfaceLevel", pTexture, tmp+1 ); + CHECK_REFCOUNT( pTexture, tmp+1 ); + /* Because the texture and surface refcount are identical */ + if (pTextureLevel) + { + CHECK_REFCOUNT ( pTextureLevel, tmp+1 ); + CHECK_ADDREF_REFCOUNT ( pTextureLevel, tmp+2 ); + CHECK_REFCOUNT ( pTexture , tmp+2 ); + CHECK_RELEASE_REFCOUNT( pTextureLevel, tmp+1 ); + CHECK_REFCOUNT ( pTexture , tmp+1 ); + CHECK_RELEASE_REFCOUNT( pTexture , tmp ); + CHECK_REFCOUNT ( pTextureLevel, tmp ); + } } hr = IDirect3DDevice8_CreateCubeTexture( pDevice, 32, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pCubeTexture ); CHECK_CALL( hr, "CreateCubeTexture", pDevice, ++refcount ); hr = IDirect3DDevice8_CreateVolumeTexture( pDevice, 32, 32, 2, 0, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pVolumeTexture ); CHECK_CALL( hr, "CreateVolumeTexture", pDevice, ++refcount ); + if (pVolumeTexture) + { + tmp = get_refcount( (IUnknown *)pVolumeTexture ); + + /* This should not increment device refcount */ + hr = IDirect3DVolumeTexture8_GetVolumeLevel(pVolumeTexture, 0, &pVolumeLevel); + CHECK_CALL( hr, "GetVolumeLevel", pDevice, refcount ); + /* But should increment volume texture's refcount */ + CHECK_REFCOUNT( pVolumeTexture, tmp+1 ); + /* Because the volume texture and volume refcount are identical */ + if (pVolumeLevel) + { + CHECK_REFCOUNT ( pVolumeLevel , tmp+1 ); + CHECK_ADDREF_REFCOUNT ( pVolumeLevel , tmp+2 ); + CHECK_REFCOUNT ( pVolumeTexture, tmp+2 ); + CHECK_RELEASE_REFCOUNT( pVolumeLevel , tmp+1 ); + CHECK_REFCOUNT ( pVolumeTexture, tmp+1 ); + CHECK_RELEASE_REFCOUNT( pVolumeTexture, tmp ); + CHECK_REFCOUNT ( pVolumeLevel , tmp ); + } + } /* Surfaces */ hr = IDirect3DDevice8_CreateDepthStencilSurface( pDevice, 32, 32, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &pStencilSurface ); CHECK_CALL( hr, "CreateDepthStencilSurface", pDevice, ++refcount ); @@ -459,9 +512,7 @@ cleanup: if (dVertexShader != -1) IDirect3DDevice8_DeleteVertexShader( pDevice, dVertexShader ); if (dPixelShader != -1) IDirect3DDevice8_DeletePixelShader( pDevice, dPixelShader ); /* Textures */ - /* pTextureLevel is holding a reference to the pTexture */ - CHECK_RELEASE(pTexture, pDevice, refcount); - CHECK_RELEASE(pTextureLevel, pDevice, --refcount); + CHECK_RELEASE(pTexture, pDevice, --refcount); CHECK_RELEASE(pCubeTexture, pDevice, --refcount); CHECK_RELEASE(pVolumeTexture, pDevice, --refcount); /* Surfaces */

1 0

Markus Amsler : d3d8: Back buffer is identical to the render target, test it only once.
by Alexandre Julliard Nov. 15, 2006

Nov. 15, 2006

Module: wine Branch: master Commit: 886c196e053b5d69ef6923f01a3ead75c5dbfebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=886c196e053b5d69ef6923f01… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Wed Nov 15 00:53:18 2006 +0100 d3d8: Back buffer is identical to the render target, test it only once. --- dlls/d3d8/tests/device.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 748aa02..9be3381 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -327,10 +327,22 @@ static void test_refcount(void) todo_wine CHECK_REFCOUNT( pRenderTarget, 2); todo_wine CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); todo_wine CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); - pRenderTarget = NULL; } CHECK_REFCOUNT( pDevice, --refcount); + /* Render target and back buffer are identical. */ + hr = IDirect3DDevice8_GetBackBuffer(pDevice, 0, 0, &pBackBuffer); + todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + if(pBackBuffer) + { + todo_wine CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n", + pRenderTarget, pBackBuffer); + pBackBuffer = NULL; + } + CHECK_REFCOUNT( pDevice, --refcount); + pRenderTarget = NULL; + hr = IDirect3DDevice8_GetDepthStencilSurface(pDevice, &pStencilSurface); todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); if(pStencilSurface) @@ -342,17 +354,6 @@ static void test_refcount(void) } CHECK_REFCOUNT( pDevice, --refcount); - hr = IDirect3DDevice8_GetBackBuffer(pDevice, 0, 0, &pBackBuffer); - todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); - if(pBackBuffer) - { - todo_wine CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DDevice8, pDevice); - todo_wine CHECK_REFCOUNT( pBackBuffer, 1); - todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); - pBackBuffer = NULL; - } - CHECK_REFCOUNT( pDevice, --refcount); - /* Buffers */ hr = IDirect3DDevice8_CreateIndexBuffer( pDevice, 16, 0, D3DFMT_INDEX32, D3DPOOL_DEFAULT, &pIndexBuffer ); CHECK_CALL( hr, "CreateIndexBuffer", pDevice, ++refcount );

1 0

Sam Dennis : msvcrt: Use the custom vsnprintf implementation for msvcrt. vsprintf too.
by Alexandre Julliard Nov. 15, 2006

Nov. 15, 2006

Module: wine Branch: master Commit: 48c006621daacde5f27947a15638fe00243a21e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c006621daacde5f27947a15… Author: Sam Dennis <samuel.howard.dennis(a)gmail.com> Date: Tue Nov 14 11:29:18 2006 +0000 msvcrt: Use the custom vsnprintf implementation for msvcrt.vsprintf too. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dc78679..eaf9312 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -738,7 +738,7 @@ # extern _pwctype @ cdecl vfprintf(ptr str long) MSVCRT_vfprintf @ cdecl vfwprintf(ptr wstr long) MSVCRT_vfwprintf @ cdecl vprintf(str long) MSVCRT_vprintf -@ cdecl vsprintf(ptr str ptr) ntdll.vsprintf +@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr long) MSVCRT_vswprintf @ cdecl vwprintf(wstr long) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 800d3b5..ad3887f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -759,6 +759,14 @@ int CDECL MSVCRT_vsnprintf( char *str, u } /********************************************************************* + * vsprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf( char *str, const char *format, va_list valist) +{ + return MSVCRT_vsnprintf(str, INT_MAX, format, valist); +} + +/********************************************************************* * _snprintf (MSVCRT.@) */ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)

1 0

Kovács András : mshtml: HTMLElementCollection_item implementation.
by Alexandre Julliard Nov. 15, 2006

Nov. 15, 2006

Module: wine Branch: master Commit: 9bf51405751c0d850cd52831ed116d001e0f2ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf51405751c0d850cd52831e… Author: Kovács András <andras(a)csevego.net> Date: Mon Nov 6 16:06:52 2006 +0100 mshtml: HTMLElementCollection_item implementation. --- dlls/mshtml/htmlelem.c | 75 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5a19805..cd869d5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1183,22 +1183,73 @@ static HRESULT WINAPI HTMLElementCollect { HTMLElementCollection *This = ELEMCOL_THIS(iface); - if(V_VT(&index) != VT_I4) { - WARN("Invalid index vt=%d\n", V_VT(&index)); - return E_INVALIDARG; - } + TRACE("(%p)->(v(%d) v(%d) %p)\n", This, V_VT(&name), V_VT(&index), pdisp); - if(V_VT(&name) != VT_I4 || V_I4(&name) != V_I4(&index)) - FIXME("Unsupproted name vt=%d\n", V_VT(&name)); + if(V_VT(&name) == VT_I4) { + TRACE("name is VT_I4: %d\n", V_I4(&name)); + if(V_I4(&name) < 0 || V_I4(&name) >= This->len) { + ERR("Invalid name! name=%d\n", V_I4(&name)); + return E_INVALIDARG; + } - TRACE("(%p)->(%d %d %p)\n", This, V_I4(&name), V_I4(&index), pdisp); + *pdisp = (IDispatch*)This->elems[V_I4(&name)]; + IDispatch_AddRef(*pdisp); + TRACE("Returning pdisp=%p\n", pdisp); + return S_OK; + } - if(V_I4(&index) < 0 || V_I4(&index) >= This->len) - return E_INVALIDARG; + if(V_VT(&name) == VT_BSTR) { + DWORD i; + nsAString tag_str; + const PRUnichar *tag; + elem_vector buf = {NULL, 0, 8}; + + TRACE("name is VT_BSTR: %s\n", debugstr_w(V_BSTR(&name))); + + nsAString_Init(&tag_str, NULL); + buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement*)); + + for(i=0; i<This->len; i++) { + if(!This->elems[i]->nselem) continue; + + nsIDOMHTMLElement_GetId(This->elems[i]->nselem, &tag_str); + nsAString_GetData(&tag_str, &tag, NULL); + + if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, + V_BSTR(&name), -1) == CSTR_EQUAL) { + TRACE("Found name. elem=%d\n", i); + if (V_VT(&index) == VT_I4) + if (buf.len == V_I4(&index)) { + nsAString_Finish(&tag_str); + mshtml_free(buf.buf); + buf.buf = NULL; + *pdisp = (IDispatch*)This->elems[i]; + TRACE("Returning element %d pdisp=%p\n", i, pdisp); + IDispatch_AddRef(*pdisp); + return S_OK; + } + elem_vector_add(&buf, This->elems[i]); + } + } + nsAString_Finish(&tag_str); + if (V_VT(&index) == VT_I4) { + mshtml_free(buf.buf); + buf.buf = NULL; + ERR("Invalid index. index=%d >= buf.len=%d\n",V_I4(&index), buf.len); + return E_INVALIDARG; + } + if(!buf.len) { + mshtml_free(buf.buf); + buf.buf = NULL; + } else if(buf.size > buf.len) { + buf.buf = mshtml_realloc(buf.buf, buf.len*sizeof(HTMLElement*)); + } + TRACE("Returning %d element(s).\n", buf.len); + return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); + } - *pdisp = (IDispatch*)This->elems[V_I4(&index)]; - IDispatch_AddRef(*pdisp); - return S_OK; + FIXME("unsupported arguments\n"); + return E_INVALIDARG; } static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface,

1 0

Eric Pouech : ntdll: Fixed returned status for NtQueryThreadInformation' s ThreadDescriptorTable
by Alexandre Julliard Nov. 15, 2006

Nov. 15, 2006

Module: wine Branch: master Commit: 5b1f3b14caed3aeaeac2eb09846857106ecce757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1f3b14caed3aeaeac2eb098… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Nov 4 11:52:44 2006 +0100 ntdll: Fixed returned status for NtQueryThreadInformation's ThreadDescriptorTable (spotted by Peter Oberndorfer). --- dlls/ntdll/thread.c | 6 ++++-- server/ptrace.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 151ff1e..43eb0cd 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1150,7 +1150,7 @@ #ifdef __i386__ if (!status) { if (!(reply->flags & WINE_LDT_FLAGS_ALLOCATED)) - status = STATUS_INVALID_LDT_OFFSET; + status = STATUS_ACCESS_VIOLATION; else { wine_ldt_set_base ( &tdi->Entry, (void *)reply->base ); @@ -1161,7 +1161,9 @@ #ifdef __i386__ } SERVER_END_REQ; } - if (status == STATUS_SUCCESS && ret_len) *ret_len = sizeof(*tdi); + if (status == STATUS_SUCCESS && ret_len) + /* yes, that's a bit strange, but it's the way it is */ + *ret_len = sizeof(LDT_ENTRY); #else status = STATUS_NOT_IMPLEMENTED; #endif diff --git a/server/ptrace.c b/server/ptrace.c index ef72713..26a4042 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -445,7 +445,7 @@ void get_selector_entry( struct thread * } if (entry >= 8192) { - set_error( STATUS_INVALID_PARAMETER ); /* FIXME */ + set_error( STATUS_ACCESS_VIOLATION ); return; } if (suspend_for_ptrace( thread ))

1 0

Alexandre Julliard : msvcrt/tests: Clean up a temp file.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 63b62dc50b8f2a80ba17abbbee840dcf11e09229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b62dc50b8f2a80ba17abbbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 12:00:38 2006 +0100 msvcrt/tests: Clean up a temp file. --- dlls/msvcrt/tests/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d33d7ab..bd58eeb 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -292,6 +292,7 @@ static void test_fgetc( void ) ret = fgetc(tempfh); ok(ich == ret, "Second fgetc expected %x got %x\n", ich, ret); fclose(tempfh); + unlink(tempf); } static void test_fgetwc( void )

1 0

Alexandre Julliard : shell32: Don' t use the short path name to delete files in SHFileOperation.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: dc0c3677cd4532c6c75694074f047f7d45d24e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0c3677cd4532c6c75694074… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 14 12:00:23 2006 +0100 shell32: Don't use the short path name to delete files in SHFileOperation. --- dlls/shell32/shlfileop.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 6405b5b..1437c07 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -207,12 +207,9 @@ BOOL SHELL_DeleteDirectoryW(HWND hwnd, L { do { - LPWSTR lp = wfd.cAlternateFileName; - if (!lp[0]) - lp = wfd.cFileName; - if (IsDotDir(lp)) + if (IsDotDir(wfd.cFileName)) continue; - PathCombineW(szTemp, pszDir, lp); + PathCombineW(szTemp, pszDir, wfd.cFileName); if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); else

1 0

Hwang YunSong(황윤성) : shdoclc: Updated Korean resource.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: bbe4550b46027d1019608f252f8d01bb99d92fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe4550b46027d1019608f252… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Nov 14 10:04:01 2006 +0900 shdoclc: Updated Korean resource. --- dlls/shdoclc/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index ce55416..dde528b 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -112,7 +112,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR } - POPUP "��Ŀ" + POPUP "��" { MENUITEM "��(&O)", IDM_FOLLOWLINKC MENUITEM "�� â�� (&N)", IDM_FOLLOWLINKN @@ -130,7 +130,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "�Ӽ�(&R)", IDM_PROPERTIES } - POPUP "�˼� �� ý�Ʈ" + POPUP "�˼� �� " { MENUITEM SEPARATOR }

1 0

Mike McCormack : msi: Split MSI_CreatePackage into two functions.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: eadf2f82be9e68cdbd8cb3f4c44f51c0514f9ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eadf2f82be9e68cdbd8cb3f4c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 14:47:24 2006 +0900 msi: Split MSI_CreatePackage into two functions. --- dlls/msi/package.c | 53 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 15c39ca..164c7f2 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -427,34 +427,20 @@ static UINT msi_get_word_count( MSIPACKA return word_count; } -MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPWSTR base_url ) +static MSIPACKAGE *msi_alloc_package( void ) { - static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; - static const WCHAR szpi[] = {'%','i',0}; - static const WCHAR szProductCode[] = { - 'P','r','o','d','u','c','t','C','o','d','e',0}; - MSIPACKAGE *package = NULL; - WCHAR uilevel[10]; + MSIPACKAGE *package; int i; - TRACE("%p\n", db); - package = alloc_msiobject( MSIHANDLETYPE_PACKAGE, sizeof (MSIPACKAGE), MSI_FreePackage ); if( package ) { - msiobj_addref( &db->hdr ); - - package->db = db; list_init( &package->components ); list_init( &package->features ); list_init( &package->files ); list_init( &package->tempfiles ); list_init( &package->folders ); - package->ActionFormat = NULL; - package->LastAction = NULL; - package->dialog = NULL; - package->next_dialog = NULL; list_init( &package->subscriptions ); list_init( &package->appids ); list_init( &package->classes ); @@ -463,16 +449,39 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA list_init( &package->progids ); list_init( &package->RunningActions ); + for (i=0; i<PROPERTY_HASH_SIZE; i++) + list_init( &package->props[i] ); + + package->ActionFormat = NULL; + package->LastAction = NULL; + package->dialog = NULL; + package->next_dialog = NULL; + } + + return package; +} + +MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPWSTR base_url ) +{ + static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; + static const WCHAR szpi[] = {'%','i',0}; + static const WCHAR szProductCode[] = { + 'P','r','o','d','u','c','t','C','o','d','e',0}; + MSIPACKAGE *package; + WCHAR uilevel[10]; + + TRACE("%p\n", db); + + package = msi_alloc_package(); + if (package) + { + msiobj_addref( &db->hdr ); + package->db = db; + package->WordCount = msi_get_word_count( package ); package->PackagePath = strdupW( db->path ); package->BaseURL = strdupW( base_url ); - /* OK, here is where we do a slew of things to the database to - * prep for all that is to come as a package */ - - for (i=0; i<PROPERTY_HASH_SIZE; i++) - list_init( &package->props[i] ); - clone_properties( package ); set_installer_properties(package); sprintfW(uilevel,szpi,gUILevel);

1 0

Mike McCormack : msi: Delete the tempfile created by GetTempFileName.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 032b1389b1d418c363c37ede2ccc178d14dfdeb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032b1389b1d418c363c37ede2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 12:43:04 2006 +0900 msi: Delete the tempfile created by GetTempFileName. --- dlls/msi/package.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6f3815f..15c39ca 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -498,13 +498,14 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA static LPCWSTR copy_package_to_temp( LPCWSTR szPackage, LPWSTR filename ) { WCHAR path[MAX_PATH]; - static const WCHAR szMSI[] = {'M','S','I',0}; + static const WCHAR szMSI[] = {'m','s','i',0}; GetTempPathW( MAX_PATH, path ); GetTempFileNameW( path, szMSI, 0, filename ); if( !CopyFileW( szPackage, filename, FALSE ) ) { + DeleteFileW( filename ); ERR("failed to copy package %s\n", debugstr_w(szPackage) ); return szPackage; }

1 0