December 2011 - Wine-Commits

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 32955de35300283f4209df38aa331075b9fefa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32955de35300283f4209df38a… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 7 18:08:09 2011 +0100 po: Update Italian translation. --- po/it.po | 66 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 32 insertions(+), 34 deletions(-) diff --git a/po/it.po b/po/it.po index 707abb1..0a127f0 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-06 11:22+0100\n" +"PO-Revision-Date: 2011-12-07 18:06+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -2215,7 +2215,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "Benvenuto alla Guida all'Importazione di Certificati" #: cryptui.rc:283 -#, fuzzy msgid "" "This wizard helps you import certificates, certificate revocation lists, and " "certificate trust lists from a file to a certificate store.\n" @@ -2227,10 +2226,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Questa guida ti aiuta a importare certificate, liste di revoca di " +"certificati e liste di fiducia di certificati da un file in un deposito di " +"certificati.\n" +"\n" "Un certificato può essere usato per identificare te o il computer da cui " -"stai comunicando. Può essere anche usato per l'autenticazione, e per firmare " -"messaggi. I depositi certificati sono collezioni di certificati, liste di " -"revoca di certificati, e liste di fiducia di certificati." +"stai comunicando. Può essere anche usato per l'autenticazione e per firmare " +"messaggi. I depositi di certificati sono collezioni di certificati, liste di " +"revoca di certificati e liste di fiducia di certificati.\n" +"\n" +"Per continuare, premere Avanti." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2348,7 +2353,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "Benvenuto alla Guida all'Esportazione del Certificato" #: cryptui.rc:373 -#, fuzzy msgid "" "This wizard helps you export certificates, certificate revocation lists, and " "certificate trust lists from a certificate store to a file.\n" @@ -2360,10 +2364,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Questa guida ti aiuta a esportare certificate, liste di revoca di " +"certificati e liste di fiducia di certificati da un deposito di certificati " +"in un file.\n" +"\n" "Un certificato può essere usato per identificare te o il computer da cui " -"stai comunicando. Può essere anche usato per l'autenticazione, e per firmare " -"messaggi. I depositi certificati sono collezioni di certificati, liste di " -"revoca di certificati, e liste di fiducia di certificati." +"stai comunicando. Può essere anche usato per l'autenticazione e per firmare " +"messaggi. I depositi di certificati sono collezioni di certificati, liste di " +"revoca di certificati e liste di fiducia di certificati.\n" +"\n" +"Per continuare, premere Avanti." #: cryptui.rc:381 msgid "" @@ -9937,19 +9947,16 @@ msgid "N" msgstr "N" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "Associazione di file mancante per l'estensione %s\n" +msgstr "Associazione di file mancante per l'estensione %1\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "Nessun comando di apertura associato con il tipo di file '%s'\n" +msgstr "Nessun comando di apertura associato con il tipo di file '%1'\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "Sovrascrivere %s" +msgstr "Sovrascrivere %1" #: cmd.rc:297 msgid "More..." @@ -9968,23 +9975,20 @@ msgid "Syntax error\n" msgstr "Errore di sintassi\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "Nessun aiuto disponibile per %s\n" +msgstr "Nessun aiuto disponibile per %1\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "Destinazione del GOTO non trovata\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "La data attuale è %s\n" +msgstr "La data attuale è %1\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "L'ora attuale è %s\n" +msgstr "L'ora attuale è %1\n" #: cmd.rc:307 msgid "Enter new date: " @@ -9995,9 +9999,8 @@ msgid "Enter new time: " msgstr "Inserisci una nuova ora: " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "Variabile d'ambiente %s non definita\n" +msgstr "Variabile d'ambiente %1 non definita\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -10013,19 +10016,16 @@ msgid "A" msgstr "T" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, Cancella" +msgstr "%1, Cancella" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "Echo è %s\n" +msgstr "Echo è %1\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "Verify è %s\n" +msgstr "Verify è %1\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -10036,14 +10036,13 @@ msgid "Parameter error\n" msgstr "Errore nel parametro\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume in drive %1!c! is %2\n" "Volume Serial Number is %3!04x!-%4!04x!\n" "\n" msgstr "" -"Il volume nell'unità %c è %s\n" -"Il numero seriale del volume è %04x-%04x\n" +"Il volume nell'unità %1!c! è %2\n" +"Il numero seriale del volume è %3!04x!-%4!04x!\n" "\n" #: cmd.rc:319 @@ -10063,9 +10062,8 @@ msgid "Wine Command Prompt" msgstr "Prompt dei comandi di Wine" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "Versione di CMD %s\n" +msgstr "Versione di CMD %1!S!\n" #: cmd.rc:324 msgid "More? "

