wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Alistair Leslie-Hughes : oledb32: Support more default properties.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 7f1473ac59ef434a42c13e87373f5bf24456a496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1473ac59ef434a42c13e873… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 16:26:32 2013 +1000 oledb32: Support more default properties. --- dlls/oledb32/datainit.c | 30 +++++++++++++++++++++++++++--- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/database.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 62e2e50..b6ba0e1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -296,12 +296,36 @@ struct dbproperty { VARTYPE type; }; +static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; -static const WCHAR persistsiW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR extemdedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; +static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; +static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; +static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; +static const WCHAR modeW[] = {'M','o','d','e',0}; +static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; +static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; +static const WCHAR persiststW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; +static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; +static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; static const struct dbproperty dbproperties[] = { - { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { persistsiW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL } + { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { extemdedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { persiststW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, + { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, }; static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index 07a4892..bb1f0b3 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oledb32.dll -IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d744c86..518bba7 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "msdadc.h" #include "msdasc.h" +#include "shlobj.h" #include "wine/test.h" @@ -36,6 +37,8 @@ static void test_GetDataSource(WCHAR *initstring) IDBInitialize *dbinit = NULL; HRESULT hr; + trace("Data Source: %s\n", wine_dbgstr_w(initstring)); + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); ok(hr == S_OK, "got %08x\n", hr); @@ -44,11 +47,43 @@ static void test_GetDataSource(WCHAR *initstring) if(SUCCEEDED(hr)) { IDBProperties *props = NULL; + IMalloc *ppM = NULL; + + hr = SHGetMalloc(&ppM); + if (FAILED(hr)) + { + ok(0, "Couldn't get IMalloc object.\n"); + goto end; + } hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) + { + ULONG cnt; + DBPROPINFOSET *pInfoset; + OLECHAR *ary; + + hr = IDBProperties_GetPropertyInfo(props, 0, NULL, &cnt, &pInfoset, &ary); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ULONG i; + for(i =0; i < pInfoset->cPropertyInfos; i++) + { + trace("(0x%04x) '%s' %d\n", pInfoset->rgPropertyInfos[i].dwPropertyID, wine_dbgstr_w(pInfoset->rgPropertyInfos[i].pwszDescription), + pInfoset->rgPropertyInfos[i].vtType); + } + + IMalloc_Free(ppM, ary); + } + IDBProperties_Release(props); + } + + IMalloc_Release(ppM); + +end: IDBInitialize_Release(dbinit); }

1 0

Alistair Leslie-Hughes : dbs.idl: Add missing DBPROPNUM* enums.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 06db5a986d3d37e58a9553c98eb50528f0b1ffe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06db5a986d3d37e58a9553c98… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 4 09:48:39 2013 +1000 dbs.idl: Add missing DBPROPNUM* enums. --- include/dbs.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index 46d55ad..a517bf2 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -347,6 +347,112 @@ enum DBPROPENUM DBPROP_NOTIFYROWSETCHANGED = 0x000000d3, }; +enum DBPROPENUM15 { + DBPROP_FILTERCOMPAREOPS = 0x000000d1, + DBPROP_FINDCOMPAREOPS = 0x000000d2, + DBPROP_IChapteredRowset = 0x000000ca, + DBPROP_IDBAsynchStatus = 0x000000cb, + DBPROP_IRowsetFind = 0x000000cc, + DBPROP_IRowsetView = 0x000000d4, + DBPROP_IViewChapter = 0x000000d5, + DBPROP_IViewFilter = 0x000000d6, + DBPROP_IViewRowset = 0x000000d7, + DBPROP_IViewSort = 0x000000d8, + DBPROP_INIT_ASYNCH = 0x000000c8, + DBPROP_MAXOPENCHAPTERS = 0x000000c7, + DBPROP_MAXORSINFILTER = 0x000000cd, + DBPROP_MAXSORTCOLUMNS = 0x000000ce, + DBPROP_ROWSET_ASYNCH = 0x000000c9, + DBPROP_SORTONINDEX = 0x000000cf +}; + +enum DBPROPENUM20 { + DBPROP_IMultipleResults = 0x000000d9, + DBPROP_DATASOURCE_TYPE = 0x000000fb, + MDPROP_AXES = 0x000000fc, + MDPROP_FLATTENING_SUPPORT = 0x000000fd, + MDPROP_MDX_JOINCUBES = 0x000000fe, + MDPROP_NAMED_LEVELS = 0x000000ff, + MDPROP_RANGEROWSET = 0x00000100, + MDPROP_MDX_SLICER = 0x000000da, + MDPROP_MDX_CUBEQUALIFICATION = 0x000000db, + MDPROP_MDX_OUTERREFERENCE = 0x000000dc, + MDPROP_MDX_QUERYBYPROPERTY = 0x000000dd, + MDPROP_MDX_CASESUPPORT = 0x000000de, + MDPROP_MDX_STRING_COMPOP = 0x000000e0, + MDPROP_MDX_DESCFLAGS = 0x000000e1, + MDPROP_MDX_SET_FUNCTIONS = 0x000000e2, + MDPROP_MDX_MEMBER_FUNCTIONS = 0x000000e3, + MDPROP_MDX_NUMERIC_FUNCTIONS = 0x000000e4, + MDPROP_MDX_FORMULAS = 0x000000e5, + MDPROP_AGGREGATECELL_UPDATE = 0x000000e6, + MDPROP_MDX_AGGREGATECELL_UPDATE = MDPROP_AGGREGATECELL_UPDATE, + MDPROP_MDX_OBJQUALIFICATION = 0x00000105, + MDPROP_MDX_NONMEASURE_EXPRESSIONS = 0x00000106, + DBPROP_ACCESSORDER = 0x000000e7, + DBPROP_BOOKMARKINFO = 0x000000e8, + DBPROP_INIT_CATALOG = 0x000000e9, + DBPROP_ROW_BULKOPS = 0x000000ea, + DBPROP_PROVIDERFRIENDLYNAME = 0x000000eb, + DBPROP_LOCKMODE = 0x000000ec, + DBPROP_MULTIPLECONNECTIONS = 0x000000ed, + DBPROP_UNIQUEROWS = 0x000000ee, + DBPROP_SERVERDATAONINSERT = 0x000000ef, + DBPROP_STORAGEFLAGS = 0x000000f0, + DBPROP_CONNECTIONSTATUS = 0x000000f4, + DBPROP_ALTERCOLUMN = 0x000000f5, + DBPROP_COLUMNLCID = 0x000000f6, + DBPROP_RESETDATASOURCE = 0x000000f7, + DBPROP_INIT_OLEDBSERVICES = 0x000000f8, + DBPROP_IRowsetRefresh = 0x000000f9, + DBPROP_SERVERNAME = 0x000000fa, + DBPROP_IParentRowset = 0x00000101, + DBPROP_HIDDENCOLUMNS = 0x00000102, + DBPROP_PROVIDERMEMORY = 0x00000103, + DBPROP_CLIENTCURSOR = 0x00000104 +}; + + +enum DBPROPENUM21 { + DBPROP_TRUSTEE_USERNAME = 0x000000f1, + DBPROP_TRUSTEE_AUTHENTICATION = 0x000000f2, + DBPROP_TRUSTEE_NEWAUTHENTICATION = 0x000000f3, + DBPROP_IRow = 0x00000107, + DBPROP_IRowChange = 0x00000108, + DBPROP_IRowSchemaChange = 0x00000109, + DBPROP_IGetRow = 0x0000010a, + DBPROP_IScopedOperations = 0x0000010b, + DBPROP_IBindResource = 0x0000010c, + DBPROP_ICreateRow = 0x0000010d, + DBPROP_INIT_BINDFLAGS = 0x0000010e, + DBPROP_INIT_LOCKOWNER = 0x0000010f, + DBPROP_GENERATEURL = 0x00000111, + DBPROP_IDBBinderProperties = 0x00000112, + DBPROP_IColumnsInfo2 = 0x00000113, + DBPROP_IRegisterProvider = 0x00000114, + DBPROP_IGetSession = 0x00000115, + DBPROP_IGetSourceRow = 0x00000116, + DBPROP_IRowsetCurrentIndex = 0x00000117, + DBPROP_OPENROWSETSUPPORT = 0x00000118, + DBPROP_COL_ISLONG = 0x00000119 +}; + +enum DBPROPENUM25 { + DBPROP_COL_SEED = 0x0000011a, + DBPROP_COL_INCREMENT = 0x0000011b, + DBPROP_INIT_GENERALTIMEOUT = 0x0000011c, + DBPROP_COMSERVICES = 0x0000011d +}; + +enum DBPROPENUM26 { + DBPROP_OUTPUTSTREAM = 0x0000011e, + DBPROP_OUTPUTENCODING = 0x0000011f, + DBPROP_TABLESTATISTICS = 0x00000120, + DBPROP_SKIPROWCOUNTRESULTS = 0x00000123, + DBPROP_IRowsetBookmark = 0x00000124, + MDPROP_VISUALMODE = 0x00000125, +}; + cpp_quote("#ifdef DBINITCONSTANTS") cpp_quote("#ifdef __cplusplus") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\")

1 0

Jason Edmeades : cmd: Avoid infinite loop running batch program.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: dd0b719a3a1419f34774fc4cd921f3378d8c237b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0b719a3a1419f34774fc4cd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Jun 4 21:27:48 2013 +0100 cmd: Avoid infinite loop running batch program. --- programs/cmd/tests/test_cmdline.cmd | 8 +++++++- programs/cmd/tests/test_cmdline.cmd.exp | 1 + programs/cmd/wcmdmain.c | 21 +++++---------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index e563341..32a1ef2 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -95,6 +95,7 @@ echo @echo 1 > "say one.bat" echo @echo 2 > "saytwo.bat" echo @echo 3 > "say (3).bat" echo @echo 4 > "say .bat" +echo @echo 5 > "bazbaz(5).bat" echo ------ Testing invocation of batch files ---------- call say one @@ -144,6 +145,11 @@ if errorlevel 2 echo error %ErrorLevel% call :setError 0 cmd /c say" "(3) prints 4?! if errorlevel 2 echo error %ErrorLevel% +call :setError 0 +rem Deliberately invoking a fully qualified batch name containing a bracket +rem should fail, as a bracket is a command delimiter. +cmd /c "bazbaz(5).bat" +if errorlevel 1 echo Passed echo ---------- Testing CMD /C quoting ----------------- cmd /c @echo "hi" @@ -261,7 +267,7 @@ call tell(1234) call tell(12(34) call tell(12;34) echo --------- Finished -------------- -del tell.bat say*.* +del tell.bat say*.* bazbaz*.bat exit :setError exit /B %1 diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 38e17a5..980f674 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -70,6 +70,7 @@ var=33@space@ 0@space@ 3@space@ 4@space@ +Passed ---------- Testing CMD /C quoting ----------------- "hi" 1@space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0d4575b..a211efa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1048,7 +1048,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; - BOOL assumeInternal = FALSE; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; @@ -1168,20 +1167,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } } - /* Internal programs won't be picked up by this search, so even - though not found, try one last createprocess and wait for it - to complete. - Note: Ideally we could tell between a console app (wait) and a - windows app, but the API's for it fail in this case */ - if (!found && pathposn == NULL) { - WINE_TRACE("ASSUMING INTERNAL\n"); - assumeInternal = TRUE; - } else { - WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir)); - } - /* Once found, launch it */ - if (found || assumeInternal) { + if (found) { STARTUPINFOW st; PROCESS_INFORMATION pe; SHFILEINFOW psfi; @@ -1191,6 +1178,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR batExt[] = {'.','b','a','t','\0'}; static const WCHAR cmdExt[] = {'.','c','m','d','\0'}; + WINE_TRACE("Found as %s\n", wine_dbgstr_w(thisDir)); + /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { BOOL oldinteractive = interactive; @@ -1214,7 +1203,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Launch the process and if a CUI wait on it to complete Note: Launching internal wine processes cannot specify a full path to exe */ - status = CreateProcessW(assumeInternal?NULL : thisDir, + status = CreateProcessW(thisDir, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); heap_free(st.lpReserved2); if ((opt_c || opt_k) && !opt_s && !status @@ -1231,7 +1220,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Always wait when non-interactive (cmd /c or in batch program), or for console applications */ - if (assumeInternal || !interactive || (console && !HIWORD(console))) + if (!interactive || (console && !HIWORD(console))) WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0;

1 0

Jason Edmeades : cmd: Fix 'for' expansion of wildcards when no args are supplied.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: a5b1172e90de94234b2799d26ccc36a752bdd7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b1172e90de94234b2799d26… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Jun 4 00:29:51 2013 +0100 cmd: Fix 'for' expansion of wildcards when no args are supplied. --- programs/cmd/builtins.c | 8 ++++++-- programs/cmd/tests/test_builtins.cmd | 17 ++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c2ccdc8..aa1e7d4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2237,6 +2237,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (!useNumbers && !doFileset) { WCHAR fullitem[MAX_PATH]; + int prefixlen = 0; /* Now build the item to use / search for in the specified directory, as it is fully qualified in the /R case */ @@ -2245,11 +2246,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcatW(fullitem, slashW); strcatW(fullitem, item); } else { + WCHAR *prefix = strrchrW(item, '\\'); + if (prefix) prefixlen = (prefix - item) + 1; strcpyW(fullitem, item); } if (strpbrkW (fullitem, wildcards)) { - hff = FindFirstFileW(fullitem, &fd); if (hff != INVALID_HANDLE_VALUE) { do { @@ -2270,7 +2272,9 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcatW(fullitem, slashW); strcatW(fullitem, fd.cFileName); } else { - strcpyW(fullitem, fd.cFileName); + if (prefixlen) lstrcpynW(fullitem, item, prefixlen + 1); + fullitem[prefixlen] = 0x00; + strcatW(fullitem, fd.cFileName); } doExecuted = TRUE; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 48a8362..78f7cdc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1017,7 +1017,22 @@ for /R %%i in (baz* fred* jim) do call temp.bat %%i call :ValidateExpected echo for /R passed -cd .. & rd /s/Q foobar +echo --- Complex wildcards unix and windows slash +cd .. +echo Windows slashs, valid path +for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f +for %%f in (foobar\baz\*) do echo WC : %%f +echo Windows slashs, invalid path +for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f +for %%f in (foobar\jim\*) do echo WC : %%f +echo Unix slashs, valid path +for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f +for %%f in (foobar/baz/*) do echo WC : %%f +echo Unix slashs, invalid path +for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f +for %%f in (foobar/jim/*) do echo WC : %%f +echo Done +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 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 77e4178..7380185 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -691,6 +691,18 @@ Mixed enumeration from provided root With duplicates enumeration Strip missing wildcards, keep unwildcarded names for /R passed +--- Complex wildcards unix and windows slash +Windows slashs, valid path +ASIS: foobar\baz\bazbaz +WC : foobar\baz\bazbaz +Windows slashs, invalid path +ASIS: foobar\jim\bazbaz +Unix slashs, valid path +ASIS: foobar/baz/bazbaz +WC : bazbaz +Unix slashs, invalid path +ASIS: foobar/jim/bazbaz +Done --- for /L 1 3

1 0

Jason Edmeades : cmd: set "var=value" ignores trailing characters.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 56a33a8c558f6b37bf219e289e48cb514cf697fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a33a8c558f6b37bf219e289… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Jun 3 22:38:15 2013 +0100 cmd: set "var=value" ignores trailing characters. --- programs/cmd/builtins.c | 19 +++++++++++++++---- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 9 ++++++--- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3c06e13..c2ccdc8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4038,8 +4038,13 @@ void WCMD_setshow_env (WCHAR *s) { s += 2; while (*s && (*s==' ' || *s=='\t')) s++; - if (*s=='\"') - WCMD_strip_quotes(s); + /* set /P "var=value"jim ignores anything after the last quote */ + if (*s=='\"') { + WCHAR *lastquote; + lastquote = WCMD_strip_quotes(s); + if (lastquote) *lastquote = 0x00; + WINE_TRACE("set: Stripped command line '%s'\n", wine_dbgstr_w(s)); + } /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { @@ -4104,8 +4109,14 @@ void WCMD_setshow_env (WCHAR *s) { } else { DWORD gle; - if (*s=='\"') - WCMD_strip_quotes(s); + /* set "var=value"jim ignores anything after the last quote */ + if (*s=='\"') { + WCHAR *lastquote; + lastquote = WCMD_strip_quotes(s); + if (lastquote) *lastquote = 0x00; + WINE_TRACE("set: Stripped command line '%s'\n", wine_dbgstr_w(s)); + } + p = strchrW (s, '='); if (p == NULL) { env = GetEnvironmentStringsW(); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 45617cf..48a8362 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -286,6 +286,24 @@ set WINE_FOO=foo@space@ echo '%WINE_FOO%' set WINE_FOO=foo@tab@ echo '%WINE_FOO%' +rem Space symbol must appear in `var` +set WINE_FOO=value@space@ +echo '%WINE_FOO%' +rem Space symbol must NOT appear in `var` +set "WINE_FOO=value"@space@ +echo '%WINE_FOO%' +rem Mixed examples: +set WINE_FOO=jim fred +echo '%WINE_FOO%' +set WINE_FOO="jim" fred +echo '%WINE_FOO%' +set "WINE_FOO=jim fred" +echo '%WINE_FOO%' +set "WINE_FOO=jim" fred +echo '%WINE_FOO%' +rem Only the final quote ends the string +set "WINE_FOO=apple"banana"grape"orange +echo '%WINE_FOO%' set WINE_FOO= echo ------------ Testing variable expansion ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 99ed738..77e4178 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -251,6 +251,13 @@ foo '' 'foo@space@' 'foo@tab@' +'value@space@' +'value' +'jim fred' +'"jim" fred' +'jim fred' +'jim' +'apple"banana"grape' ------------ Testing variable expansion ------------ ~dp0 should be directory containing batch file @pwd@\ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 418f8c9..e5a0138 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -115,7 +115,7 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); -void WCMD_strip_quotes(WCHAR *cmd); +WCHAR *WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 876bbef..0d4575b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -496,20 +496,23 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr) { /************************************************************************* * WCMD_strip_quotes * - * Remove first and last quote WCHARacters, preserving all other text + * Remove first and last quote WCHARacters, preserving all other text + * Returns the location of the final quote */ -void WCMD_strip_quotes(WCHAR *cmd) { - WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; +WCHAR *WCMD_strip_quotes(WCHAR *cmd) { + WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL, *lastquote; while((*dest=*src) != '\0') { if (*src=='\"') lastq=dest; dest++, src++; } + lastquote = lastq; if (lastq) { dest=lastq++; while ((*dest++=*lastq++) != 0) ; } + return lastquote; }

1 0

Austin English : api-ms-win-core-localregistry-l1-1-0: Add stub dll.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 1648340d09847903ad6e7e7abcd870c46bd329c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1648340d09847903ad6e7e7ab… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 4 13:20:00 2013 -0700 api-ms-win-core-localregistry-l1-1-0: Add stub dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-core-localregistry-l1-1-0.spec | 40 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 46 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d72d2df..df05f1f 100755 --- a/configure +++ b/configure @@ -15750,6 +15750,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 0a8c316..57d76d9 100644 --- a/configure.ac +++ b/configure.ac @@ -2574,6 +2574,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in b/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in new file mode 100644 index 0000000..57d3e80 --- /dev/null +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-localregistry-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec new file mode 100644 index 0000000..fcf4f00 --- /dev/null +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec @@ -0,0 +1,40 @@ +@ stdcall RegCloseKey(long) advapi32.RegCloseKey +@ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExA +@ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW +@ stdcall RegDeleteKeyExA(long str long long) advapi32.RegDeleteKeyExA +@ stdcall RegDeleteKeyExW(long wstr long long) advapi32.RegDeleteKeyExW +@ stdcall RegDeleteTreeA(long str) advapi32.RegDeleteTreeA +@ stdcall RegDeleteTreeW(long wstr) advapi32.RegDeleteTreeW +@ stdcall RegDeleteValueA(long str) advapi32.RegDeleteValueA +@ stdcall RegDeleteValueW(long wstr) advapi32.RegDeleteValueW +@ stub RegDisablePredefinedCacheEx +@ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExA +@ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW +@ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueA +@ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW +@ stdcall RegFlushKey(long) advapi32.RegFlushKey +@ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity +@ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA +@ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW +@ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA +@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) advapi32.RegLoadMUIStringW +@ stdcall RegNotifyChangeKeyValue(long long long long long) advapi32.RegNotifyChangeKeyValue +@ stdcall RegOpenCurrentUser(long ptr) advapi32.RegOpenCurrentUser +@ stdcall RegOpenKeyExA(long str long long ptr) advapi32.RegOpenKeyExA +@ stdcall RegOpenKeyExW(long wstr long long ptr) advapi32.RegOpenKeyExW +@ stdcall RegOpenUserClassesRoot(ptr long long ptr) advapi32.RegOpenUserClassesRoot +@ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyA +@ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW +@ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) advapi32.RegQueryValueExA +@ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW +@ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA +@ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW +@ stub RegSaveKeyExA +@ stub RegSaveKeyExW +@ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity +@ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA +@ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW +@ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA +@ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW diff --git a/tools/make_specfiles b/tools/make_specfiles index 44e0fa0..002d252 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -120,6 +120,7 @@ my @dll_groups = ], [ "advapi32", + "api-ms-win-core-localregistry-l1-1-0", "api-ms-win-downlevel-advapi32-l1-1-0", "api-ms-win-downlevel-advapi32-l2-1-0", "api-ms-win-security-base-l1-1-0",

1 0

Jason Edmeades : cmd: Fix tilda parameter expansion when arg is empty.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 2b9649d9db1f4b769f6a80407ae2ea6dc364aaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9649d9db1f4b769f6a80407… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jun 2 21:29:58 2013 +0100 cmd: Fix tilda parameter expansion when arg is empty. --- programs/cmd/batch.c | 12 +++++++----- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 09081f4..294a153 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -514,11 +514,13 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) - return; - - exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, - &fileInfo); + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + exists = FALSE; + fullfilename[0] = 0x00; + } else { + exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, + &fileInfo); + } /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ if (memchrW(firstModifier, 'a', modifierLen) != NULL) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f3aa1a9..45617cf 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -363,6 +363,7 @@ for %%i in ("d e" f) do echo %%~dpi for %%i in ("g h" i) do echo %%~sdi for %%i in ("g h" i) do echo %%~dsi for %%i in ("j k" l.eh) do echo '%%~xsi' +for %%i in ("") do echo '%%~i,%%~fi,%%~di,%%~pi,%%~ni,%%~xi,%%~si,%%~ai,%%~ti,%%~zi' echo --- in parameters for %%i in ("A B" C) do call :echoFun %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dd6ccb5..99ed738 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -319,6 +319,7 @@ N @drive@ '' '.eh' +',,,,,,,,,' --- in parameters "A B" C

1 0

Jason Edmeades : cmd: Fix handling of redundant information on goto/labels.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: dc4dd0cb97c55698bccf204db10e7b31901888a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4dd0cb97c55698bccf204db… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jun 2 00:17:30 2013 +0100 cmd: Fix handling of redundant information on goto/labels. --- programs/cmd/builtins.c | 34 +++++++++++++----- programs/cmd/tests/test_builtins.cmd | 55 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++ programs/cmd/wcmdmain.c | 22 ++++++----- 4 files changed, 97 insertions(+), 20 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1d9fc15..3c06e13 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2501,7 +2501,8 @@ void WCMD_give_help (const WCHAR *args) void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; - WCHAR current[MAX_PATH]; + WCHAR *labelend = NULL; + const WCHAR labelEndsW[] = {'>','<','|','&',' ',':','\t','\0'}; /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; @@ -2521,25 +2522,38 @@ void WCMD_goto (CMD_LIST **cmdList) { return; } - /* Support goto :label as well as goto label */ + /* Support goto :label as well as goto label plus remove trailing chars */ if (*paramStart == ':') paramStart++; + labelend = strpbrkW(paramStart, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("goto label: '%s'\n", wine_dbgstr_w(paramStart)); SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (*paramStart && + WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; - while (isspaceW (*str)) str++; + + /* Ignore leading whitespace or no-echo character */ + while (*str=='@' || isspaceW (*str)) str++; + + /* If the first real character is a : then this is a label */ if (*str == ':') { - DWORD index = 0; str++; - while (((current[index] = str[index])) && (!isspaceW (current[index]))) - index++; - /* ignore space at the end */ - current[index] = 0; - if (lstrcmpiW (current, paramStart) == 0) return; + /* Skip spaces between : and label */ + while (isspaceW (*str)) str++; + WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); + + /* Label ends at whitespace or redirection characters */ + labelend = strpbrkW(str, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + + if (lstrcmpiW (str, paramStart) == 0) return; } } WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); + context -> skip_rest = TRUE; } return; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 54070bc..f3aa1a9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2538,17 +2538,72 @@ echo %ErrorLevel% should still be 7 echo ------------ Testing GOTO ------------ if a==a goto dest1 +echo FAILURE at dest 1 :dest1 echo goto with no leading space worked +if a==a goto :dest1b +echo FAILURE at dest 1b +:dest1b +echo goto with colon and no leading space worked if b==b goto dest2 +echo FAILURE at dest 2 :dest2 echo goto with a leading space worked if c==c goto dest3 +echo FAILURE at dest 3 :dest3 echo goto with a leading tab worked if d==d goto dest4 +echo FAILURE at dest 4 :dest4@space@ echo goto with a following space worked +if e==e goto dest5 +echo FAILURE at dest 5 +:dest5&& echo FAILURE +echo goto with following amphersands worked + +del failure.txt >nul 2>&1 +if f==f goto dest6 +echo FAILURE at dest 6 +:dest6>FAILURE.TXT +if exist FAILURE.TXT echo FAILURE at dest 6 as file exists +echo goto with redirections worked +del FAILURE.TXT >nul 2>&1 + +:: some text that is ignored | dir >cmd_output | another test +if exist cmd_output echo FAILURE at dest 6 as file exists +echo Ignoring double colons worked +del cmd_output >nul 2>&1 + +rem goto a label which does not exist issues an error message and +rem acts the same as goto :EOF, and ensure ::label is never matched +del testgoto.bat >nul 2>&1 +echo goto :dest7 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 7 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest7>> testgoto.bat +echo echo FAILURE at dest 7 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +del testgoto.bat >nul 2>&1 +echo goto ::dest8 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 8 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest8>> testgoto.bat +echo echo FAILURE at dest 8 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +if g==g goto dest9 +echo FAILURE at dest 9 +:dest91 +echo FAILURE at dest 91 +@ : dest9>rubbish +echo label with mixed whitespace and no echo worked + +if h==h goto :dest10:this is ignored +echo FAILURE at dest 10 +:dest10:this is also ignored +echo Correctly ignored trailing information echo ------------ Testing PATH ------------ set WINE_backup_path=%path% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ebfe8cd..dd6ccb5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1294,9 +1294,15 @@ errorlevel zero, good@or_broken@errorlevel nonzero, bad 7 should still be 7 ------------ Testing GOTO ------------ goto with no leading space worked +goto with colon and no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +goto with following amphersands worked +goto with redirections worked +Ignoring double colons worked +label with mixed whitespace and no echo worked +Correctly ignored trailing information ------------ Testing PATH ------------ PATH=original PATH=try2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 95f2995..876bbef 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1813,7 +1813,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; - BOOL inRem = FALSE; + BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; BOOL inIf = FALSE; @@ -1910,9 +1910,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (curStringLen == 0 && curCopyTo == curString) { static const WCHAR forDO[] = {'d','o'}; - /* If command starts with 'rem ', ignore any &&, ( etc. */ - if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos)) { - inRem = TRUE; + /* If command starts with 'rem ' or identifies a label, ignore any &&, ( etc. */ + if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos) || + *curPos == ':') { + inOneLine = TRUE; } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { inFor = TRUE; @@ -1971,11 +1972,12 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } } - /* Nothing 'ends' a REM statement and &&, quotes etc are ineffective, - so just use the default processing ie skip character specific - matching below */ - if (!inRem) thisChar = *curPos; - else thisChar = 'X'; /* Character with no special processing */ + /* Nothing 'ends' a one line statement (e.g. REM or :labels mean + the &&, quotes and redirection etc are ineffective, so just force + the use of the default processing by skipping character specific + matching below) */ + if (!inOneLine) thisChar = *curPos; + else thisChar = 'X'; /* Character with no special processing */ lastWasWhiteSpace = FALSE; /* Will be reset below */ lastWasCaret = FALSE; @@ -2225,7 +2227,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WCHAR *extraData; WINE_TRACE("Need to read more data as outstanding brackets or carets\n"); - inRem = FALSE; + inOneLine = FALSE; prevDelim = CMD_NONE; inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0

Piotr Caban : msvcrt: Don't detect overflow in atoi implementation.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f3eb64ec7344e97067a4defa366896489cd1be20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eb64ec7344e97067a4defa3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 15:52:10 2013 +0200 msvcrt: Don't detect overflow in atoi implementation. --- dlls/msvcr100/msvcr100.c | 5 +++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 20 ++++++++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/string.c | 22 +++++++++++++++++++++- dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 11 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 149f132..d425455 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -484,6 +484,11 @@ size_t CDECL _aligned_msize(void *p, size_t alignment, size_t offset) return _msize(*alloc_ptr)-alignment-sizeof(void*); } +int CDECL MSVCR100_atoi(const char *str) +{ + return _atoi_l(str, NULL); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 370feb2..63a0caa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1629,7 +1629,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) MSVCR100_atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 99834dd..7550eb9 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -75,6 +75,7 @@ static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); static void* (__cdecl *p__aligned_offset_malloc)(size_t, size_t, size_t); static void (__cdecl *p__aligned_free)(void*); static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); +static int (__cdecl *p_atoi)(const char*); /* make sure we use the correct errno */ #undef errno @@ -104,6 +105,7 @@ static BOOL init(void) SET(p__aligned_offset_malloc, "_aligned_offset_malloc"); SET(p__aligned_free, "_aligned_free"); SET(p__aligned_msize, "_aligned_msize"); + SET(p_atoi, "atoi"); return TRUE; } @@ -358,6 +360,23 @@ static void test__aligned_msize(void) p__aligned_free(mem); } +static void test_atoi(void) +{ + int r; + + r = p_atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = p_atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = p_atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = p_atoi("4294967296"); + ok(r == 2147483647, "atoi(4294967296) = %d\n", r); +} + START_TEST(msvcr100) { if (!init()) @@ -367,4 +386,5 @@ START_TEST(msvcr100) test_wmemmove_s(); test_fread_s(); test__aligned_msize(); + test_atoi(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c38763a..e82f100 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1991,7 +1991,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2ed25c2..1a33fbb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -688,7 +688,7 @@ @ cdecl atan2(double double) msvcrt.atan2 @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl calloc(long long) msvcrt.calloc diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 0f985c7..afdab05 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -684,7 +684,7 @@ @ cdecl atan2(double double) msvcrt.atan2 @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl calloc(long long) msvcrt.calloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 47bf34f..521a69d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1310,7 +1310,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d76ab73..fd71ef4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1283,7 +1283,7 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcrt.atanf @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi ##don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9ad4cef..f2d1e20 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -893,7 +893,27 @@ int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) */ int __cdecl MSVCRT_atoi(const char *str) { - return MSVCRT__atoi_l(str, NULL); + BOOL minus = FALSE; + int ret = 0; + + if(!str) + return 0; + + while(isspace(*str)) str++; + + if(*str == '+') { + str++; + }else if(*str == '-') { + minus = TRUE; + str++; + } + + while(*str>='0' && *str<='9') { + ret = ret*10+*str-'0'; + str++; + } + + return minus ? -ret : ret; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 31314fd..6115377 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2521,6 +2521,23 @@ static void test__wcstoi64(void) return; } +static void test_atoi(void) +{ + int r; + + r = atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = atoi("4294967296"); + ok(r == 0, "atoi(4294967296) = %d\n", r); +} + START_TEST(string) { char mem[100]; @@ -2620,4 +2637,5 @@ START_TEST(string) test__atodbl(); test__stricmp(); test__wcstoi64(); + test_atoi(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d4755f4..e88ffa3 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -182,6 +182,7 @@ int __cdecl abs(int); int __cdecl atexit(void (*)(void)); double __cdecl atof(const char*); int __cdecl atoi(const char*); +int __cdecl _atoi_l(const char*,_locale_t); __msvcrt_long __cdecl atol(const char*); void* __cdecl calloc(size_t,size_t); #ifndef __i386__

