August 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : comctl32: Create the WinSxS manifest from a resource.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 2ebb30633eb521af178e69d00a95e4e43b80527a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebb30633eb521af178e69d00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 15:34:02 2011 +0200 comctl32: Create the WinSxS manifest from a resource. --- dlls/comctl32/comctl32.manifest | 34 ++++++++++++++ dlls/comctl32/comctl32.rc | 3 + dlls/comctl32/commctrl.c | 92 --------------------------------------- tools/wine.inf.in | 1 - 4 files changed, 37 insertions(+), 93 deletions(-) diff --git a/dlls/comctl32/comctl32.manifest b/dlls/comctl32/comctl32.manifest new file mode 100644 index 0000000..4c86137 --- /dev/null +++ b/dlls/comctl32/comctl32.manifest @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/> + <file name="comctl32.dll"> + <windowClass>Button</windowClass> + <windowClass>ButtonListBox</windowClass> + <windowClass>ComboBoxEx32</windowClass> + <windowClass>ComboLBox</windowClass> + <windowClass>Combobox</windowClass> + <windowClass>Edit</windowClass> + <windowClass>Listbox</windowClass> + <windowClass>NativeFontCtl</windowClass> + <windowClass>ReBarWindow32</windowClass> + <windowClass>ScrollBar</windowClass> + <windowClass>Static</windowClass> + <windowClass>SysAnimate32</windowClass> + <windowClass>SysDateTimePick32</windowClass> + <windowClass>SysHeader32</windowClass> + <windowClass>SysIPAddress32</windowClass> + <windowClass>SysLink</windowClass> + <windowClass>SysListView32</windowClass> + <windowClass>SysMonthCal32</windowClass> + <windowClass>SysPager</windowClass> + <windowClass>SysTabControl32</windowClass> + <windowClass>SysTreeView32</windowClass> + <windowClass>ToolbarWindow32</windowClass> + <windowClass>msctls_hotkey32</windowClass> + <windowClass>msctls_progress32</windowClass> + <windowClass>msctls_statusbar32</windowClass> + <windowClass>msctls_trackbar32</windowClass> + <windowClass>msctls_updown32</windowClass> + <windowClass>tooltips_class32</windowClass> + </file> +</assembly> diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc index a525111..7f3d178 100644 --- a/dlls/comctl32/comctl32.rc +++ b/dlls/comctl32/comctl32.rc @@ -55,6 +55,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: comctl32.manifest */ +WINE_MANIFEST RT_MANIFEST comctl32.manifest + /* @makedep: idt_check.bmp */ IDT_CHECK BITMAP idt_check.bmp diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 38cadad..76ab3a1 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -72,57 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); -#define NAME "microsoft.windows.common-controls" -#define FILE "comctl32.dll" -#define VERSION "6.0.2600.2982" -#define PUBLIC_KEY "6595b64144ccf1df" - -#ifdef __i386__ -#define ARCH "x86" -#elif defined __x86_64__ -#define ARCH "amd64" -#else -#define ARCH "none" -#endif - -static const char manifest[] = - "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" - "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" - " <assemblyIdentity type=\"win32\" name=\"" NAME "\" version=\"" VERSION "\" processorArchitecture=\"" ARCH "\" publicKeyToken=\"" PUBLIC_KEY "\"/>\n" - " <file name=\"" FILE "\">\n" - " <windowClass>Button</windowClass>\n" - " <windowClass>ButtonListBox</windowClass>\n" - " <windowClass>ComboBoxEx32</windowClass>\n" - " <windowClass>ComboLBox</windowClass>\n" - " <windowClass>Combobox</windowClass>\n" - " <windowClass>Edit</windowClass>\n" - " <windowClass>Listbox</windowClass>\n" - " <windowClass>NativeFontCtl</windowClass>\n" - " <windowClass>ReBarWindow32</windowClass>\n" - " <windowClass>ScrollBar</windowClass>\n" - " <windowClass>Static</windowClass>\n" - " <windowClass>SysAnimate32</windowClass>\n" - " <windowClass>SysDateTimePick32</windowClass>\n" - " <windowClass>SysHeader32</windowClass>\n" - " <windowClass>SysIPAddress32</windowClass>\n" - " <windowClass>SysLink</windowClass>\n" - " <windowClass>SysListView32</windowClass>\n" - " <windowClass>SysMonthCal32</windowClass>\n" - " <windowClass>SysPager</windowClass>\n" - " <windowClass>SysTabControl32</windowClass>\n" - " <windowClass>SysTreeView32</windowClass>\n" - " <windowClass>ToolbarWindow32</windowClass>\n" - " <windowClass>msctls_hotkey32</windowClass>\n" - " <windowClass>msctls_progress32</windowClass>\n" - " <windowClass>msctls_statusbar32</windowClass>\n" - " <windowClass>msctls_trackbar32</windowClass>\n" - " <windowClass>msctls_updown32</windowClass>\n" - " <windowClass>tooltips_class32</windowClass>\n" - " </file>\n" - "</assembly>\n"; - -static const char manifest_filename[] = ARCH "_" NAME "_" PUBLIC_KEY "_" VERSION "_none_deadbeef.manifest"; - static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LPWSTR COMCTL32_wSubclass = NULL; @@ -143,46 +92,6 @@ static const WCHAR strCC32SubclassInfo[] = { 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 }; -static BOOL create_manifest( BOOL install ) -{ - static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s',0}; - static const WCHAR manifestsW[] = {'\\','m','a','n','i','f','e','s','t','s','\\',0}; - - DWORD len, written; - WCHAR *buffer; - HANDLE file; - BOOL ret = FALSE; - - len = MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), NULL, 0 ); - len += GetWindowsDirectoryW( NULL, 0 ); - len += lstrlenW(winsxsW); - len += lstrlenW(manifestsW); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; - GetWindowsDirectoryW( buffer, len ); - lstrcatW( buffer, winsxsW ); - CreateDirectoryW( buffer, NULL ); - lstrcatW( buffer, manifestsW ); - CreateDirectoryW( buffer, NULL ); - MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), - buffer + lstrlenW(buffer), len ); - if (install) - { - file = CreateFileW( buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); - if (file != INVALID_HANDLE_VALUE) - { - ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && - written == sizeof(manifest)-1); - CloseHandle( file ); - if (!ret) DeleteFileW( buffer ); - else TRACE("created %s\n", debugstr_w(buffer)); - } - } - else ret = DeleteFileW( buffer ); - - HeapFree( GetProcessHeap(), 0, buffer ); - return ret; -} - /*********************************************************************** * DllMain [Internal] @@ -1018,7 +927,6 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); - if (!create_manifest( bInstall )) return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index af19c90..cd5e0e8 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2501,7 +2501,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shell32.dll,1 11,,quartz.dll,1 -11,,comctl32.dll,2 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1