1 0

Jacek Caban : wininet: Added more connection failure tests.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 7a1ad69869032559b71973e106747d3d416d97ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1ad69869032559b71973e10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 16:40:43 2011 +0100 wininet: Added more connection failure tests. --- dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 89 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 80d6d7e..eb7f868 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3221,6 +3221,8 @@ struct info HANDLE wait; DWORD thread; unsigned int line; + DWORD expect_result; + BOOL is_aborted; }; static CRITICAL_SECTION notification_cs; @@ -3233,11 +3235,27 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW EnterCriticalSection( &notification_cs ); + if(info->is_aborted) { + LeaveCriticalSection(&notification_cs); + return; + } + if (status == INTERNET_STATUS_HANDLE_CREATED) { DWORD size = sizeof(struct info *); HttpQueryInfoA( handle, INTERNET_OPTION_CONTEXT_VALUE, &info, &size, 0 ); + }else if(status == INTERNET_STATUS_REQUEST_COMPLETE) { + INTERNET_ASYNC_RESULT *ar = (INTERNET_ASYNC_RESULT*)buffer; + + ok(buflen == sizeof(*ar), "unexpected buflen = %d\n", buflen); + if(info->expect_result == ERROR_SUCCESS) { + ok(ar->dwResult == 1, "ar->dwResult = %ld, expected 1\n", ar->dwResult); + }else { + ok(!ar->dwResult, "ar->dwResult = %ld, expected 1\n", ar->dwResult); + ok(ar->dwError == info->expect_result, "ar->dwError = %d, expected %d\n", ar->dwError, info->expect_result); + } } + i = info->index; if (i >= info->count) { @@ -3277,17 +3295,22 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW LeaveCriticalSection( &notification_cs ); } -static void setup_test( struct info *info, enum api function, unsigned int line ) +static void setup_test( struct info *info, enum api function, unsigned int line, DWORD expect_result ) { info->function = function; info->line = line; + info->expect_result = expect_result; } struct notification_data { const struct notification *test; const unsigned int count; + const char *method; + const char *host; + const char *path; const char *data; + BOOL expect_conn_failure; }; static const struct notification async_send_request_ex_test[] = @@ -3334,16 +3357,46 @@ static const struct notification async_send_request_ex_test2[] = { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } }; +static const struct notification async_send_request_ex_resolve_failure_test[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } +}; + static const struct notification_data notification_data[] = { { async_send_request_ex_test, sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + "POST", + "test.winehq.org", + "tests/posttest.php", "Public ID=codeweavers" }, { async_send_request_ex_test2, - sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]) + sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + "POST", + "test.winehq.org", + "tests/posttest.php" }, + { + async_send_request_ex_resolve_failure_test, + sizeof(async_send_request_ex_resolve_failure_test)/sizeof(async_send_request_ex_resolve_failure_test[0]), + "GET", + "brokenhost", + "index.html", + NULL, + TRUE + } }; static void test_async_HttpSendRequestEx(const struct notification_data *nd) @@ -3356,7 +3409,7 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) static const char *accept[2] = {"*/*", NULL}; char buffer[32]; - trace("\n"); + trace("Async HttpSendRequestEx test (%s %s)\n", nd->method, nd->host); InitializeCriticalSection( &notification_cs ); @@ -3365,50 +3418,63 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) info.index = 0; info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); info.thread = GetCurrentThreadId(); + info.is_aborted = FALSE; ses = InternetOpen( "winetest", 0, NULL, NULL, INTERNET_FLAG_ASYNC ); ok( ses != NULL, "InternetOpen failed\n" ); pInternetSetStatusCallbackA( ses, check_notification ); - setup_test( &info, internet_connect, __LINE__ ); - con = InternetConnect( ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); + setup_test( &info, internet_connect, __LINE__, ERROR_SUCCESS ); + con = InternetConnect( ses, nd->host, 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); ok( con != NULL, "InternetConnect failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); - setup_test( &info, http_open_request, __LINE__ ); - req = HttpOpenRequest( con, "POST", "tests/posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); + setup_test( &info, http_open_request, __LINE__, ERROR_SUCCESS ); + req = HttpOpenRequest( con, nd->method, nd->path, NULL, NULL, accept, 0, (DWORD_PTR)&info ); ok( req != NULL, "HttpOpenRequest failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); - memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); - b.dwStructSize = sizeof(INTERNET_BUFFERSA); - b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; - b.dwHeadersLength = strlen( b.lpcszHeader ); - b.dwBufferTotal = nd->data ? strlen( nd->data ) : 0; + if(nd->data) { + memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); + b.dwStructSize = sizeof(INTERNET_BUFFERSA); + b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; + b.dwHeadersLength = strlen( b.lpcszHeader ); + b.dwBufferTotal = nd->data ? strlen( nd->data ) : 0; + } - setup_test( &info, http_send_request_ex, __LINE__ ); + setup_test( &info, http_send_request_ex, __LINE__, + nd->expect_conn_failure ? ERROR_INTERNET_NAME_NOT_RESOLVED : ERROR_SUCCESS ); ret = HttpSendRequestExA( req, nd->data ? &b : NULL, NULL, 0x28, 0 ); ok( !ret && GetLastError() == ERROR_IO_PENDING, "HttpSendRequestExA failed %d %u\n", ret, GetLastError() ); - WaitForSingleObject( info.wait, 10000 ); + error = WaitForSingleObject( info.wait, 10000 ); + if(error != WAIT_OBJECT_0) { + skip("WaitForSingleObject returned %d, assuming DNS problem\n", error); + info.is_aborted = TRUE; + goto abort; + } size = sizeof(buffer); SetLastError( 0xdeadbeef ); ret = HttpQueryInfoA( req, HTTP_QUERY_CONTENT_ENCODING, buffer, &size, 0 ); error = GetLastError(); ok( !ret, "HttpQueryInfoA failed %u\n", GetLastError() ); - todo_wine - ok( error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, - "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); + if(nd->expect_conn_failure) { + ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND got %u\n", error ); + }else { + todo_wine + ok(error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, + "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); + } if (nd->data) { written = 0; size = strlen( nd->data ); - setup_test( &info, internet_writefile, __LINE__ ); + setup_test( &info, internet_writefile, __LINE__, ERROR_SUCCESS ); ret = InternetWriteFile( req, nd->data, size, &written ); ok( ret, "InternetWriteFile failed %u\n", GetLastError() ); ok( written == size, "expected %u got %u\n", written, size ); @@ -3423,7 +3489,8 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) } SetLastError( 0xdeadbeef ); - setup_test( &info, http_end_request, __LINE__ ); + setup_test( &info, http_end_request, __LINE__, + nd->expect_conn_failure ? ERROR_INTERNET_OPERATION_CANCELLED : ERROR_SUCCESS); ret = HttpEndRequestA( req, NULL, 0x28, 0 ); error = GetLastError(); ok( !ret, "HttpEndRequestA succeeded\n" ); @@ -3431,7 +3498,8 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) WaitForSingleObject( info.wait, 10000 ); - setup_test( &info, internet_close_handle, __LINE__ ); + setup_test( &info, internet_close_handle, __LINE__, ERROR_SUCCESS ); + abort: InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); @@ -3571,6 +3639,7 @@ START_TEST(http) test_open_url_async(); test_async_HttpSendRequestEx(&notification_data[0]); test_async_HttpSendRequestEx(&notification_data[1]); + test_async_HttpSendRequestEx(&notification_data[2]); InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test();

