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

Hans Leidekker : wininet: Properly initialize access type when no proxy is configured.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 3c43a6568fc3d25d9bbebe2350eb747fe3c1dfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c43a6568fc3d25d9bbebe235… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Aug 2 23:21:54 2008 +0200 wininet: Properly initialize access type when no proxy is configured. --- dlls/wininet/internet.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a306fd2..d06298f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -410,8 +410,11 @@ static BOOL INTERNET_ConfigureProxy( LPWININETAPPINFOW lpwai ) TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwai->lpszProxy)); enabled = 1; } - if (!enabled) TRACE("Proxy is not enabled.\n"); - + if (!enabled) + { + TRACE("Proxy is not enabled.\n"); + lpwai->dwAccessType = INTERNET_OPEN_TYPE_DIRECT; + } RegCloseKey( key ); return (enabled > 0); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipFillPolygon2/GdipFillPolygon2I.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: e04a6620367ec43fa1894814dc0010f0db40d333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04a6620367ec43fa1894814d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 12:19:36 2008 +0400 gdiplus: Implemented GdipFillPolygon2/GdipFillPolygon2I. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5b046a1..eeda4be 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -222,8 +222,8 @@ @ stdcall GdipFillPath(ptr ptr ptr) @ stdcall GdipFillPie(ptr ptr long long long long long long) @ stdcall GdipFillPieI(ptr ptr long long long long long long) -@ stub GdipFillPolygon2 -@ stub GdipFillPolygon2I +@ stdcall GdipFillPolygon2(ptr ptr ptr long) +@ stdcall GdipFillPolygon2I(ptr ptr ptr long) @ stdcall GdipFillPolygon(ptr ptr ptr long long) @ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stdcall GdipFillRectangle(ptr ptr long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b6766d8..4448b6a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2004,6 +2004,18 @@ end: return retval; } +GpStatus WINGDIPAPI GdipFillPolygon2(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPointF *points, INT count) +{ + return GdipFillPolygon(graphics, brush, points, count, FillModeAlternate); +} + +GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPoint *points, INT count) +{ + return GdipFillPolygonI(graphics, brush, points, count, FillModeAlternate); +} + GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) {

1 0

James Hawkins : msi: Add a stub implementation of MsiEnumPatchesEx.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 8782fdba1b419f36a507da29d5e12d1bd3cc585f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8782fdba1b419f36a507da29d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Aug 3 23:53:45 2008 -0500 msi: Add a stub implementation of MsiEnumPatchesEx. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/registry.c | 30 ++++++++++++++++++++++++++++++ include/msi.h | 6 ++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index fd1ff55..e3a4a63 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -262,8 +262,8 @@ 266 stdcall MsiSourceListGetInfoW(wstr wstr long long wstr ptr ptr) 267 stdcall MsiSourceListSetInfoA(str str long long str str) 268 stdcall MsiSourceListSetInfoW(wstr wstr long long wstr wstr) -269 stub MsiEnumPatchesExA -270 stub MsiEnumPatchesExW +269 stdcall MsiEnumPatchesExA(str str long long long ptr ptr ptr ptr ptr) +270 stdcall MsiEnumPatchesExW(wstr wstr long long long ptr ptr ptr ptr ptr) 271 stdcall MsiSourceListEnumMediaDisksA(str str long long long ptr ptr ptr ptr ptr) 272 stdcall MsiSourceListEnumMediaDisksW(wstr wstr long long long ptr ptr ptr ptr ptr) 273 stdcall MsiSourceListAddMediaDiskA(str str long long long str str) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 9a4837b..2cd860a 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1734,6 +1734,36 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved, } /*********************************************************************** + * MsiEnumPatchesExA [MSI.@] + */ +UINT WINAPI MsiEnumPatchesExA(LPCSTR szProductCode, LPCSTR szUserSid, + DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPSTR szPatchCode, + LPSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, + LPSTR szTargetUserSid, LPSTR pcchTargetUserSid) +{ + FIXME("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p) stub!\n", + debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, dwFilter, + dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, + szTargetUserSid, pcchTargetUserSid); + return ERROR_NO_MORE_ITEMS; +} + +/*********************************************************************** + * MsiEnumPatchesW [MSI.@] + */ +UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, + DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPWSTR szPatchCode, + LPWSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, + LPWSTR szTargetUserSid, LPWSTR pcchTargetUserSid) +{ + FIXME("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p) stub!\n", + debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, dwFilter, + dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, + szTargetUserSid, pcchTargetUserSid); + return ERROR_NO_MORE_ITEMS; +} + +/*********************************************************************** * MsiEnumPatchesA [MSI.@] */ UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, diff --git a/include/msi.h b/include/msi.h index 1ffce4e..f3d4445 100644 --- a/include/msi.h +++ b/include/msi.h @@ -579,6 +579,12 @@ UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, LPDWORD); UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) +UINT WINAPI MsiEnumPatchesExA(LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, LPSTR, + MSIINSTALLCONTEXT*, LPSTR, LPSTR); +UINT WINAPI MsiEnumPatchesExW(LPCWSTR, LPCWSTR, DWORD, DWORD, DWORD, LPWSTR, LPWSTR, + MSIINSTALLCONTEXT*, LPWSTR, LPWSTR); +#define MsiEnumPatchesEx WINELIB_NAME_AW(MsiEnumPatchesEx) + UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO); UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO); #define MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash)

