November 2011 - Wine-commits

Henri Verbeet : d3d9/tests: Test the window and backbuffer dimensions after display mode changes.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 1ac6f487d54132db82795bdb1e38cab599afc4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac6f487d54132db82795bdb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 27 21:34:45 2011 +0100 d3d9/tests: Test the window and backbuffer dimensions after display mode changes. --- dlls/d3d9/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9d1da3d..9395880 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3248,6 +3248,96 @@ done: IDirect3D9_Release(d3d9); } +static void test_mode_change(void) +{ + RECT fullscreen_rect, focus_rect, r; + IDirect3DSurface9 *backbuffer; + IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; + IDirect3D9 *d3d9; + DEVMODEW devmode; + UINT refcount; + HRESULT hr; + DWORD ret; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping mode change tests.\n"); + return; + } + + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(focus_window, &focus_rect); + + device = create_device(d3d9, device_window, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = 640; + devmode.dmPelsHeight = 480; + + ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", ret); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == 640, "Got unexpect width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == 480, "Got unexpect height %u.\n", devmode.dmPelsHeight); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + hr = IDirect3DSurface9_GetDesc(backbuffer, &desc); + ok(SUCCEEDED(hr), "Failed to get backbuffer desc, hr %#x.\n", hr); + ok(desc.Width == screen_width, "Got unexpected backbuffer width %u.\n", desc.Width); + ok(desc.Height == screen_height, "Got unexpected backbuffer height %u.\n", desc.Height); + IDirect3DSurface9_Release(backbuffer); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == screen_width, "Got unexpect width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == screen_height, "Got unexpect height %u.\n", devmode.dmPelsHeight); + +done: + DestroyWindow(device_window); + DestroyWindow(focus_window); + if (d3d9) + IDirect3D9_Release(d3d9); + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + ok(devmode.dmPelsWidth == screen_width, "Got unexpect width %u.\n", devmode.dmPelsWidth); + ok(devmode.dmPelsHeight == screen_height, "Got unexpect height %u.\n", devmode.dmPelsHeight); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3302,6 +3392,7 @@ START_TEST(device) test_wndproc(); test_wndproc_windowed(); test_window_style(); + test_mode_change(); } out:

1 0

Alexandre Julliard : wineps: Don't crash on missing loca OTF table.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 62cf70d36383aee854db6e775d4fc086f57ca13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cf70d36383aee854db6e775… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 26 16:29:50 2011 +0100 wineps: Don't crash on missing loca OTF table. --- dlls/wineps.drv/type1.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index fbda3de..01c9c7e 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -226,11 +226,20 @@ static BOOL get_glyf_pos(HDC hdc, DWORD index, DWORD *start, DWORD *end) *start = *end = 0; len = GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0); + if (len == GDI_ERROR) return FALSE; head = HeapAlloc(GetProcessHeap(), 0, len); GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, len); loca_format = get_be_word(head + 50); len = GetFontData(hdc, MS_MAKE_TAG('l','o','c','a'), 0, NULL, 0); + if (len == GDI_ERROR) + { + len = GetFontData(hdc, MS_MAKE_TAG('C','F','F',' '), 0, NULL, 0); + if (len != GDI_ERROR) FIXME( "CFF tables not supported yet\n" ); + else ERR( "loca table not found\n" ); + HeapFree(GetProcessHeap(), 0, head); + return FALSE; + } loca = HeapAlloc(GetProcessHeap(), 0, len); GetFontData(hdc, MS_MAKE_TAG('l','o','c','a'), 0, loca, len);

1 0

Marcus Meissner : d3d9: Check that surface is allocated (Coverity).
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: d255efbde1e827140e0edfb326148a253c8eb094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d255efbde1e827140e0edfb32… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 18:12:32 2011 +0100 d3d9: Check that surface is allocated (Coverity). --- dlls/d3d9/tests/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index eb6e65c..80d8199 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -725,12 +725,14 @@ static void test_surface_lockrect_blocks(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed (%08x)\n", hr); IDirect3DTexture9_Release(texture); } + if (FAILED(hr)) continue; break; case D3DPOOL_SCRATCH: hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 128, 128, formats[i].fmt, pools[j].pool, &surface, 0); ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (%08x)\n", hr); + if (FAILED(hr)) continue; break; default:

1 0

