August 2010 - Wine-commits - list.winehq.org

Thomas Mullaly : urlmon: Implemented IUri_GetExtension.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 07e7a117ca119e629d784b0b2b98eb8e9bf7f0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e7a117ca119e629d784b0b2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 18:36:49 2010 -0400 urlmon: Implemented IUri_GetExtension. --- dlls/urlmon/tests/uri.c | 230 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 33 ++++++-- 2 files changed, 141 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07e7a117ca119e629d784…

1 0

Sven Baars : shdocvw: Update the Dutch translation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: c510a13db515b44bf1cdce12381714a63a253d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c510a13db515b44bf1cdce123… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Aug 2 23:53:59 2010 +0200 shdocvw: Update the Dutch translation. --- dlls/shdocvw/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Nl.rc b/dlls/shdocvw/Nl.rc index d01c579..2237c5f 100644 --- a/dlls/shdocvw/Nl.rc +++ b/dlls/shdocvw/Nl.rc @@ -50,6 +50,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Eigenschappen...", ID_BROWSE_PROPERTIES } + POPUP "&Favorieten" + { + MENUITEM "&Toevoegen aan Favorieten..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Help" { MENUITEM "&Over Internet Explorer...", ID_BROWSE_ABOUT

1 0

Frédéric Delanoy : shdocvw: Update French translation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 82d8c52e39661952d1eab3ea3ef789c95dd6584b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d8c52e39661952d1eab3ea3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 3 02:16:52 2010 +0200 shdocvw: Update French translation. --- dlls/shdocvw/Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index 94b4a7e..b7326bb 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -55,6 +55,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Propriétés...", ID_BROWSE_PROPERTIES } + POPUP "&Favoris" + { + MENUITEM "&Ajouter aux favoris..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Aide" { MENUITEM "À &propos d'Internet Explorer...", ID_BROWSE_ABOUT

1 0

Detlef Riekenberg : include: Add a closing bracket.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 51aef89beafd3e22b0cb0acf0b464ea213c43df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51aef89beafd3e22b0cb0acf0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 3 05:25:10 2010 +0200 include: Add a closing bracket. --- include/winsock2.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index ea20ceb..5d5bd60 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -550,7 +550,7 @@ typedef int (WINAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char*,int*); typedef ULONG (WINAPI *LPFN_HTONL)(ULONG); typedef WS(u_short) (WINAPI *LPFN_HTONS)(WS(u_short)); typedef ULONG (WINAPI *LPFN_INET_ADDR)(const char*); -typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr); +typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr)); typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,LONG,ULONG*); typedef int (WINAPI *LPFN_LISTEN)(SOCKET,int); typedef ULONG (WINAPI *LPFN_NTOHL)(ULONG);

1 0

Detlef Riekenberg : shdocvw: Do not trim the last character, when using the iexplore open menu.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: a4e01951579da52b7facc245aad5d5f869ba4aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e01951579da52b7facc245a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 3 05:32:29 2010 +0200 shdocvw: Do not trim the last character, when using the iexplore open menu. --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index bef25ab..b794a8b 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -251,7 +251,7 @@ static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocStringLen(NULL, len); - GetWindowTextW(hwndurl, V_BSTR(&url), len); + GetWindowTextW(hwndurl, V_BSTR(&url), len + 1); IWebBrowser2_Navigate2(WEBBROWSER2(This), &url, NULL, NULL, NULL, NULL); SysFreeString(V_BSTR(&url));

1 0

Anders Jonsson : cryptui: Fix typos in English resources.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: e8994599dcebb948d5c219bf7dda13546e70a0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8994599dcebb948d5c219bf7… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:24:12 2010 +0200 cryptui: Fix typos in English resources. --- dlls/cryptui/cryptui_En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index a608210..bd158d2 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -118,10 +118,10 @@ STRINGTABLE IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?" IDS_CERT_MGR "Certificates" IDS_FRIENDLY_NAME_NONE "<None>" - IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" + IDS_PURPOSE_SERVER_AUTH "Ensures the identity of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" - IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messges" + IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messages" IDS_PURPOSE_IPSEC "Allows secure communication over the Internet" IDS_PURPOSE_TIMESTAMP_SIGNING "Allows data to be signed with the current time" IDS_PURPOSE_CTL_USAGE_SIGNING "Allows you to digitally sign a certificate trust list"

