October 2010 - Wine-commits

Yaron Shahrabani : iccvid: Added Hebrew translation.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: ccfa119b877124f97ebd2373115414fbfc5cd5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfa119b877124f97ebd23731… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Oct 26 23:26:56 2010 +0200 iccvid: Added Hebrew translation. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_He.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index cbf9d7c..02ed092 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -11,6 +11,7 @@ RC_SRCS = \ iccvid_En.rc \ iccvid_Es.rc \ iccvid_Fr.rc \ + iccvid_He.rc \ iccvid_Hu.rc \ iccvid_It.rc \ iccvid_Ja.rc \ diff --git a/dlls/iccvid/iccvid_He.rc b/dlls/iccvid/iccvid_He.rc new file mode 100644 index 0000000..7188b0c --- /dev/null +++ b/dlls/iccvid/iccvid_He.rc @@ -0,0 +1,30 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "iccvid_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NAME "מקודד הווידאו Cinepak" + IDS_DESCRIPTION "מקודד הווידאו Cinepak" +}

1 0

Louis Lenders : rpcrt4: Add stub for NdrMesTypeEncode2.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: 92f41c56f7397f1763d90bee41e6ec1c04804595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f41c56f7397f1763d90bee4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Oct 26 22:56:11 2010 +0200 rpcrt4: Add stub for NdrMesTypeEncode2. --- dlls/rpcrt4/ndr_es.c | 6 ++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 9a56939..b336c21 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -445,6 +445,12 @@ void RPC_ENTRY NdrMesTypeDecode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); } +void RPC_ENTRY NdrMesTypeEncode2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, + const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, const void *pObject) +{ + FIXME("(%p, %p, %p, %p, %p)\n", Handle, pPicklingInfo, pStubDesc, pFormatString, pObject); +} + void RPC_ENTRY NdrMesTypeFree2(handle_t Handle, const MIDL_TYPE_PICKLING_INFO *pPicklingInfo, const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormatString, void *pObject) { diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 477b3f0..e0c6c11 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -227,7 +227,7 @@ @ stub NdrMesTypeAlignSize @ stdcall NdrMesTypeDecode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeDecode -@ stub NdrMesTypeEncode2 +@ stdcall NdrMesTypeEncode2(ptr ptr ptr ptr ptr) @ stub NdrMesTypeEncode @ stdcall NdrMesTypeFree2(ptr ptr ptr ptr ptr) @ stdcall NdrNonConformantStringBufferSize(ptr ptr ptr)

1 0

Piotr Caban : urlmon: Improved url canonicalize when Uri_CREATE_FILE_USE_DOS_PATH is specified.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: 8a6210d28fcea9b6b16a5b35b679dcf0623ea3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6210d28fcea9b6b16a5b35b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 26 23:27:59 2010 +0200 urlmon: Improved url canonicalize when Uri_CREATE_FILE_USE_DOS_PATH is specified. --- dlls/urlmon/tests/uri.c | 29 +++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 6 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 8045a27..93493a8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3744,6 +3744,35 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + /* Allow more characters when Uri_CREATE_FILE_USE_DOS_PATH is specified */ + { "file:///c:/dir\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH + |Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE + |Uri_HAS_SCHEME, FALSE, + { + {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file:///c:/dir\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {0,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "file://c|/dir\\index.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH |Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9f78e28..77d14cd 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2870,6 +2870,7 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * NOTES: * file://c:/test%20test -> file:///c:/test%2520test * file://c:/test%3Etest -> file:///c:/test%253Etest + * if Uri_CREATE_FILE_USE_DOS_PATH is not set: * file:///c:/test%20test -> file:///c:/test%20test * file:///c:/test%test -> file:///c:/test%25test */ @@ -2931,7 +2932,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, WCHAR val; /* Check if the % represents a valid encoded char, or if it needs encoded. */ - BOOL force_encode = !check_pct_encoded(&tmp) && is_file; + BOOL force_encode = !check_pct_encoded(&tmp) && is_file && !(flags&Uri_CREATE_FILE_USE_DOS_PATH); val = decode_pct_val(ptr); if(force_encode || escape_pct) { @@ -2940,7 +2941,8 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, pct_encode_val(*ptr, uri->canon_uri+uri->canon_len); uri->canon_len += 3; } else if((is_unreserved(val) && known_scheme) || - (is_file && (is_unreserved(val) || is_reserved(val)))) { + (is_file && (is_unreserved(val) || is_reserved(val) || + (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { if(!computeOnly) uri->canon_uri[uri->canon_len] = val; ++uri->canon_len;

1 0

Nikolay Sivov : msxml3: Make line endings fix helper faster using BSTR stored length.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: ecfc3f153cd146505695267295acc0ab6c4b84c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfc3f153cd14650569526729… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 01:10:53 2010 +0400 msxml3: Make line endings fix helper faster using BSTR stored length. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3e8665f..0d12209 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -903,7 +903,7 @@ static BSTR EnsureCorrectEOL(BSTR sInput) int nLen; int i; - nLen = lstrlenW(sInput); + nLen = SysStringLen(sInput); /* Count line endings */ for(i=0; i < nLen; i++) { @@ -935,7 +935,7 @@ static BSTR EnsureCorrectEOL(BSTR sInput) sNew = sInput; } - TRACE("len %d\n", lstrlenW(sNew)); + TRACE("len %d\n", SysStringLen(sNew)); return sNew; }

1 0

Nikolay Sivov : msxml3: Fix a leak of error message BSTR.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: bd7787c12a3df1db44fc899bb78e4d86b40daead URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7787c12a3df1db44fc899bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 01:15:38 2010 +0400 msxml3: Fix a leak of error message BSTR. --- dlls/msxml3/saxreader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 815d062..fbc10cf 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -218,6 +218,7 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) BSTR bstrMsg = SysAllocString(msg); IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler, (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrMsg, hr); + SysFreeString(bstrMsg); } else ISAXErrorHandler_fatalError(This->saxreader->errorHandler, @@ -1319,6 +1320,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) BSTR bstrError = SysAllocString(wszError); IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler, (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrError, E_FAIL); + SysFreeString(bstrError); } else ISAXErrorHandler_fatalError(This->saxreader->errorHandler,

1 0

Nikolay Sivov : msxml3: Output error message for fatal errors.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: 9a3bfce9c032715b86a1ccdac0bb4162bc0906da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3bfce9c032715b86a1ccdac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 01:25:26 2010 +0400 msxml3: Output error message for fatal errors. --- dlls/msxml3/saxreader.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fbc10cf..a0c821e 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1292,7 +1292,7 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) { saxlocator *This = ctx; char message[1024]; - WCHAR *wszError; + WCHAR *error; DWORD len; va_list args; @@ -1311,22 +1311,25 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) va_end(args); len = MultiByteToWideChar(CP_UNIXCP, 0, message, -1, NULL, 0); - wszError = heap_alloc(sizeof(WCHAR)*len); - if(wszError) - MultiByteToWideChar(CP_UNIXCP, 0, message, -1, wszError, len); + error = heap_alloc(sizeof(WCHAR)*len); + if(error) + { + MultiByteToWideChar(CP_UNIXCP, 0, message, -1, error, len); + TRACE("fatal error for %p: %s\n", This, debugstr_w(error)); + } if(This->vbInterface) { - BSTR bstrError = SysAllocString(wszError); + BSTR bstrError = SysAllocString(error); IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler, (IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrError, E_FAIL); SysFreeString(bstrError); } else ISAXErrorHandler_fatalError(This->saxreader->errorHandler, - (ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL); + (ISAXLocator*)&This->lpSAXLocatorVtbl, error, E_FAIL); - heap_free(wszError); + heap_free(error); xmlStopParser(This->pParserCtxt); This->ret = E_FAIL;

