January 2009 - Wine-commits

Paul Vriens : wintrust: Add some CryptCATCDF stubs.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 4a2e02d57d25518e61d03527c89d692ec829c105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2e02d57d25518e61d03527c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jan 17 16:02:36 2009 +0100 wintrust: Add some CryptCATCDF stubs. --- dlls/wintrust/crypt.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 8 +++--- include/mscat.h | 21 +++++++++++++++++- 3 files changed, 72 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 8049f33..cf8aa73 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -961,6 +961,54 @@ BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcb return FALSE; } + +/*********************************************************************** + * CryptCATCDFClose (WINTRUST.@) + */ +BOOL WINAPI CryptCATCDFClose(CRYPTCATCDF *pCDF) +{ + FIXME("(%p) stub\n", pCDF); + + return FALSE; +} + +/*********************************************************************** + * CryptCATCDFEnumCatAttributes (WINTRUST.@) + */ +CRYPTCATATTRIBUTE * WINAPI CryptCATCDFEnumCatAttributes(CRYPTCATCDF *pCDF, + CRYPTCATATTRIBUTE *pPrevAttr, + PFN_CDF_PARSE_ERROR_CALLBACK pfnParseError) +{ + FIXME("(%p %p %p) stub\n", pCDF, pPrevAttr, pfnParseError); + + return NULL; +} + +/*********************************************************************** + * CryptCATCDFEnumMembersByCDFTagEx (WINTRUST.@) + */ +LPWSTR WINAPI CryptCATCDFEnumMembersByCDFTagEx(CRYPTCATCDF *pCDF, LPWSTR pwszPrevCDFTag, + PFN_CDF_PARSE_ERROR_CALLBACK pfnParseError, + CRYPTCATMEMBER **ppMember, BOOL fContinueOnError, + LPVOID pvReserved) +{ + FIXME("(%p %s %p %p %d %p) stub\n", pCDF, debugstr_w(pwszPrevCDFTag), pfnParseError, + ppMember, fContinueOnError, pvReserved); + + return NULL; +} + +/*********************************************************************** + * CryptCATCDFOpen (WINTRUST.@) + */ +CRYPTCATCDF * WINAPI CryptCATCDFOpen(LPWSTR pwszFilePath, + PFN_CDF_PARSE_ERROR_CALLBACK pfnParseError) +{ + FIXME("(%s %p) stub\n", debugstr_w(pwszFilePath), pfnParseError); + + return NULL; +} + static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index bf5ee1f..9c5b1cb 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -9,14 +9,14 @@ @ stdcall CryptCATAdminReleaseContext(long long) @ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) @ stdcall CryptCATAdminResolveCatalogPath(ptr wstr ptr long) -@ stub CryptCATCDFClose +@ stdcall CryptCATCDFClose(ptr) @ stub CryptCATCDFEnumAttributes @ stub CryptCATCDFEnumAttributesWithCDFTag -@ stub CryptCATCDFEnumCatAttributes +@ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) @ stub CryptCATCDFEnumMembers @ stub CryptCATCDFEnumMembersByCDFTag -@ stub CryptCATCDFEnumMembersByCDFTagEx -@ stub CryptCATCDFOpen +@ stdcall CryptCATCDFEnumMembersByCDFTagEx(ptr wstr ptr ptr long ptr) +@ stdcall CryptCATCDFOpen(wstr ptr) @ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) @ stdcall CryptCATClose(long) @ stdcall CryptCATEnumerateAttr(ptr ptr ptr) diff --git a/include/mscat.h b/include/mscat.h index d037adc..a45e024 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -71,8 +71,20 @@ typedef struct CATALOG_INFO_ WCHAR wszCatalogFile[MAX_PATH]; } CATALOG_INFO; +typedef struct CRYPTCATCDF_ +{ + DWORD cbStruct; + HANDLE hFile; + DWORD dwCurFilePos; + DWORD dwLastMemberOffset; + BOOL fEOF; + LPWSTR pwszResultDir; + HANDLE hCATStore; +} CRYPTCATCDF; + #include <poppack.h> +typedef void (WINAPI *PFN_CDF_PARSE_ERROR_CALLBACK)(DWORD, DWORD, WCHAR *); BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); @@ -83,7 +95,14 @@ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD); BOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN, WCHAR *, CATALOG_INFO *, DWORD); BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO, CATALOG_INFO *, DWORD); -BOOL WINAPI CryptCATClose(HANDLE); +BOOL WINAPI CryptCATCDFClose(CRYPTCATCDF *); +CRYPTCATATTRIBUTE * WINAPI CryptCATCDFEnumCatAttributes(CRYPTCATCDF *, CRYPTCATATTRIBUTE *, + PFN_CDF_PARSE_ERROR_CALLBACK); +LPWSTR WINAPI CryptCATCDFEnumMembersByCDFTagEx(CRYPTCATCDF *, LPWSTR, + PFN_CDF_PARSE_ERROR_CALLBACK, + CRYPTCATMEMBER **, BOOL, LPVOID); +CRYPTCATCDF * WINAPI CryptCATCDFOpen(LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK); +BOOL WINAPI CryptCATClose(HANDLE); CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateAttr(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *); CRYPTCATATTRIBUTE * WINAPI CryptCATEnumerateCatAttr(HANDLE, CRYPTCATATTRIBUTE *); CRYPTCATMEMBER * WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER *);