Francois Gouget : cmd: Use WCMD_output_asis*() for strings that are not supposed to contain formating directives.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 3b729284644c4183958735009f328ca9ea1d0ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b729284644c4183958735009… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 24 00:30:23 2011 +0100 cmd: Use WCMD_output_asis*() for strings that are not supposed to contain formating directives. --- programs/cmd/builtins.c | 12 ++++++------ programs/cmd/directory.c | 10 +++++----- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6703cef..5197297 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -361,7 +361,7 @@ void WCMD_choice (const WCHAR * command) { ptr = strchrW(opt_c, answer[0]); if (ptr) { WCMD_output_asis(answer); - WCMD_output(newline); + WCMD_output_asis(newline); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); @@ -964,7 +964,7 @@ void WCMD_echo (const WCHAR *command) echo_mode = FALSE; else { WCMD_output_asis (command); - WCMD_output (newline); + WCMD_output_asis (newline); } HeapFree(GetProcessHeap(), 0, trimmed); } @@ -1777,7 +1777,7 @@ void WCMD_pause (void) if (have_console) SetConsoleMode(hIn, 0); - WCMD_output(anykey); + WCMD_output_asis(anykey); WCMD_ReadFile(hIn, &key, 1, &count); if (have_console) SetConsoleMode(hIn, oldmode); @@ -2114,7 +2114,7 @@ void WCMD_setshow_default (const WCHAR *command) { GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); if (strlenW(command) == 0) { strcatW (cwd, newline); - WCMD_output (cwd); + WCMD_output_asis (cwd); } else { /* Remove any double quotes, which may be in the @@ -2325,7 +2325,7 @@ void WCMD_setshow_env (WCHAR *s) { /* Output the prompt */ *p++ = '\0'; - if (strlenW(p) != 0) WCMD_output(p); + if (strlenW(p) != 0) WCMD_output_asis(p); /* Read the reply */ WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); @@ -2697,7 +2697,7 @@ void WCMD_verify (const WCHAR *command) { void WCMD_version (void) { - WCMD_output (version_string); + WCMD_output_asis (version_string); } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 03cb952..a5447f5 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -326,7 +326,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Output the results */ if (!bare) { - if (level != 0 && (entry_count > 0)) WCMD_output (newline); + if (level != 0 && (entry_count > 0)) WCMD_output_asis (newline); if (!recurse || ((entry_count > 0) && done_header==FALSE)) { static const WCHAR headerW[] = {'D','i','r','e','c','t','o','r','y',' ','o','f', ' ','%','s','\n','\n','\0'}; @@ -430,13 +430,13 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le strcatW(&temp[toWrite], space); toWrite++; if (toWrite > 99) { - WCMD_output(temp); + WCMD_output_asis(temp); toWrite = 0; strcpyW(temp, nullW); } padding--; } - WCMD_output(temp); + WCMD_output_asis(temp); } } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -472,7 +472,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } } } - if (addNewLine) WCMD_output (newline); + if (addNewLine) WCMD_output_asis (newline); cur_width = 0; } @@ -949,7 +949,7 @@ void WCMD_directory (WCHAR *cmd) } } else { static const WCHAR newLine2[] = {'\n','\n','\0'}; - if (!bare) WCMD_output (newLine2); + if (!bare) WCMD_output_asis (newLine2); } /* Clear any errors from previous invocations, and process it */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 090a6f1..5bcdbca 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1512,7 +1512,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_type (p); break; case WCMD_VER: - WCMD_output(newline); + WCMD_output_asis(newline); WCMD_version (); break; case WCMD_VERIFY:

1 0