1 0

Alexandre Julliard : setupapi: Add support for creating WinSxS manifest files from fake dll resources.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: e8a7246e8bbc0f890626ec5305500b7ed2a63876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a7246e8bbc0f890626ec530… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 15:33:41 2011 +0200 setupapi: Add support for creating WinSxS manifest files from fake dll resources. --- dlls/setupapi/fakedll.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 281 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8a7246e8bbc0f890626e…

1 0

Frédéric Delanoy : cmd/tests: Test handling of strings starting with on/off using the ECHO builtin.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 0decc777eb50d415ef64f212cb6cd5dd973d5414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0decc777eb50d415ef64f212c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:24 2011 +0200 cmd/tests: Test handling of strings starting with on/off using the ECHO builtin. --- programs/cmd/tests/test_builtins.cmd | 2 ++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6cd8a48..1c53cd2 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -15,6 +15,7 @@ echo: echo : echo:word echo :word +echo off now echo word(a)space@ echo word(a)space@@space@ echo word @@ -41,6 +42,7 @@ echo: echo : echo:word echo :word +echo on again echo word(a)space@ echo word(a)space@@space@ echo word diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e6bf421..c9c6521 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -42,6 +42,9 @@ word @pwd@>echo :word(a)space@ :word +(a)pwd@>echo off now(a)space@ +off now + @pwd@>echo word(a)space@@space@ word(a)space@ @@ -85,6 +88,7 @@ word : word :word +on again word(a)space@ word(a)space@@space@ word

1 0

