January 2010 - Wine-commits

Matijn Woudt : winhttp/tests: Add tests for WinHttpSetTimeouts.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 5a712037aff785e943bc29f15fb065bb3cb48c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a712037aff785e943bc29f15… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Wed Jan 27 23:01:29 2010 +0100 winhttp/tests: Add tests for WinHttpSetTimeouts. --- dlls/winhttp/tests/winhttp.c | 108 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f0b46b6..bddf871 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1031,6 +1031,113 @@ static void test_set_default_proxy_config(void) GetLastError()); } +static void test_Timeouts (void) +{ + BOOL ret; + HINTERNET ses, req, con; + static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; + + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, -2, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, -2, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, 0, -2, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, 0, 0, -2); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, -1, -1, -1, -1); + todo_wine ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, 0, 0, 0); + todo_wine ok(ret, "%u\n", GetLastError()); + + con = WinHttpConnect(ses, codeweavers, 0, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, -2, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, -2, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, 0, -2, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, 0, 0, -2); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, -1, -1, -1, -1); + ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, + "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, + "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, -2, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, -2, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, 0, -2, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, 0, 0, -2); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, -1, -1, -1, -1); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, 0, 0, 0); + ok(ret, "%u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + START_TEST (winhttp) { test_OpenRequest(); @@ -1043,4 +1150,5 @@ START_TEST (winhttp) test_QueryOption(); test_set_default_proxy_config(); test_empty_headers_param(); + test_Timeouts(); }

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_LoadFileMessage.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 9e8e14ed127fd5a017777cc7ac91087cdc59c72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8e14ed127fd5a017777cc7a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:25:48 2010 -0800 wintrust: Return error directly from SOFTPUB_LoadFileMessage. --- dlls/wintrust/softpub.c | 54 ++++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 47b76b2..9d13b4a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -323,35 +323,45 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) return ret; } -static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err = ERROR_SUCCESS; if (!data->pWintrustData->u.pFile) { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + err = ERROR_INVALID_PARAMETER; goto error; } - ret = SOFTPUB_OpenFile(data); - if (!ret) + if (!SOFTPUB_OpenFile(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetFileSubject(data); - if (!ret) + } + if (!SOFTPUB_GetFileSubject(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetSIP(data); - if (!ret) + } + if (!SOFTPUB_GetSIP(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, - data->pWintrustData->u.pFile->pcwszFilePath); - if (!ret) + } + if (!SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, + data->pWintrustData->u.pFile->pcwszFilePath)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_CreateStoreFromMessage(data); - if (!ret) + } + if (!SOFTPUB_CreateStoreFromMessage(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_DecodeInnerContent(data); + } + if (!SOFTPUB_DecodeInnerContent(data)) + err = GetLastError(); error: - return ret; + return err; } static BOOL SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) @@ -393,7 +403,8 @@ error: HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + BOOL ret = TRUE; + DWORD err = ERROR_SUCCESS; TRACE("(%p)\n", data); @@ -406,7 +417,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) ret = SOFTPUB_LoadCertMessage(data); break; case WTD_CHOICE_FILE: - ret = SOFTPUB_LoadFileMessage(data); + err = SOFTPUB_LoadFileMessage(data); break; case WTD_CHOICE_CATALOG: ret = SOFTPUB_LoadCatalogMessage(data); @@ -420,6 +431,11 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError(); + else if (err) + { + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = err; + ret = FALSE; + } TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); return ret ? S_OK : S_FALSE;

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_LoadCatalogMessage .
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 528876c40230f0e8c0fefa39b9b77088892b7319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=528876c40230f0e8c0fefa39b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:26:36 2010 -0800 wintrust: Return error directly from SOFTPUB_LoadCatalogMessage. --- dlls/wintrust/softpub.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9d13b4a..967bb1a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -364,9 +364,9 @@ error: return err; } -static BOOL SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; HANDLE catalog = INVALID_HANDLE_VALUE; if (!data->pWintrustData->u.pCatalog) @@ -378,27 +378,36 @@ static BOOL SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (catalog == INVALID_HANDLE_VALUE) - return FALSE; - ret = CryptSIPRetrieveSubjectGuid( + return GetLastError(); + if (!CryptSIPRetrieveSubjectGuid( data->pWintrustData->u.pCatalog->pcwszCatalogFilePath, catalog, - &data->u.pPDSip->gSubject); - if (!ret) + &data->u.pPDSip->gSubject)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetSIP(data); - if (!ret) + } + if (!SOFTPUB_GetSIP(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetMessageFromFile(data, catalog, - data->pWintrustData->u.pCatalog->pcwszCatalogFilePath); - if (!ret) + } + if (!SOFTPUB_GetMessageFromFile(data, catalog, + data->pWintrustData->u.pCatalog->pcwszCatalogFilePath)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_CreateStoreFromMessage(data); - if (!ret) + } + if (!SOFTPUB_CreateStoreFromMessage(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_DecodeInnerContent(data); + } + if (!SOFTPUB_DecodeInnerContent(data)) + err = GetLastError(); /* FIXME: this loads the catalog file, but doesn't validate the member. */ error: CloseHandle(catalog); - return ret; + return err; } HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) @@ -420,7 +429,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_LoadFileMessage(data); break; case WTD_CHOICE_CATALOG: - ret = SOFTPUB_LoadCatalogMessage(data); + err = SOFTPUB_LoadCatalogMessage(data); break; default: FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice);

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_OpenFile.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: fc1fbf61074fed98b1423cf501580ecb57d5b995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1fbf61074fed98b1423cf50… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:27:49 2010 -0800 wintrust: Return error directly from SOFTPUB_OpenFile. --- dlls/wintrust/softpub.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 967bb1a..1ff0599 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -75,9 +75,9 @@ HRESULT WINAPI DriverFinalPolicy(CRYPT_PROVIDER_DATA *data) /* Assumes data->pWintrustData->u.pFile exists. Makes sure a file handle is * open for the file. */ -static BOOL SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data) { - BOOL ret = TRUE; + DWORD err = ERROR_SUCCESS; /* PSDK implies that all values should be initialized to NULL, so callers * typically have hFile as NULL rather than INVALID_HANDLE_VALUE. Check @@ -92,13 +92,13 @@ static BOOL SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data) if (data->pWintrustData->u.pFile->hFile != INVALID_HANDLE_VALUE) data->fOpenedFile = TRUE; else - ret = FALSE; + err = GetLastError(); } - if (ret) + if (!err) GetFileTime(data->pWintrustData->u.pFile->hFile, &data->sftSystemTime, NULL, NULL); - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %d\n", err); + return err; } /* Assumes data->pWintrustData->u.pFile exists. Sets data->pPDSip->gSubject to @@ -332,11 +332,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = ERROR_INVALID_PARAMETER; goto error; } - if (!SOFTPUB_OpenFile(data)) - { - err = GetLastError(); + err = SOFTPUB_OpenFile(data); + if (err) goto error; - } if (!SOFTPUB_GetFileSubject(data)) { err = GetLastError();

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_GetFileSubject.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: b5fbb87470e42064765467aad1de67937c231c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5fbb87470e42064765467aad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:29:35 2010 -0800 wintrust: Return error directly from SOFTPUB_GetFileSubject. --- dlls/wintrust/softpub.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1ff0599..356d8fe 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -104,26 +104,24 @@ static DWORD SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data) /* Assumes data->pWintrustData->u.pFile exists. Sets data->pPDSip->gSubject to * the file's subject GUID. */ -static BOOL SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err = ERROR_SUCCESS; if (!WVT_ISINSTRUCT(WINTRUST_FILE_INFO, data->pWintrustData->u.pFile->cbStruct, pgKnownSubject) || !data->pWintrustData->u.pFile->pgKnownSubject) { - ret = CryptSIPRetrieveSubjectGuid( + if (!CryptSIPRetrieveSubjectGuid( data->pWintrustData->u.pFile->pcwszFilePath, data->pWintrustData->u.pFile->hFile, - &data->u.pPDSip->gSubject); + &data->u.pPDSip->gSubject)) + err = GetLastError(); } else - { data->u.pPDSip->gSubject = *data->pWintrustData->u.pFile->pgKnownSubject; - ret = TRUE; - } - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %d\n", err); + return err; } /* Assumes data->u.pPDSip exists, and its gSubject member set. @@ -335,11 +333,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_OpenFile(data); if (err) goto error; - if (!SOFTPUB_GetFileSubject(data)) - { - err = GetLastError(); + err = SOFTPUB_GetFileSubject(data); + if (err) goto error; - } if (!SOFTPUB_GetSIP(data)) { err = GetLastError();

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_GetSIP.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 2c12de4b7e4536460aab1baeea1dda78da132fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c12de4b7e4536460aab1baee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:31:26 2010 -0800 wintrust: Return error directly from SOFTPUB_GetSIP. --- dlls/wintrust/softpub.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 356d8fe..a6edfe2 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -127,20 +127,20 @@ static DWORD SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) /* Assumes data->u.pPDSip exists, and its gSubject member set. * Allocates data->u.pPDSip->pSip and loads it, if possible. */ -static BOOL SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err = ERROR_SUCCESS; data->u.pPDSip->pSip = data->psPfns->pfnAlloc(sizeof(SIP_DISPATCH_INFO)); if (data->u.pPDSip->pSip) - ret = CryptSIPLoad(&data->u.pPDSip->gSubject, 0, data->u.pPDSip->pSip); - else { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; + if (!CryptSIPLoad(&data->u.pPDSip->gSubject, 0, data->u.pPDSip->pSip)) + err = GetLastError(); } - TRACE("returning %d\n", ret); - return ret; + else + err = ERROR_OUTOFMEMORY; + TRACE("returning %d\n", err); + return err; } /* Assumes data->u.pPDSip has been loaded, and data->u.pPDSip->pSip allocated. @@ -336,11 +336,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_GetFileSubject(data); if (err) goto error; - if (!SOFTPUB_GetSIP(data)) - { - err = GetLastError(); + err = SOFTPUB_GetSIP(data); + if (err) goto error; - } if (!SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, data->pWintrustData->u.pFile->pcwszFilePath)) { @@ -380,11 +378,9 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) err = GetLastError(); goto error; } - if (!SOFTPUB_GetSIP(data)) - { - err = GetLastError(); + err = SOFTPUB_GetSIP(data); + if (err) goto error; - } if (!SOFTPUB_GetMessageFromFile(data, catalog, data->pWintrustData->u.pCatalog->pcwszCatalogFilePath)) {

1 0

André Hentschel : oleaut32/tests: Add a test for DosTime.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 2e48ecd924ad0ca8be223d07370ded2b5c2c3631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e48ecd924ad0ca8be223d073… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 27 20:02:43 2010 +0100 oleaut32/tests: Add a test for DosTime. --- dlls/oleaut32/tests/vartest.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 05f4be3..16c08be 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1759,7 +1759,8 @@ static void test_DosDateTimeToVariantTime(void) DOS2DT(1,1,1980,0,0,29,1,29221.00032407407); /* 1/1/1980 12:00:28 AM */ DOS2DT(1,1,1980,0,0,31,1,29221.00034722222); /* 1/1/1980 12:00:30 AM */ DOS2DT(1,1,1980,0,59,0,1,29221.04097222222); /* 1/1/1980 12:59:00 AM */ - DOS2DT(1,1,1980,0,60,0,0,0.0); /* Invalid seconds */ + DOS2DT(1,1,1980,0,60,0,0,0.0); /* Invalid minutes */ + DOS2DT(1,1,1980,0,0,60,0,0.0); /* Invalid seconds */ DOS2DT(1,1,1980,23,0,0,1,29221.95833333333); /* 1/1/1980 11:00:00 PM */ DOS2DT(1,1,1980,24,0,0,0,0.0); /* Invalid hours */ }