1 0

Jacek Caban : wininet: Use test.winehq.org instead of crossover.codeweavers .com in test_async_HttpSendRequestEx.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 3dc2c3ca44333db57d1180dd9c24b8e97629d9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc2c3ca44333db57d1180dd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 16:40:07 2011 +0100 wininet: Use test.winehq.org instead of crossover.codeweavers.com in test_async_HttpSendRequestEx. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7c6d97c..80d6d7e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3372,13 +3372,13 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) pInternetSetStatusCallbackA( ses, check_notification ); setup_test( &info, internet_connect, __LINE__ ); - con = InternetConnect( ses, "crossover.codeweavers.com", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); + con = InternetConnect( ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); ok( con != NULL, "InternetConnect failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); setup_test( &info, http_open_request, __LINE__ ); - req = HttpOpenRequest( con, "POST", "posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); + req = HttpOpenRequest( con, "POST", "tests/posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); ok( req != NULL, "HttpOpenRequest failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 );

1 0

Alexandre Julliard : gdi32: Use the convert_bits helper function in SetDIBits and SetDIBitsToDevice.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: df9e0ccf5c7c56cdab457cb1023582a7078df2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9e0ccf5c7c56cdab457cb10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 19:53:44 2011 +0100 gdi32: Use the convert_bits helper function in SetDIBits and SetDIBitsToDevice. --- dlls/gdi32/dib.c | 33 ++++----------------------------- 1 files changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0b8bb76..ed5eea7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -680,21 +680,8 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) { - void *ptr; - - dst_info->bmiHeader.biWidth = dst.width; - ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); - if (ptr) - { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); - } - else err = ERROR_OUTOFMEMORY; + err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + if (!err) err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } if(err) result = 0; @@ -810,20 +797,8 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { - void *ptr; - - dst_info->bmiHeader.biWidth = src.visrect.right - src.visrect.left; - ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); - if (ptr) - { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); - } - else err = ERROR_OUTOFMEMORY; + err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); } if (err) lines = 0;

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Gettnames implementation.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 451f9b9cc086f5b424523348f816a4b7495580a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451f9b9cc086f5b424523348f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:10:26 2011 +0100 msvcp90: Added _Locinfo::_Gettnames implementation. --- dlls/msvcp90/locale.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d0e5616..27687ba 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); +void* __cdecl _Gettnames(void); typedef int category; @@ -692,7 +693,7 @@ DEFINE_THISCALL_WRAPPER(_Timevec_dtor, 4) void __thiscall _Timevec_dtor(_Timevec *this) { TRACE("(%p)\n", this); - MSVCRT_operator_delete(this->timeptr); + free(this->timeptr); } /* ??4_Timevec(a)std@@QAEAAV01(a)ABV01@@Z */ @@ -1015,7 +1016,10 @@ basic_string_char __thiscall _Locinfo__Getname(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Gettnames, 4) _Timevec __thiscall _Locinfo__Gettnames(const _Locinfo *this) { - _Timevec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); + _Timevec ret; + + TRACE("(%p)\n", this); + + _Timevec_ctor_timeptr(&ret, _Gettnames()); return ret; }