Alexandre Julliard : msvcr80: Add a WinSxS manifest resource.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 05ddaaf0686a0fcc10c9874a8d3abc9f35459f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ddaaf0686a0fcc10c9874a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 25 17:20:03 2011 +0200 msvcr80: Add a WinSxS manifest resource. --- dlls/msvcr80/Makefile.in | 2 ++ dlls/msvcr80/msvcr80.manifest | 7 +++++++ dlls/msvcr80/msvcr80.rc | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 760f1bf..b353a1f 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -6,4 +6,6 @@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ msvcr80.c +RC_SRCS = msvcr80.rc + @MAKE_DLL_RULES@ diff --git a/dlls/msvcr80/msvcr80.manifest b/dlls/msvcr80/msvcr80.manifest new file mode 100644 index 0000000..5f3daed --- /dev/null +++ b/dlls/msvcr80/msvcr80.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC80.CRT" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="msvcr80.dll"/> + <file name="msvcp80.dll"/> + <file name="msvcm80.dll"/> +</assembly> diff --git a/dlls/msvcr80/msvcr80.rc b/dlls/msvcr80/msvcr80.rc new file mode 100644 index 0000000..458c5df --- /dev/null +++ b/dlls/msvcr80/msvcr80.rc @@ -0,0 +1,22 @@ +/* + * Resource file for msvcr80 + * + * Copyright 2011 Alexandre Julliard + * + * 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 + */ + +/* @makedep: msvcr80.manifest */ +WINE_MANIFEST 24 msvcr80.manifest

1 0

