December 2008 - Wine-commits

Paul Vriens : quartz/tests: Fix test failures on Win9x by using A-functions .
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 061302483f5aa8fe7ea219a6cdf93b9ffce0c8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=061302483f5aa8fe7ea219a6c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 18 14:43:19 2008 +0100 quartz/tests: Fix test failures on Win9x by using A-functions. --- dlls/quartz/tests/filtermapper.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 122c2ee..3025b18 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -57,7 +57,11 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) if (SUCCEEDED(hr)) { - if (!lstrcmpW((WCHAR*)V_UNION(&var, bstrVal), wszFilterName)) found = TRUE; + CHAR val1[512], val2[512]; + + WideCharToMultiByte(CP_ACP, 0, (WCHAR*)V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); + WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); + if (!lstrcmpA(val1, val2)) found = TRUE; } IPropertyBag_Release(pPropBagCat); @@ -179,10 +183,13 @@ static void test_legacy_filter_registration(void) IFilterMapper *pMapper = NULL; HRESULT hr; static const WCHAR wszFilterName[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 0 }; + static const CHAR szFilterName[] = "Testfilter"; static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 }; CLSID clsidFilter; WCHAR wszRegKey[MAX_PATH]; + CHAR szRegKey[MAX_PATH]; static const WCHAR wszClsid[] = {'C','L','S','I','D', 0}; + static const CHAR szClsid[] = "CLSID"; static const WCHAR wszSlash[] = {'\\', 0}; LONG lRet; HKEY hKey = NULL; @@ -211,15 +218,16 @@ static void test_legacy_filter_registration(void) lRet = StringFromGUID2(&clsidFilter, wszRegKey + lstrlenW(wszRegKey), MAX_PATH - lstrlenW(wszRegKey)); ok(lRet > 0, "StringFromGUID2 failed\n"); if (!lRet) goto out; + WideCharToMultiByte(CP_ACP, 0, wszRegKey, -1, szRegKey, sizeof(szRegKey), 0, 0); /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus * class key for it. */ - lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - ok(lRet == ERROR_SUCCESS, "RegCreateKeyExW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + lRet = RegCreateKeyExA(HKEY_CLASSES_ROOT, szRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); + ok(lRet == ERROR_SUCCESS, "RegCreateKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); /* Set default value - this is interpreted as "friendly name" later. */ - lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)wszFilterName, (lstrlenW(wszFilterName) + 1) * 2); - ok(lRet == ERROR_SUCCESS, "RegSetValueExW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + lRet = RegSetValueExA(hKey, NULL, 0, REG_SZ, (LPBYTE)szFilterName, lstrlenA(szFilterName) + 1); + ok(lRet == ERROR_SUCCESS, "RegSetValueExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); if (hKey) RegCloseKey(hKey); hKey = NULL; @@ -256,7 +264,10 @@ static void test_legacy_filter_registration(void) while(!found && IEnumRegFilters_Next(pRegEnum, 1, &prgf, &cFetched) == S_OK) { - if (!lstrcmpW(prgf->Name, wszFilterName)) found = TRUE; + CHAR val[512]; + + WideCharToMultiByte(CP_ACP, 0, prgf->Name, -1, val, sizeof(val), 0, 0); + if (!lstrcmpA(val, szFilterName)) found = TRUE; CoTaskMemFree(prgf); } @@ -268,14 +279,15 @@ static void test_legacy_filter_registration(void) hr = IFilterMapper_UnregisterFilter(pMapper, clsidFilter); ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszClsid, 0, KEY_WRITE | DELETE, &hKey); - ok(lRet == ERROR_SUCCESS, "RegOpenKeyExW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); + ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); lRet = StringFromGUID2(&clsidFilter, wszRegKey, MAX_PATH); ok(lRet > 0, "StringFromGUID2 failed\n"); + WideCharToMultiByte(CP_ACP, 0, wszRegKey, -1, szRegKey, sizeof(szRegKey), 0, 0); - lRet = RegDeleteKeyW(hKey, wszRegKey); - ok(lRet == ERROR_SUCCESS, "RegDeleteKeyW failed with %x\n", HRESULT_FROM_WIN32(lRet)); + lRet = RegDeleteKeyA(hKey, szRegKey); + ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); if (hKey) RegCloseKey(hKey); hKey = NULL;

1 0

Hans Leidekker : wintrust: Add tests for adding and removing catalog files.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: b8bb31dc34b4ebb4884aaacfdecfdf91327e905c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bb31dc34b4ebb4884aaacfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 18 14:22:40 2008 +0100 wintrust: Add tests for adding and removing catalog files. --- dlls/wintrust/tests/crypt.c | 142 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 137 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index af78051..dc748c9 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1,6 +1,7 @@ /* Unit test suite for wintrust crypt functions * * Copyright 2007 Paul Vriens + * Copyright 2008 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,12 +28,63 @@ #include "wine/test.h" static char selfname[MAX_PATH]; - static CHAR CURR_DIR[MAX_PATH]; +/* + * Minimalistic catalog file. To reconstruct, save text below as winetest.cdf, + * convert to DOS line endings and run 'makecat /cat winetest.cdf' + */ + +/* +[CatalogHeader] +Name=winetest.cat +ResultDir=.\ +PublicVersion=0x00000001 +EncodingType= +CATATTR1=0x10010001:attr1:value1 +CATATTR2=0x10010001:attr2:value2 + +[CatalogFiles] +hashme=.\winetest.cdf +*/ + +const BYTE test_catalog[] = { + 0x30, 0x82, 0x01, 0xbc, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, + 0x82, 0x01, 0xad, 0x30, 0x82, 0x01, 0xa9, 0x02, 0x01, 0x01, 0x31, 0x00, 0x30, 0x82, 0x01, 0x9e, + 0x06, 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x0a, 0x01, 0xa0, 0x82, 0x01, 0x8f, 0x30, + 0x82, 0x01, 0x8b, 0x30, 0x0c, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x0c, 0x01, + 0x01, 0x04, 0x10, 0xfa, 0x55, 0x2c, 0xc2, 0xf6, 0xcc, 0xdd, 0x11, 0x2a, 0x9c, 0x00, 0x14, 0x22, + 0xec, 0x8f, 0x3b, 0x17, 0x0d, 0x30, 0x38, 0x31, 0x32, 0x31, 0x38, 0x31, 0x31, 0x32, 0x36, 0x34, + 0x38, 0x5a, 0x30, 0x0e, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x0c, 0x01, 0x02, + 0x05, 0x00, 0x30, 0x81, 0xdd, 0x30, 0x81, 0xda, 0x04, 0x0e, 0x68, 0x00, 0x61, 0x00, 0x73, 0x00, + 0x68, 0x00, 0x6d, 0x00, 0x65, 0x00, 0x00, 0x00, 0x31, 0x81, 0xc7, 0x30, 0x61, 0x06, 0x0a, 0x2b, + 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x04, 0x31, 0x53, 0x30, 0x51, 0x30, 0x2c, 0x06, + 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x19, 0xa2, 0x1e, 0x80, 0x1c, 0x00, + 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x4f, 0x00, 0x62, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x6c, 0x00, + 0x65, 0x00, 0x74, 0x00, 0x65, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x30, 0x21, 0x30, 0x09, 0x06, + 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xed, 0xd6, 0x9c, 0x9c, 0xb2, 0xfc, + 0xaa, 0x03, 0xe8, 0xd3, 0x20, 0xf6, 0xab, 0x28, 0xc3, 0xff, 0xbd, 0x07, 0x36, 0xf5, 0x30, 0x62, + 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x0c, 0x02, 0x02, 0x31, 0x54, 0x30, 0x52, + 0x1e, 0x4c, 0x00, 0x7b, 0x00, 0x44, 0x00, 0x45, 0x00, 0x33, 0x00, 0x35, 0x00, 0x31, 0x00, 0x41, + 0x00, 0x34, 0x00, 0x32, 0x00, 0x2d, 0x00, 0x38, 0x00, 0x45, 0x00, 0x35, 0x00, 0x39, 0x00, 0x2d, + 0x00, 0x31, 0x00, 0x31, 0x00, 0x44, 0x00, 0x30, 0x00, 0x2d, 0x00, 0x38, 0x00, 0x43, 0x00, 0x34, + 0x00, 0x37, 0x00, 0x2d, 0x00, 0x30, 0x00, 0x30, 0x00, 0x43, 0x00, 0x30, 0x00, 0x34, 0x00, 0x46, + 0x00, 0x43, 0x00, 0x32, 0x00, 0x39, 0x00, 0x35, 0x00, 0x45, 0x00, 0x45, 0x00, 0x7d, 0x02, 0x02, + 0x02, 0x00, 0xa0, 0x6a, 0x30, 0x68, 0x30, 0x32, 0x06, 0x0a, 0x2b, 0x06, 0x01, 0x04, 0x01, 0x82, + 0x37, 0x0c, 0x02, 0x01, 0x04, 0x24, 0x30, 0x22, 0x1e, 0x0a, 0x00, 0x61, 0x00, 0x74, 0x00, 0x74, + 0x00, 0x72, 0x00, 0x32, 0x02, 0x04, 0x10, 0x01, 0x00, 0x01, 0x04, 0x0e, 0x76, 0x00, 0x61, 0x00, + 0x6c, 0x00, 0x75, 0x00, 0x65, 0x00, 0x32, 0x00, 0x00, 0x00, 0x30, 0x32, 0x06, 0x0a, 0x2b, 0x06, + 0x01, 0x04, 0x01, 0x82, 0x37, 0x0c, 0x02, 0x01, 0x04, 0x24, 0x30, 0x22, 0x1e, 0x0a, 0x00, 0x61, + 0x00, 0x74, 0x00, 0x74, 0x00, 0x72, 0x00, 0x31, 0x02, 0x04, 0x10, 0x01, 0x00, 0x01, 0x04, 0x0e, + 0x76, 0x00, 0x61, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x65, 0x00, 0x31, 0x00, 0x00, 0x00, 0x31, 0x00, +}; + static BOOL (WINAPI * pCryptCATAdminAcquireContext)(HCATADMIN*, const GUID*, DWORD); static BOOL (WINAPI * pCryptCATAdminReleaseContext)(HCATADMIN, DWORD); static BOOL (WINAPI * pCryptCATAdminCalcHashFromFileHandle)(HANDLE hFile, DWORD*, BYTE*, DWORD); +static HCATINFO (WINAPI * pCryptCATAdminAddCatalog)(HCATADMIN, PWSTR, PWSTR, DWORD); +static BOOL (WINAPI * pCryptCATAdminRemoveCatalog)(HCATADMIN, LPCWSTR, DWORD); +static BOOL (WINAPI * pCryptCATAdminReleaseCatalogContext)(HCATADMIN, HCATINFO, DWORD); static void InitFunctionPtrs(void) { @@ -47,15 +99,19 @@ static void InitFunctionPtrs(void) WINTRUST_GET_PROC(CryptCATAdminAcquireContext) WINTRUST_GET_PROC(CryptCATAdminReleaseContext) WINTRUST_GET_PROC(CryptCATAdminCalcHashFromFileHandle) + WINTRUST_GET_PROC(CryptCATAdminAddCatalog) + WINTRUST_GET_PROC(CryptCATAdminRemoveCatalog) + WINTRUST_GET_PROC(CryptCATAdminReleaseCatalogContext) #undef WINTRUST_GET_PROC } +static GUID dummy = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static void test_context(void) { BOOL ret; HCATADMIN hca; - static GUID dummy = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ CHAR windir[MAX_PATH], catroot[MAX_PATH], catroot2[MAX_PATH], dummydir[MAX_PATH]; DWORD attrs; @@ -155,9 +211,6 @@ static void test_context(void) lstrcatA(catroot2, "\\system32\\CatRoot2"); attrs = GetFileAttributes(catroot); - /* On a clean Wine this will fail. When a native wintrust.dll was used in the past - * some tests will succeed. - */ ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n"); /* Windows creates the GUID directory in capitals */ @@ -321,6 +374,84 @@ static void test_calchash(void) DeleteFileA(temp); } +static void test_CryptCATAdminAddRemoveCatalog(void) +{ + static WCHAR basenameW[] = {'w','i','n','e','t','e','s','t','.','c','a','t',0}; + HCATADMIN hcatadmin; + HCATINFO hcatinfo; + WCHAR tmpfileW[MAX_PATH]; + char tmpfile[MAX_PATH]; + HANDLE file; + DWORD error, written; + BOOL ret; + + if (!GetTempFileNameA(CURR_DIR, "cat", 0, tmpfile)) return; + DeleteFileA(tmpfile); + file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u", GetLastError()); + CloseHandle(file); + + ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); + ok(ret, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0); + error = GetLastError(); + ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMTER\n", GetLastError()); + + SetLastError(0xdeadbeef); + hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, NULL, NULL, 0); + error = GetLastError(); + ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected INVALID_PARAMTER\n", GetLastError()); + + MultiByteToWideChar(0, 0, tmpfile, -1, tmpfileW, MAX_PATH); + + SetLastError(0xdeadbeef); + hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); + error = GetLastError(); + todo_wine { + ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); + ok(error == ERROR_BAD_FORMAT, "got %u expected ERROR_BAD_FORMAT\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1); + error = GetLastError(); + ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMTER\n", GetLastError()); + + SetLastError(0xdeadbeef); + hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); + error = GetLastError(); + ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); + todo_wine ok(error == ERROR_BAD_FORMAT, "got %u expected ERROR_BAD_FORMAT\n", GetLastError()); + + DeleteFileA(tmpfile); + file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u", GetLastError()); + WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); + CloseHandle(file); + + hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); + todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); + + hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); + ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); + + ret = pCryptCATAdminReleaseCatalogContext(hcatadmin, hcatinfo, 0); + ok(ret, "CryptCATAdminReleaseCatalogContext failed %u\n", GetLastError()); + + ret = pCryptCATAdminRemoveCatalog(hcatadmin, tmpfileW, 0); + ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + + ret = pCryptCATAdminReleaseContext(hcatadmin, 0); + ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError()); + + DeleteFileA(tmpfile); +} + START_TEST(crypt) { int myARGC; @@ -335,4 +466,5 @@ START_TEST(crypt) test_context(); test_calchash(); + test_CryptCATAdminAddRemoveCatalog(); }

1 0

Hans Leidekker : mscat32: Forward more functions to wintrust.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: a35a09b46244f3a29d1c475d366903ddfbedae20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35a09b46244f3a29d1c475d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 18 14:23:04 2008 +0100 mscat32: Forward more functions to wintrust. --- dlls/mscat32/mscat32.spec | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/mscat32/mscat32.spec b/dlls/mscat32/mscat32.spec index 5d277de..37f6e74 100644 --- a/dlls/mscat32/mscat32.spec +++ b/dlls/mscat32/mscat32.spec @@ -5,30 +5,30 @@ @ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr) wintrust.CryptCATAdminEnumCatalogFromHash @ stdcall CryptCATAdminReleaseCatalogContext(long long long) wintrust.CryptCATAdminReleaseCatalogContext @ stdcall CryptCATAdminReleaseContext(long long) wintrust.CryptCATAdminReleaseContext -@ stub CryptCATCDFClose +@ stdcall CryptCATCDFClose(ptr) wintrust.CryptCATCDFClose @ stub CryptCATCDFEnumAttributes -@ stub CryptCATCDFEnumAttributesWithCDFTag -@ stub CryptCATCDFEnumCatAttributes +@ stdcall CryptCATCDFEnumAttributesWithCDFTag(ptr wstr ptr ptr ptr) wintrust.CryptCATCDFEnumAttributesWithCDFTag +@ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) wintrust.CryptCATCDFEnumCatAttributes @ stub CryptCATCDFEnumMembers @ stub CryptCATCDFEnumMembersByCDFTag -@ stub CryptCATCDFOpen -@ stub CryptCATCatalogInfoFromContext +@ stdcall CryptCATCDFOpen(wstr ptr) wintrust.CryptCATCDFOpen +@ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) wintrust.CryptCATCatalogInfoFromContext @ stdcall CryptCATClose(long) wintrust.CryptCATClose -@ stub CryptCATEnumerateAttr -@ stub CryptCATEnumerateCatAttr +@ stdcall CryptCATEnumerateAttr(ptr ptr ptr) wintrust.CryptCATEnumerateAttr +@ stdcall CryptCATEnumerateCatAttr(ptr ptr) wintrust.CryptCATEnumerateCatAttr @ stdcall CryptCATEnumerateMember(long ptr) wintrust.CryptCATEnumerateMember -@ stub CryptCATGetAttrInfo -@ stub CryptCATGetCatAttrInfo -@ stub CryptCATGetMemberInfo -@ stub CryptCATHandleFromStore +@ stdcall CryptCATGetAttrInfo(ptr ptr wstr) wintrust.CryptCATGetAttrInfo +@ stdcall CryptCATGetCatAttrInfo(ptr wstr) wintrust.CryptCATGetCatAttrInfo +@ stdcall CryptCATGetMemberInfo(ptr wstr) wintrust.CryptCATGetMemberInfo +@ stdcall CryptCATHandleFromStore(ptr) wintrust.CryptCATHandleFromStore @ stdcall CryptCATOpen(wstr long long long long) wintrust.CryptCATOpen -@ stub CryptCATPersistStore -@ stub CryptCATPutAttrInfo -@ stub CryptCATPutCatAttrInfo -@ stub CryptCATPutMemberInfo -@ stub CryptCATStoreFromHandle +@ stdcall CryptCATPersistStore(ptr) wintrust.CryptCATPersistStore +@ stdcall CryptCATPutAttrInfo(ptr ptr wstr long long ptr) wintrust.CryptCATPutAttrInfo +@ stdcall CryptCATPutCatAttrInfo(ptr wstr long long ptr) wintrust.CryptCATPutCatAttrInfo +@ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) wintrust.CryptCATPutMemberInfo +@ stdcall CryptCATStoreFromHandle(ptr) wintrust.CryptCATStoreFromHandle @ stdcall -private DllRegisterServer() wintrust.mscat32DllRegisterServer @ stdcall -private DllUnregisterServer() wintrust.mscat32DllUnregisterServer -@ stub IsCatalogFile +@ stdcall IsCatalogFile(ptr wstr) wintrust.IsCatalogFile @ stub MsCatConstructHashTag @ stub MsCatFreeHashTag

