wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Thomas Mullaly : urlmon: Implemented IUri_GetPort.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: d992bab72e0350b0122d867e74c1a79a184ec3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d992bab72e0350b0122d867e7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 12 18:15:13 2010 -0400 urlmon: Implemented IUri_GetPort. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 20 +++++--- 2 files changed, 74 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d992bab72e0350b0122d8…

1 0

Thomas Mullaly : urlmon: Implemented canonicalization for ports in URIs.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 4a88270ce00635348b3dc018d008effc7c8f256a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a88270ce00635348b3dc018d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 12 16:31:30 2010 -0400 urlmon: Implemented canonicalization for ports in URIs. --- dlls/urlmon/uri.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ce27d6d..11c2cfe 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -50,6 +50,9 @@ typedef struct { INT host_start; DWORD host_len; Uri_HOST_TYPE host_type; + + USHORT port; + BOOL has_port; } Uri; typedef struct { @@ -138,6 +141,20 @@ static const struct { {URL_SCHEME_WILDCARD, {'*',0}} }; +/* List of default ports Windows recognizes. */ +static const struct { + URL_SCHEME scheme; + USHORT port; +} default_ports[] = { + {URL_SCHEME_FTP, 21}, + {URL_SCHEME_HTTP, 80}, + {URL_SCHEME_GOPHER, 70}, + {URL_SCHEME_NNTP, 119}, + {URL_SCHEME_TELNET, 23}, + {URL_SCHEME_WAIS, 210}, + {URL_SCHEME_HTTPS, 443}, +}; + static inline BOOL is_alpha(WCHAR val) { return ((val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z')); } @@ -1893,6 +1910,72 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO return TRUE; } +static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + BOOL has_default_port = FALSE; + USHORT default_port = 0; + DWORD i; + + uri->has_port = FALSE; + + /* Check if the scheme has a default port. */ + for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { + if(default_ports[i].scheme == data->scheme_type) { + has_default_port = TRUE; + default_port = default_ports[i].port; + break; + } + } + + if(data->port || has_default_port) + uri->has_port = TRUE; + + /* Possible cases: + * 1) Has a port which is the default port. + * 2) Has a port (not the default). + * 3) Doesn't have a port, but, scheme has a default port. + * 4) No port. + */ + if(has_default_port && data->port && data->port_value == default_port) { + /* If it's the default port and this flag isn't set, don't do anything. */ + if(flags & Uri_CREATE_NO_CANONICALIZE) { + /* Copy the original port over. */ + if(!computeOnly) { + uri->canon_uri[uri->canon_len] = ':'; + memcpy(uri->canon_uri+uri->canon_len+1, data->port, data->port_len*sizeof(WCHAR)); + } + uri->canon_len += data->port_len+1; + } + + uri->port = default_port; + } else if(data->port) { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = ':'; + ++uri->canon_len; + + if(flags & Uri_CREATE_NO_CANONICALIZE) { + /* Copy the original over without changes. */ + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->port, data->port_len*sizeof(WCHAR)); + uri->canon_len += data->port_len; + } else { + const WCHAR formatW[] = {'%','u',0}; + INT len = 0; + if(!computeOnly) + len = sprintfW(uri->canon_uri+uri->canon_len, formatW, data->port_value); + else { + WCHAR tmp[6]; + len = sprintfW(tmp, formatW, data->port_value); + } + uri->canon_len += len; + } + + uri->port = data->port_value; + } else if(has_default_port) + uri->port = default_port; + + return TRUE; +} + /* Canonicalizes the authority of the URI represented by the parse_data. */ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { if(!canonicalize_userinfo(data, uri, flags, computeOnly)) @@ -1901,7 +1984,8 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags if(!canonicalize_host(data, uri, flags, computeOnly)) return FALSE; - /* TODO Canonicalize port information. */ + if(!canonicalize_port(data, uri, flags, computeOnly)) + return FALSE; return TRUE; } @@ -2050,7 +2134,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { } uri->canon_uri[uri->canon_len] = '\0'; - TRACE("(%p %p %x): finished canonicalizing the URI.\n", data, uri, flags); + TRACE("(%p %p %x): finished canonicalizing the URI. uri=%s\n", data, uri, flags, debugstr_w(uri->canon_uri)); return S_OK; }