1 0

Andrew Eikum : oleaut32: Only copy previous function name if both are property accessors.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 0210cb93856df5432101a8df71da1f9060ed3860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0210cb93856df5432101a8df7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 4 08:18:58 2013 -0500 oleaut32: Only copy previous function name if both are property accessors. --- dlls/oleaut32/typelib.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 725bf2f..bb3be43 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2240,6 +2240,13 @@ static void MSFT_ResolveReferencedTypes(TLBContext *pcx, ITypeInfoImpl *pTI, TYP } } +static int TLB_is_propgetput(INVOKEKIND invkind) +{ + return (invkind == INVOKE_PROPERTYGET || + invkind == INVOKE_PROPERTYPUT || + invkind == INVOKE_PROPERTYPUTREF); +} + static void MSFT_DoFuncs(TLBContext* pcx, ITypeInfoImpl* pTI, @@ -2294,13 +2301,6 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - /* nameoffset is sometimes -1 on the second half of a propget/propput - * pair of functions */ - if ((nameoffset == -1) && (i > 0)) - ptfd->Name = ptfd_prev->Name; - else - ptfd->Name = MSFT_ReadName(pcx, nameoffset); - /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(pFuncRec->Info), pcx, recoffset); @@ -2351,6 +2351,15 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.oVft = pFuncRec->VtableOffset & ~1; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0) && + TLB_is_propgetput(ptfd_prev->funcdesc.invkind) && + TLB_is_propgetput(ptfd->funcdesc.invkind)) + ptfd->Name = ptfd_prev->Name; + else + ptfd->Name = MSFT_ReadName(pcx, nameoffset); + MSFT_GetTdesc(pcx, pFuncRec->DataType, &ptfd->funcdesc.elemdescFunc.tdesc,

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013