July 2006 - Wine-Commits - list.winehq.org

Christian Gmeiner : setupapi: Rename a test.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: dce52c1b3bb71a8165f0cc7aac63cfad95331152 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dce52c1b3bb71a8165f0cc7… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Thu Jul 20 15:08:32 2006 +0200 setupapi: Rename a test. --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 4181858..b2f3a52 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -31,7 +31,7 @@ #include "setupapi.h" #include "wine/test.h" -static void test_Device_Info_List(void) +static void test_SetupDiCreateDeviceInfoListEx(void) { HDEVINFO devlist; BOOL ret; @@ -65,5 +65,5 @@ static void test_Device_Info_List(void) START_TEST(devinst) { - test_Device_Info_List(); + test_SetupDiCreateDeviceInfoListEx(); }

1 0

Alexandre Julliard : ntdll: Set a proper HEAP_MIN_DATA_SIZE on 64-bit platforms.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: 4ed286b43130a0e3be965eca0a91e3699d3d2aa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ed286b43130a0e3be965ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:53:52 2006 +0200 ntdll: Set a proper HEAP_MIN_DATA_SIZE on 64-bit platforms. --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b62c4da..a2e76dd 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -84,7 +84,8 @@ #define QUIET 1 #define NOISY 0 /* Report all errors */ /* minimum data size (without arenas) of an allocated block */ -#define HEAP_MIN_DATA_SIZE 16 +/* make sure that it's larger than a free list entry */ +#define HEAP_MIN_DATA_SIZE (2 * sizeof(struct list)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE))

1 0

Alexandre Julliard : ntdll: Simplify the sanity checks in RtlFreeHeap and RtlReAllocateHeap.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: d49884c3e957c2a4218316232a6239c388541df1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d49884c3e957c2a42183162… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 13:22:13 2006 +0200 ntdll: Simplify the sanity checks in RtlFreeHeap and RtlReAllocateHeap. --- dlls/ntdll/heap.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a2e76dd..d02e61a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -969,12 +969,6 @@ static BOOL HEAP_IsRealArena( HEAP *heap SUBHEAP *subheap; BOOL ret = TRUE; - if (!heapPtr || (heapPtr->magic != HEAP_MAGIC)) - { - ERR("Invalid heap %p!\n", heapPtr ); - return FALSE; - } - flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; /* calling HeapLock may result in infinite recursion, so do the critsect directly */ @@ -1233,24 +1227,28 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) - { - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); - TRACE("(%p,%08lx,%p): returning FALSE\n", heap, flags, ptr ); - return FALSE; - } - /* Turn the block into a free block */ + /* Some sanity checks */ pInUse = (ARENA_INUSE *)ptr - 1; - subheap = HEAP_FindSubHeap( heapPtr, pInUse ); + if (!(subheap = HEAP_FindSubHeap( heapPtr, pInUse ))) goto error; + if ((char *)pInUse < (char *)subheap + subheap->headerSize) goto error; + if (!HEAP_ValidateInUseArena( subheap, pInUse, QUIET )) goto error; + + /* Turn the block into a free block */ + HEAP_MakeInUseBlockFree( subheap, pInUse ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); TRACE("(%p,%08lx,%p): returning TRUE\n", heap, flags, ptr ); return TRUE; + +error: + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + TRACE("(%p,%08lx,%p): returning FALSE\n", heap, flags, ptr ); + return FALSE; } @@ -1292,18 +1290,14 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE h if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) - { - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); - TRACE("(%p,%08lx,%p,%08lx): returning NULL\n", heap, flags, ptr, size ); - return NULL; - } + + pArena = (ARENA_INUSE *)ptr - 1; + if (!(subheap = HEAP_FindSubHeap( heapPtr, pArena ))) goto error; + if ((char *)pArena < (char *)subheap + subheap->headerSize) goto error; + if (!HEAP_ValidateInUseArena( subheap, pArena, QUIET )) goto error; /* Check if we need to grow the block */ - pArena = (ARENA_INUSE *)ptr - 1; - subheap = HEAP_FindSubHeap( heapPtr, pArena ); oldSize = (pArena->size & ARENA_SIZE_MASK); if (rounded_size > oldSize) { @@ -1380,6 +1374,12 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE h TRACE("(%p,%08lx,%p,%08lx): returning %p\n", heap, flags, ptr, size, pArena + 1 ); return (LPVOID)(pArena + 1); + +error: + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); + TRACE("(%p,%08lx,%p,%08lx): returning NULL\n", heap, flags, ptr, size ); + return NULL; }