1 0

Jacek Caban : mshtml: Write aCount bytes in nsIInputStream::ReadSegments.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: d464e7b5462b151829d6323b15f440f61af3d308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d464e7b5462b151829d6323b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 18 14:08:47 2008 +0100 mshtml: Write aCount bytes in nsIInputStream::ReadSegments. --- dlls/mshtml/navigate.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 0a543a7..188cdd7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -180,10 +180,10 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, if(!This->buf_size) return S_OK; - if(This->buf_size > aCount) - FIXME("buf_size > aCount\n"); + if(aCount > This->buf_size) + aCount = This->buf_size; - nsres = aWriter(NSINSTREAM(This), aClousure, This->buf, 0, This->buf_size, &written); + nsres = aWriter(NSINSTREAM(This), aClousure, This->buf, 0, aCount, &written); if(NS_FAILED(nsres)) TRACE("aWritter failed: %08x\n", nsres); else if(written != This->buf_size)

1 0

Hans Leidekker : wintrust: Implement CryptCATAdminAddCatalog, CryptCATAdminReleaseCatalogContext and CryptCATAdminReleaseContext.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 02f805347d2904f8037f1ea6c460b06f1755829a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f805347d2904f8037f1ea6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 18 14:22:26 2008 +0100 wintrust: Implement CryptCATAdminAddCatalog, CryptCATAdminReleaseCatalogContext and CryptCATAdminReleaseContext. Based on work done by Maarten Lankhorst. --- dlls/wintrust/crypt.c | 83 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index b69647d..b03740c 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); #define CATADMIN_MAGIC 0x43415441 /* 'CATA' */ +#define CATINFO_MAGIC 0x43415449 /* 'CATI' */ struct catadmin { @@ -44,6 +45,12 @@ struct catadmin WCHAR path[MAX_PATH]; }; +struct catinfo +{ + DWORD magic; + WCHAR file[MAX_PATH]; +}; + /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) * @@ -114,9 +121,53 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, PWSTR selectBaseName, DWORD flags) { - FIXME("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile), + static const WCHAR slashW[] = {'\\',0}; + struct catadmin *ca = catAdmin; + struct catinfo *ci; + WCHAR *target; + DWORD len; + + TRACE("%p %s %s %d\n", catAdmin, debugstr_w(catalogFile), debugstr_w(selectBaseName), flags); - return (HCATINFO) 0xdeeeaaadL; + + if (!selectBaseName) + { + FIXME("NULL basename not handled\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!ca || ca->magic != CATADMIN_MAGIC || !catalogFile || flags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + len = strlenW(ca->path) + strlenW(selectBaseName) + 2; + if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + strcpyW(target, ca->path); + strcatW(target, slashW); + strcatW(target, selectBaseName); + + if (!CopyFileW(catalogFile, target, FALSE)) + { + HeapFree(GetProcessHeap(), 0, target); + return NULL; + } + if (!(ci = HeapAlloc(GetProcessHeap(), 0, sizeof(*ci)))) + { + HeapFree(GetProcessHeap(), 0, target); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ci->magic = CATINFO_MAGIC; + strcpyW(ci->file, selectBaseName); + + HeapFree(GetProcessHeap(), 0, target); + return ci; } /*********************************************************************** @@ -156,15 +207,25 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, * * RETURNS * Success: TRUE. - * Failure: FAIL. + * Failure: FALSE. * */ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, HCATINFO hCatInfo, DWORD dwFlags) { - FIXME("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags); - return TRUE; + struct catinfo *ci = hCatInfo; + struct catadmin *ca = hCatAdmin; + + TRACE("%p %p %x\n", hCatAdmin, hCatInfo, dwFlags); + + if (!ca || ca->magic != CATADMIN_MAGIC || !ci || ci->magic != CATINFO_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ci->magic = 0; + return HeapFree(GetProcessHeap(), 0, ci); } /*********************************************************************** @@ -178,7 +239,7 @@ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, * * RETURNS * Success: TRUE. - * Failure: FAIL. + * Failure: FALSE. * */ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) @@ -213,7 +274,15 @@ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) */ BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN hCatAdmin, LPCWSTR pwszCatalogFile, DWORD dwFlags) { - FIXME("%p %s %x\n", hCatAdmin, debugstr_w(pwszCatalogFile), dwFlags); + struct catadmin *ca = hCatAdmin; + + TRACE("%p %s %x\n", hCatAdmin, debugstr_w(pwszCatalogFile), dwFlags); + + if (!ca || ca->magic != CATADMIN_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return DeleteFileW(pwszCatalogFile); }

