January 2009 - Wine-Commits

Andrew Talbot : winex11.drv: Declare some functions static.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: f63ceec4329051cd4e367f0cd72976c99517d3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63ceec4329051cd4e367f0cd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 29 21:40:50 2009 +0000 winex11.drv: Declare some functions static. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 4f87137..a44de11 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -286,7 +286,7 @@ BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) * Setup physDev->gc for drawing operations using current pen. * Return FALSE if pen is PS_NULL, TRUE otherwise. */ -BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ) +static BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ) { XGCValues val; UINT rop2 = GetROP2(physDev->hdc); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 31800f7..8eccfe1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1226,7 +1226,7 @@ void make_window_embedded( Display *display, struct x11drv_win_data *data ) * * Convert a rect from client to X window coordinates */ -void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { RECT rc; @@ -1827,7 +1827,7 @@ Window X11DRV_get_whole_window( HWND hwnd ) * * Return the X window associated with the client area of a window */ -Window X11DRV_get_client_window( HWND hwnd ) +static Window X11DRV_get_client_window( HWND hwnd ) { struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 955a08c..7d0b2ba 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -247,7 +247,6 @@ extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ); extern BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ); extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ); -extern BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ); extern BOOL X11DRV_SetupGCForText( X11DRV_PDEVICE *physDev ); extern INT X11DRV_XWStoDS( X11DRV_PDEVICE *physDev, INT width ); extern INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height ); @@ -718,7 +717,6 @@ struct x11drv_win_data extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ); extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ); extern Window X11DRV_get_whole_window( HWND hwnd ); -extern Window X11DRV_get_client_window( HWND hwnd ); extern XIC X11DRV_get_ic( HWND hwnd ); extern int pixelformat_from_fbconfig_id( XID fbconfig_id ); @@ -753,7 +751,6 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ); extern int X11DRV_check_error(void); -extern void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ); extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ); extern void xinerama_init( unsigned int width, unsigned int height );

1 0