1 0

Piotr Caban : msvcp90: Added _Locinfo:: _Getfalse and _Gettrue implementation.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: dc1a38d38544b05790da6f027a6bcdead3f5536f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1a38d38544b05790da6f027… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:09:15 2011 +0100 msvcp90: Added _Locinfo::_Getfalse and _Gettrue implementation. --- dlls/msvcp90/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a668d18..ae270ae 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -951,8 +951,8 @@ const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Getfalse, 4) const char* __thiscall _Locinfo__Getfalse(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return "false"; } /* ?_Gettrue(a)_Locinfo@std@@QBEPBDXZ */ @@ -960,8 +960,8 @@ const char* __thiscall _Locinfo__Getfalse(const _Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo__Gettrue, 4) const char* __thiscall _Locinfo__Gettrue(const _Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return "true"; } /* ?_Getlconv(a)_Locinfo@std@@QBEPBUlconv@@XZ */

1 0

Stefan Dösinger : ddraw/tests: Extend the CreateSurface(NULL test), use own function.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 9cf25006adf37387c8dfad25839c1a00aa8b2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf25006adf37387c8dfad258… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 8 15:59:07 2011 +0100 ddraw/tests: Extend the CreateSurface(NULL test), use own function. --- dlls/ddraw/tests/dsurface.c | 64 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 0aabaad..32af27e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -29,6 +29,8 @@ #include "d3d.h" #include "unknwn.h" +static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *, void **, REFIID, IUnknown *); + static LPDIRECTDRAW lpDD = NULL; static DDCAPS ddcaps; @@ -4484,10 +4486,6 @@ static void set_surface_desc_test(void) IDirectDrawSurface3 *surface3; BYTE data[16*16*4]; - hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); - ok(hr == DDERR_INVALIDPARAMS, "CreateSurface with a NULL DDSD returned %#x," - " expected DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); - reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; ddsd.dwWidth = 8; @@ -4909,11 +4907,68 @@ static void partial_block_lock_test(void) IDirectDraw7_Release(dd7); } +static void create_surface_test(void) +{ + HRESULT hr; + IDirectDraw2 *ddraw2; + IDirectDraw4 *ddraw4; + IDirectDraw7 *ddraw7; + IDirectDrawSurface *surface; + IDirectDrawSurface4 *surface4; + IDirectDrawSurface7 *surface7; + + hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &ddraw2); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + hr = IDirectDraw2_CreateSurface(ddraw2, NULL, &surface, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + IDirectDraw2_Release(ddraw2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &ddraw4); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + hr = IDirectDraw4_CreateSurface(ddraw4, NULL, &surface4, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + IDirectDraw4_Release(ddraw4); + + if (!pDirectDrawCreateEx) + { + skip("DirectDrawCreateEx not available, skipping IDirectDraw7 tests.\n"); + return; + } + hr = pDirectDrawCreateEx(NULL, (void **) &ddraw7, &IID_IDirectDraw7, NULL); + ok(SUCCEEDED(hr), "DirectDrawCreateEx failed, hr %#x.\n", hr); + + hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreateSurface(ddsd=NULL, pre-SCL) returned %#x," + " expected %#x.\n", hr, DDERR_NOCOOPERATIVELEVELSET); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + + hr = IDirectDraw7_CreateSurface(ddraw7, NULL, &surface7, NULL); + ok(hr == DDERR_INVALIDPARAMS, "CreateSurface(ddsd=NULL) returned %#x," + " expected %#x.\n", hr, DDERR_INVALIDPARAMS); + + IDirectDraw7_Release(ddraw7); +} + START_TEST(dsurface) { HRESULT ret; IDirectDraw4 *dd4; + HMODULE ddraw_mod = GetModuleHandleA("ddraw.dll"); + pDirectDrawCreateEx = (void *) GetProcAddress(ddraw_mod, "DirectDrawCreateEx"); + if (!CreateDirectDraw()) return; @@ -4970,5 +5025,6 @@ START_TEST(dsurface) pixelformat_flag_test(); set_surface_desc_test(); partial_block_lock_test(); + create_surface_test(); ReleaseDirectDraw(); }