1 0

David Hedberg : shlwapi: Add room for null terminator in local SHGetShellKey buffer.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: 8a4c60335ec41ae411c8193de3acf43ce0e89551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4c60335ec41ae411c8193de… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Oct 27 03:13:11 2010 +0200 shlwapi: Add room for null terminator in local SHGetShellKey buffer. --- dlls/shlwapi/ordinal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index b04fd9e..3c00b8e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4514,7 +4514,7 @@ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) else size_user = 0; - path = HeapAlloc(GetProcessHeap(), 0, size_key+size_subkey+size_user); + path = HeapAlloc(GetProcessHeap(), 0, size_key+size_subkey+size_user+sizeof(WCHAR)); if(!path) { ERR("Out of memory\n"); return NULL;

1 0

Martin Wilck : xcopy: Move command line parsing code into separate function .
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: b62c0d23f7d5b1bbcab40768be7516975ae489ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62c0d23f7d5b1bbcab40768b… Author: Martin Wilck <Martin.Wilck(a)particle-dynamics.de> Date: Wed Oct 27 01:48:50 2010 +0200 xcopy: Move command line parsing code into separate function. --- programs/xcopy/xcopy.c | 153 +++++++++++++++++++++++++++-------------------- programs/xcopy/xcopy.h | 1 + 2 files changed, 89 insertions(+), 65 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 4572374..ed736db 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -49,6 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(xcopy); /* Prototypes */ +static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, + WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *flags); static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *spec, DWORD flags); static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, @@ -108,17 +111,6 @@ int wmain (int argc, WCHAR *argvW[]) const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; - const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; - - /* - * Parse the command line - */ - - /* Confirm at least one parameter */ - if (argc < 2) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; - } /* Preinitialize flags based on COPYCMD */ if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) { @@ -135,6 +127,88 @@ int wmain (int argc, WCHAR *argvW[]) lose */ flags |= OPT_COPYHIDSYS; + /* + * Parse the command line + */ + if ((rc = XCOPY_ParseCommandLine(argc, argvW, suppliedsource, + supplieddestination, &flags)) != RC_OK) { + if (rc == RC_HELP) + return RC_OK; + else + return rc; + } + + /* Trace out the supplied information */ + WINE_TRACE("Supplied parameters:\n"); + WINE_TRACE("Source : '%s'\n", wine_dbgstr_w(suppliedsource)); + WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); + + /* Extract required information from source specification */ + rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + if (rc != RC_OK) return rc; + + /* Extract required information from destination specification */ + rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, + destinationspec, sourcespec, flags); + if (rc != RC_OK) return rc; + + /* Trace out the resulting information */ + WINE_TRACE("Resolved parameters:\n"); + WINE_TRACE("Source Stem : '%s'\n", wine_dbgstr_w(sourcestem)); + WINE_TRACE("Source Spec : '%s'\n", wine_dbgstr_w(sourcespec)); + WINE_TRACE("Dest Stem : '%s'\n", wine_dbgstr_w(destinationstem)); + WINE_TRACE("Dest Spec : '%s'\n", wine_dbgstr_w(destinationspec)); + + /* Pause if necessary */ + if (flags & OPT_PAUSE) { + DWORD count; + char pausestr[10]; + + XCOPY_wprintf(XCOPY_LoadMessage(STRING_PAUSE)); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), + &count, NULL); + } + + /* Now do the hard work... */ + rc = XCOPY_DoCopy(sourcestem, sourcespec, + destinationstem, destinationspec, + flags); + + /* Clear up exclude list allocated memory */ + while (excludeList) { + EXCLUDELIST *pos = excludeList; + excludeList = excludeList -> next; + HeapFree(GetProcessHeap(), 0, pos->name); + HeapFree(GetProcessHeap(), 0, pos); + } + + /* Finished - print trailer and exit */ + if (flags & OPT_SIMULATE) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); + } else if (!(flags & OPT_NOCOPY)) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); + } + if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; + return rc; + +} + +/* ========================================================================= + XCOPY_ParseCommandLine - Parses the command line + ========================================================================= */ +static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, + WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *pflags) +{ + const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; + DWORD flags = *pflags; + + /* Confirm at least one parameter */ + if (argc < 2) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); + return RC_INITERROR; + } + /* Skip first arg, which is the program name */ argvW++; @@ -241,7 +315,7 @@ int wmain (int argc, WCHAR *argvW[]) case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); - return RC_OK; + return RC_HELP; default: WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); @@ -255,59 +329,8 @@ int wmain (int argc, WCHAR *argvW[]) if (supplieddestination[0] == 0x00) lstrcpyW(supplieddestination, wchr_dot); - /* Trace out the supplied information */ - WINE_TRACE("Supplied parameters:\n"); - WINE_TRACE("Source : '%s'\n", wine_dbgstr_w(suppliedsource)); - WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); - - /* Extract required information from source specification */ - rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); - if (rc != RC_OK) return rc; - - /* Extract required information from destination specification */ - rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, - destinationspec, sourcespec, flags); - if (rc != RC_OK) return rc; - - /* Trace out the resulting information */ - WINE_TRACE("Resolved parameters:\n"); - WINE_TRACE("Source Stem : '%s'\n", wine_dbgstr_w(sourcestem)); - WINE_TRACE("Source Spec : '%s'\n", wine_dbgstr_w(sourcespec)); - WINE_TRACE("Dest Stem : '%s'\n", wine_dbgstr_w(destinationstem)); - WINE_TRACE("Dest Spec : '%s'\n", wine_dbgstr_w(destinationspec)); - - /* Pause if necessary */ - if (flags & OPT_PAUSE) { - DWORD count; - char pausestr[10]; - - XCOPY_wprintf(XCOPY_LoadMessage(STRING_PAUSE)); - ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), - &count, NULL); - } - - /* Now do the hard work... */ - rc = XCOPY_DoCopy(sourcestem, sourcespec, - destinationstem, destinationspec, - flags); - - /* Clear up exclude list allocated memory */ - while (excludeList) { - EXCLUDELIST *pos = excludeList; - excludeList = excludeList -> next; - HeapFree(GetProcessHeap(), 0, pos->name); - HeapFree(GetProcessHeap(), 0, pos); - } - - /* Finished - print trailer and exit */ - if (flags & OPT_SIMULATE) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); - } else if (!(flags & OPT_NOCOPY)) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); - } - if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; - return rc; - + *pflags = flags; + return RC_OK; } diff --git a/programs/xcopy/xcopy.h b/programs/xcopy/xcopy.h index 1c93395..3e9644e 100644 --- a/programs/xcopy/xcopy.h +++ b/programs/xcopy/xcopy.h @@ -26,6 +26,7 @@ #define RC_CTRLC 2 #define RC_INITERROR 4 #define RC_WRITEERROR 5 +#define RC_HELP 6 #define OPT_ASSUMEDIR 0x00000001 #define OPT_RECURSIVE 0x00000002

