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

Hans Leidekker : winhttp: Use default values when empty strings are passed for verb, object and version parameters.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 13ba609b0488fa28fc03bcde1262e62a6eae2178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ba609b0488fa28fc03bcde1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 28 13:51:41 2008 +0200 winhttp: Use default values when empty strings are passed for verb, object and version parameters. --- dlls/winhttp/session.c | 6 +++--- dlls/winhttp/tests/winhttp.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index dc8c1bf..9b66dcc 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -272,9 +272,9 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; - if (!verb) verb = get; - if (!object) object = slash; - if (!version) version = http1_1; + if (!verb || !*verb) verb = get; + if (!object || !*object) object = slash; + if (!version || !*version) version = http1_1; if (!(request->verb = strdupW( verb ))) goto end; if (!(request->path = strdupW( object ))) goto end; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index eb0129c..6ba3a32 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -573,6 +573,45 @@ static void test_secure_connection(void) WinHttpCloseHandle(ses); } +static void test_request_parameter_defaults(void) +{ + static const WCHAR empty[] = {0}; + static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; + + HANDLE ses, con, req; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, codeweavers, 0, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + WinHttpCloseHandle(req); + + req = WinHttpOpenRequest(con, empty, empty, empty, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + START_TEST (winhttp) { test_OpenRequest(); @@ -581,4 +620,5 @@ START_TEST (winhttp) test_WinHttpTimeToSystemTime(); test_WinHttpAddHeaders(); test_secure_connection(); + test_request_parameter_defaults(); }

1 0

Hans Leidekker : winhttp: Test secure connections. Fix a crash when no response is returned.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: f732065c4c8b8065701f49d8742a8d1a299205e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f732065c4c8b8065701f49d87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 28 13:50:03 2008 +0200 winhttp: Test secure connections. Fix a crash when no response is returned. --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 95ef892..3449ce6 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -538,6 +538,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID else headers = request->raw_headers; + if (!headers) return FALSE; len = strlenW( headers ) * sizeof(WCHAR); if (len + sizeof(WCHAR) > *buflen) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3fbb24c..eb0129c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -525,6 +525,54 @@ static void test_WinHttpAddHeaders(void) } +static void test_secure_connection(void) +{ + static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; + + HANDLE ses, con, req; + DWORD size; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, google, 443, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + /* try without setting WINHTTP_FLAG_SECURE */ + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(!ret, "succeeded unexpectedly\n"); + + size = 0; + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); + ok(!ret, "succeeded unexpectedly\n"); + + WinHttpCloseHandle(req); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + size = 0; + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); + ok(!ret, "succeeded unexpectedly\n"); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + START_TEST (winhttp) { test_OpenRequest(); @@ -532,4 +580,5 @@ START_TEST (winhttp) test_WinHttpTimeFromSystemTime(); test_WinHttpTimeToSystemTime(); test_WinHttpAddHeaders(); + test_secure_connection(); }

1 0

Hans Leidekker : winhttp: Add support for secure connections.
by Alexandre Julliard 29 Aug '08

29 Aug '08

Module: wine Branch: master Commit: 0b19e8559f89f2b6a503821d2ac5fffb31aec6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b19e8559f89f2b6a503821d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 28 13:49:19 2008 +0200 winhttp: Add support for secure connections. --- dlls/winhttp/net.c | 294 +++++++++++++++++++++++++++++++++++++++- dlls/winhttp/request.c | 6 + dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 6 +- 4 files changed, 303 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b19e8559f89f2b6a5038…

1 0

Jeremy Newman : World Wine News, this just is not "weekly" anymore.
by Jeremy Newman 28 Aug '08

28 Aug '08