Frédéric Delanoy : cmd: Misc tab fixes.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 09655aca95d1942aee4005afda472c31d7709c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09655aca95d1942aee4005afd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:23 2011 +0200 cmd: Misc tab fixes. --- programs/cmd/builtins.c | 7 ++++--- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5e405d5..7b8f76d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2098,7 +2098,8 @@ void WCMD_setshow_default (const WCHAR *command) { NORM_IGNORECASE | SORT_STRINGSORT, command, 2, parmD, -1) == CSTR_EQUAL) { command += 2; - while (*command && *command==' ') command++; + while (*command && (*command==' ' || *command=='\t')) + command++; } GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); @@ -2309,7 +2310,7 @@ void WCMD_setshow_env (WCHAR *s) { DWORD count; s += 2; - while (*s && *s==' ') s++; + while (*s && (*s==' ' || *s=='\t')) s++; if (*s=='\"') WCMD_opt_s_strip_quotes(s); @@ -2406,7 +2407,7 @@ void WCMD_setshow_prompt (void) { } else { s = param1; - while ((*s == '=') || (*s == ' ')) s++; + while ((*s == '=') || (*s == ' ') || (*s == '\t')) s++; if (strlenW(s) == 0) { SetEnvironmentVariableW(promptW, NULL); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cc083d2..6cd8a48 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -325,6 +325,11 @@ cd cd ..\.. cd rd /Q/s foobar +mkdir foobar +cd /d(a)tab@foobar +cd +cd .. +rd /q/s foobar echo ------------ Testing type ------------ echo bar> foobaz @@ -465,6 +470,7 @@ rd /s/Q foobar echo ...for /L rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here for /L %%i in (1,2,0) do echo %%i +for(a)tab@/L %%i in (1,2,0) do echo %%i for /L %%i in (1,2,6) do echo %%i for /l %%i in (1 ,2,6) do echo %%i for /L %%i in (a,2,3) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 535ef44..e6bf421 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -247,6 +247,7 @@ Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ @pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@ +(a)pwd@\foobar ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Frédéric Delanoy : cmd: Fix FOR tab handling.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 7b125126a7a1bb58caa4e1091c5d87f5388d0c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b125126a7a1bb58caa4e1091… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:18 2011 +0200 cmd: Fix FOR tab handling. --- programs/cmd/builtins.c | 20 +++++---------- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 57 ++++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7aaa900..7cc6520 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -902,10 +902,8 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WIN32_FIND_DATAW fd; HANDLE hff; int i; - const WCHAR inW[] = {'i', 'n', ' ', '\0'}; - const WCHAR inTabW[] = {'i', 'n', '\t', '\0'}; - const WCHAR doW[] = {'d', 'o', ' ', '\0'}; - const WCHAR doTabW[] = {'d', 'o', '\t', '\0'}; + const WCHAR inW[] = {'i','n'}; + const WCHAR doW[] = {'d','o'}; CMD_LIST *setStart, *thisSet, *cmdStart, *cmdEnd; WCHAR variable[4]; WCHAR *firstCmd; @@ -981,10 +979,8 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Ensure line continues with IN */ if (!*curPos - || (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, inW, -1) != CSTR_EQUAL - && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, inTabW, -1) != CSTR_EQUAL)) { + || !WCMD_keyword_ws_found(inW, sizeof(inW)/sizeof(inW[0]), curPos)) { + WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1008,12 +1004,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Syntax error if missing close bracket, or nothing following it and once we have the complete set, we expect a DO */ - WINE_TRACE("Looking for 'do' in %p\n", *cmdList); + WINE_TRACE("Looking for 'do ' in %p\n", *cmdList); if ((*cmdList == NULL) - || (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 3, doW, -1) != CSTR_EQUAL - && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 3, doTabW, -1) != CSTR_EQUAL)) { + || !WCMD_keyword_ws_found(doW, sizeof(doW)/sizeof(doW[0]), (*cmdList)->command)) { + WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 19ba913..885add4 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -97,6 +97,7 @@ int WCMD_volume (int mode, const WCHAR *command); WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); +BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, const WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 67b6ef4..0edc005 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -455,6 +455,18 @@ WCHAR *WCMD_skip_leading_spaces (WCHAR *string) { return ptr; } +/*************************************************************************** + * WCMD_keyword_ws_found + * + * Checks if the string located at ptr matches a keyword (of length len) + * followed by a whitespace character (space or tab) + */ +BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr) { + return (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + ptr, len, keyword, len) == CSTR_EQUAL) + && ((*(ptr + len) == ' ') || (*(ptr + len) == '\t')); +} + /************************************************************************* * WCMD_opt_s_strip_quotes * @@ -1742,8 +1754,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ const WCHAR remCmd[] = {'r','e','m',' ','\0'}; - const WCHAR forCmd[] = {'f','o','r',' ' ,'\0'}; - const WCHAR forTabCmd[] = {'f','o','r','\t','\0'}; + const WCHAR forCmd[] = {'f','o','r'}; const WCHAR ifCmd[] = {'i','f',' ','\0'}; const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; BOOL inRem = FALSE; @@ -1827,19 +1838,14 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Certain commands need special handling */ if (curStringLen == 0 && curCopyTo == curString) { - const WCHAR forDO[] = {'d','o',' ' ,'\0'}; - const WCHAR forDOTab[] = {'d','o','\t','\0'}; + const WCHAR forDO[] = {'d','o'}; /* If command starts with 'rem', ignore any &&, ( etc */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, curPos, 4, remCmd, -1) == CSTR_EQUAL) { inRem = TRUE; - /* If command starts with 'for', handle ('s mid line after IN or DO */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, forCmd, -1) == CSTR_EQUAL - || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, forTabCmd, -1) == CSTR_EQUAL) { + } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { inFor = TRUE; /* If command starts with 'if' or 'else', handle ('s mid line. We should ensure this @@ -1866,37 +1872,32 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE whitespace, followed by DO, ie closeBracket inserts a NULL entry, curLen is then 0, and all whitespace is skipped */ } else if (inFor && - (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forDO, -1) == CSTR_EQUAL - || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forDOTab, -1) == CSTR_EQUAL)) { - WINE_TRACE("Found DO\n"); + WCMD_keyword_ws_found(forDO, sizeof(forDO)/sizeof(forDO[0]), curPos)) { + const int keyw_len = sizeof(forDO)/sizeof(forDO[0]) + 1; + WINE_TRACE("Found 'DO '\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; - memcpy(&curCopyTo[*curLen], curPos, 3*sizeof(WCHAR)); - (*curLen)+=3; - curPos+=3; + memcpy(&curCopyTo[*curLen], curPos, keyw_len*sizeof(WCHAR)); + (*curLen)+=keyw_len; + curPos+=keyw_len; continue; } } else if (curCopyTo == curString) { /* Special handling for the 'FOR' command */ if (inFor && lastWasWhiteSpace) { - const WCHAR forIN[] = {'i','n',' ' ,'\0'}; - const WCHAR forINTab[] = {'i','n','\t','\0'}; + const WCHAR forIN[] = {'i','n'}; - WINE_TRACE("Found 'FOR', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); + WINE_TRACE("Found 'FOR ', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); - if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forIN, -1) == CSTR_EQUAL - || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forINTab, -1) == CSTR_EQUAL) { - WINE_TRACE("Found IN\n"); + if (WCMD_keyword_ws_found(forIN, sizeof(forIN)/sizeof(forIN[0]), curPos)) { + const int keyw_len = sizeof(forIN)/sizeof(forIN[0]) + 1; + WINE_TRACE("Found 'IN '\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE; - memcpy(&curCopyTo[*curLen], curPos, 3*sizeof(WCHAR)); - (*curLen)+=3; - curPos+=3; + memcpy(&curCopyTo[*curLen], curPos, keyw_len*sizeof(WCHAR)); + (*curLen)+=keyw_len; + curPos+=keyw_len; continue; } }

