October 2006 - Wine-commits

Hans Leidekker : mscms: Document the transform functions.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 3dbac638b0dec3552612eb5e07c5e088590ace7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbac638b0dec3552612eb5e0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 15:35:56 2006 +0200 mscms: Document the transform functions. --- dlls/mscms/transform.c | 76 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index a38b43e..0cc4505 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -1,7 +1,7 @@ /* * MSCMS - Color Management System for Wine * - * Copyright 2005 Hans Leidekker + * Copyright 2005, 2006 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,6 +34,11 @@ #include "mscms_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(mscms); +/****************************************************************************** + * CreateColorTransformA [MSCMS.@] + * + * See CreateColorTransformW. + */ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, HPROFILE target, DWORD flags ) { @@ -53,6 +58,21 @@ HTRANSFORM WINAPI CreateColorTransformA( return CreateColorTransformW( &spaceW, dest, target, flags ); } +/****************************************************************************** + * CreateColorTransformW [MSCMS.@] + * + * Create a color transform. + * + * PARAMS + * space [I] Input color space. + * dest [I] Color profile of destination device. + * target [I] Color profile of target device. + * flags [I] Flags. + * + * RETURNS + * Success: Handle to a transform. + * Failure: NULL + */ HTRANSFORM WINAPI CreateColorTransformW( LPLOGCOLORSPACEW space, HPROFILE dest, HPROFILE target, DWORD flags ) { @@ -78,16 +98,31 @@ #ifdef HAVE_LCMS TYPE_BGR_8, intent, 0 ); } else - { cmstransform = cmsCreateTransform( cmsprofiles[0], TYPE_BGR_8, cmsprofiles[1], TYPE_BGR_8, intent, 0 ); - } + ret = MSCMS_create_htransform_handle( cmstransform ); #endif /* HAVE_LCMS */ return ret; } +/****************************************************************************** + * CreateMultiProfileTransform [MSCMS.@] + * + * Create a color transform from an array of color profiles. + * + * PARAMS + * profiles [I] Array of color profiles. + * nprofiles [I] Number of color profiles. + * intents [I] Array of rendering intents. + * flags [I] Flags. + * cmm [I] Profile to take the CMM from. + * + * RETURNS + * Success: Handle to a transform. + * Failure: NULL + */ HTRANSFORM WINAPI CreateMultiProfileTransform( PHPROFILE profiles, DWORD nprofiles, PDWORD intents, DWORD nintents, DWORD flags, DWORD cmm ) { @@ -119,6 +154,18 @@ #endif /* HAVE_LCMS */ return ret; } +/****************************************************************************** + * DeleteColorTransform [MSCMS.@] + * + * Delete a color transform. + * + * PARAMS + * transform [I] Handle to a color transform. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOL WINAPI DeleteColorTransform( HTRANSFORM transform ) { BOOL ret = FALSE; @@ -137,6 +184,28 @@ #endif /* HAVE_LCMS */ return ret; } +/****************************************************************************** + * TranslateBitmapBits [MSCMS.@] + * + * Perform color translation. + * + * PARAMS + * transform [I] Handle to a color transform. + * srcbits [I] Source bitmap. + * input [I] Format of the source bitmap. + * width [I] Width of the source bitmap. + * height [I] Height of the source bitmap. + * inputstride [I] Number of bytes in one scanline. + * destbits [I] Destination bitmap. + * output [I] Format of the destination bitmap. + * outputstride [I] Number of bytes in one scanline. + * callback [I] Callback function. + * data [I] Callback data. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOL WINAPI TranslateBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT input, DWORD width, DWORD height, DWORD inputstride, PVOID destbits, BMFORMAT output, DWORD outputstride, PBMCALLBACKFN callback, ULONG data ) @@ -150,7 +219,6 @@ #ifdef HAVE_LCMS outputstride, callback, data ); cmstransform = MSCMS_htransform2cmstransform( transform ); - cmsDoTransform( cmstransform, srcbits, destbits, width * height ); ret = TRUE;

1 0

Francois Gouget : Add missing '\n's to Wine traces.
by Alexandre Julliard 05 Oct '06

05 Oct '06

1 0

Paul Vriens : crypt32: Change function declaration to overcome some cast-qual warnings in future patches .
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: a28c40f31415a6a4b4e5567389d0b4ae46cc346b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28c40f31415a6a4b4e556738… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Oct 5 13:41:05 2006 +0200 crypt32: Change function declaration to overcome some cast-qual warnings in future patches. --- dlls/crypt32/sip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index bfd2ab6..36b7483 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -60,7 +60,7 @@ static const WCHAR szDllName[] = { 'D',' static const WCHAR szFuncName[] = { 'F','u','n','c','N','a','m','e',0 }; /* convert a guid to a wide character string */ -static void CRYPT_guid2wstr( LPGUID guid, LPWSTR wstr ) +static void CRYPT_guid2wstr( const GUID *guid, LPWSTR wstr ) { char str[40];

1 0

Paul Vriens : crypt32: Correct the documentation.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: a9b53ef6b21b68abf15f26f5dedccc769b9b4bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b53ef6b21b68abf15f26f5d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Oct 5 13:41:25 2006 +0200 crypt32: Correct the documentation. --- dlls/crypt32/sip.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 36b7483..55228c2 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -357,7 +357,7 @@ cleanup3: /*********************************************************************** * CryptSIPLoad (CRYPT32.@) * - * Load the functions for the given SIP. + * Load some internal crypt32 functions into a SIP_DISPATCH_INFO structure. * * PARAMS * pgSubject [I] The GUID. @@ -369,9 +369,15 @@ cleanup3: * Failure: FALSE. (Look at GetLastError()). * * NOTES - * Testing shows that (somehow) the table of functions is cached between - * calls. + * CryptSIPLoad uses caching for the list of GUIDs and whether a SIP is + * already loaded. * + * An application calls CryptSipLoad which will return a structure with the + * function addresses of some internal crypt32 functions. The application will + * then call these functions which will be forwarded to the appropriate SIP. + * + * CryptSIPLoad will load the needed SIP but doesn't unload this dll. The unloading + * is done when crypt32 is unloaded. */ BOOL WINAPI CryptSIPLoad (const GUID *pgSubject, DWORD dwFlags, SIP_DISPATCH_INFO *pSipDispatch)

1 0

Paul Vriens : crypt32: Move some defines to the top as they will be needed in more functions.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 94be5b0d9e87c287ed60da9e19e33331ac15c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94be5b0d9e87c287ed60da9e1… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Oct 5 13:40:43 2006 +0200 crypt32: Move some defines to the top as they will be needed in more functions. --- dlls/crypt32/sip.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index d7936e0..bfd2ab6 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -56,6 +56,9 @@ static const WCHAR szIsMyFile[] = { static const WCHAR szIsMyFile2[] = { 'I','s','M','y','F','i','l','e','T','y','p','e','2','\\',0}; +static const WCHAR szDllName[] = { 'D','l','l',0 }; +static const WCHAR szFuncName[] = { 'F','u','n','c','N','a','m','e',0 }; + /* convert a guid to a wide character string */ static void CRYPT_guid2wstr( LPGUID guid, LPWSTR wstr ) { @@ -150,8 +153,6 @@ #undef CRYPT_SIPREMOVEPROV static LONG CRYPT_SIPWriteFunction( LPGUID guid, LPCWSTR szKey, LPCWSTR szDll, LPCWSTR szFunction ) { - static const WCHAR szDllName[] = { 'D','l','l',0 }; - static const WCHAR szFuncName[] = { 'F','u','n','c','N','a','m','e',0 }; WCHAR szFullKey[ 0x100 ]; LONG r = ERROR_SUCCESS; HKEY hKey;

1 0

Hans Leidekker : wininet: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: cd2c458588fe9c227b01e6b88fbc73c49b7b8144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2c458588fe9c227b01e6b88… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 13:18:56 2006 +0200 wininet: Win64 printf format warning fixes. --- dlls/wininet/Makefile.in | 2 - dlls/wininet/cookie.c | 12 ++-- dlls/wininet/dialogs.c | 6 +- dlls/wininet/ftp.c | 28 +++++----- dlls/wininet/http.c | 32 ++++++------ dlls/wininet/internet.c | 114 +++++++++++++++++++++--------------------- dlls/wininet/netconnection.c | 4 + dlls/wininet/urlcache.c | 98 ++++++++++++++++++------------------ dlls/wininet/utility.c | 4 + 9 files changed, 150 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd2c458588fe9c227b01e…

1 0

Alexandre Julliard : dinput: Only register the window class once to avoid race conditions.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 09371c75d5538131b6fd57db5c615165b356f23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=09371c75d5538131b6fd57db5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 17:45:45 2006 +0200 dinput: Only register the window class once to avoid race conditions. --- dlls/dinput/dinput_main.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b60cd89..5ac150b 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -754,20 +754,13 @@ static LRESULT CALLBACK dinput_hook_WndP static HWND hook_thread_hwnd; static LONG hook_thread_refcount; +static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0}; + static DWORD WINAPI hook_thread_proc(void *param) { - static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0}; MSG msg; - WNDCLASSEXW wcex; HWND hwnd; - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - wcex.lpfnWndProc = dinput_hook_WndProc; - wcex.lpszClassName = classW; - wcex.hInstance = GetModuleHandleW(0); - - if (!RegisterClassExW(&wcex)) ERR("Error registering window class\n"); hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0); hook_thread_hwnd = hwnd; @@ -783,7 +776,6 @@ static DWORD WINAPI hook_thread_proc(voi } else ERR("Error creating message window\n"); - UnregisterClassW(wcex.lpszClassName, wcex.hInstance); return 0; } @@ -799,8 +791,21 @@ static CRITICAL_SECTION dinput_hook_crit static BOOL create_hook_thread(void) { LONG ref; + static ATOM class_atom; EnterCriticalSection(&dinput_hook_crit); + + if (!class_atom) + { + WNDCLASSEXW wcex; + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + wcex.lpfnWndProc = dinput_hook_WndProc; + wcex.lpszClassName = classW; + wcex.hInstance = GetModuleHandleW(0); + if (!(class_atom = RegisterClassExW(&wcex))) ERR("Error registering window class\n"); + } + ref = ++hook_thread_refcount; TRACE("Refcount %ld\n", ref); if (ref == 1)

1 0

Francois Gouget : oleview: Fix the placement of a '\n'.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 33546e08699f24648f49a6e22c7b1eb5da3e4dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=33546e08699f24648f49a6e22… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:06:12 2006 +0200 oleview: Fix the placement of a '\n'. --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 35e5fc1..e91a613 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1134,7 +1134,7 @@ int PopulateTree(void) break; default: lstrcpyW(wszText, bstrName); - WINE_FIXME("pTypeAttr->typekind == %d\n not supported", + WINE_FIXME("pTypeAttr->typekind == %d not supported\n", pTypeAttr->typekind); }

1 0

Francois Gouget : user/tests: It is perfectly valid for some sysparams registry fields
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: f4ac836f58e2365ef1503aa80b6b925aa42eaac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ac836f58e2365ef1503aa80… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:59:13 2006 +0200 user/tests: It is perfectly valid for some sysparams registry fields to not be set if they have their default value. This is the case on Windows for instance. --- dlls/user/tests/sysparams.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c index 4dd0ec9..d9f5875 100644 --- a/dlls/user/tests/sysparams.c +++ b/dlls/user/tests/sysparams.c @@ -1466,18 +1466,20 @@ static void test_SPI_SETMINIMIZEDMETRICS rc=SystemParametersInfoA( SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), &lpMm_orig, FALSE ); if (!test_error_msg(rc,"SPI_{GET,SET}MINIMIZEDMETRICS")) return; - /* test registry */ + /* Test registry. Note that it is perfectly valid for some fields to + * not be set. + */ regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINWIDTH_VALNAME, dpi); - ok( regval == lpMm_orig.iWidth, "wrong value in registry %d, expected %d\n", + ok( regval == -1 || regval == lpMm_orig.iWidth, "wrong value in registry %d, expected %d\n", regval, lpMm_orig.iWidth); regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINHORZGAP_VALNAME, dpi); - ok( regval == lpMm_orig.iHorzGap, "wrong value in registry %d, expected %d\n", + ok( regval == -1 || regval == lpMm_orig.iHorzGap, "wrong value in registry %d, expected %d\n", regval, lpMm_orig.iHorzGap); regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINVERTGAP_VALNAME, dpi); - ok( regval == lpMm_orig.iVertGap, "wrong value in registry %d, expected %d\n", + ok( regval == -1 || regval == lpMm_orig.iVertGap, "wrong value in registry %d, expected %d\n", regval, lpMm_orig.iVertGap); regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINARRANGE_VALNAME, dpi); - ok( regval == lpMm_orig.iArrange, "wrong value in registry %d, expected %d\n", + ok( regval == -1 || regval == lpMm_orig.iArrange, "wrong value in registry %d, expected %d\n", regval, lpMm_orig.iArrange); /* set some new values */ lpMm_cur.iWidth = 180;

1 0

Hans Leidekker : wininet/tests: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: de3b5be338a902a75d2d59854a8beed685650100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3b5be338a902a75d2d59854… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 5 13:19:00 2006 +0200 wininet/tests: Win64 printf format warning fixes. --- dlls/wininet/tests/Makefile.in | 1 dlls/wininet/tests/http.c | 144 ++++++++++++++++++++-------------------- dlls/wininet/tests/internet.c | 26 ++++--- dlls/wininet/tests/url.c | 126 ++++++++++++++++++----------------- 4 files changed, 148 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de3b5be338a902a75d2d5…

1 0