1 0

Thomas Mullaly : urlmon/tests: Restructured invalid URI tests plus added more test data.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 8a51ac06192ede2da72906e5f5884226cb184881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a51ac06192ede2da72906e5f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 11 20:19:53 2010 -0400 urlmon/tests: Restructured invalid URI tests plus added more test data. --- dlls/urlmon/tests/uri.c | 664 ++++++++++++++++------------------------------- 1 files changed, 222 insertions(+), 442 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a51ac06192ede2da7290…

1 0

Thomas Mullaly : urlmon: Implemented a port parse for URIs.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: ceddd027971389c708368491e654f99083f23780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceddd027971389c708368491e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 11 19:26:08 2010 -0400 urlmon: Implemented a port parse for URIs. --- dlls/urlmon/uri.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 99 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1140e95..ce27d6d 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -24,6 +24,7 @@ #include "shlwapi.h" #define UINT_MAX 0xffffffff +#define USHORT_MAX 0xffff WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -100,6 +101,10 @@ typedef struct { BOOL has_ipv6; ipv6_address ipv6_address; + + const WCHAR *port; + DWORD port_len; + USHORT port_value; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -821,6 +826,44 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); } +/* Attempts to parse a port from the URI. + * + * NOTES: + * Windows seems to have a cap on what the maximum value + * for a port can be. The max value is USHORT_MAX. + * + * port = *DIGIT + */ +static BOOL parse_port(const WCHAR **ptr, parse_data *data, DWORD flags) { + UINT port = 0; + data->port = *ptr; + + while(!is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { + if(!is_num(**ptr)) { + *ptr = data->port; + data->port = NULL; + return FALSE; + } + + port = port*10 + (**ptr-'0'); + + if(port > USHORT_MAX) { + *ptr = data->port; + data->port = NULL; + return FALSE; + } + + ++(*ptr); + } + + data->port_value = port; + data->port_len = *ptr - data->port; + + TRACE("(%p %p %x): Found port %s len=%d value=%u\n", ptr, data, flags, + debugstr_wn(data->port, data->port_len), data->port_len, data->port_value); + return TRUE; +} + /* Attempts to parse a IPv4 address from the URI. * * NOTES: @@ -853,7 +896,15 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) /* Check if what we found is the only part of the host name (if it isn't * we don't have an IPv4 address). */ - if(!is_auth_delim(**ptr, !is_unknown) && **ptr != ':') { + if(**ptr == ':') { + ++(*ptr); + if(!parse_port(ptr, data, flags)) { + *ptr = data->host; + data->host = NULL; + return FALSE; + } + } else if(!is_auth_delim(**ptr, !is_unknown)) { + /* Found more data which belongs the host, so this isn't an IPv4. */ *ptr = data->host; data->host = NULL; data->has_implicit_ip = FALSE; @@ -862,6 +913,7 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) data->host_len = *ptr - data->host; data->host_type = Uri_HOST_IPV4; + TRACE("(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d\n", ptr, data, flags, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); @@ -870,11 +922,15 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) /* Attempts to parse the reg-name from the URI. * + * Because of the way Windows handles ':' this function also + * handles parsing the port. + * * reg-name = *( unreserved / pct-encoded / sub-delims ) * * NOTE: * Windows allows everything, but, the characters in "auth_delims" and ':' - * to appear in a reg-name. + * to appear in a reg-name, unless it's an unknown scheme type then ':' is + * allowed to appear (even if a valid port isn't after it). * * Windows doesn't like host names which start with '[' and end with ']' * and don't contain a valid IP literal address in between them. @@ -888,6 +944,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL has_start_bracket = **ptr == '['; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; BOOL inside_brackets = has_start_bracket; + BOOL ignore_col = FALSE; /* We have to be careful with file schemes. */ if(data->scheme_type == URL_SCHEME_FILE) { @@ -909,10 +966,29 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { data->host = *ptr; while(!is_auth_delim(**ptr, known_scheme)) { - if(**ptr == ':') { + if(**ptr == ':' && !ignore_col) { /* We can ignore ':' if were inside brackets.*/ - if(!inside_brackets) - break; + if(!inside_brackets) { + const WCHAR *tmp = (*ptr)++; + + /* Attempt to parse the port. */ + if(!parse_port(ptr, data, flags)) { + /* Windows expects there to be a valid port for known scheme types. */ + if(data->scheme_type != URL_SCHEME_UNKNOWN) { + *ptr = data->host; + data->host = NULL; + TRACE("(%p %p %x): Expected valid port\n", ptr, data, flags); + return FALSE; + } else + /* Windows gives up on trying to parse a port when it + * encounters 1 invalid port. + */ + ignore_col = TRUE; + } else { + data->host_len = tmp - data->host; + break; + } + } } else if(**ptr == '%' && known_scheme) { /* Has to be a legit % encoded value. */ if(!check_pct_encoded(ptr)) { @@ -940,7 +1016,9 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { } } - data->host_len = *ptr - data->host; + /* Don't overwrite our length if we found a port earlier. */ + if(!data->port) + data->host_len = *ptr - data->host; /* If the host is empty, then it's an unknown host type. */ if(data->host_len == 0) @@ -1185,8 +1263,19 @@ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { } ++(*ptr); + if(**ptr == ':') { + ++(*ptr); + /* If a valid port is not found, then let it trickle down to + * parse_reg_name. + */ + if(!parse_port(ptr, data, flags)) { + *ptr = data->host; + data->host = NULL; + return FALSE; + } + } else + data->host_len = *ptr - data->host; - data->host_len = *ptr - data->host; return TRUE; } @@ -1215,6 +1304,9 @@ static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { parse_userinfo(ptr, data, flags); + /* Parsing the port will happen during one of the host parsing + * routines (if the URI has a port). + */ if(!parse_host(ptr, data, flags)) return FALSE;