Module: website Branch: master Commit: 7bfa0d28eb9a5973fe66259130ce721ee0634670 URL: http://source.winehq.org/git/website.git/?a=commit;h=7bfa0d28eb9a5973fe6625… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Aug 28 09:38:06 2008 -0500 World Wine News, this just is not "weekly" anymore. --- wwn/en/wn20080827_351.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/en/wn20080827_351.xml b/wwn/en/wn20080827_351.xml index a71d822..f79ee96 100644 --- a/wwn/en/wn20080827_351.xml +++ b/wwn/en/wn20080827_351.xml @@ -5,7 +5,7 @@ <author contact="http://www.bluesata.com">Zachary Goldberg</author> <issue num="351" date="08/26/2008" /> -<intro> <p>This is the 351 issue of the Wine Weekly News publication. +<intro> <p>This is the 351 issue of the World Wine News publication. Its main goal is to update the community on the status of the patchwatcher and other major august developments. If this issue also helps to spread peace in the world the editor will be very content. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a></p> </intro> <stats posts="509" size="764" contrib="113" multiples="63" lastweek="28">

1 0

Zachary Goldberg : WWN Issue 351
by Jeremy Newman 28 Aug '08

28 Aug '08

Module: website Branch: master Commit: d46d6cc91139190b638798bbee499365f52dae37 URL: http://source.winehq.org/git/website.git/?a=commit;h=d46d6cc91139190b638798… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Thu Aug 28 09:35:43 2008 -0500 WWN Issue 351 --- news/en/2008082801.xml | 21 + wwn/en/wn20080827_351.xml | 4153 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4174 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d46d6cc91139190b63…

1 0

Vijay Kiran Kamuju : d3drm: Include d3drmobj.h in d3drm.h.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 02ca43cbbcbda8c21bda061a29043c753c1ce3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ca43cbbcbda8c21bda061a2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Aug 27 12:27:38 2008 -0400 d3drm: Include d3drmobj.h in d3drm.h. --- include/d3drm.h | 2 +- include/d3drmobj.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 3168900..4ee4354 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -20,7 +20,7 @@ #define __D3DRM_H__ #include <ddraw.h> -/* #include <d3drmobj.h> */ +#include <d3drmobj.h> /* Direct3DRM Object CLSID */ diff --git a/include/d3drmobj.h b/include/d3drmobj.h index ca32ec9..ab37ebc 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -65,6 +65,9 @@ typedef struct _D3DRMPICKDESC2 /***************************************************************************** * IDirect3DRMObject interface */ +#ifdef WINE_NO_UNICODE_MACROS +#undef GetClassName +#endif #define INTERFACE IDirect3DRMObject DECLARE_INTERFACE_(IDirect3DRMObject,IUnknown) {

1 0

Louis Lenders : shobjidl.idl: Add Taskbarlist interface definitions.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 4bfd945b452e3ab6b2d43f084f784347c8ce5993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfd945b452e3ab6b2d43f084… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 20 08:24:07 2008 +0000 shobjidl.idl: Add Taskbarlist interface definitions. --- include/shobjidl.idl | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 31d211d..23a1fde 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1349,3 +1349,28 @@ interface IFileSystemBindData : IUnknown HRESULT GetFindData( [out] WIN32_FIND_DATAW *pfd); } + +/***************************************************************************** + * ITaskbarList interface + */ +[ + object, + uuid(56FDF342-FD6D-11d0-958A-006097C9A090), + pointer_default(unique) +] +interface ITaskbarList : IUnknown +{ + HRESULT HrInit(); + + HRESULT AddTab( + [in] HWND hwnd); + + HRESULT DeleteTab( + [in] HWND hwnd); + + HRESULT ActivateTab( + [in] HWND hwnd); + + HRESULT SetActiveAlt( + [in] HWND hwnd); +}

1 0