1 0

Paul Vriens : wintrust/tests: Add a few parameter tests.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 39361deadcc74433bd2740095f6b0adb4fb3db45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39361deadcc74433bd2740095… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 19 09:03:04 2009 +0100 wintrust/tests: Add a few parameter tests. --- dlls/wintrust/tests/crypt.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 91b27fd..1f7656a 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -89,6 +89,8 @@ static BOOL (WINAPI * pCryptCATAdminRemoveCatalog)(HCATADMIN, LPCWSTR, DWORD); static BOOL (WINAPI * pCryptCATAdminReleaseCatalogContext)(HCATADMIN, HCATINFO, DWORD); static HANDLE (WINAPI * pCryptCATOpen)(LPWSTR, DWORD, HCRYPTPROV, DWORD, DWORD); static BOOL (WINAPI * pCryptCATCatalogInfoFromContext)(HCATINFO, CATALOG_INFO *, DWORD); +static BOOL (WINAPI * pCryptCATCDFClose)(CRYPTCATCDF *); +static CRYPTCATCDF * (WINAPI * pCryptCATCDFOpen)(LPWSTR, PFN_CDF_PARSE_ERROR_CALLBACK); static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateCatAttr)(HANDLE, CRYPTCATATTRIBUTE *); static CRYPTCATMEMBER * (WINAPI * pCryptCATEnumerateMember)(HANDLE, CRYPTCATMEMBER *); static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateAttr)(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *); @@ -112,6 +114,8 @@ static void InitFunctionPtrs(void) WINTRUST_GET_PROC(CryptCATAdminReleaseCatalogContext) WINTRUST_GET_PROC(CryptCATOpen) WINTRUST_GET_PROC(CryptCATCatalogInfoFromContext) + WINTRUST_GET_PROC(CryptCATCDFClose) + WINTRUST_GET_PROC(CryptCATCDFOpen) WINTRUST_GET_PROC(CryptCATEnumerateCatAttr) WINTRUST_GET_PROC(CryptCATEnumerateMember) WINTRUST_GET_PROC(CryptCATEnumerateAttr) @@ -349,6 +353,71 @@ static void test_calchash(void) DeleteFileA(temp); } +static void WINAPI cdf_callback(DWORD area, DWORD error, WCHAR* line) +{ +} + +static void test_CryptCATCDF_params(void) +{ + static WCHAR nonexistent[] = {'d','e','a','d','b','e','e','f','.','c','d','f',0}; + static CHAR cdffileA[] = "tempfile.cdf"; + static WCHAR cdffileW[] = {'t','e','m','p','f','i','l','e','.','c','d','f',0}; + CRYPTCATCDF *catcdf; + HANDLE file; + BOOL ret; + + if (!pCryptCATCDFOpen) + { + win_skip("CryptCATCDFOpen is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + catcdf = pCryptCATCDFOpen(NULL, NULL); + ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + catcdf = pCryptCATCDFOpen(NULL, cdf_callback); + ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* File doesn't exist */ + SetLastError(0xdeadbeef); + catcdf = pCryptCATCDFOpen(nonexistent, cdf_callback); + ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Empty file */ + DeleteFileA(cdffileA); + file = CreateFileA(cdffileA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + CloseHandle(file); + + SetLastError(0xdeadbeef); + catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); + ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + DeleteFileA(cdffileA); + + SetLastError(0xdeadbeef); + ret = pCryptCATCDFClose(NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + catcdf = NULL; + SetLastError(0xdeadbeef); + ret = pCryptCATCDFClose(catcdf); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +} + static void test_CryptCATAdminAddRemoveCatalog(void) { static WCHAR basenameW[] = {'w','i','n','e','t','e','s','t','.','c','a','t',0}; @@ -584,6 +653,8 @@ START_TEST(crypt) test_context(); test_calchash(); + /* Parameter checking only */ + test_CryptCATCDF_params(); test_CryptCATAdminAddRemoveCatalog(); test_catalog_properties(); }

1 0

Paul Vriens : wintrust/tests: Add a test for enumerating catalog attributes .
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 669aa20c9143665e55fb4ba6a37fe988d1ca114e URL: http://source.winehq.org/git/wine.git/?a=commit;h=669aa20c9143665e55fb4ba6a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 16 16:13:10 2009 +0100 wintrust/tests: Add a test for enumerating catalog attributes. --- dlls/wintrust/tests/crypt.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 383fe8b..91b27fd 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -89,6 +89,7 @@ static BOOL (WINAPI * pCryptCATAdminRemoveCatalog)(HCATADMIN, LPCWSTR, DWORD); static BOOL (WINAPI * pCryptCATAdminReleaseCatalogContext)(HCATADMIN, HCATINFO, DWORD); static HANDLE (WINAPI * pCryptCATOpen)(LPWSTR, DWORD, HCRYPTPROV, DWORD, DWORD); static BOOL (WINAPI * pCryptCATCatalogInfoFromContext)(HCATINFO, CATALOG_INFO *, DWORD); +static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateCatAttr)(HANDLE, CRYPTCATATTRIBUTE *); static CRYPTCATMEMBER * (WINAPI * pCryptCATEnumerateMember)(HANDLE, CRYPTCATMEMBER *); static CRYPTCATATTRIBUTE * (WINAPI * pCryptCATEnumerateAttr)(HANDLE, CRYPTCATMEMBER *, CRYPTCATATTRIBUTE *); static BOOL (WINAPI * pCryptCATClose)(HANDLE); @@ -111,6 +112,7 @@ static void InitFunctionPtrs(void) WINTRUST_GET_PROC(CryptCATAdminReleaseCatalogContext) WINTRUST_GET_PROC(CryptCATOpen) WINTRUST_GET_PROC(CryptCATCatalogInfoFromContext) + WINTRUST_GET_PROC(CryptCATEnumerateCatAttr) WINTRUST_GET_PROC(CryptCATEnumerateMember) WINTRUST_GET_PROC(CryptCATEnumerateAttr) WINTRUST_GET_PROC(CryptCATClose) @@ -483,6 +485,8 @@ static void test_CryptCATAdminAddRemoveCatalog(void) static void test_catalog_properties(void) { static const WCHAR hashmeW[] = {'h','a','s','h','m','e',0}; + static const WCHAR attr1W[] = {'a','t','t','r','1',0}; + static const WCHAR attr2W[] = {'a','t','t','r','2',0}; static const GUID subject = {0xde351a42,0x8e59,0x11d0,{0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee}}; HANDLE hcat; @@ -493,6 +497,7 @@ static void test_catalog_properties(void) DWORD written; HANDLE file; BOOL ret; + int attrcount = 0; if (!GetTempFileNameA(CURR_DIR, "cat", 0, catalog)) return; file = CreateFileA(catalog, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -534,6 +539,18 @@ static void test_catalog_properties(void) m = pCryptCATEnumerateMember(hcat, m); ok(m == NULL, "CryptCATEnumerateMember succeeded\n"); + attr = NULL; + while ((attr = pCryptCATEnumerateCatAttr(hcat, attr))) + { + ok(!lstrcmpW(attr->pwszReferenceTag, attr1W) || + !lstrcmpW(attr->pwszReferenceTag, attr2W), + "Expected 'attr1' or 'attr2'\n"); + + attrcount++; + } + todo_wine + ok(attrcount == 2, "Expected 2 catalog attributes, got %d\n", attrcount); + ret = pCryptCATClose(hcat); ok(ret, "CryptCATClose failed\n");

1 0

Ge van Geldorp : msi/tests: Windows Installer 3. 0 often returns ERROR_INVALID_PARAMETER.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 349d8bd1a1a6d93201128f1f9854d56641922771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349d8bd1a1a6d93201128f1f9… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jan 19 00:37:56 2009 +0100 msi/tests: Windows Installer 3.0 often returns ERROR_INVALID_PARAMETER. --- dlls/msi/tests/install.c | 64 +++++++++++++-------- dlls/msi/tests/source.c | 147 ++++++++++++++++++++++++++++++---------------- 2 files changed, 136 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=349d8bd1a1a6d93201128…

1 0

Ge van Geldorp : msi/tests: Double nul-terminate REG_MULTI_SZ values.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 3355f3d66fe52058dc75e0f1111c982c6742fddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3355f3d66fe52058dc75e0f11… Author: Ge van Geldorp <ge(a)gse.nl> Date: Mon Jan 19 00:38:27 2009 +0100 msi/tests: Double nul-terminate REG_MULTI_SZ values. --- dlls/msi/tests/msi.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index da89faa..3ce1a0d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1275,7 +1275,8 @@ static void test_MsiQueryComponentState(void) 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_NOTUSED, "Expected INSTALLSTATE_NOTUSED, got %d\n", state); + ok(state == INSTALLSTATE_NOTUSED || state == INSTALLSTATE_LOCAL, + "Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -1390,7 +1391,8 @@ static void test_MsiQueryComponentState(void) state = MAGIC_ERROR; r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, component, &state); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_NOTUSED, "Expected INSTALLSTATE_NOTUSED, got %d\n", state); + ok(state == INSTALLSTATE_NOTUSED || state == INSTALLSTATE_LOCAL, + "Expected INSTALLSTATE_NOTUSED or INSTALLSTATE_LOCAL, got %d\n", state); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"hi", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4023,7 +4025,6 @@ static void test_MsiGetProductInfoEx(void) INSTALLPROPERTY_HELPTELEPHONE, buf, &sz); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); ok(sz == 10, "Expected 10, got %d\n", sz); /* szValue is NULL, pcchValue is exactly 5 */ @@ -7779,9 +7780,10 @@ static void test_MsiEnumPatchesEx(void) "Expected targetsid to be unchanged, got %s\n", targetsid); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + patch_squashed[lstrlenA(patch_squashed) + 1] = '\0'; res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ, (const BYTE *)patch_squashed, - lstrlenA(patch_squashed) + 1); + lstrlenA(patch_squashed) + 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Patches value exists */ @@ -8780,9 +8782,10 @@ static void test_MsiEnumPatchesEx(void) "Expected targetsid to be unchanged, got %s\n", targetsid); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + patch_squashed[lstrlenA(patch_squashed) + 1] = '\0'; res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ, (const BYTE *)patch_squashed, - lstrlenA(patch_squashed) + 1); + lstrlenA(patch_squashed) + 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Patches value exists */ @@ -9257,9 +9260,10 @@ static void test_MsiEnumPatches(void) "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + patch_squashed[lstrlenA(patch_squashed) + 1] = '\0'; res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ, (const BYTE *)patch_squashed, - lstrlenA(patch_squashed) + 1); + lstrlenA(patch_squashed) + 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Patches value exists */ @@ -9445,9 +9449,10 @@ static void test_MsiEnumPatches(void) "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + patch_squashed[lstrlenA(patch_squashed) + 1] = '\0'; res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ, (const BYTE *)patch_squashed, - lstrlenA(patch_squashed) + 1); + lstrlenA(patch_squashed) + 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Patches value exists */ @@ -9589,9 +9594,10 @@ static void test_MsiEnumPatches(void) "Expected lpTransformsBuf to be unchanged, got \"%s\"\n", transforms); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + patch_squashed[lstrlenA(patch_squashed) + 1] = '\0'; res = RegSetValueExA(patches, "Patches", 0, REG_MULTI_SZ, (const BYTE *)patch_squashed, - lstrlenA(patch_squashed) + 1); + lstrlenA(patch_squashed) + 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* Patches value exists */

1 0

Alexandre Julliard : server: Store process/ thread affinity as a 64-bit value.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 913e792b57dbd0e04a5bc7c01fce305976e4283e URL: http://source.winehq.org/git/wine.git/?a=commit;h=913e792b57dbd0e04a5bc7c01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 14:15:51 2009 +0100 server: Store process/thread affinity as a 64-bit value. --- dlls/ntdll/process.c | 4 ++-- dlls/ntdll/thread.c | 8 ++++---- include/wine/server_protocol.h | 19 ++++++++++--------- server/process.h | 2 +- server/protocol.def | 13 +++++++------ server/request.h | 17 +++++++++-------- server/thread.h | 2 +- server/trace.c | 21 ++++++++++++++------- tools/make_requests | 1 + 9 files changed, 49 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=913e792b57dbd0e04a5bc…

1 0

Alexandre Julliard : kernel32: LCMapString should include the terminating NULL also for LCMAP_SORTKEY.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 317ad64985095f59d3dc09ae7c9792c8c2bf03b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=317ad64985095f59d3dc09ae7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 13:46:30 2009 +0100 kernel32: LCMapString should include the terminating NULL also for LCMAP_SORTKEY. --- dlls/kernel32/locale.c | 4 ++++ dlls/kernel32/tests/locale.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1b994ec..03554c3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2371,6 +2371,8 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); if (ret == 0) SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + ret++; return ret; } @@ -2510,6 +2512,8 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen, ret = wine_get_sortkey(flags, srcW, srclenW, dst, dstlen); if (ret == 0) SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + ret++; goto map_string_exit; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index dfbbe04..57bfa01 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1227,9 +1227,11 @@ static void test_LCMapStringA(void) ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, upper_case, -1, buf, sizeof(buf)); ok(ret, "LCMapStringA must succeed\n"); + ok(buf[ret-1] == 0, "LCMapStringA not null-terminated\n"); ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, upper_case, lstrlenA(upper_case), buf2, sizeof(buf2)); - ok(ret, "LCMapStringA must succeed\n"); + ok(ret2, "LCMapStringA must succeed\n"); + ok(buf2[ret2-1] == 0, "LCMapStringA not null-terminated\n" ); ok(ret == ret2, "lengths of sort keys must be equal\n"); ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n");