1 0

Robert Reif : advapi32: Partial LookupAccountSid implementation.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: a2cdb3ba9a9ef5f0a34ffc967cb0f632740f5c52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2cdb3ba9a9ef5f0a34ffc9… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Jul 20 07:05:46 2006 -0400 advapi32: Partial LookupAccountSid implementation. --- dlls/advapi32/security.c | 245 +++++++++++++++++++++++++++++++++++----- dlls/advapi32/tests/security.c | 36 ++++++ 2 files changed, 248 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a2cdb3ba9a9ef5f0a34…

1 0

Alexandre Julliard : ntdll: Add a few more free list entries to the heap.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: 13163349521e50e7039e188a22b6a814dcfcfc37 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13163349521e50e7039e188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:53:24 2006 +0200 ntdll: Add a few more free list entries to the heap. --- dlls/ntdll/heap.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 68a234b..b62c4da 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -88,13 +88,12 @@ #define HEAP_MIN_DATA_SIZE 16 /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) -#define HEAP_NB_FREE_LISTS 4 /* Number of free lists */ - /* Max size of the blocks on the free lists */ -static const DWORD HEAP_freeListSizes[HEAP_NB_FREE_LISTS] = +static const DWORD HEAP_freeListSizes[] = { - 0x20, 0x80, 0x200, ~0UL + 0x10, 0x20, 0x30, 0x40, 0x60, 0x80, 0x100, 0x200, 0x400, 0x1000, ~0UL }; +#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes)/sizeof(HEAP_freeListSizes[0])) typedef struct {

1 0

Hwang YunSong(황윤성) : comdlg32: Updated Korean resource.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: c945c25b82e6ed70a4983a12223bff60ebe45f7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c945c25b82e6ed70a4983a1… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Jul 21 16:58:12 2006 +0900 comdlg32: Updated Korean resource. --- dlls/comdlg32/cdlg_Ko.rc | 62 +++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c945c25b82e6ed70a49…

1 0