1 0

Michael Stefaniuc : msxml3: Remove redundant NULL checks before HeapFree and fix a memleak (Smatch).
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 0f5d6827db681b8ff23b8d60c3b040b3c26ece75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5d6827db681b8ff23b8d60c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 1 21:50:51 2008 +0200 msxml3: Remove redundant NULL checks before HeapFree and fix a memleak (Smatch). --- dlls/msxml3/saxreader.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0b44a6e..4bba5e6 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -806,16 +806,12 @@ static HRESULT SAXAttributes_create(saxattributes **attr, || !attributes->szURI || !attributes->szValue || !attributes->szQName) { - if(attributes->szLocalname) - HeapFree(GetProcessHeap(), 0, attributes->szLocalname); - if(attributes->szPrefix) - HeapFree(GetProcessHeap(), 0, attributes->szPrefix); - if(attributes->szURI) - HeapFree(GetProcessHeap(), 0, attributes->szURI); - if(attributes->szValue) - HeapFree(GetProcessHeap(), 0, attributes->szValue); - if(attributes->szQName) - HeapFree(GetProcessHeap(), 0, attributes->szQName); + HeapFree(GetProcessHeap(), 0, attributes->szLocalname); + HeapFree(GetProcessHeap(), 0, attributes->szPrefix); + HeapFree(GetProcessHeap(), 0, attributes->szURI); + HeapFree(GetProcessHeap(), 0, attributes->szValue); + HeapFree(GetProcessHeap(), 0, attributes->szQName); + HeapFree(GetProcessHeap(), 0, attributes); return E_FAIL; }

1 0