1 0

Alexandre Julliard : server: Generate padding in request structures from make_requests.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 7f1dc355ecad665beaeea95738fdee38276cf4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1dc355ecad665beaeea9573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 14:01:39 2009 +0100 server: Generate padding in request structures from make_requests. Add compile-time asserts to check that the structures have the expected layout. --- include/wine/server_protocol.h | 145 +++++- server/protocol.def | 1 - server/request.h | 1294 ++++++++++++++++++++++++++++++++++++++++ tools/make_requests | 33 +- 4 files changed, 1468 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f1dc355ecad665beaeea…

1 0

Andrew Talbot : rpcrt4: Declare some functions static.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 273b40656b9cd8bb61ddefd27892098e14ff67d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=273b40656b9cd8bb61ddefd27… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 17 17:45:06 2009 +0000 rpcrt4: Declare some functions static. --- dlls/rpcrt4/rpc_binding.h | 1 - dlls/rpcrt4/rpc_message.c | 6 +++--- dlls/rpcrt4/rpc_message.h | 1 - dlls/rpcrt4/rpc_transport.c | 5 +++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 25a2108..5aa8307 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -139,7 +139,6 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCS RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); -RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint); RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 155d7ec..e4f96a9 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -321,7 +321,7 @@ NCA_STATUS RPC2NCA_STATUS(RPC_STATUS status) } } -RPC_STATUS NCA2RPC_STATUS(NCA_STATUS status) +static RPC_STATUS NCA2RPC_STATUS(NCA_STATUS status) { switch (status) { @@ -687,7 +687,7 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, } /* validates version and frag_len fields */ -RPC_STATUS RPCRT4_ValidateCommonHeader(const RpcPktCommonHdr *hdr) +static RPC_STATUS RPCRT4_ValidateCommonHeader(const RpcPktCommonHdr *hdr) { DWORD hdr_length; @@ -720,7 +720,7 @@ RPC_STATUS RPCRT4_ValidateCommonHeader(const RpcPktCommonHdr *hdr) * * Receive a fragment from a connection. */ -RPC_STATUS RPCRT4_receive_fragment(RpcConnection *Connection, RpcPktHdr **Header, void **Payload) +static RPC_STATUS RPCRT4_receive_fragment(RpcConnection *Connection, RpcPktHdr **Header, void **Payload) { RPC_STATUS status; DWORD hdr_length; diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 7e746cb..e403388 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -35,7 +35,6 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffe RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg); RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg, unsigned char **auth_data_out, unsigned long *auth_length_out); NCA_STATUS RPC2NCA_STATUS(RPC_STATUS status); -RPC_STATUS NCA2RPC_STATUS(NCA_STATUS status); RPC_STATUS RPCRT4_AuthorizeConnection(RpcConnection* conn, BYTE *challenge, ULONG count); #endif diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index d635d49..1e759a6 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -90,6 +90,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); +static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); + /**** ncacn_np support ****/ typedef struct _RpcConnection_np @@ -1541,8 +1543,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, return RPC_S_OK; } - -RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection) +static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection) { RPC_STATUS err;

1 0

Erich Hoover : regedit: Fix import mangling REG_EXPAND_SZ values.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 51a04d5b65580567c11601f372f79d77c00f3177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a04d5b65580567c11601f37… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jan 18 01:29:09 2009 -0700 regedit: Fix import mangling REG_EXPAND_SZ values. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a4e8936..018a58e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -394,7 +394,7 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) if (!lpbData) return ERROR_INVALID_DATA; - if(dwDataType == REG_MULTI_SZ && !is_unicode) + if((dwDataType == REG_MULTI_SZ || dwDataType == REG_EXPAND_SZ) && !is_unicode) { LPBYTE tmp = lpbData; lpbData = (LPBYTE)GetWideStringN((char*)lpbData, dwLen, &dwLen);

1 0