1 0

Nikolay Sivov : msxml3: Fix parameter validation for startElement() for MXXMLWriter60.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 25bf8e5387873d8a002d01c454c3af4f14589036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf8e5387873d8a002d01c45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 15:31:02 2011 +0400 msxml3: Fix parameter validation for startElement() for MXXMLWriter60. --- dlls/msxml3/mxwriter.c | 3 +- dlls/msxml3/tests/saxreader.c | 177 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 164 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 60ac35f..0ac5974 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -737,7 +737,8 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); - if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; + if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) + return E_INVALIDARG; xmlOutputBufferWriteString(This->buffer, "<"); s = xmlchar_from_wchar(QName); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e136e33..ca70a0d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -32,6 +32,9 @@ #include "wine/test.h" +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -1377,6 +1380,163 @@ static void test_mxwriter_startenddocument(void) free_bstrs(); } +struct writer_startelement_t { + const GUID *clsid; + const char *uri; + const char *local_name; + const char *qname; + const char *output; + HRESULT hr; +}; + +static const struct writer_startelement_t writer_startelement[] = { + /* 0 */ + { &CLSID_MXXMLWriter, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, NULL, NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, NULL, NULL, NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, "uri", NULL, NULL, NULL, E_INVALIDARG }, + /* 5 */ + { &CLSID_MXXMLWriter30, "uri", NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, "uri", NULL, NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, "uri", NULL, NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, NULL, "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, NULL, "local", NULL, NULL, E_INVALIDARG }, + /* 10 */ + { &CLSID_MXXMLWriter40, NULL, "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, NULL, "local", NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, NULL, NULL, "qname", NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, NULL, NULL, "qname", NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, NULL, NULL, "qname", NULL, E_INVALIDARG }, + /* 15 */ + { &CLSID_MXXMLWriter60, NULL, NULL, "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter, "uri", "local", "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter30, "uri", "local", "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter40, "uri", "local", "qname", "<qname>", S_OK }, + { &CLSID_MXXMLWriter60, "uri", "local", "qname", "<qname>", S_OK }, + /* 20 */ + { &CLSID_MXXMLWriter, "uri", "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter30, "uri", "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter40, "uri", "local", NULL, NULL, E_INVALIDARG }, + { &CLSID_MXXMLWriter60, "uri", "local", NULL, "<>", S_OK }, + { &CLSID_MXXMLWriter, "uri", "local", "uri:local", "<uri:local>", S_OK }, + /* 25 */ + { &CLSID_MXXMLWriter30, "uri", "local", "uri:local", "<uri:local>", S_OK }, + { &CLSID_MXXMLWriter40, "uri", "local", "uri:local", "<uri:local>", S_OK }, + { &CLSID_MXXMLWriter60, "uri", "local", "uri:local", "<uri:local>", S_OK }, + { &CLSID_MXXMLWriter, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + { &CLSID_MXXMLWriter30, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + /* 30 */ + { &CLSID_MXXMLWriter40, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + { &CLSID_MXXMLWriter60, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, + { NULL } +}; + +struct msxmlsupported_data_t +{ + const GUID *clsid; + const char *name; + BOOL supported; +}; + +static struct msxmlsupported_data_t msxmlsupported_data[] = +{ + { &CLSID_MXXMLWriter, "MXXMLWriter" }, + { &CLSID_MXXMLWriter30, "MXXMLWriter30" }, + { &CLSID_MXXMLWriter40, "MXXMLWriter40" }, + { &CLSID_MXXMLWriter60, "MXXMLWriter60" }, + { NULL } +}; + +static void get_supported_mxwriter_data(struct msxmlsupported_data_t *table) +{ + while (table->clsid) + { + IMXWriter *writer; + HRESULT hr; + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + if (hr == S_OK) IMXWriter_Release(writer); + + table->supported = hr == S_OK; + if (hr != S_OK) win_skip("class %s not supported\n", table->name); + + table++; + } +} + +static BOOL is_mxwriter_supported(const GUID *clsid, const struct msxmlsupported_data_t *table) +{ + while (table->clsid) + { + if (table->clsid == clsid) return table->supported; + table++; + } + return FALSE; +} + +static void test_mxwriter_startelement(const struct writer_startelement_t *table) +{ + int i; + + get_supported_mxwriter_data(msxmlsupported_data); + + i = 0; + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_mxwriter_supported(table->clsid, msxmlsupported_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), + _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), NULL); + ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + table++; + i++; + } + + free_bstrs(); +} + static void test_mxwriter_startendelement(void) { static const char winehqA[] = "http://winehq.org"; @@ -1385,6 +1545,8 @@ static void test_mxwriter_startendelement(void) VARIANT dest; HRESULT hr; + test_mxwriter_startelement(writer_startelement); + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1398,21 +1560,6 @@ static void test_mxwriter_startendelement(void) hr = ISAXContentHandler_startDocument(content); ok(hr == S_OK, "got %08x\n", hr); - /* qualified name without defined namespace */ - hr = ISAXContentHandler_startElement(content, NULL, 0, NULL, 0, _bstr_("a:b"), 3, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - - hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, _bstr_("a:b"), 3, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - - /* only local name is an error too */ - hr = ISAXContentHandler_startElement(content, NULL, 0, _bstr_("b"), 1, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - - /* only local name is an error too */ - hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); - /* all string pointers should be not null */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_("b"), 1, _bstr_(""), 0, NULL); ok(hr == S_OK, "got %08x\n", hr);