1 0

Anders Jonsson : winmm: Fix typo in English, Slovak resources.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 2ebe732453a6477dd8e5fcc209b297c7e2cf5b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe732453a6477dd8e5fcc20… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:25:48 2010 +0200 winmm: Fix typo in English, Slovak resources. --- dlls/winmm/winmm_En.rc | 2 +- dlls/winmm/winmm_Sk.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index cc20333..f529dff 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -121,7 +121,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device." diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index 3706f44..1d7bc77 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -121,7 +121,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device."

1 0

Luca Bennati : shdocvw: Update Italian translation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 44aa9a7d938ad077eea9495acf3ebbcd5ca3de99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa9a7d938ad077eea9495ac… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Aug 3 08:51:17 2010 +0200 shdocvw: Update Italian translation. --- dlls/shdocvw/It.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/It.rc b/dlls/shdocvw/It.rc index 8d5782e..d7cc14c 100644 --- a/dlls/shdocvw/It.rc +++ b/dlls/shdocvw/It.rc @@ -54,6 +54,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Proprietà...", ID_BROWSE_PROPERTIES } + POPUP "&Preferiti" + { + MENUITEM "&Aggiungi ai Preferiti..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Aiuto" { MENUITEM "&Informazioni su Internet Explorer...", ID_BROWSE_ABOUT

1 0