1 0

Stefan Dösinger : ddraw: SetSurfaceDesc can set width, height and pitch under certain conditions.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 481e2f336685cdbc6a14b0ebf9274bb98cbe5cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=481e2f336685cdbc6a14b0ebf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 8 15:59:06 2011 +0100 ddraw: SetSurfaceDesc can set width, height and pitch under certain conditions. --- dlls/ddraw/surface.c | 53 +++++++++++++++- dlls/ddraw/tests/dsurface.c | 151 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 190 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=481e2f336685cdbc6a14b…

1 0

Stefan Dösinger : ddraw/tests: Make the SetSurfaceDesc test ok messages consistent.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: b2ca7e37f48c0592f063db77f17187fd58f0e4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ca7e37f48c0592f063db77f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 8 00:13:03 2011 +0100 ddraw/tests: Make the SetSurfaceDesc test ok messages consistent. --- dlls/ddraw/tests/dsurface.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 9bf5643..45aa602 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4502,29 +4502,27 @@ static void set_surface_desc_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); - ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); IDirectDrawSurface_Release(surface); reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_SetSurfaceDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr); /* Redundantly setting the same lpSurface is not an error */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_SetSurfaceDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetSurfaceDesc failed, hr %#x.\n", hr); hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 1); - ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface3_SetSurfaceDesc returned %#x, expected" - " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, NULL, 0); - ok(hr == DDERR_INVALIDPARAMS, "IDirectDrawSurface3_SetSurfaceDesc returned %#x, expected" - " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); @@ -4541,12 +4539,12 @@ static void set_surface_desc_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); - ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); - ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); IDirectDrawSurface_Release(surface); hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr); old_pitch = U1(ddsd).lPitch; /* Setting width and height is an error */ @@ -4555,31 +4553,31 @@ static void set_surface_desc_test(void) ddsd.dwWidth = 16; ddsd.dwHeight = 16; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); ddsd.lpSurface = data; ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); reset_ddsd(&ddsd); hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); - ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); - ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u\n", ddsd.dwWidth); - ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u\n", ddsd.dwHeight); + ok(SUCCEEDED(hr), "GetSurfaceDesc failed, hr %#x.\n", hr); + ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u.\n", ddsd.dwWidth); + ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u.\n", ddsd.dwHeight); /* Setting the pitch is an error */ reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_PITCH; U1(ddsd).lPitch = 1024; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); U1(ddsd).lPitch = old_pitch; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */ reset_ddsd(&ddsd); @@ -4591,11 +4589,11 @@ static void set_surface_desc_test(void) U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DD_OK); + ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DD_OK); /* Can't set color keys */ reset_ddsd(&ddsd); @@ -4603,7 +4601,7 @@ static void set_surface_desc_test(void) ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff0000; ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x00ff0000; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); - ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x.\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); }

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Getmonths implementation.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 462fa62c535bf979274382d226110e5e1b6a7249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462fa62c535bf979274382d22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 12:10:12 2011 +0100 msvcp90: Added _Locinfo::_Getmonths implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1163b31..d0e5616 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); char* __cdecl _Getdays(void); +char* __cdecl _Getmonths(void); typedef int category; @@ -952,10 +953,21 @@ const char* __thiscall _Locinfo__Getdays(_Locinfo *this) /* ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ */ /* ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getmonths, 4) -const char* __thiscall _Locinfo__Getmonths(const _Locinfo *this) +const char* __thiscall _Locinfo__Getmonths(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + char *months = _Getmonths(); + + TRACE("(%p)\n", this); + + if(months) { + MSVCP_basic_string_char_dtor(&this->months); + MSVCP_basic_string_char_ctor_cstr(&this->months, months); + free(months); + } + + return this->months.size ? MSVCP_basic_string_char_c_str(&this->months) : + ":Jan:January:Feb:February:Mar:March:Apr:April:May:May:Jun:June:Jul:July" + ":Aug:August:Sep:September:Oct:October:Nov:November:Dec:December"; } /* ?_Getfalse(a)_Locinfo@std@@QBEPBDXZ */

1 0