1 0

Bernhard Loos : msi: Use an array instead of a hashtable for WHEREVIEW.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 3bd0acf1ba233ff7deb370c7f198a71e29b15799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd0acf1ba233ff7deb370c7f… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Aug 24 16:42:53 2011 +0200 msi: Use an array instead of a hashtable for WHEREVIEW. --- dlls/msi/where.c | 150 ++++++++++++++++++++++++------------------------------ 1 files changed, 67 insertions(+), 83 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index ae31e81..c29c883 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -36,14 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); -#define MSI_HASH_TABLE_SIZE 37 - -typedef struct tagMSIHASHENTRY +typedef struct tagMSIROWENTRY { - struct tagMSIHASHENTRY *next; UINT value; - UINT row; -} MSIHASHENTRY; +} MSIROWENTRY; /* below is the query interface to a table */ @@ -53,73 +49,84 @@ typedef struct tagMSIWHEREVIEW MSIDATABASE *db; MSIVIEW *table; UINT row_count; - MSIHASHENTRY **reorder; + MSIROWENTRY **reorder; + UINT reorder_size; /* number of entries available in reorder */ struct expr *cond; UINT rec_index; } MSIWHEREVIEW; -static void free_hash_table(MSIHASHENTRY **table) -{ - MSIHASHENTRY *new, *old; - int i; - - if (!table) - return; +#define INITIAL_REORDER_SIZE 16 - for (i = 0; i < MSI_HASH_TABLE_SIZE; i++) - { - new = table[i]; +static UINT init_reorder(MSIWHEREVIEW *wv) +{ + MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); + if (!new) + return ERROR_OUTOFMEMORY; - while (new) - { - old = new; - new = old->next; - msi_free(old); - } + if (wv->reorder) + msi_free(wv->reorder); - table[i] = NULL; - } + wv->reorder = new; + wv->reorder_size = INITIAL_REORDER_SIZE; + wv->row_count = 0; - msi_free(table); + return ERROR_SUCCESS; } -static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) +static void free_reorder(MSIWHEREVIEW *wv) { - MSIHASHENTRY *entry; + UINT i; - if (!table) - return ERROR_SUCCESS; + if (!wv->reorder) + return; + + for (i = 0; i < wv->row_count; i++) + msi_free(wv->reorder[i]); + + msi_free( wv->reorder ); + wv->reorder = NULL; + wv->reorder_size = 0; + wv->row_count = 0; +} - if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) +static inline UINT find_row(MSIWHEREVIEW *wv, UINT row, UINT *value) +{ + if (row >= wv->row_count) { - WARN("Row not found in hash table!\n"); - return ERROR_FUNCTION_FAILED; + *value = -2; + return ERROR_NO_MORE_ITEMS; } - while (entry && entry->row != row) - entry = entry->next; + *value = wv->reorder[row]->value; - if (entry) *val = entry->value; return ERROR_SUCCESS; } -static UINT add_entry_to_hash(MSIHASHENTRY **table, UINT row, UINT val) +static UINT add_row(MSIWHEREVIEW *wv, UINT val) { - MSIHASHENTRY *new = msi_alloc(sizeof(MSIHASHENTRY)); - MSIHASHENTRY *prev; + MSIROWENTRY *new; + + if (wv->reorder_size <= wv->row_count) + { + MSIROWENTRY **new_reorder; + UINT newsize = wv->reorder_size * 2; + + new_reorder = msi_realloc_zero(wv->reorder, sizeof(MSIROWENTRY *) * newsize); + if (!new_reorder) + return ERROR_OUTOFMEMORY; + + wv->reorder = new_reorder; + wv->reorder_size = newsize; + } + + new = msi_alloc(sizeof(MSIROWENTRY)); if (!new) return ERROR_OUTOFMEMORY; - new->next = NULL; - new->value = val; - new->row = row; + wv->reorder[wv->row_count++] = new; - prev = table[row % MSI_HASH_TABLE_SIZE]; - if (prev) - new->next = prev; - - table[row % MSI_HASH_TABLE_SIZE] = new; + new->value = val; return ERROR_SUCCESS; } @@ -134,10 +141,7 @@ static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * if( !wv->table ) return ERROR_FUNCTION_FAILED; - if( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -154,10 +158,7 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt if( !wv->table ) return ERROR_FUNCTION_FAILED; - if( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -174,10 +175,7 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) if (!wv->table) return ERROR_FUNCTION_FAILED; - if (row > wv->row_count) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -194,10 +192,7 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if( !wv->table ) return ERROR_FUNCTION_FAILED; - if( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash(wv->reorder, row, &row); + r = find_row(wv, row, &row); if (r != ERROR_SUCCESS) return r; @@ -214,10 +209,7 @@ static UINT WHERE_delete_row(struct tagMSIVIEW *view, UINT row) if ( !wv->table ) return ERROR_FUNCTION_FAILED; - if ( row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - r = find_entry_in_hash( wv->reorder, row, &row ); + r = find_row( wv, row, &row ); if ( r != ERROR_SUCCESS ) return r; @@ -396,12 +388,9 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( r != ERROR_SUCCESS ) return r; - free_hash_table(wv->reorder); - wv->reorder = msi_alloc_zero(MSI_HASH_TABLE_SIZE * sizeof(MSIHASHENTRY *)); - if( !wv->reorder ) - return ERROR_OUTOFMEMORY; - - wv->row_count = 0; + r = init_reorder(wv); + if( r != ERROR_SUCCESS ) + return r; if (0) /* disable optimization, there's no guarantee that strings are in the string table */ { @@ -439,7 +428,7 @@ if (0) /* disable optimization, there's no guarantee that strings are in the str { r = table->ops->find_matching_rows(table, col, value, &row, &handle); if (r == ERROR_SUCCESS) - add_entry_to_hash(wv->reorder, wv->row_count++, row); + add_row(wv, row); } while (r == ERROR_SUCCESS); if (r == ERROR_NO_MORE_ITEMS) @@ -459,7 +448,7 @@ if (0) /* disable optimization, there's no guarantee that strings are in the str if( r != ERROR_SUCCESS ) return r; if( val ) - add_entry_to_hash( wv->reorder, wv->row_count++, i ); + add_row( wv, i ); } return ERROR_SUCCESS; @@ -517,7 +506,7 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, TRACE("%p %d %p\n", wv, eModifyMode, rec); - find_entry_in_hash(wv->reorder, row - 1, &row); + find_row(wv, row - 1, &row); row++; return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); @@ -533,9 +522,7 @@ static UINT WHERE_delete( struct tagMSIVIEW *view ) wv->table->ops->delete( wv->table ); wv->table = 0; - free_hash_table(wv->reorder); - wv->reorder = NULL; - wv->row_count = 0; + free_reorder(wv); msiobj_release( &wv->db->hdr ); msi_free( wv ); @@ -558,10 +545,7 @@ static UINT WHERE_find_matching_rows( struct tagMSIVIEW *view, UINT col, if (r != ERROR_SUCCESS) return r; - if( *row > wv->row_count ) - return ERROR_NO_MORE_ITEMS; - - return find_entry_in_hash(wv->reorder, *row, row); + return find_row(wv, *row, row); } static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns)