1 0

Jacek Caban : mshtml: Added nsIChannel::[Get|Set]Owner implementation.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: bbd4a63491bae50eecb4f735fe67584d41b9fced URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd4a63491bae50eecb4f735f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 18 14:08:31 2008 +0100 mshtml: Added nsIChannel::[Get|Set]Owner implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0d02f26..6cb41bd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -348,6 +348,7 @@ typedef struct { nsIInputStream *post_data_stream; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; + nsISupports *owner; nsLoadFlags load_flags; nsIURI *original_uri; char *content_type; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0669463..1dca2a4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -417,8 +417,11 @@ static nsresult NSAPI nsChannel_GetOwner(nsIHttpChannel *iface, nsISupports **aO if(This->channel) return nsIChannel_GetOwner(This->channel, aOwner); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->owner) + nsISupports_AddRef(This->owner); + *aOwner = This->owner; + + return NS_OK; } static nsresult NSAPI nsChannel_SetOwner(nsIHttpChannel *iface, nsISupports *aOwner) @@ -430,8 +433,13 @@ static nsresult NSAPI nsChannel_SetOwner(nsIHttpChannel *iface, nsISupports *aOw if(This->channel) return nsIChannel_SetOwner(This->channel, aOwner); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(aOwner) + nsISupports_AddRef(aOwner); + if(This->owner) + nsISupports_Release(This->owner); + This->owner = aOwner; + + return NS_OK; } static nsresult NSAPI nsChannel_GetNotificationCallbacks(nsIHttpChannel *iface,

1 0

Dylan Smith : richedit: Made sure text is offset by formatting rectangle.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 297716e01ca8c58f2ed400da1437b02fb420448a URL: http://source.winehq.org/git/wine.git/?a=commit;h=297716e01ca8c58f2ed400da1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Dec 18 01:56:49 2008 -0500 richedit: Made sure text is offset by formatting rectangle. The formatting rectangle is set with EM_SETRECT, and retrieved with EM_GETRECT, so it corresponds to rcFormat in the code. This defines the area that the richedit control should draw the text so that it is offset by the top-left corner of the formatting rectangle, and clipped so that it doesn't draw past the bottom or right hand side. Thus this is important for implementing windowless richedit controls to not interfere with the rest of the window. --- dlls/riched20/caret.c | 17 +++--- dlls/riched20/editor.c | 135 ++++++++++++++++++++++++++++++++++------- dlls/riched20/editstr.h | 4 +- dlls/riched20/paint.c | 103 +++++++++++++++++++------------- dlls/riched20/run.c | 2 +- dlls/riched20/tests/editor.c | 33 ++++------ dlls/riched20/wrap.c | 24 ++++---- 7 files changed, 211 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=297716e01ca8c58f2ed40…

1 0

Jacek Caban : mshtml: Use stored nsINetUtil interface.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: d356d15225aa0e717ed0b5cf40718ea513a6d909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d356d15225aa0e717ed0b5cf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 18 14:08:13 2008 +0100 mshtml: Use stored nsINetUtil interface. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 2 ++ dlls/mshtml/nsio.c | 35 ++++++++++++++++++++++------------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 60e250d..0d02f26 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -500,6 +500,7 @@ BOOL load_gecko(BOOL); void close_gecko(void); void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*); void init_nsio(nsIComponentManager*,nsIComponentRegistrar*); +void release_nsio(void); BOOL install_wine_gecko(BOOL); HRESULT nsuri_to_url(LPCWSTR,BSTR*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 923604d..34bc6d5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -865,6 +865,8 @@ void close_gecko(void) { TRACE("()\n"); + release_nsio(); + if(pCompMgr) nsIComponentManager_Release(pCompMgr); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 31fb897..0669463 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -47,6 +47,7 @@ static const IID NS_IOSERVICE_CID = {0x9ac9e770, 0x18bc, 0x11d3, {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40}}; static nsIIOService *nsio = NULL; +static nsINetUtil *net_util; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; @@ -2260,21 +2261,9 @@ static nsrefcnt NSAPI nsNetUtil_Release(nsINetUtil *iface) static nsresult NSAPI nsNetUtil_ParseContentType(nsINetUtil *iface, const nsACString *aTypeHeader, nsACString *aCharset, PRBool *aHadCharset, nsACString *aContentType) { - nsINetUtil *net_util; - nsresult nsres; - TRACE("(%p %p %p %p)\n", aTypeHeader, aCharset, aHadCharset, aContentType); - nsres = nsIIOService_QueryInterface(nsio, &IID_nsINetUtil, (void**)&net_util); - if(NS_FAILED(nsres)) { - WARN("Could not get nsINetUtil interface: %08x\n", nsres); - return nsres; - } - - nsres = nsINetUtil_ParseContentType(net_util, aTypeHeader, aCharset, aHadCharset, aContentType); - - nsINetUtil_Release(net_util); - return nsres; + return nsINetUtil_ParseContentType(net_util, aTypeHeader, aCharset, aHadCharset, aContentType); } static const nsINetUtilVtbl nsNetUtilVtbl = { @@ -2380,6 +2369,13 @@ void init_nsio(nsIComponentManager *component_manager, nsIComponentRegistrar *re return; } + nsres = nsIIOService_QueryInterface(nsio, &IID_nsINetUtil, (void**)&net_util); + if(NS_FAILED(nsres)) { + WARN("Could not get nsINetUtil interface: %08x\n", nsres); + nsIIOService_Release(nsio); + return; + } + nsres = nsIComponentRegistrar_UnregisterFactory(registrar, &NS_IOSERVICE_CID, old_factory); nsIFactory_Release(old_factory); if(NS_FAILED(nsres)) @@ -2390,3 +2386,16 @@ void init_nsio(nsIComponentManager *component_manager, nsIComponentRegistrar *re if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08x\n", nsres); } + +void release_nsio(void) +{ + if(net_util) { + nsINetUtil_Release(net_util); + net_util = NULL; + } + + if(nsio) { + nsIIOService_Release(nsio); + nsio = NULL; + } +}

1 0

Rico Schüller : comdlg32: Fix German translation.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 2381f237873d6e8ddcdfd955c96431d6f24c6790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2381f237873d6e8ddcdfd955c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 17 21:04:44 2008 +0100 comdlg32: Fix German translation. --- dlls/comdlg32/cdlg_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index 721b20c..ed2c944 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -400,7 +400,7 @@ Bitte geben sie einen Wert zwischen %d und %d an." PD32_GENERIC_ERROR "Ein unbekannter Fehler ist aufgetreten." PD32_DRIVER_UNKNOWN "Unbekannter Druckertreiber." PD32_NO_DEVICES "Bevor Sie drucker-relevante Aufgaben ausf�hren k�nnen, \ - wie die Seiteneinrichtung oder ein Dokument zu drucken,\ + wie die Seiteneinrichtung oder ein Dokument zu drucken, \ m�ssen Sie einen Drucker installieren. Bitte f�hren Sie dies zuerst aus und versuchen Sie es erneut." PD32_DEFAULT_PRINTER "Standard Drucker; "

1 0

Dylan Smith : richedit: Fixed ITextHostImpl return values for tests.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 62db58545eb70016ecd7ae2cd63072b866331cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62db58545eb70016ecd7ae2cd… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Dec 18 01:56:32 2008 -0500 richedit: Fixed ITextHostImpl return values for tests. There were several methods that do not have a HRESULT for a return value, so returning E_NOTIMPL is not appropriate. For all the BOOL return values FALSE was returned to indicate the operation was not performed. --- dlls/riched20/tests/txtsrv.c | 114 +++++++++++++++++++++--------------------- 1 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62db58545eb70016ecd7a…

1 0