1 0

Martin Wilck : xcopy: Fix command line parsing logic.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: 766f6b0b4b153e8262591a52e123e63b0f7c2f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766f6b0b4b153e8262591a52e… Author: Martin Wilck <Martin.Wilck(a)particle-dynamics.de> Date: Wed Oct 27 01:49:06 2010 +0200 xcopy: Fix command line parsing logic. Experiments show xcopy under Windows does not use argc/argv logic for treating double quotes and backslashes. The xcopy logic is simplified because literal quotes are illegal in Windows file names, thus escaped double quotes (\") need not be treated. 'XCOPY "c:\dir a" "c:\dir b\"' works under Windows. --- programs/xcopy/xcopy.c | 142 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 103 insertions(+), 39 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index ed736db..9e931c0 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -49,9 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xcopy); /* Prototypes */ -static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, - WCHAR *suppliedsource, - WCHAR *supplieddestination, DWORD *flags); +static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *flags); static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *spec, DWORD flags); static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, @@ -130,12 +129,12 @@ int wmain (int argc, WCHAR *argvW[]) /* * Parse the command line */ - if ((rc = XCOPY_ParseCommandLine(argc, argvW, suppliedsource, - supplieddestination, &flags)) != RC_OK) { - if (rc == RC_HELP) - return RC_OK; - else - return rc; + if ((rc = XCOPY_ParseCommandLine(suppliedsource, supplieddestination, + &flags)) != RC_OK) { + if (rc == RC_HELP) + return RC_OK; + else + return rc; } /* Trace out the supplied information */ @@ -196,43 +195,102 @@ int wmain (int argc, WCHAR *argvW[]) /* ========================================================================= XCOPY_ParseCommandLine - Parses the command line ========================================================================= */ -static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, - WCHAR *suppliedsource, - WCHAR *supplieddestination, DWORD *pflags) +static BOOL is_whitespace(WCHAR c) +{ + return c == ' ' || c == '\t'; +} + +static WCHAR *skip_whitespace(WCHAR *p) +{ + for (; *p && is_whitespace(*p); p++); + return p; +} + +/* Windows XCOPY uses a simplified command line parsing algorithm + that lacks the escaped-quote logic of build_argv(), because + literal double quotes are illegal in any of its arguments. + Example: 'XCOPY "c:\DIR A" "c:DIR B\"' is OK. */ +static int find_end_of_word(const WCHAR *word, WCHAR **end) +{ + BOOL in_quotes = 0; + const WCHAR *ptr = word; + for (;;) { + for (; *ptr != '\0' && *ptr != '"' && + (in_quotes || !is_whitespace(*ptr)); ptr++); + if (*ptr == '"') { + in_quotes = !in_quotes; + ptr++; + } + /* Odd number of double quotes is illegal for XCOPY */ + if (in_quotes && *ptr == '\0') + return RC_INITERROR; + if (*ptr == '\0' || (!in_quotes && is_whitespace(*ptr))) + break; + } + *end = (WCHAR*)ptr; + return RC_OK; +} + +/* Remove all double quotes from a word */ +static void strip_quotes(WCHAR *word, WCHAR **end) +{ + WCHAR *rp, *wp; + for (rp = word, wp = word; *rp != '\0'; rp++) { + if (*rp == '"') + continue; + if (wp < rp) + *wp = *rp; + wp++; + } + *wp = '\0'; + *end = wp; +} + +static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *pflags) { const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; DWORD flags = *pflags; + WCHAR *cmdline, *word, *end, *next; + int rc = RC_INITERROR; - /* Confirm at least one parameter */ - if (argc < 2) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; - } + cmdline = _wcsdup(GetCommandLineW()); + if (cmdline == NULL) + return rc; /* Skip first arg, which is the program name */ - argvW++; + if ((rc = find_end_of_word(cmdline, &word)) != RC_OK) + goto out; + word = skip_whitespace(word); - while (argc > 1) + while (*word) { - argc--; - WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(*argvW)); + WCHAR first; + if ((rc = find_end_of_word(word, &end)) != RC_OK) + goto out; + + next = skip_whitespace(end); + first = word[0]; + *end = '\0'; + strip_quotes(word, &end); + WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(word)); /* First non-switch parameter is source, second is destination */ - if (*argvW[0] != '/') { + if (first != '/') { if (suppliedsource[0] == 0x00) { - lstrcpyW(suppliedsource, *argvW); + lstrcpyW(suppliedsource, word); } else if (supplieddestination[0] == 0x00) { - lstrcpyW(supplieddestination, *argvW); + lstrcpyW(supplieddestination, word); } else { XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; + goto out; } } else { /* Process all the switch options Note: Windows docs say /P prompts when dest is created but tests show it is done for each src file regardless of the destination */ - switch (toupper(argvW[0][1])) { + switch (toupper(word[1])) { case 'I': flags |= OPT_ASSUMEDIR; break; case 'S': flags |= OPT_RECURSIVE; break; case 'Q': flags |= OPT_QUIET; break; @@ -254,19 +312,19 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, /* E can be /E or /EXCLUDE */ case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - &argvW[0][1], 8, + &word[1], 8, EXCLUDE, -1) == 2) { - if (XCOPY_ProcessExcludeList(&argvW[0][9])) { + if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - return RC_INITERROR; + goto out; } else flags |= OPT_EXCLUDELIST; } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; break; /* D can be /D or /D: */ - case 'D': if ((argvW[0][2])==':' && isdigit(argvW[0][3])) { + case 'D': if (word[2]==':' && isdigit(word[3])) { SYSTEMTIME st; - WCHAR *pos = &argvW[0][3]; + WCHAR *pos = &word[3]; BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); @@ -285,6 +343,7 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, /* Parse the arg : Day */ if (!isError) { st.wYear = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; if (st.wYear < 100) st.wYear+=2000; } @@ -305,24 +364,25 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); } else { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - return RC_INITERROR; + goto out; } } else { flags |= OPT_DATENEWER; } break; - case '-': if (toupper(argvW[0][2])=='Y') + case '-': if (toupper(word[2])=='Y') flags &= ~OPT_NOPROMPT; break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); - return RC_HELP; + rc = RC_HELP; + goto out; default: - WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); - return RC_INITERROR; + WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); + goto out; } } - argvW++; + word = next; } /* Default the destination if not supplied */ @@ -330,7 +390,11 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, lstrcpyW(supplieddestination, wchr_dot); *pflags = flags; - return RC_OK; + rc = RC_OK; + + out: + free(cmdline); + return rc; }

1 0

Carl Raffaele : comdlg32: Removed 16 bit dependency.
by Alexandre Julliard 27 Oct '10

27 Oct '10

Module: wine Branch: master Commit: 2484b731510be165c12416c4ecea53d9febe169c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2484b731510be165c12416c4e… Author: Carl Raffaele <cjraffae(a)mtu.edu> Date: Mon Oct 25 20:54:35 2010 -0400 comdlg32: Removed 16 bit dependency. --- dlls/comdlg32/cdlg.h | 1 - dlls/comdlg32/fontdlg.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index b56c167..686baea 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -22,7 +22,6 @@ #define _WINE_DLL_CDLG_H #include "dlgs.h" -#include "wownt32.h" /* Common dialogs implementation globals */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 83400fc..321bfc6 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -754,7 +754,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) { j=SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,j,0); SendMessageW(hDlg,WM_COMMAND,cmb2, - MAKELONG(HWND_16(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE)); + MAKELONG(LOWORD(GetDlgItem(hDlg,cmb2)),CBN_SELCHANGE)); } } CFn_ReleaseDC(lpcf, hdc);

1 0