1 0

Thomas Mullaly : urlmon: Fixed a bug that would cause tests to randomly fail.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 821b8fcdc8383203cb6f6cd3e99a94ec3cfca779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821b8fcdc8383203cb6f6cd3e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jul 28 17:43:08 2010 -0400 urlmon: Fixed a bug that would cause tests to randomly fail. --- dlls/urlmon/uri.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 91d556d..1140e95 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1790,6 +1790,7 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO uri->host_len = data->host_len; } + uri->host_type = Uri_HOST_UNKNOWN; break; default: WARN("(%p %p %x %d): Canonicalization not supported yet\n", data,

1 0

Frédéric Delanoy : shdocvw: Fix French translation.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 16f120f1ddd8484828f83796ff74580d497df23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f120f1ddd8484828f83796f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 28 22:51:49 2010 +0200 shdocvw: Fix French translation. --- dlls/shdocvw/Fr.rc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index 2d053a2..94b4a7e 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -1,5 +1,6 @@ /* * shdocvw French resources + * * Copyright 2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or @@ -40,7 +41,10 @@ IDR_BROWSE_MAIN_MENU MENU { POPUP "&Fichier" { - MENUITEM "&Nouvelle fenêtre" ID_BROWSE_NEW_WINDOW + POPUP "&Nouvelle" + { + MENUITEM "&Fenêtre" ID_BROWSE_NEW_WINDOW + } MENUITEM "&Ouvrir...", ID_BROWSE_OPEN MENUITEM "&Enregistrer", ID_BROWSE_SAVE MENUITEM "Enregistrer &sous...", ID_BROWSE_SAVE_AS

1 0

Matt 'Murph' Finnicum : imm32: Set size of OSVERSIONINFOA before calling GetVersionExA.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 084bf06fe943c8f7dc5eff4b46e4d63270f5a3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084bf06fe943c8f7dc5eff4b4… Author: Matt 'Murph' Finnicum <mattfinn(a)gmail.com> Date: Wed Jul 28 14:08:33 2010 -0500 imm32: Set size of OSVERSIONINFOA before calling GetVersionExA. --- dlls/imm32/imm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c708b83..28f482c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1769,6 +1769,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) if ( data ) return data->lastVK; + version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); GetVersionExA( &version ); switch(version.dwPlatformId) {

1 0

Paul Vriens : setupapi: Add a stub for SetupDiLoadClassIcon.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: aaf4ce8ac6d70f19b6bce495d1b580acb61c1c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf4ce8ac6d70f19b6bce495d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 28 16:24:47 2010 +0200 setupapi: Add a stub for SetupDiLoadClassIcon. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6de75b1..1b43bb9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -363,7 +363,7 @@ @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice @ stub SetupDiInstallDriverFiles -@ stub SetupDiLoadClassIcon +@ stdcall SetupDiLoadClassIcon(ptr ptr ptr) @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long) @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 264a890..a37d689 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -417,3 +417,14 @@ BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA Dev SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiLoadClassIcon (SETUPAPI.@) + */ +BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT MiniIconIndex) +{ + FIXME(": stub %s, %p, %p\n", debugstr_guid(ClassGuid), LargeIcon, MiniIconIndex); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Andrew Eikum : comdlg32/tests: Use GetOpenFileNameA instead of GetOpenFileNameW.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 1b7a3dae6e2026679a866a8fd6a6b1fd0874751d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7a3dae6e2026679a866a8fd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 28 09:23:00 2010 -0500 comdlg32/tests: Use GetOpenFileNameA instead of GetOpenFileNameW. --- dlls/comdlg32/tests/filedlg.c | 46 ++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index fc7762b..90d4afb 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -988,59 +988,49 @@ static void test_resizable2(void) static void test_mru(void) { ok_wndproc_testcase testcase = {0}; - OPENFILENAMEW ofn = {sizeof(OPENFILENAMEW)}; - const char *test_dir_nameA = "C:\\mru_test"; - const WCHAR test_file_name[] = - {'t','e','s','t','.','t','x','t',0}; - const WCHAR test_full_path[] = - {'C',':','\\','m','r','u','_','t','e','s','t','\\','t','e','s','t','.','t','x','t',0}; - const WCHAR template1W[] = - {'t','e','m','p','l','a','t','e','1',0}; - WCHAR filename_buf[MAX_PATH]; + OPENFILENAME ofn = {sizeof(OPENFILENAME)}; + const char *test_dir_name = "C:\\mru_test"; + const char *test_file_name = "test.txt"; + const char *test_full_path = "C:\\mru_test\\test.txt"; + char filename_buf[MAX_PATH]; DWORD ret; ofn.lpstrFile = filename_buf; ofn.nMaxFile = sizeof(filename_buf); - ofn.lpTemplateName = template1W; + ofn.lpTemplateName = "template1"; ofn.hInstance = GetModuleHandle(NULL); ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_NOCHANGEDIR; ofn.lCustData = (LPARAM)&testcase; ofn.lpfnHook = (LPOFNHOOKPROC)test_ok_wndproc; SetLastError(0xdeadbeef); - ret = CreateDirectoryA(test_dir_nameA, NULL); + ret = CreateDirectoryA(test_dir_name, NULL); ok(ret == TRUE, "CreateDirectoryA should have succeeded: %d\n", GetLastError()); /* "teach" comdlg32 about this directory */ - lstrcpyW(filename_buf, test_full_path); + strcpy(filename_buf, test_full_path); SetLastError(0xdeadbeef); - ret = GetOpenFileNameW(&ofn); - if(!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED){ - win_skip("Platform doesn't implement GetOpenFileNameW\n"); - RemoveDirectoryA(test_dir_nameA); - return; - } - ok(ret, "GetOpenFileNameW should have succeeded: %d\n", GetLastError()); - ok(testcase.actclose, "Open File dialog should have closed.\n"); + ret = GetOpenFileNameA(&ofn); + ok(ret, "GetOpenFileNameA should have succeeded: %d\n", GetLastError()); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %x\n", ret); - ok(!lstrcmpW(ofn.lpstrFile, test_full_path), "Expected to get %s, got %s\n", - wine_dbgstr_w(test_full_path), wine_dbgstr_w(ofn.lpstrFile)); + ok(testcase.actclose, "Open File dialog should have closed.\n"); + ok(!strcmp(ofn.lpstrFile, test_full_path), "Expected to get %s, got %s\n", test_full_path, ofn.lpstrFile); /* get a filename without a full path. it should return the file in * test_dir_name, not in the CWD */ - lstrcpyW(filename_buf, test_file_name); + strcpy(filename_buf, test_file_name); SetLastError(0xdeadbeef); - ret = GetOpenFileNameW(&ofn); - ok(ret, "GetOpenFileNameW should have succeeded: %d\n", GetLastError()); - ok(testcase.actclose, "Open File dialog should have closed.\n"); + ret = GetOpenFileNameA(&ofn); + ok(ret, "GetOpenFileNameA should have succeeded: %d\n", GetLastError()); ret = CommDlgExtendedError(); ok(!ret, "CommDlgExtendedError returned %x\n", ret); - if(lstrcmpW(ofn.lpstrFile, test_full_path) != 0) + ok(testcase.actclose, "Open File dialog should have closed.\n"); + if(strcmp(ofn.lpstrFile, test_full_path) != 0) win_skip("Platform doesn't save MRU data\n"); SetLastError(0xdeadbeef); - ret = RemoveDirectoryA(test_dir_nameA); + ret = RemoveDirectoryA(test_dir_name); ok(ret == TRUE, "RemoveDirectoryA should have succeeded: %d\n", GetLastError()); }

1 0

Alexandre Julliard : gdi32: Make sure the text dimensions are always positive in the ExtTextOut normal case .
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 7c1124e49a80514ee4e40cc16584f89cd4081006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1124e49a80514ee4e40cc16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:15:01 2010 +0200 gdi32: Make sure the text dimensions are always positive in the ExtTextOut normal case. --- dlls/gdi32/font.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d51445..1b36374 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1777,12 +1777,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; - TRACE("%p, %d, %d, %08x, %p, %s, %d, %p)\n", hdc, x, y, flags, - lprect, debugstr_wn(str, count), count, lpDx); - - if(lprect) - TRACE("rect: %d,%d - %d,%d\n", lprect->left, lprect->top, lprect->right, - lprect->bottom); + TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, + wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); TRACE("align = %x bkmode = %x mapmode = %x\n", align, GetBkMode(hdc), GetMapMode(hdc)); if(align & TA_UPDATECP) @@ -1923,7 +1919,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, GetTextExtentPointW(hdc, reordered_str, count, &sz); done_extents = TRUE; } - width.x = INTERNAL_XWSTODS(dc, sz.cx); + width.x = abs(INTERNAL_XWSTODS(dc, sz.cx)); width.y = 0; } @@ -2018,7 +2014,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, for(j = 1; j < count; j++) { GetTextExtentPointW(hdc, reordered_str + j - 1, 1, &tmpsz); - offsets[j].x = offsets[j - 1].x + INTERNAL_XWSTODS(dc, tmpsz.cx); + offsets[j].x = offsets[j - 1].x + abs(INTERNAL_XWSTODS(dc, tmpsz.cx)); offsets[j].y = 0; } }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2010