Kirill K. Smirnov : wineconsole: Check return value of CreateWindow() for errors, do not rely upon callback function.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 359cd00982e86d899bbdb5a14a69a398de646c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=359cd00982e86d899bbdb5a14… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Aug 2 21:03:05 2008 +0400 wineconsole: Check return value of CreateWindow() for errors, do not rely upon callback function. --- programs/wineconsole/user.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 6ded183..03157aa 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1434,7 +1434,7 @@ enum init_return WCUSER_InitBackend(struct inner_data* data) RegisterClass(&wndclass); - CreateWindow(wndclass.lpszClassName, NULL, + data->hWnd = CreateWindow(wndclass.lpszClassName, NULL, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data); if (!data->hWnd) return init_not_supported;

1 0

Juan Lang : crypt32: More fully implement CryptSIPRetrieveSubjectGuid.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 5d4d5b16fd2ca99648e6755d09fe17298e952620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4d5b16fd2ca99648e6755d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 1 10:19:52 2008 -0700 crypt32: More fully implement CryptSIPRetrieveSubjectGuid. --- dlls/crypt32/sip.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 227c895..8258e79 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -318,6 +318,9 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid static const WORD dosHdr = IMAGE_DOS_SIGNATURE; static const BYTE cabHdr[] = { 'M','S','C','F' }; BYTE hdr[SIP_MAX_MAGIC_NUMBER]; + WCHAR szFullKey[ 0x100 ]; + LONG r = ERROR_SUCCESS; + HKEY key; TRACE("(%s %p %p)\n", wine_dbgstr_w(FileName), hFileIn, pgSubject); @@ -369,16 +372,84 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid goto cleanup; } - /* FIXME - * There is a lot more to be checked: - * - Check for the keys CryptSIPDllIsMyFileType and CryptSIPDllIsMyFileType2 - * under HKLM\Software\Microsoft\Cryptography\OID\EncodingType 0. Here are - * functions listed that need check if a SIP Provider can deal with the - * given file. - */ + /* Check for supported functions using CryptSIPDllIsMyFileType */ + /* max length of szFullKey depends on our code only, so we won't overrun */ + lstrcpyW(szFullKey, szOID); + lstrcatW(szFullKey, szIsMyFile); + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szFullKey, 0, KEY_READ, &key); + if (r == ERROR_SUCCESS) + { + DWORD index = 0, size; + WCHAR subKeyName[MAX_PATH]; + + do { + size = sizeof(subKeyName) / sizeof(subKeyName[0]); + r = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, + NULL, NULL); + if (r == ERROR_SUCCESS) + { + HKEY subKey; + + r = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); + if (r == ERROR_SUCCESS) + { + HMODULE lib; + pfnIsFileSupported isMy = CRYPT_LoadSIPFuncFromKey(subKey, + &lib); + + if (isMy) + { + bRet = isMy(hFile, pgSubject); + FreeLibrary(lib); + } + RegCloseKey(subKey); + } + } + } while (!bRet && r == ERROR_SUCCESS); + RegCloseKey(key); + } - /* Let's set the most common error for now */ - SetLastError(TRUST_E_SUBJECT_FORM_UNKNOWN); + /* Check for supported functions using CryptSIPDllIsMyFileType2 */ + if (!bRet) + { + lstrcpyW(szFullKey, szOID); + lstrcatW(szFullKey, szIsMyFile2); + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szFullKey, 0, KEY_READ, &key); + if (r == ERROR_SUCCESS) + { + DWORD index = 0, size; + WCHAR subKeyName[MAX_PATH]; + + do { + size = sizeof(subKeyName) / sizeof(subKeyName[0]); + r = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, + NULL, NULL); + if (r == ERROR_SUCCESS) + { + HKEY subKey; + + r = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); + if (r == ERROR_SUCCESS) + { + HMODULE lib; + pfnIsFileSupportedName isMy2 = + CRYPT_LoadSIPFuncFromKey(subKey, &lib); + + if (isMy2) + { + bRet = isMy2((LPWSTR)FileName, pgSubject); + FreeLibrary(lib); + } + RegCloseKey(subKey); + } + } + } while (!bRet && r == ERROR_SUCCESS); + RegCloseKey(key); + } + } + + if (!bRet) + SetLastError(TRUST_E_SUBJECT_FORM_UNKNOWN); cleanup: /* If we didn't open this one we shouldn't close it (hFile is a copy),

1 0

Juan Lang : crypt32: Create a helper to load a SIP function from an open key.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 7d78d394ae67400547628aab896dcfb0bbf622e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d78d394ae67400547628aab8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 1 10:19:15 2008 -0700 crypt32: Create a helper to load a SIP function from an open key. --- dlls/crypt32/sip.c | 68 +++++++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 8668f5b..227c895 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -254,6 +254,39 @@ end_function: return TRUE; } +static void *CRYPT_LoadSIPFuncFromKey(HKEY key, HMODULE *pLib) +{ + LONG r; + DWORD size; + WCHAR dllName[MAX_PATH]; + char functionName[MAX_PATH]; + HMODULE lib; + void *func = NULL; + + /* Read the DLL entry */ + size = sizeof(dllName); + r = RegQueryValueExW(key, szDllName, NULL, NULL, (LPBYTE)dllName, &size); + if (r) goto end; + + /* Read the Function entry */ + size = sizeof(functionName); + r = RegQueryValueExA(key, "FuncName", NULL, NULL, (LPBYTE)functionName, + &size); + if (r) goto end; + + lib = LoadLibraryW(dllName); + if (!lib) + goto end; + func = GetProcAddress(lib, functionName); + if (func) + *pLib = lib; + else + FreeLibrary(lib); + +end: + return func; +} + /*********************************************************************** * CryptSIPRetrieveSubjectGuid (CRYPT32.@) * @@ -378,40 +411,17 @@ static void *CRYPT_LoadSIPFunc(const GUID *pgSubject, LPCWSTR function, HMODULE *pLib) { LONG r; - HKEY key = NULL; - DWORD size; - WCHAR dllName[MAX_PATH]; - char functionName[MAX_PATH]; - HMODULE lib; + HKEY key; void *func = NULL; TRACE("(%s, %s)\n", debugstr_guid(pgSubject), debugstr_w(function)); r = CRYPT_OpenSIPFunctionKey(pgSubject, function, &key); - if (r) goto error; - - /* Read the DLL entry */ - size = sizeof(dllName); - r = RegQueryValueExW(key, szDllName, NULL, NULL, (LPBYTE)dllName, &size); - if (r) goto error; - - /* Read the Function entry */ - size = sizeof(functionName); - r = RegQueryValueExA(key, "FuncName", NULL, NULL, (LPBYTE)functionName, - &size); - if (r) goto error; - - lib = LoadLibraryW(dllName); - if (!lib) - goto error; - func = GetProcAddress(lib, functionName); - if (func) - *pLib = lib; - else - FreeLibrary(lib); - -error: - RegCloseKey(key); + if (!r) + { + func = CRYPT_LoadSIPFuncFromKey(key, pLib); + RegCloseKey(key); + } TRACE("returning %p\n", func); return func; }