Alasdair Sinclair : riched32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 44df3f543005aaed108d8e81c295ef769094f54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44df3f543005aaed108d8e81c… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:40 2009 +0000 riched32/tests: Fix missing void in empty parameter list. --- dlls/riched32/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index fe2d1d5..ac98d16 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -48,7 +48,7 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS10A, ES_MULTILINE, parent); } -static void test_WM_SETTEXT() +static void test_WM_SETTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); const char * TestItem1 = "TestSomeText";

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 8236f362ff76a80b59cf25ea7cba81e0a1315559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8236f362ff76a80b59cf25ea7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 29 20:23:13 2009 +0100 kernel32/tests: Fix some test failures on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index a6a1dd0..5292c33 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -461,7 +461,7 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) static void test_GetPrivateProfileString(const char *content, const char *descript) { - DWORD ret; + DWORD ret, len; CHAR buf[MAX_PATH]; CHAR def_val[MAX_PATH]; CHAR path[MAX_PATH]; @@ -497,8 +497,11 @@ static void test_GetPrivateProfileString(const char *content, const char *descri lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, MAX_PATH, filename); - ok(ret == 18, "Expected 18, got %d\n", ret); - ok(!memcmp(buf, "section1\0section2\0", ret + 1), + ok(ret == 18 || + broken(ret == 19), /* Win9x and WinME */ + "Expected 18, got %d\n", ret); + len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0section2\0", len), "Expected \"section1\\0section2\\0\", got \"%s\"\n", buf); /* lpAppName is empty */ @@ -685,7 +688,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); - ok(!memcmp(buf, "section1\0secti\0", ret + 1), + len = lstrlenA("section1") + 2 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0secti\0", ret + 1) || + broken(!memcmp(buf, "section1\0\0", len)), /* Win9x, WinME */ "Expected \"section1\\0secti\\0\", got \"%s\"\n", buf); /* lpKeyName is NULL, not enough room for final key name */ @@ -693,7 +698,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ret = GetPrivateProfileStringA("section1", NULL, "default", buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); - ok(!memcmp(buf, "name1\0name2\0na\0", ret + 1), + ok(!memcmp(buf, "name1\0name2\0na\0", ret + 1) || + broken(!memcmp(buf, "name1\0name2\0n\0\0", ret + 1)), /* Win9x, WinME */ "Expected \"name1\\0name2\\0na\\0\", got \"%s\"\n", buf); /* key value has quotation marks which are stripped */

1 0

Alasdair Sinclair : oleaut32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: ded6c50b78c7aea98317338e11d1ee6dffd8a015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded6c50b78c7aea98317338e1… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:17 2009 +0000 oleaut32/tests: Fix missing void in empty parameter list. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index f2997d6..1130410 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -495,7 +495,7 @@ static void test_OleCreatePictureIndirect(void) IPicture_Release(pict); } -static void test_apm() +static void test_apm(void) { OLE_HANDLE handle; LPSTREAM stream;

1 0

Paul Vriens : kernel32/tests: Skip some tests on Win9x and WinME.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: a21ea16f909d745121b48556df1dcf9553425d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21ea16f909d745121b48556d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 29 19:46:50 2009 +0100 kernel32/tests: Skip some tests on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 154d6cf..a6a1dd0 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -262,7 +262,7 @@ static void test_profile_sections_names(void) ret = GetPrivateProfileSectionNamesW( bufW, 29, testfile3W ); if (ret == 0 && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - skip("GetPrivateProfileSectionNamesW is not implemented\n"); + win_skip("GetPrivateProfileSectionNamesW is not implemented\n"); DeleteFileA( testfile3 ); return; } @@ -475,6 +475,18 @@ static void test_GetPrivateProfileString(const char *content, const char *descri trace("test_GetPrivateProfileStringA: %s\n", descript); + if(!lstrcmpA(descript, "CR only")) + { + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStringW(NULL, NULL, NULL, + NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Win9x and WinME don't handle 'CR only' correctly\n"); + return; + } + } + create_test_file(filename, content, lstrlenA(content)); /* Run this test series with caching. Wine won't cache profile

1 0

Alasdair Sinclair : quartz/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 20f565de5ee36ac004488724b4e9bbff2bee73cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f565de5ee36ac004488724b… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:26 2009 +0000 quartz/tests: Fix missing void in empty parameter list. --- dlls/quartz/tests/avisplitter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index f4c8157..33a0d6d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -185,7 +185,7 @@ static const char afile[] = "test.avi"; * By avoiding the filtergraph all together and connecting streams directly to * the null renderer I am sure that this is not the case here. */ -static void test_threads() +static void test_threads(void) { IFileSourceFilter *pfile = NULL; IBaseFilter *preader = NULL, *pavi = NULL;

1 0

Alasdair Sinclair : riched20/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 0e543a715c54001800381e237952b3e42e4eccce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e543a715c54001800381e237… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:33 2009 +0000 riched20/tests: Fix missing void in empty parameter list. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 244ab09..da284d4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3225,7 +3225,7 @@ static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, return 0; } -static void test_WM_SETTEXT() +static void test_WM_SETTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); const char * TestItem1 = "TestSomeText";

1 0

Alexandre Julliard : kernel32/tests: Don' t test the implementation details of the SList structure.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 3e88d45f7c245a072d9ca8815f45a460da24a5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e88d45f7c245a072d9ca8815… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 22:08:07 2009 +0100 kernel32/tests: Don't test the implementation details of the SList structure. --- dlls/kernel32/tests/sync.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 62be4c7..3910466 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -197,7 +197,7 @@ static void test_slist(void) int value; } item1, item2, item3, *pitem; - SLIST_HEADER slist_header, test_header; + SLIST_HEADER slist_header; PSLIST_ENTRY entry; USHORT size; @@ -224,11 +224,8 @@ static void test_slist(void) return; } - memset(&test_header, 0, sizeof(test_header)); memset(&slist_header, 0xFF, sizeof(slist_header)); pInitializeSListHead(&slist_header); - ok(memcmp(&test_header, &slist_header, sizeof(SLIST_HEADER)) == 0, - "InitializeSListHead didn't zero-fill list header\n"); size = pQueryDepthSList(&slist_header); ok(size == 0, "initially created slist has size %d, expected 0\n", size);

1 0

Juan Lang : crypt32: Fix debug channel for PFX functions.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 3fd732b25b819b17e619b6d767974bfc36c783ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd732b25b819b17e619b6d76… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 02:07:20 2009 -0800 crypt32: Fix debug channel for PFX functions. --- dlls/crypt32/decode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f353131..cda8b62 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5516,7 +5516,7 @@ BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX) { BOOL ret; - TRACE("(%p)\n", pPFX); + TRACE_(crypt)("(%p)\n", pPFX); /* A PFX blob is an asn.1-encoded sequence, consisting of at least a * version integer of length 1 (3 encoded byes) and at least one other @@ -5550,6 +5550,6 @@ BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB *pPFX) HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB *pPFX, LPCWSTR szPassword, DWORD dwFlags) { - FIXME("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); + FIXME_(crypt)("(%p, %p, %08x): stub\n", pPFX, szPassword, dwFlags); return NULL; }

1 0

Hans Leidekker : wininet: Implement IsDomainLegalCookieDomainW.
by Alexandre Julliard Jan. 30, 2009

Jan. 30, 2009

Module: wine Branch: master Commit: 2d42f291c81ee400f0e34b054ca70402563da404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d42f291c81ee400f0e34b054… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 29 16:59:33 2009 +0100 wininet: Implement IsDomainLegalCookieDomainW. --- dlls/wininet/cookie.c | 25 ++++++++ dlls/wininet/tests/internet.c | 131 +++++++++++++++++++++++++++++++++++++++++ dlls/wininet/wininet.spec | 2 +- 3 files changed, 157 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 1ee8809..c6352c8 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -696,3 +696,28 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } + +/*********************************************************************** + * IsDomainLegalCookieDomainW (WININET.@) + */ +BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) +{ + const WCHAR *p; + + FIXME("(%s, %s)\n", debugstr_w(s1), debugstr_w(s2)); + + if (!s1 || !s2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) + { + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + if (!(p = strchrW(s2, '.'))) return FALSE; + if (strchrW(p + 1, '.') && !strcmpW(p + 1, s1)) return TRUE; + else if (!strcmpW(s1, s2)) return TRUE; + return FALSE; +} diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5fbfd76..13a5f5c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -31,6 +31,7 @@ static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPS static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); +static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); /* ############################### */ @@ -526,6 +527,131 @@ static void InternetTimeToSystemTimeW_test(void) ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); } +static void test_IsDomainLegalCookieDomainW(void) +{ + BOOL ret; + DWORD error; + static const WCHAR empty[] = {0}; + static const WCHAR dot[] = {'.',0}; + static const WCHAR uk[] = {'u','k',0}; + static const WCHAR com[] = {'c','o','m',0}; + static const WCHAR dot_com[] = {'.','c','o','m',0}; + static const WCHAR gmail_com[] = {'g','m','a','i','l','.','c','o','m',0}; + static const WCHAR dot_gmail_com[] = {'.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR mail_gmail_com[] = {'m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR gmail_co_uk[] = {'g','m','a','i','l','.','c','o','.','u','k',0}; + static const WCHAR co_uk[] = {'c','o','.','u','k',0}; + static const WCHAR dot_co_uk[] = {'.','c','o','.','u','k',0}; + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(NULL, NULL); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, NULL); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(NULL, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(empty, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, empty); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(gmail_com, dot); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(dot, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, dot_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(dot_com, com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(com, gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + + ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW failed\n"); + ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); + + ret = pIsDomainLegalCookieDomainW(uk, co_uk); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, dot_co_uk); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, gmail_co_uk); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_com, com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + SetLastError(0xdeadbeef); + ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); + error = GetLastError(); + ok(!ret, "IsDomainLegalCookieDomainW failed\n"); + ok(error == ERROR_INVALID_NAME, "got %u expected ERROR_INVALID_NAME\n", error); + + ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(mail_gmail_com, gmail_com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(mail_gmail_com, com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + + ret = pIsDomainLegalCookieDomainW(mail_gmail_com, dot_gmail_com); + ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); +} + /* ############################### */ START_TEST(internet) @@ -536,6 +662,7 @@ START_TEST(internet) pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW"); pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA"); pInternetTimeToSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeW"); + pIsDomainLegalCookieDomainW = (void*)GetProcAddress(hdll, (LPCSTR)117); test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); @@ -552,4 +679,8 @@ START_TEST(internet) InternetTimeToSystemTimeA_test(); InternetTimeToSystemTimeW_test(); } + if (!pIsDomainLegalCookieDomainW) + skip("skipping IsDomainLegalCookieDomainW tests\n"); + else + test_IsDomainLegalCookieDomainW(); } diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index f5b616e..8db462c 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -9,7 +9,7 @@ 111 stub -noname ExportCookieFileW 112 stub -noname IsProfilesEnabled 116 stub -noname IsDomainlegalCookieDomainA -117 stub -noname IsDomainLegalCookieDomainW +117 stdcall -noname IsDomainLegalCookieDomainW(wstr wstr) 118 stub -noname FindP3PPolicySymbol 120 stub -noname MapResourceToPolicy 121 stub -noname GetP3PPolicy

1 0