1 0

Frédéric Delanoy : cmd/tests: Add REM tests.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: d147df418c0414a422bf00eeb2c7cc2be14bdb50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147df418c0414a422bf00eeb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:20 2011 +0200 cmd/tests: Add REM tests. --- programs/cmd/tests/test_builtins.cmd | 14 ++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 11 +++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0d2f983..7c3353f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -52,6 +52,20 @@ echo @tab(a)word echo @tab(a)word echo(a)tab@@tab(a)word +echo ------------ Testing rem -------------- +rem Hello +rem Hello +rem Hello || foo +rem echo lol +rem echo foo & echo bar +(a)echo on +rem Hello +rem Hello +rem Hello || foo +rem echo lol +rem echo foo & echo bar +(a)echo off + echo ------------ Testing redirection operators -------------- mkdir foobar & cd foobar echo ...stdout redirection diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4846cf3..7435c72 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -95,6 +95,17 @@ word @tab(a)word @space@@tab(a)word @tab(a)word +------------ Testing rem -------------- + +(a)pwd@>rem Hello(a)space@ + +(a)pwd@>rem Hello(a)space@ + +(a)pwd@>rem Hello || foo(a)space@ + +(a)pwd@>rem echo lol(a)space@ + +(a)pwd@>rem echo foo & echo bar(a)space@ ------------ Testing redirection operators -------------- ...stdout redirection foo