Alexandre Julliard : winemenubuilder: Rename some variables to reflect the fact that we no longer use XPM format .
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: e446a7c7bf146f82460f5d898b0ff309e3daadb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e446a7c7bf146f82460f5d898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 20:28:58 2010 +0200 winemenubuilder: Rename some variables to reflect the fact that we no longer use XPM format. --- programs/winemenubuilder/winemenubuilder.c | 58 ++++++++++++---------------- 1 files changed, 25 insertions(+), 33 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 7a77358..b7971e4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -372,7 +372,7 @@ static BOOL CALLBACK EnumResNameProc(HMODULE hModule, LPCWSTR lpszType, LPWSTR l return TRUE; } -static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) +static BOOL extract_icon_from_module(LPCWSTR szFileName, int nIndex, const char *icon_name) { HMODULE hModule; HRSRC hResInfo; @@ -452,7 +452,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) { if ((pIcon = LockResource(hResData))) { - if (reassemble_and_save_to_png(&iconDirEntry, pIcon, szXPMFileName, szFileName)) + if (reassemble_and_save_to_png(&iconDirEntry, pIcon, icon_name, szFileName)) ret = TRUE; else ret = FALSE; @@ -466,24 +466,16 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) return ret; } -static BOOL ExtractFromEXEDLL(LPCWSTR szFileName, int nIndex, char *szXPMFileName) +static int ExtractFromICO(LPCWSTR szFileName, const char *icon_name) { - if (!extract_icon32(szFileName, nIndex, szXPMFileName) /*&& - !extract_icon16(szFileName, szXPMFileName)*/) - return FALSE; - return TRUE; -} - -static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) -{ - FILE *fICOFile = NULL; + FILE *fICOFile; ICONDIR iconDir; ICONDIRENTRY *pIconDirEntry = NULL; int nMax = 0, nMaxBits = 0; int nIndex = 0; void *pIcon = NULL; int i; - char *filename = NULL; + char *filename; IStream *icoStream = NULL; HRESULT hr; @@ -536,7 +528,7 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) goto error; } - if (!SaveIconStreamAsPNG(icoStream, nIndex, szXPMFileName, szFileName)) + if (!SaveIconStreamAsPNG(icoStream, nIndex, icon_name, szFileName)) goto error; HeapFree(GetProcessHeap(), 0, pIcon); @@ -556,7 +548,7 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) return 0; } -static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) +static int ExtractFromFileType(LPCWSTR szFileName, const char *icon_name) { int ret = 0; WCHAR *extension; @@ -590,7 +582,7 @@ static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) WINE_TRACE("executable %s -> icon %s\n", wine_dbgstr_w(executable), wine_dbgstr_a(output_path)); } if (output_path) - ret = (rename(output_path, szXPMFileName) == 0); + ret = (rename(output_path, icon_name) == 0); end: HeapFree(GetProcessHeap(), 0, icon); @@ -599,11 +591,11 @@ end: return ret; } -static BOOL create_default_icon( char *filename ) +static BOOL create_default_icon( const char *filename ) { static const WCHAR user32W[] = {'u','s','e','r','3','2',0}; - return extract_icon32( user32W, -(INT_PTR)IDI_WINLOGO, filename ); + return extract_icon_from_module( user32W, -(INT_PTR)IDI_WINLOGO, filename ); } static unsigned short crc16(const char* string) @@ -737,7 +729,7 @@ static WCHAR* utf8_chars_to_wchars(LPCSTR string) static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) { unsigned short crc; - char *iconsdir = NULL, *ico_path = NULL, *ico_name, *xpm_path = NULL; + char *iconsdir = NULL, *ico_path = NULL, *ico_name, *png_path = NULL; char* s; int n; @@ -781,37 +773,37 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO /* Try to treat the source file as an exe */ if (destFilename) - xpm_path=heap_printf("%s/%s.png",iconsdir,destFilename); + png_path=heap_printf("%s/%s.png",iconsdir,destFilename); else - xpm_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); - if (xpm_path == NULL) + png_path=heap_printf("%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (png_path == NULL) { WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); return NULL; } - if (ExtractFromEXEDLL( path, index, xpm_path )) + if (extract_icon_from_module( path, index, png_path )) goto end; /* Must be something else, ignore the index in that case */ if (destFilename) - sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + sprintf(png_path,"%s/%s.png",iconsdir,destFilename); else - sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); - if (ExtractFromICO( path, xpm_path)) + sprintf(png_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); + if (ExtractFromICO( path, png_path)) goto end; - if (ExtractFromFileType( path, xpm_path )) + if (ExtractFromFileType( path, png_path )) goto end; - if (!bWait && create_default_icon( xpm_path )) + if (!bWait && create_default_icon( png_path )) goto end; - HeapFree( GetProcessHeap(), 0, xpm_path ); - xpm_path=NULL; + HeapFree( GetProcessHeap(), 0, png_path ); + png_path=NULL; end: HeapFree(GetProcessHeap(), 0, iconsdir); HeapFree(GetProcessHeap(), 0, ico_path); - return xpm_path; + return png_path; } static HKEY open_menus_reg_key(void) @@ -2815,12 +2807,12 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) if (szIconPath[0]) { - if (!ExtractFromEXEDLL(szIconPath, iconId, utf8OutputPath)) + if (!extract_icon_from_module(szIconPath, iconId, utf8OutputPath)) ExtractFromICO(szIconPath, utf8OutputPath); } else { - if (!ExtractFromEXEDLL(szPath, iconId, utf8OutputPath)) + if (!extract_icon_from_module(szPath, iconId, utf8OutputPath)) ExtractFromICO(szPath, utf8OutputPath); }

1 0

Thomas Mullaly : urlmon: Implemented a path parser for hierarchical URIs.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 0ecec6d7c01050ac5b97a8bab7b9d4177f934b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecec6d7c01050ac5b97a8bab… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 18 10:27:21 2010 -0400 urlmon: Implemented a path parser for hierarchical URIs. --- dlls/urlmon/tests/uri.c | 32 ++++++++++++++++++- dlls/urlmon/uri.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b87b9a3..7cd11ff 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2217,6 +2217,34 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "zip://www.google.com\\test", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN| + Uri_HAS_HOST|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"zip://www.google.com\\test",S_OK,TRUE}, + {"www.google.com\\test",S_OK,FALSE}, + {"zip://www.google.com\\test",S_OK,TRUE}, + {"google.com\\test",S_OK,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"www.google.com\\test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"zip://www.google.com\\test",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -2264,7 +2292,9 @@ static const invalid_uri invalid_uri_tests[] = { /* Invalid port with IPv4 address. */ {"http://www.winehq.org:1abcd",0,FALSE}, /* Invalid port with IPv6 address. */ - {"http://[::ffff]:32xy",0,FALSE} + {"http://[::ffff]:32xy",0,FALSE}, + /* Not allowed to have backslashes with NO_CANONICALIZE. */ + {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 20d8bb1..9ab1dda 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -113,6 +113,9 @@ typedef struct { const WCHAR *port; DWORD port_len; USHORT port_value; + + const WCHAR *path; + DWORD path_len; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -257,6 +260,10 @@ static inline BOOL is_hexdigit(WCHAR val) { (val >= '0' && val <= '9')); } +static inline BOOL is_path_delim(WCHAR val) { + return (!val || val == '#' || val == '?'); +} + /* Computes the size of the given IPv6 address. * Each h16 component is 16bits, if there is an IPv4 address, it's * 32bits. If there's an elision it can be 16bits to 128bits, depending @@ -1482,6 +1489,70 @@ static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } +/* Attempts to parse the path information of a hierarchical URI. */ +static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD flags) { + const WCHAR *start = *ptr; + static const WCHAR slash[] = {'/',0}; + + if(is_path_delim(**ptr)) { + if(data->scheme_type == URL_SCHEME_WILDCARD) { + /* Wildcard schemes don't get a '/' attached if their path is + * empty. + */ + data->path = NULL; + data->path_len = 0; + } else if(!(flags & Uri_CREATE_NO_CANONICALIZE)) { + /* If the path component is empty, then a '/' is added. */ + data->path = slash; + data->path_len = 1; + } + } else { + while(!is_path_delim(**ptr)) { + if(**ptr == '%' && data->scheme_type != URL_SCHEME_UNKNOWN && + data->scheme_type != URL_SCHEME_FILE) { + if(!check_pct_encoded(ptr)) { + *ptr = start; + return FALSE; + } else + continue; + } else if(**ptr == '\\') { + /* Not allowed to have a backslash if NO_CANONICALIZE is set + * and the scheme is known type (but not a file scheme). + */ + if(flags & Uri_CREATE_NO_CANONICALIZE) { + if(data->scheme_type != URL_SCHEME_FILE && + data->scheme_type != URL_SCHEME_UNKNOWN) { + *ptr = start; + return FALSE; + } + } + } + + ++(*ptr); + } + + /* The only time a URI doesn't have a path is when + * the NO_CANONICALIZE flag is set and the raw URI + * didn't contain one. + */ + if(*ptr == start) { + data->path = NULL; + data->path_len = 0; + } else { + data->path = start; + data->path_len = *ptr - start; + } + } + + if(data->path) + TRACE("(%p %p %x): Parsed path %s len=%d\n", ptr, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + else + TRACE("(%p %p %x): The URI contained no path\n", ptr, data, flags); + + return TRUE; +} + /* Determines how the URI should be parsed after the scheme information. * * If the scheme is followed, by "//" then, it is treated as an hierarchical URI @@ -1525,11 +1596,15 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { TRACE("(%p %p %x): Treating URI as an hierarchical URI.\n", ptr, data, flags); data->is_opaque = FALSE; + if(data->scheme_type == URL_SCHEME_FILE) + /* Skip past the "//" after the scheme (if any). */ + check_hierarchical(ptr); + /* TODO: Handle hierarchical URI's, parse authority then parse the path. */ if(!parse_authority(ptr, data, flags)) return FALSE; - return TRUE; + return parse_path_hierarchical(ptr, data, flags); } } @@ -1564,6 +1639,8 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_hierpart(pptr, data, flags)) return FALSE; + /* TODO: Parse query and fragment (if the URI has one). */ + TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); return TRUE; }

1 0