1 0

Roy Shea : mstask/test: NewWorkItem conformance test.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 41da56a05f0c7eb362b0d99041ac23f4d5ed5f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41da56a05f0c7eb362b0d9904… Author: Roy Shea <royshea(a)gmail.com> Date: Fri Aug 1 17:13:38 2008 -0700 mstask/test: NewWorkItem conformance test. --- dlls/mstask/tests/Makefile.in | 13 ++++++ dlls/mstask/tests/task_scheduler.c | 82 ++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in new file mode 100644 index 0000000..9a261e7 --- /dev/null +++ b/dlls/mstask/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = mstask.dll +IMPORTS = ole32 kernel32 + +CTESTS = \ + task_scheduler.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c new file mode 100644 index 0000000..94614dc --- /dev/null +++ b/dlls/mstask/tests/task_scheduler.c @@ -0,0 +1,82 @@ +/* + * Test suite for TaskScheduler interface + * + * Copyright (C) 2008 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "initguid.h" +#include "mstask.h" +#include "wine/test.h" + +static ITaskScheduler *test_task_scheduler; + +static void test_NewWorkItem(void) +{ + HRESULT hres; + ITask *task; + const WCHAR task_name[] = {'T', 'e', 's', 't', 'i', 'n', 'g', 0}; + GUID GUID_BAD; + + /* Initialize a GUID that will not be a recognized CLSID or a IID */ + CoCreateGuid(&GUID_BAD); + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler. Skipping tests.\n"); + return; + } + + /* Test basic task creation */ + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, + &CLSID_CTask, &IID_ITask, (IUnknown**)&task); + todo_wine ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); + if (hres == S_OK) + ITask_Release(task); + + /* Task creation attempt using invalid work item class ID */ + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, + &GUID_BAD, &IID_ITask, (IUnknown**)&task); + todo_wine ok(hres == CLASS_E_CLASSNOTAVAILABLE, + "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); + + /* Task creation attempt using invalid interface ID */ + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, + &CLSID_CTask, &GUID_BAD, (IUnknown**)&task); + todo_wine ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); + + /* Task creation attempt using invalid work item class and interface ID */ + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, + &GUID_BAD, &GUID_BAD, (IUnknown**)&task); + todo_wine ok(hres == CLASS_E_CLASSNOTAVAILABLE, + "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); + + ITaskScheduler_Release(test_task_scheduler); + return; +} + +START_TEST(task_scheduler) +{ + CoInitialize(NULL); + test_NewWorkItem(); + CoUninitialize(); +}

1 0

Juan Lang : crypt32: Use ReadFile rather than a memory-mapped file to check the type of a file.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 3f563c3d9bdf8f31615382fff6b9d44c4cb49fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f563c3d9bdf8f31615382fff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 1 10:18:36 2008 -0700 crypt32: Use ReadFile rather than a memory-mapped file to check the type of a file. --- dlls/crypt32/sip.c | 53 +++++++++++++++++++++++---------------------------- 1 files changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 171165a..8668f5b 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -1,6 +1,6 @@ /* * Copyright 2002 Mike McCormack for CodeWeavers - * Copyright 2005 Juan Lang + * Copyright 2005-2008 Juan Lang * Copyright 2006 Paul Vriens * * This library is free software; you can redistribute it and/or @@ -276,15 +276,15 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid (LPCWSTR FileName, HANDLE hFileIn, GUID *pgSubject) { HANDLE hFile; - HANDLE hFilemapped; - LPVOID pMapped; BOOL bRet = FALSE; - DWORD fileSize; - IMAGE_DOS_HEADER *dos; + DWORD count; + LARGE_INTEGER zero, oldPos; /* FIXME, find out if there is a name for this GUID */ static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + static const WORD dosHdr = IMAGE_DOS_SIGNATURE; static const BYTE cabHdr[] = { 'M','S','C','F' }; + BYTE hdr[SIP_MAX_MAGIC_NUMBER]; TRACE("(%s %p %p)\n", wine_dbgstr_w(FileName), hFileIn, pgSubject); @@ -307,38 +307,33 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid if (hFile == INVALID_HANDLE_VALUE) return FALSE; } - hFilemapped = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); - /* Last error is set by CreateFileMapping */ - if (!hFilemapped) goto cleanup3; + zero.QuadPart = 0; + SetFilePointerEx(hFile, zero, &oldPos, FILE_CURRENT); + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + if (!ReadFile(hFile, hdr, sizeof(hdr), &count, NULL)) + goto cleanup; - pMapped = MapViewOfFile(hFilemapped, FILE_MAP_READ, 0, 0, 0); - /* Last error is set by MapViewOfFile */ - if (!pMapped) goto cleanup2; - - /* Native checks it right here */ - fileSize = GetFileSize(hFile, NULL); - if (fileSize < 4) + if (count < SIP_MAX_MAGIC_NUMBER) { SetLastError(ERROR_INVALID_PARAMETER); - goto cleanup1; + goto cleanup; } /* As everything is in place now we start looking at the file header */ - dos = (IMAGE_DOS_HEADER *)pMapped; - if (dos->e_magic == IMAGE_DOS_SIGNATURE) + if (!memcmp(hdr, &dosHdr, sizeof(dosHdr))) { *pgSubject = unknown; SetLastError(S_OK); bRet = TRUE; - goto cleanup1; + goto cleanup; } /* Quick-n-dirty check for a cab file. */ - if (!memcmp(pMapped, cabHdr, sizeof(cabHdr))) + if (!memcmp(hdr, cabHdr, sizeof(cabHdr))) { *pgSubject = cabGUID; SetLastError(S_OK); bRet = TRUE; - goto cleanup1; + goto cleanup; } /* FIXME @@ -352,14 +347,14 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid /* Let's set the most common error for now */ SetLastError(TRUST_E_SUBJECT_FORM_UNKNOWN); - /* The 3 different cleanups are here because we shouldn't overwrite the last error */ -cleanup1: - UnmapViewOfFile(pMapped); -cleanup2: - CloseHandle(hFilemapped); -cleanup3: - /* If we didn't open this one we shouldn't close it (hFile is a copy) */ - if (!hFileIn) CloseHandle(hFile); +cleanup: + /* If we didn't open this one we shouldn't close it (hFile is a copy), + * but we should reset the file pointer to its original position. + */ + if (!hFileIn) + CloseHandle(hFile); + else + SetFilePointerEx(hFile, oldPos, NULL, FILE_BEGIN); return bRet; }