Louis Lenders : shlwapi: Fix UrlUnEscape to expand URLs in-place even if the output buffer is NULL.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 58efbe97ec7a22c61e65757b8cbb3e9bd4ac75a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58efbe97ec7a22c61e65757b8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 27 09:27:34 2008 -0700 shlwapi: Fix UrlUnEscape to expand URLs in-place even if the output buffer is NULL. --- dlls/shlwapi/tests/url.c | 4 ---- dlls/shlwapi/url.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0bff99d..c7c6f8f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -937,21 +937,17 @@ static void test_UrlUnescape(void) ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); - todo_wine { /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ ok(UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeA failed unexpectedly\n"); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); - } dwEscaped = sizeof(inplaceW); ok(UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - todo_wine { /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ ok(UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); - } } diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index c286fc6..febf6a7 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1155,13 +1155,15 @@ HRESULT WINAPI UrlUnescapeA( TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_a(pszUrl), pszUnescaped, pcchUnescaped, dwFlags); - if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE)) || !pcchUnescaped) - return E_INVALIDARG; + if (!pszUrl) return E_INVALIDARG; if(dwFlags & URL_UNESCAPE_INPLACE) dst = pszUrl; else + { + if (!pszUnescaped || !pcchUnescaped) return E_INVALIDARG; dst = pszUnescaped; + } for(src = pszUrl, needed = 0; *src; src++, needed++) { if(dwFlags & URL_DONT_UNESCAPE_EXTRA_INFO && @@ -1222,13 +1224,15 @@ HRESULT WINAPI UrlUnescapeW( TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(pszUrl), pszUnescaped, pcchUnescaped, dwFlags); - if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE))|| !pcchUnescaped) - return E_INVALIDARG; + if(!pszUrl) return E_INVALIDARG; if(dwFlags & URL_UNESCAPE_INPLACE) dst = pszUrl; else + { + if (!pszUnescaped || !pcchUnescaped) return E_INVALIDARG; dst = pszUnescaped; + } for(src = pszUrl, needed = 0; *src; src++, needed++) { if(dwFlags & URL_DONT_UNESCAPE_EXTRA_INFO &&

1 0

Louis Lenders : shlwapi: Add test showing UrlUnEscape should convert the url in place when URL_UNESCAPE_INPLACE is set .
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: d571636dbcf0208c36f70664fb6dffdaa5c96f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d571636dbcf0208c36f70664f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Aug 27 09:26:28 2008 -0700 shlwapi: Add test showing UrlUnEscape should convert the url in place when URL_UNESCAPE_INPLACE is set. --- dlls/shlwapi/tests/url.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 76996c4..0bff99d 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -296,7 +296,8 @@ static struct { const char *expect; } TEST_URL_UNESCAPE[] = { {"file://foo/bar", "file://foo/bar"}, - {"file://fo%20o%5Ca/bar", "file://fo o\\a/bar"} + {"file://fo%20o%5Ca/bar", "file://fo o\\a/bar"}, + {"file://%24%25foobar", "file://$%foobar"} }; /* ################ */ @@ -906,14 +907,21 @@ static void test_UrlUnescape(void) DWORD dwEscaped; size_t i; static char inplace[] = "file:///C:/Program%20Files"; + static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; static WCHAR inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/','P','r','o','g','r','a','m',' ','F','i','l','e','s',0}; + static WCHAR another_inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/','P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; for(i=0; i<sizeof(TEST_URL_UNESCAPE)/sizeof(TEST_URL_UNESCAPE[0]); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; ok(UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, &dwEscaped, 0) == S_OK, "UrlUnescapeA didn't return 0x%08x from \"%s\"\n", S_OK, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); + ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); + /* if we set the bufferpointer to NULL here UrlUnescape fails and string gets not converted */ + ok(UrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0) == E_INVALIDARG, "UrlUnescapeA didn't return 0x%08x from \"%s\"\n", E_INVALIDARG ,TEST_URL_UNESCAPE[i].url); + ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); + dwEscaped = INTERNET_MAX_URL_LENGTH; urlW = GetWideString(TEST_URL_UNESCAPE[i].url); expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); @@ -929,9 +937,22 @@ static void test_UrlUnescape(void) ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); + todo_wine { + /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + ok(UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeA failed unexpectedly\n"); + ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); + } + dwEscaped = sizeof(inplaceW); ok(UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); + + todo_wine { + /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + ok(UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); + ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); + } + } /* ########################### */

1 0

Jim Cameron : user32/tests: Add a regression test for CreateIconFromResource.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 2df7f6a343d1e8b680d0346fa1eae7c2ae837347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df7f6a343d1e8b680d0346fa… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Wed Aug 27 21:51:42 2008 +0100 user32/tests: Add a regression test for CreateIconFromResource. --- dlls/user32/tests/cursoricon.c | 94 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c36adce..0c611a3 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -851,6 +851,99 @@ static void test_LoadImage(void) test_LoadImageFile(pngimage, sizeof(pngimage), "png", 0); } +static void test_CreateIconFromResource(void) +{ + HANDLE handle; + BOOL ret; + DWORD error; + BITMAPINFOHEADER *icon_header; + INT16 *hotspot; + ICONINFO icon_info; + +#define ICON_RES_WIDTH 32 +#define ICON_RES_HEIGHT 32 +#define ICON_RES_AND_SIZE (ICON_WIDTH*ICON_HEIGHT/8) +#define ICON_RES_BPP 32 +#define ICON_RES_SIZE \ + (sizeof(BITMAPINFOHEADER) + ICON_AND_SIZE + ICON_AND_SIZE*ICON_BPP) +#define CRSR_RES_SIZE (2*sizeof(INT16) + ICON_RES_SIZE) + + /* Set icon data. */ + hotspot = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, CRSR_RES_SIZE); + + /* Cursor resources have an extra hotspot, icon resources not. */ + hotspot[0] = 3; + hotspot[1] = 3; + + icon_header = (BITMAPINFOHEADER *) (hotspot + 2); + icon_header->biSize = sizeof(BITMAPINFOHEADER); + icon_header->biWidth = ICON_WIDTH; + icon_header->biHeight = ICON_HEIGHT*2; + icon_header->biPlanes = 1; + icon_header->biBitCount = ICON_BPP; + icon_header->biSizeImage = 0; /* Uncompressed bitmap. */ + + /* Test creating a cursor. */ + SetLastError(0xdeadbeef); + handle = CreateIconFromResource((PBYTE) hotspot, CRSR_RES_SIZE, FALSE, 0x00030000); + ok(handle != NULL, "Create cursor failed.\n"); + + /* Test the icon information. */ + SetLastError(0xdeadbeef); + ret = GetIconInfo(handle, &icon_info); + ok(ret, "GetIconInfo() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + if (ret) + { + ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); + ok(icon_info.xHotspot == 3, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 3, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); + } + + /* Clean up. */ + SetLastError(0xdeadbeef); + ret = DestroyCursor(handle); + ok(ret, "DestroyCursor() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + /* Test creating an icon. */ + SetLastError(0xdeadbeef); + handle = CreateIconFromResource((PBYTE) icon_header, ICON_RES_SIZE, TRUE, + 0x00030000); + ok(handle != NULL, "Create icon failed.\n"); + + /* Test the icon information. */ + SetLastError(0xdeadbeef); + ret = GetIconInfo(handle, &icon_info); + ok(ret, "GetIconInfo() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + if (ret) + { + ok(icon_info.fIcon == TRUE, "fIcon != TRUE.\n"); + /* Icons always have hotspot in the middle */ + ok(icon_info.xHotspot == ICON_WIDTH/2, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == ICON_HEIGHT/2, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); + } + + /* Clean up. */ + SetLastError(0xdeadbeef); + ret = DestroyCursor(handle); + ok(ret, "DestroyCursor() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + HeapFree(GetProcessHeap(), 0, hotspot); +} + static void test_DestroyCursor(void) { static const BYTE bmp_bits[4096]; @@ -955,6 +1048,7 @@ START_TEST(cursoricon) test_initial_cursor(); test_CreateIcon(); test_LoadImage(); + test_CreateIconFromResource(); test_DestroyCursor(); do_parent(); test_child_process();

1 0