Mike McCormack : msi: Handle W/ A conversions more correctly in MsiProvideQualifiedComponentEx.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: aed2de8ec9c24ab28b4f7ab923f32b476d707537 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aed2de8ec9c24ab28b4f7ab… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 21 14:05:29 2006 +0900 msi: Handle W/A conversions more correctly in MsiProvideQualifiedComponentEx. --- dlls/msi/msi.c | 102 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 60 insertions(+), 42 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 38e7ce6..f81c9d6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1549,20 +1549,19 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCS } /*********************************************************************** - * MsiProvideQualifiedComponentExW [MSI.@] + * MSI_ProvideQualifiedComponentEx [internal] */ -UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent, +UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct, - DWORD Unused1, DWORD Unused2, LPWSTR lpPathBuf, + DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, DWORD* pcchPathBuf) { - HKEY hkey; - UINT rc; + WCHAR product[MAX_FEATURE_CHARS+1], component[MAX_FEATURE_CHARS+1], + feature[MAX_FEATURE_CHARS+1]; LPWSTR info; + HKEY hkey; DWORD sz; - WCHAR product[MAX_FEATURE_CHARS+1]; - WCHAR component[MAX_FEATURE_CHARS+1]; - WCHAR feature[MAX_FEATURE_CHARS+1]; + UINT rc; TRACE("%s %s %li %s %li %li %p %p\n", debugstr_w(szComponent), debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), @@ -1581,16 +1580,32 @@ UINT WINAPI MsiProvideQualifiedComponent MsiDecomposeDescriptorW(info, product, feature, component, &sz); if (!szProduct) - rc = MsiGetComponentPathW(product, component, lpPathBuf, pcchPathBuf); + rc = MSI_GetComponentPath(product, component, lpPathBuf, pcchPathBuf); else - rc = MsiGetComponentPathW(szProduct, component, lpPathBuf, pcchPathBuf); + rc = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); - msi_free(info); - if (rc == INSTALLSTATE_LOCAL) - return ERROR_SUCCESS; - else + if (rc != INSTALLSTATE_LOCAL) return ERROR_FILE_NOT_FOUND; + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiProvideQualifiedComponentExW [MSI.@] + */ +UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent, + LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct, + DWORD Unused1, DWORD Unused2, LPWSTR lpPathBuf, + DWORD* pcchPathBuf) +{ + awstring path; + + path.unicode = TRUE; + path.str.w = lpPathBuf; + + return MSI_ProvideQualifiedComponentEx(szComponent, szQualifier, + dwInstallMode, szProduct, Unused1, Unused2, &path, pcchPathBuf); } /*********************************************************************** @@ -1601,11 +1616,38 @@ UINT WINAPI MsiProvideQualifiedComponent DWORD Unused1, DWORD Unused2, LPSTR lpPathBuf, DWORD* pcchPathBuf) { - FIXME("%s %s %li %s %li %li %p %p\n", debugstr_a(szComponent), + LPWSTR szwComponent, szwQualifier = NULL, szwProduct = NULL; + UINT r = ERROR_OUTOFMEMORY; + awstring path; + + TRACE("%s %s %lu %s %lu %lu %p %p\n", debugstr_a(szComponent), debugstr_a(szQualifier), dwInstallMode, debugstr_a(szProduct), Unused1, Unused2, lpPathBuf, pcchPathBuf); - return ERROR_CALL_NOT_IMPLEMENTED; + szwComponent = strdupAtoW( szComponent ); + if (szComponent && !szwComponent) + goto end; + + szwQualifier = strdupAtoW( szQualifier ); + if (szQualifier && !szwQualifier) + goto end; + + szwProduct = strdupAtoW( szProduct ); + if (szProduct && !szwProduct) + goto end; + + path.unicode = FALSE; + path.str.a = lpPathBuf; + + r = MSI_ProvideQualifiedComponentEx(szwComponent, szwQualifier, + dwInstallMode, szwProduct, Unused1, + Unused2, &path, pcchPathBuf); +end: + msi_free(szwProduct); + msi_free(szwComponent); + msi_free(szwQualifier); + + return r; } /*********************************************************************** @@ -1626,32 +1668,8 @@ UINT WINAPI MsiProvideQualifiedComponent LPCSTR szQualifier, DWORD dwInstallMode, LPSTR lpPathBuf, DWORD* pcchPathBuf) { - LPWSTR szwComponent, szwQualifier, lpwPathBuf; - DWORD cchwPathBuf; - UINT rc; - - TRACE("%s %s %li %p %p\n",szComponent, szQualifier, - dwInstallMode, lpPathBuf, pcchPathBuf); - - szwComponent= strdupAtoW( szComponent); - szwQualifier= strdupAtoW( szQualifier); - - lpwPathBuf = msi_alloc(*pcchPathBuf * sizeof(WCHAR)); - - cchwPathBuf = *pcchPathBuf; - - rc = MsiProvideQualifiedComponentW(szwComponent, szwQualifier, - dwInstallMode, lpwPathBuf, &cchwPathBuf); - - msi_free(szwComponent); - msi_free(szwQualifier); - - if (rc == ERROR_SUCCESS) - *pcchPathBuf = WideCharToMultiByte(CP_ACP, 0, lpwPathBuf, cchwPathBuf + 1, - lpPathBuf, *pcchPathBuf, NULL, NULL); - - msi_free(lpwPathBuf); - return rc; + return MsiProvideQualifiedComponentExA(szComponent, szQualifier, + dwInstallMode, NULL, 0, 0, lpPathBuf, pcchPathBuf); } USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR szProduct, LPWSTR lpUserNameBuf,

1 0

Mike McCormack : msi: Use msi_reg_get_val_str() to read a registry value.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: 869495efd3b9ed7b1f7d984583b6edecf6fd0368 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=869495efd3b9ed7b1f7d984… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 21 14:05:15 2006 +0900 msi: Use msi_reg_get_val_str() to read a registry value. --- dlls/msi/msi.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 0d74524..38e7ce6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1572,22 +1572,11 @@ UINT WINAPI MsiProvideQualifiedComponent if (rc != ERROR_SUCCESS) return ERROR_INDEX_ABSENT; - sz = 0; - rc = RegQueryValueExW( hkey, szQualifier, NULL, NULL, NULL, &sz); - if (sz <= 0) - { - RegCloseKey(hkey); - return ERROR_INDEX_ABSENT; - } + info = msi_reg_get_val_str( hkey, szQualifier ); + RegCloseKey(hkey); - info = msi_alloc(sz); - rc = RegQueryValueExW( hkey, szQualifier, NULL, NULL, (LPBYTE)info, &sz); - if (rc != ERROR_SUCCESS) - { - RegCloseKey(hkey); - msi_free(info); + if (!info) return ERROR_INDEX_ABSENT; - } MsiDecomposeDescriptorW(info, product, feature, component, &sz); @@ -1596,7 +1585,6 @@ UINT WINAPI MsiProvideQualifiedComponent else rc = MsiGetComponentPathW(szProduct, component, lpPathBuf, pcchPathBuf); - RegCloseKey(hkey); msi_free(info); if (rc == INSTALLSTATE_LOCAL)

1 0

Mike McCormack : msi: Add a stub implementation for MsiProvideQualifiedComponentExA.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: db1baf73670239343d9d31cb44b747ccafb83bd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db1baf73670239343d9d31c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 21 14:05:00 2006 +0900 msi: Add a stub implementation for MsiProvideQualifiedComponentExA. --- dlls/msi/msi.c | 15 +++++++++++++++ dlls/msi/msi.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f138d1c..0d74524 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1606,6 +1606,21 @@ UINT WINAPI MsiProvideQualifiedComponent } /*********************************************************************** + * MsiProvideQualifiedComponentExA [MSI.@] + */ +UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR szComponent, + LPCSTR szQualifier, DWORD dwInstallMode, LPSTR szProduct, + DWORD Unused1, DWORD Unused2, LPSTR lpPathBuf, + DWORD* pcchPathBuf) +{ + FIXME("%s %s %li %s %li %li %p %p\n", debugstr_a(szComponent), + debugstr_a(szQualifier), dwInstallMode, debugstr_a(szProduct), + Unused1, Unused2, lpPathBuf, pcchPathBuf); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * MsiProvideQualifiedComponentW [MSI.@] */ UINT WINAPI MsiProvideQualifiedComponentW( LPCWSTR szComponent, diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 27c04c8..d718fd2 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -195,7 +195,7 @@ 199 stdcall MsiMessageBoxW(long long long long long long) 200 stdcall MsiDecomposeDescriptorA(str ptr ptr ptr ptr) 201 stdcall MsiDecomposeDescriptorW(wstr ptr ptr ptr ptr) -202 stub MsiProvideQualifiedComponentExA +202 stdcall MsiProvideQualifiedComponentExA(str str long str long long ptr ptr) 203 stdcall MsiProvideQualifiedComponentExW(wstr wstr long wstr long long ptr ptr) 204 stdcall MsiEnumRelatedProductsA(str long long ptr) 205 stdcall MsiEnumRelatedProductsW(wstr long long ptr)

1 0

Mike McCormack : msi: Components with INSTALLSTATE_NOTUSED are considered present.
by Alexandre Julliard July 21, 2006

July 21, 2006

Module: wine Branch: refs/heads/master Commit: 8bce656fd38d0613341eb43d9ed5627b2abe5d1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8bce656fd38d0613341eb43… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jul 21 14:04:44 2006 +0900 msi: Components with INSTALLSTATE_NOTUSED are considered present. --- dlls/msi/msi.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f197f47..f138d1c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1124,6 +1124,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureState UINT rc; HKEY hkey; INSTALLSTATE r; + BOOL missing = FALSE; TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szFeature)); @@ -1166,8 +1167,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureState return INSTALLSTATE_UNKNOWN; } - r = INSTALLSTATE_LOCAL; - for( p = components; (*p != 2) && (lstrlenW(p) > 20); p += 20) + for( p = components; *p != 2 ; p += 20) { if (!decode_base85_guid( p, &guid )) { @@ -1176,19 +1176,25 @@ INSTALLSTATE WINAPI MsiQueryFeatureState } StringFromGUID2(&guid, comp, GUID_SIZE); r = MsiGetComponentPathW(szProduct, comp, NULL, 0); - if (r != INSTALLSTATE_LOCAL && r != INSTALLSTATE_SOURCE) + TRACE("component %s state %d\n", debugstr_guid(&guid), r); + switch (r) { - TRACE("component %s state %d\n", debugstr_guid(&guid), r); - r = INSTALLSTATE_ADVERTISED; + case INSTALLSTATE_NOTUSED: + case INSTALLSTATE_LOCAL: + case INSTALLSTATE_SOURCE: + break; + default: + missing = TRUE; } } - if (r == INSTALLSTATE_LOCAL && *p != 2) - ERR("%s -> %s\n", debugstr_w(szFeature), debugstr_w(components)); - + TRACE("%s %s -> %d\n", debugstr_w(szProduct), debugstr_w(szFeature), r); msi_free(components); - return r; + if (missing) + return INSTALLSTATE_ADVERTISED; + + return INSTALLSTATE_LOCAL; } /******************************************************************

1 0