1 0

Frédéric Delanoy : cmd: Fix REM tab handling.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 6d3fd3abcdcd67142c43e0f4a3357b1c32a15563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3fd3abcdcd67142c43e0f4a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:21 2011 +0200 cmd: Fix REM tab handling. --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ programs/cmd/wcmdmain.c | 7 +++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c3353f..cd46dbd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -58,12 +58,18 @@ rem Hello rem Hello || foo rem echo lol rem echo foo & echo bar +rem @tab@ Hello +rem(a)tab@ Hello +rem(a)tab@echo foo & echo bar @echo on rem Hello rem Hello rem Hello || foo rem echo lol rem echo foo & echo bar +rem @tab@ Hello +rem(a)tab@ Hello +rem(a)tab@echo foo & echo bar @echo off echo ------------ Testing redirection operators -------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7435c72..dafb6a3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -106,6 +106,12 @@ word @pwd@>rem echo lol(a)space@ @pwd@>rem echo foo & echo bar(a)space@ + +(a)pwd@>rem @tab@ Hello(a)space@ + +(a)pwd@>rem(a)tab@ Hello(a)space@ + +(a)pwd@>rem(a)tab@echo foo & echo bar(a)space@ ------------ Testing redirection operators -------------- ...stdout redirection foo diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47af612..3efabfa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1753,7 +1753,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE CMD_LIST *lastEntry = NULL; CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ - const WCHAR remCmd[] = {'r','e','m',' ','\0'}; + const WCHAR remCmd[] = {'r','e','m'}; const WCHAR forCmd[] = {'f','o','r'}; const WCHAR ifCmd[] = {'i','f',' ','\0'}; const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; @@ -1840,9 +1840,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (curStringLen == 0 && curCopyTo == curString) { const WCHAR forDO[] = {'d','o'}; - /* If command starts with 'rem', ignore any &&, ( etc */ - if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, remCmd, -1) == CSTR_EQUAL) { + /* If command starts with 'rem ', ignore any &&, ( etc. */ + if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos)) { inRem = TRUE; } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) {

1 0