Jacek Caban : urlmon: Properly compare file URIs.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: e0f6b95d44f8208d2dce75278eb88e6eb57fe744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f6b95d44f8208d2dce75278… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:58:37 2011 +0100 urlmon: Properly compare file URIs. --- dlls/urlmon/uri.c | 59 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c0233bf..55488d9 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3859,6 +3859,49 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, return S_OK; } +static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) +{ + WCHAR *canon_path_a, *canon_path_b; + DWORD len_a, len_b; + + if(!a->path_len) { + *ret = !b->path_len; + return S_OK; + } + + if(!b->path_len) { + *ret = FALSE; + return S_OK; + } + + /* Fast path */ + if(a->path_len == b->path_len && !memicmpW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) { + *ret = TRUE; + return S_OK; + } + + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, NULL); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, NULL); + + canon_path_a = heap_alloc(len_a*sizeof(WCHAR)); + if(!canon_path_a) + return E_OUTOFMEMORY; + canon_path_b = heap_alloc(len_b*sizeof(WCHAR)); + if(!canon_path_b) { + heap_free(canon_path_a); + return E_OUTOFMEMORY; + } + + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, canon_path_a); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, canon_path_b); + + *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a); + + heap_free(canon_path_a); + heap_free(canon_path_b); + return S_OK; +} + /* Checks if the two Uri's are logically equivalent. It's a simple * comparison, since they are both of type Uri, and it can access * the properties of each Uri directly without the need to go @@ -3867,19 +3910,13 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, static HRESULT compare_uris(const Uri *a, const Uri *b, BOOL *ret) { const BOOL known_scheme = a->scheme_type != URL_SCHEME_UNKNOWN; const BOOL are_hierarchical = a->authority_start > -1 && b->authority_start > -1; + HRESULT hres; *ret = FALSE; if(a->scheme_type != b->scheme_type) return S_OK; - if(a->scheme_type == URL_SCHEME_FILE) { - if(a->canon_len == b->canon_len) { - *ret = !StrCmpIW(a->canon_uri, b->canon_uri); - return S_OK; - } - } - /* Only compare the scheme names (if any) if their unknown scheme types. */ if(!known_scheme) { if((a->scheme_start > -1 && b->scheme_start > -1) && @@ -3927,7 +3964,13 @@ static HRESULT compare_uris(const Uri *a, const Uri *b, BOOL *ret) { * would still evaluate to TRUE, but, only if they are both hierarchical * URIs. */ - if((a->path_start > -1 && b->path_start > -1) && + if(a->scheme_type == URL_SCHEME_FILE) { + BOOL cmp; + + hres = compare_file_paths(a, b, &cmp); + if(FAILED(hres) || !cmp) + return hres; + } else if((a->path_start > -1 && b->path_start > -1) && (a->path_len == b->path_len)) { if(StrCmpNW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) return S_OK;

1 0

Jacek Caban : urlmon: Added file URIs compare tests.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: d4d51a489ea123cc7d726a8708aff735147cf09e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d51a489ea123cc7d726a870… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 15:59:00 2011 +0100 urlmon: Added file URIs compare tests. --- dlls/urlmon/tests/uri.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index c8fb522..ad63ccf 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -280,6 +280,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file://c:\\tests\\../tests/foo%20bar.mp3", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"file:///c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"/c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"/c:/tests/../tests/foo%2520bar.mp3",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\tests\\../tests/foo%20bar.mp3",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "FILE://localhost/test dir\\../tests/test%20file.README.txt", 0, S_OK, FALSE, { {"file:///tests/test%20file.README.txt",S_OK,FALSE}, @@ -4501,6 +4526,41 @@ static const uri_equality equality_tests[] = { "http://google.com:70/",0, "http://google.com:71/",0, FALSE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:/dir/file.txt", Uri_CREATE_FILE_USE_DOS_PATH, + TRUE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:\\dir\\file.txt", Uri_CREATE_NO_CANONICALIZE, + TRUE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:\\dir2\\..\\dir\\file.txt", Uri_CREATE_NO_CANONICALIZE, + TRUE + }, + { + "file:///c:\\dir2\\..\\ dir\\file.txt", Uri_CREATE_NO_CANONICALIZE, + "file:///c:/%20dir/file.txt", 0, + TRUE + }, + { + "file:///c:/Dir/file.txt", 0, + "file:///C:/dir/file.TXT", Uri_CREATE_FILE_USE_DOS_PATH, + TRUE + }, + { + "file:///c:/dir/file.txt", 0, + "file:///c:\\dir\\file.txt", Uri_CREATE_FILE_USE_DOS_PATH, + TRUE + }, + { + "file:///c:/dir/file.txt#a", 0, + "file:///c:\\dir\\file.txt#b", Uri_CREATE_FILE_USE_DOS_PATH, + FALSE } };

1 0

Marcus Meissner : expand: Initialize a variable (Coverity).
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 56968fb3790ee6ea6027a6ed0db727cfcad76957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56968fb3790ee6ea6027a6ed0… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 18:09:35 2011 +0100 expand: Initialize a variable (Coverity). --- programs/expand/expand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 2bede08..ea7bfdf 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -30,7 +30,7 @@ static int myprintf(const char* format, ...) { va_list va; char tmp[8192]; - DWORD w; + DWORD w = 0; int len; va_start(va, format);

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 420e2e99f8b1007e69df4fbd049d67b8ab332990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420e2e99f8b1007e69df4fbd0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 24 22:09:55 2011 +0100 po: Update German translation. --- po/de.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index e9e2ce1..61f1ef6 100644 --- a/po/de.po +++ b/po/de.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-11-21 20:10+0100\n" +"PO-Revision-Date: 2011-11-24 22:08+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -9376,7 +9376,6 @@ msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9385,9 +9384,9 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" +"%1\n" "Diese Datei enthält Unicode-Zeichen, die verloren gehen, wenn\n" -"Sie die Datei mit %s-Zeichenkodierung speichern.\n" +"Sie die Datei mit %2-Zeichenkodierung speichern.\n" "Um die Zeichen beizubehalten, klicken Sie Abbrechen und wählen\n" "Sie eine der Unicode-Optionen in der Liste.\n" "Möchten Sie fortfahren?" @@ -11202,9 +11201,8 @@ msgid "Processes: %d" msgstr "Prozesse: %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "Speicherauslastung: %dK / %dK" +msgstr "Speicherauslastung: %1!u!kB / %2!u!kB" #: taskmgr.rc:272 msgid "Image Name"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: c724a6155d6d5658addfc22b98e472e3e419c6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c724a6155d6d5658addfc22b9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 24 23:06:39 2011 +0100 po: Update French translation. --- po/fr.po | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index c6e5401..8a0edc9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5681,7 +5681,7 @@ msgstr "Entrez le mot de passe réseau" #: mpr.rc:35 msgid "Please enter your username and password:" -msgstr "Veuillez saisir votre nom d'utilisateur et votre mot de passe :" +msgstr "Veuillez saisir vos nom d'utilisateur et mot de passe :" #: mpr.rc:36 msgid "Proxy" @@ -9396,7 +9396,6 @@ msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9405,9 +9404,9 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" +"%1\n" "Ce fichier contient des caractères Unicode qui seront perdus si\n" -"vous le sauvez dans le codage %s.\n" +"vous le sauvez dans le codage %2.\n" "Pour conserver ces caractères, cliquez sur Annuler et sélectionnez\n" "une des alternatives Unicode dans la liste déroulante Codage.\n" "Continuer ?" @@ -11240,9 +11239,8 @@ msgid "Processes: %d" msgstr "Processus : %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "Utilisation mémoire : %dK / %dK" +msgstr "Utilisation mémoire : %1!u! ko / %2!u! ko" #: taskmgr.rc:272 msgid "Image Name" @@ -12577,17 +12575,17 @@ msgstr "%1 libres sur %2" #: winefile.rc:121 msgctxt "unit kilobyte" msgid "kB" -msgstr "kB" +msgstr "ko" #: winefile.rc:122 msgctxt "unit megabyte" msgid "MB" -msgstr "MB" +msgstr "Mo" #: winefile.rc:123 msgctxt "unit gigabyte" msgid "GB" -msgstr "GB" +msgstr "Go" #: winemine.rc:34 msgid "&Game"

1 0

Hans Leidekker : winhttp: Resolve the server name only on the first request .
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 7d8730f8c5d36dbe450ba415d1d3a0ba119289e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8730f8c5d36dbe450ba415d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 25 14:55:13 2011 +0100 winhttp: Resolve the server name only on the first request. --- dlls/winhttp/request.c | 63 +++++++++++++++++++++++-------------- dlls/winhttp/session.c | 6 ++-- dlls/winhttp/tests/notification.c | 59 ++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 102 insertions(+), 27 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a56572d..f610dde 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -909,53 +909,68 @@ static BOOL secure_proxy_connect( request_t *request ) #define INET6_ADDRSTRLEN 46 #endif +static WCHAR *addr_to_str( const struct sockaddr *addr ) +{ + char buf[INET6_ADDRSTRLEN]; + const void *src; + + switch (addr->sa_family) + { + case AF_INET: + src = &((struct sockaddr_in *)addr)->sin_addr; + break; + case AF_INET6: + src = &((struct sockaddr_in6 *)addr)->sin6_addr; + break; + default: + WARN("unsupported address family %d\n", addr->sa_family); + return NULL; + } + if (!inet_ntop( addr->sa_family, src, buf, sizeof(buf) )) return NULL; + return strdupAW( buf ); +} + static BOOL open_connection( request_t *request ) { connect_t *connect; - const void *addr; - char address[INET6_ADDRSTRLEN]; - WCHAR *addressW; + WCHAR *addressW = NULL; INTERNET_PORT port; socklen_t slen; + struct sockaddr *saddr; + DWORD len; if (netconn_connected( &request->netconn )) return TRUE; connect = request->connect; port = connect->serverport ? connect->serverport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + saddr = (struct sockaddr *)&connect->sockaddr; + slen = sizeof(struct sockaddr); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 ); - - slen = sizeof(connect->sockaddr); - if (!netconn_resolve( connect->servername, port, (struct sockaddr *)&connect->sockaddr, &slen, request->resolve_timeout )) return FALSE; - switch (connect->sockaddr.ss_family) + if (!connect->resolved) { - case AF_INET: - addr = &((struct sockaddr_in *)&connect->sockaddr)->sin_addr; - break; - case AF_INET6: - addr = &((struct sockaddr_in6 *)&connect->sockaddr)->sin6_addr; - break; - default: - WARN("unsupported address family %d\n", connect->sockaddr.ss_family); - return FALSE; - } - inet_ntop( connect->sockaddr.ss_family, addr, address, sizeof(address) ); - addressW = strdupAW( address ); + len = strlenW( connect->servername ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, len ); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, strlenW(addressW) + 1 ); + if (!netconn_resolve( connect->servername, port, saddr, &slen, request->resolve_timeout )) return FALSE; + connect->resolved = TRUE; - TRACE("connecting to %s:%u\n", address, port); + if (!(addressW = addr_to_str( saddr ))) return FALSE; + len = strlenW( addressW ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, len ); + } + if (!addressW && !(addressW = addr_to_str( saddr ))) return FALSE; + TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!netconn_create( &request->netconn, connect->sockaddr.ss_family, SOCK_STREAM, 0 )) + if (!netconn_create( &request->netconn, saddr->sa_family, SOCK_STREAM, 0 )) { heap_free( addressW ); return FALSE; } netconn_set_timeout( &request->netconn, TRUE, request->send_timeout ); netconn_set_timeout( &request->netconn, FALSE, request->recv_timeout ); - if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen, request->connect_timeout )) + if (!netconn_connect( &request->netconn, saddr, slen, request->connect_timeout )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 110de80..0f9e782 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -423,7 +423,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT session->proxy_server, colon - session->proxy_server - 1 )) { heap_free( connect->servername ); - connect->sockaddr.ss_family = 0xffff; + connect->resolved = FALSE; if (!(connect->servername = heap_alloc( (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) { @@ -445,7 +445,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT session->proxy_server )) { heap_free( connect->servername ); - connect->sockaddr.ss_family = 0xffff; + connect->resolved = FALSE; if (!(connect->servername = strdupW( session->proxy_server ))) { ret = FALSE; @@ -458,7 +458,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT else if (server) { heap_free( connect->servername ); - connect->sockaddr.ss_family = 0xffff; + connect->resolved = FALSE; if (!(connect->servername = strdupW( server ))) { ret = FALSE; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 7ceede7..84a3569 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -135,6 +135,16 @@ static const struct notification cache_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } }; @@ -190,6 +200,32 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_open_request, __LINE__ ); + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); + ok(ret, "failed to set context value %u\n", GetLastError()); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + ret = WinHttpReceiveResponse( req, NULL ); + ok(ret, "failed to receive response %u\n", GetLastError()); + + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -231,6 +267,29 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + + setup_test( &info, winhttp_open_request, __LINE__ ); + req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); + ok(ret, "failed to set context value %u\n", GetLastError()); + + setup_test( &info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); + + setup_test( &info, winhttp_receive_response, __LINE__ ); + ret = WinHttpReceiveResponse( req, NULL ); + ok(ret, "failed to receive response %u\n", GetLastError()); + + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok(ret, "failed unexpectedly %u\n", GetLastError()); + ok(status == 200, "request failed unexpectedly %u\n", status); + + setup_test( &info, winhttp_close_handle, __LINE__ ); + WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index fbd5032..7105553 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -119,6 +119,7 @@ typedef struct INTERNET_PORT hostport; INTERNET_PORT serverport; struct sockaddr_storage sockaddr; + BOOL resolved; } connect_t; typedef struct

1 0