August 2008 - Wine-commits - list.winehq.org

Piotr Caban : msxml3: Add ISAXAttributes_getName implementation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 5e1af9b9653aa579052d02e18ac8fd3c87721b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1af9b9653aa579052d02e18… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:30:16 2008 +0200 msxml3: Add ISAXAttributes_getName implementation. --- dlls/msxml3/saxreader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 55d4d56..d850c05 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -696,9 +696,20 @@ static HRESULT WINAPI isaxattributes_getName( int *pQNameLength) { saxattributes *This = impl_from_ISAXAttributes( iface ); + TRACE("(%p)->(%d)\n", This, nIndex); - FIXME("(%p)->(%d) stub\n", This, nIndex); - return E_NOTIMPL; + if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; + if(!pUri || !pUriLength || !pLocalName || !pLocalNameSize + || !pQName || !pQNameLength) return E_POINTER; + + *pUriLength = SysStringLen(This->szURI[nIndex]); + *pUri = This->szURI[nIndex]; + *pLocalNameSize = SysStringLen(This->szLocalname[nIndex]); + *pLocalName = This->szLocalname[nIndex]; + *pQNameLength = SysStringLen(This->szQName[nIndex]); + *pQName = This->szQName[nIndex]; + + return S_OK; } static HRESULT WINAPI isaxattributes_getIndexFromName(

1 0

Alexander Nicolaysen Sørnes : regedit: Fix passing null pointer.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 93f1d070fc09bc34427b9adcc5209b21c0ed4e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f1d070fc09bc34427b9adcc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 21 10:32:11 2008 +0200 regedit: Fix passing null pointer. --- programs/regedit/framewnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index de4b98a..51c94cc 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -673,7 +673,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_REGISTRY_PRINT: { const WCHAR empty = 0; - PrintRegistryHive(hWnd, empty); + PrintRegistryHive(hWnd, &empty); break; } case ID_EDIT_DELETE:

1 0

Piotr Caban : msxml3: Add ISAXContentHandler_endPrefix event.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 03f790970923ab51c00b6d42922042b2ef58fc1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f790970923ab51c00b6d429… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 20 18:20:50 2008 +0200 msxml3: Add ISAXContentHandler_endPrefix event. --- dlls/msxml3/saxreader.c | 70 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 18ff134..f7da49f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -72,6 +72,9 @@ typedef struct _saxlocator int line; int column; BOOL vbInterface; + int nsStackSize; + int nsStackLast; + int *nsStack; } saxlocator; typedef struct _saxattributes @@ -117,6 +120,29 @@ static inline saxattributes *impl_from_ISAXAttributes( ISAXAttributes *iface ) } +static HRESULT namespacePush(saxlocator *locator, int ns) +{ + if(locator->nsStackLast>=locator->nsStackSize) + { + int *new_stack; + + new_stack = HeapReAlloc(GetProcessHeap(), 0, + locator->nsStack, locator->nsStackSize*2); + if(!new_stack) return E_OUTOFMEMORY; + locator->nsStack = new_stack; + locator->nsStackSize *= 2; + } + locator->nsStack[locator->nsStackLast++] = ns; + + return S_OK; +} + +static int namespacePop(saxlocator *locator) +{ + if(locator->nsStackLast == 0) return 0; + return locator->nsStack[--locator->nsStackLast]; +} + static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) { DWORD dLen; @@ -937,7 +963,9 @@ static void libxmlStartElementNS( update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); - if(This->saxreader->contentHandler) + hr = namespacePush(This, nb_namespaces); + + if(hr==S_OK && This->saxreader->contentHandler) { for(index=0; index<nb_namespaces; index++) { @@ -990,10 +1018,10 @@ static void libxmlStartElementNS( SysFreeString(NamespaceUri); SysFreeString(LocalName); SysFreeString(QName); - - if(hr != S_OK) - format_error_message_from_id(This, hr); } + + if(hr != S_OK) + format_error_message_from_id(This, hr); } static void libxmlEndElementNS( @@ -1002,15 +1030,18 @@ static void libxmlEndElementNS( const xmlChar *prefix, const xmlChar *URI) { - BSTR NamespaceUri, LocalName, QName; + BSTR NamespaceUri, LocalName, QName, Prefix; saxlocator *This = ctx; HRESULT hr; xmlChar *end; + int nsNr, index; end = This->lastCur; while(*end != '<' && *(end+1) != '/') end++; update_position(This, end+2); + nsNr = namespacePop(This); + if(This->saxreader->contentHandler) { NamespaceUri = bstr_from_xmlChar(URI); @@ -1033,7 +1064,26 @@ static void libxmlEndElementNS( SysFreeString(QName); if(hr != S_OK) + { format_error_message_from_id(This, hr); + return; + } + + for(index=This->pParserCtxt->nsNr-2; + index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + { + Prefix = bstr_from_xmlChar(This->pParserCtxt->nsTab[index]); + + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); + + SysFreeString(Prefix); + } } } @@ -1410,6 +1460,7 @@ static ULONG WINAPI isaxlocator_Release( SysFreeString(This->publicId); if(This->systemId) SysFreeString(This->systemId); + HeapFree(GetProcessHeap(), 0, This->nsStack); ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl); HeapFree( GetProcessHeap(), 0, This ); @@ -1517,6 +1568,15 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B locator->line = 0; locator->column = 0; locator->ret = S_OK; + locator->nsStackSize = 8; + locator->nsStackLast = 0; + locator->nsStack = HeapAlloc(GetProcessHeap(), 0, locator->nsStackSize); + if(!locator->nsStack) + { + ISAXXMLReader_Release((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); + HeapFree(GetProcessHeap(), 0, locator); + return E_OUTOFMEMORY; + } *ppsaxlocator = locator;

1 0

James Hawkins : msi: Fix the logic to determine the appropriate action of the component.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 7c9873e4711a108862effac7e5ddc72d3af34206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9873e4711a108862effac7e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:17:46 2008 -0500 msi: Fix the logic to determine the appropriate action of the component. --- dlls/msi/msipriv.h | 36 ++++++++++++++- dlls/msi/tests/format.c | 5 ++- dlls/msi/tests/install.c | 25 +++------- dlls/msi/tests/package.c | 110 +++++++++++++++++----------------------------- 4 files changed, 86 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9873e4711a108862eff…

1 0

James Hawkins : msi: Don't remove a misc file if the action is unknown.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 472b991958b3c426765ee76f96cba7194db5281d URL: http://source.winehq.org/git/wine.git/?a=commit;h=472b991958b3c426765ee76f9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:18:40 2008 -0500 msi: Don't remove a misc file if the action is unknown. --- dlls/msi/files.c | 3 +++ dlls/msi/tests/install.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 945390e..0d9cd11 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -439,6 +439,9 @@ static BOOL verify_comp_for_removal(MSICOMPONENT *comp, UINT install_mode) { INSTALLSTATE request = comp->ActionRequest; + if (request == INSTALLSTATE_UNKNOWN) + return FALSE; + if (install_mode == msidbRemoveFileInstallModeOnInstall && (request == INSTALLSTATE_LOCAL || request == INSTALLSTATE_SOURCE)) return TRUE; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6774cfb..40fabf8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4317,10 +4317,7 @@ static void test_removefiles(void) ok(delete_pf("msitest\\attoparsec", TRUE), "File deleted\n"); ok(!delete_pf("msitest\\storeys", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\block", TRUE), "File not deleted\n"); - todo_wine - { - ok(delete_pf("msitest\\siriometer", TRUE), "File deleted\n"); - } + ok(delete_pf("msitest\\siriometer", TRUE), "File deleted\n"); ok(pf_exists("msitest\\cabout"), "Directory deleted\n"); ok(pf_exists("msitest"), "Directory deleted\n");

1 0

Alexander Nicolaysen Sørnes : kernel32/ winerr: Add Norwegian Bokmå l translation.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: edf48ea287a765674a417ad7d1161270b1a59b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf48ea287a765674a417ad7d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 20 19:19:40 2008 +0200 kernel32/winerr: Add Norwegian Bokmål translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/kernel.rc | 1 + dlls/kernel32/nls/winerr_nor.mc | 3731 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 3735 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edf48ea287a765674a417…

1 0

James Hawkins : msi: Remove an invalid setting of the install state.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 4553d0fd4726b0f08c04bc192f86dd9ec023089d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4553d0fd4726b0f08c04bc192… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 01:36:56 2008 -0500 msi: Remove an invalid setting of the install state. --- dlls/msi/action.c | 2 - dlls/msi/tests/install.c | 5 +- dlls/msi/tests/package.c | 213 ++++++++++++--------------------------------- 3 files changed, 61 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4553d0fd4726b0f08c04b…

1 0

James Hawkins : msi: Don't remove a file that is installed as source.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: f909e1c06ed7723eb6524ec3faeb11ea610cb8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f909e1c06ed7723eb6524ec3f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:17:15 2008 -0500 msi: Don't remove a file that is installed as source. --- dlls/msi/files.c | 3 ++- dlls/msi/tests/install.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6de1c5a..945390e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -547,7 +547,8 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); - if ( file->Component->ActionRequest != INSTALLSTATE_ABSENT ) + if ( file->Component->ActionRequest != INSTALLSTATE_ABSENT || + file->Component->Installed == INSTALLSTATE_SOURCE ) continue; /* don't remove a file if the old file diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1c361a3..9727393 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4269,9 +4269,9 @@ static void test_removefiles(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); + ok(delete_pf("msitest\\helium", TRUE), "File deleted\n"); todo_wine { - ok(delete_pf("msitest\\helium", TRUE), "File deleted\n"); ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); } ok(delete_pf("msitest", FALSE), "File deleted\n");

1 0

James Hawkins : msi: Downgrade an ERR to a TRACE.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: b965a74ef28d9967ff0e0b26b71380d7c2cc4859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b965a74ef28d9967ff0e0b26b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:15:31 2008 -0500 msi: Downgrade an ERR to a TRACE. --- dlls/msi/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index c829ce9..6de1c5a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -558,7 +558,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) TRACE("removing %s\n", debugstr_w(file->File) ); if ( !DeleteFileW( file->TargetPath ) ) - ERR("failed to delete %s\n", debugstr_w(file->TargetPath) ); + TRACE("failed to delete %s\n", debugstr_w(file->TargetPath)); file->state = msifs_missing; /* the UI chunk */

1 0

James Hawkins : msi: Handle components installed as source in MsiQueryComponentState.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 39b874706c4509b222de01e77a3a09d2c1049d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b874706c4509b222de01e77… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 21 02:16:03 2008 -0500 msi: Handle components installed as source in MsiQueryComponentState. --- dlls/msi/msi.c | 19 ++++++++++++++----- dlls/msi/tests/msi.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 9055c59..f86f194 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1299,7 +1299,7 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context) static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, MSIINSTALLCONTEXT context, - LPCWSTR comp, DWORD *sz) + LPCWSTR comp, LPWSTR val, DWORD *sz) { HKEY hkey; LONG res; @@ -1313,8 +1313,7 @@ static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, if (r != ERROR_SUCCESS) return FALSE; - *sz = 0; - res = RegQueryValueExW(hkey, squished_pc, NULL, NULL, NULL, sz); + res = RegQueryValueExW(hkey, squished_pc, NULL, NULL, (BYTE *)val, sz); if (res != ERROR_SUCCESS) return FALSE; @@ -1327,6 +1326,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, LPCWSTR szComponent, INSTALLSTATE *pdwState) { WCHAR squished_pc[GUID_SIZE]; + WCHAR val[MAX_PATH]; BOOL found; DWORD sz; @@ -1357,13 +1357,22 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, *pdwState = INSTALLSTATE_UNKNOWN; - if (!msi_comp_find_prodcode(squished_pc, dwContext, szComponent, &sz)) + sz = MAX_PATH; + if (!msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz)) return ERROR_UNKNOWN_COMPONENT; if (sz == 0) *pdwState = INSTALLSTATE_NOTUSED; else - *pdwState = INSTALLSTATE_LOCAL; + { + if (lstrlenW(val) > 2 && + val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9') + { + *pdwState = INSTALLSTATE_SOURCE; + } + else + *pdwState = INSTALLSTATE_LOCAL; + } return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 0e262ae..bafcddc 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1237,6 +1237,43 @@ static void test_MsiQueryComponentState(void) res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + /* INSTALLSTATE_LOCAL */ + state = MAGIC_ERROR; + r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01\\", 4); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLSTATE_SOURCE */ + state = MAGIC_ERROR; + r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* bad INSTALLSTATE_SOURCE */ + state = MAGIC_ERROR; + r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01a", 4); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* INSTALLSTATE_SOURCE */ + state = MAGIC_ERROR; + r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"01", 3); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* bad INSTALLSTATE_SOURCE */ state = MAGIC_ERROR; r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, component, &state); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0