1 0

André Hentschel : oleaut32/tests: Add tests for backrolled time.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 0e1bc3ef2b28eb5ac7e5d9f361a9c02c9a5dbe75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e1bc3ef2b28eb5ac7e5d9f36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 27 20:04:26 2010 +0100 oleaut32/tests: Add tests for backrolled time. --- dlls/oleaut32/tests/vartest.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 16c08be..8d7cf11 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1653,6 +1653,9 @@ static void test_VarDateFromUdate(void) todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ todo_wine UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test rolled seconds */ + todo_wine UD2T(2,1,1980,-6,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ + todo_wine UD2T(1,1,1980,19,-59,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ + todo_wine UD2T(1,1,1980,18,2,-44,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Rolls back to 31 Dec 1899 */ UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */

1 0

Henri Verbeet : wined3d: Just use the GL 1.1 texture format constants.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: 08c2a23599fc13e8a2c9e9f6e15110129bd82d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c2a23599fc13e8a2c9e9f6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:38 2010 +0100 wined3d: Just use the GL 1.1 texture format constants. We assume GL 1.1 is available everywhere else. --- dlls/wined3d/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7b3341e..4038833 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -387,7 +387,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GL_RGBA16_EXT, + {WINED3DFMT_R16G16_UNORM, GL_RGB16, GL_RGB16, GL_RGBA16, GL_RGB, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, @@ -395,7 +395,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16B16A16_UNORM, GL_RGBA16_EXT, GL_RGBA16_EXT, 0, + {WINED3DFMT_R16G16B16A16_UNORM, GL_RGBA16, GL_RGBA16, 0, GL_RGBA, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, @@ -445,7 +445,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_BYTE, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, NV_TEXTURE_SHADER}, - {WINED3DFMT_R16G16_SNORM, GL_RGB16_EXT, GL_RGB16_EXT, 0, + {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, @@ -506,7 +506,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, - {WINED3DFMT_L16_UNORM, GL_LUMINANCE16_EXT, GL_LUMINANCE16_EXT, 0, + {WINED3DFMT_L16_UNORM, GL_LUMINANCE16, GL_LUMINANCE16, 0, GL_LUMINANCE, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE},

1 0

Henri Verbeet : wined3d: Trace the GLSL version string.
by Alexandre Julliard 28 Jan '10

28 Jan '10

Module: wine Branch: master Commit: b2e511f3918a83211eb577fa3c15bff931522d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e511f3918a83211eb577fa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:39 2010 +0100 wined3d: Trace the GLSL version string. At some point we'll use the GLSL version to check if certain features are available. For now just print the version. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6183c4c..c2694eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,6 +72,7 @@ static const struct { {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX, 0 }, {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, + {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100, 0 }, {"GL_ARB_sync", ARB_SYNC, 0 }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, @@ -2007,6 +2008,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str gl_info->limits.glsl_varyings = gl_max; TRACE_(d3d_caps)("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); } + if (gl_info->supported[ARB_SHADING_LANGUAGE_100]) + { + const char *str = (const char *)glGetString(GL_SHADING_LANGUAGE_VERSION_ARB); + TRACE_(d3d_caps)("GLSL version string: %s.\n", debugstr_a(str)); + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) { glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 306de2a..f0367ce 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1752,6 +1752,7 @@ typedef enum wined3d_gl_extension ARB_PROVOKING_VERTEX, ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, + ARB_SHADING_LANGUAGE_100, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION,

1 0