1 0

Paul Vriens : mlang/tests: Skip tests for unsupported code page identifiers .
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: c03dfb8f50840a389d409c571f1369f18c9c51d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03dfb8f50840a389d409c571… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 1 18:21:57 2008 +0200 mlang/tests: Skip tests for unsupported code page identifiers. --- dlls/mlang/tests/mlang.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index b5d77f7..b173842 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1182,7 +1182,13 @@ static void test_JapaneseConversion(void) destsz = 30; outlen = jis_jp[i][0]; srcsz = unc_jp[i][0]; + SetLastError(0xdeadbeef); hr = pConvertINetUnicodeToMultiByte(NULL, 50220, &unc_jp[i][1], &srcsz, output, &destsz); + if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + { + skip("Code page identifier 50220 is not supported\n"); + break; + } ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr); ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz); ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz); @@ -1215,7 +1221,13 @@ static void test_JapaneseConversion(void) outlen = sjis_jp[i][0]; srcsz = unc_jp[i][0]; + SetLastError(0xdeadbeef); hr = pConvertINetUnicodeToMultiByte(NULL, 932, &unc_jp[i][1], &srcsz, output, &destsz); + if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + { + skip("Code page identifier 932 is not supported\n"); + break; + } ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); ok(destsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,destsz); ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz); @@ -1238,7 +1250,13 @@ static void test_JapaneseConversion(void) outlen = euc_jp[i][0]; srcsz = unc_jp[i][0]; + SetLastError(0xdeadbeef); hr = pConvertINetUnicodeToMultiByte(NULL, 51932, &unc_jp[i][1], &srcsz, output, &destsz); + if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + { + skip("Code page identifier 51932 is not supported\n"); + break; + } ok(hr == S_OK, "(%i) Expected S_OK, got %08x\n",i,hr); ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz); ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); @@ -1258,7 +1276,13 @@ static void test_JapaneseConversion(void) i = 0; destsz = 30; srcsz = jis_jp[i][0]; + SetLastError(0xdeadbeef); hr = pConvertINetMultiByteToUnicode(NULL, 50932, &jis_jp[i][1], &srcsz, outputW, &destsz); + if (hr == S_FALSE && GetLastError() == ERROR_INVALID_NAME) + { + skip("Code page identifier 50932 is not supported\n"); + return; + } ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == jis_jp[i][0],"(%i) Expected %i, got %i\n",i,jis_jp[i][0],srcsz); @@ -1276,7 +1300,8 @@ static void test_JapaneseConversion(void) i = 2; destsz = 30; srcsz = euc_jp[i][0]; - hr = pConvertINetMultiByteToUnicode(NULL, 50932, &euc_jp[i][1], &srcsz, outputW, &destsz); ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + hr = pConvertINetMultiByteToUnicode(NULL, 50932, &euc_jp[i][1], &srcsz, outputW, &destsz); + ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == euc_jp[i][0],"(%i) Expected %i, got %i\n",i,euc_jp[i][0],srcsz); ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i);

1 0