October 2012 - Wine-commits

Daniel Jelinski : comctl32: Fix notifications and return value when collapsing already collapsed node.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 0b6cf6e46a02085ae97f943f9c2ce2db9a0a0caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6cf6e46a02085ae97f943f9… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Oct 12 22:50:23 2012 +0200 comctl32: Fix notifications and return value when collapsing already collapsed node. --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 1021648..c60ed4d 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1395,7 +1395,7 @@ static void test_expandnotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hRoot); - todo_wine expect(FALSE, ret); + expect(FALSE, ret); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "no collapse notifications", FALSE); g_get_from_expand = TRUE; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3f6b457..3b2f747 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3234,6 +3234,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, RECT scrollRect; LONG scrollDist = 0; TREEVIEW_ITEM *nextItem = NULL, *tmpItem; + BOOL wasExpanded; TRACE("TVE_COLLAPSE %p %s\n", item, TREEVIEW_ItemName(item)); @@ -3246,9 +3247,10 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, if (item->firstChild == NULL) return FALSE; + wasExpanded = (item->state & TVIS_EXPANDED) != 0; item->state &= ~TVIS_EXPANDED; - if (bUser) + if (wasExpanded && bUser) TREEVIEW_SendExpanded(infoPtr, item, action); bSetSelection = (infoPtr->selectedItem != NULL @@ -3329,7 +3331,7 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, bSetFirstVisible ? item : infoPtr->firstVisible, TRUE); - return TRUE; + return wasExpanded; } static BOOL

1 0

Daniel Jelinski : comctl32/tests: Expanding/ collapsing a node always sends associated messages.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 50bdb257f9dd8184c86cbf9e196254ba1f5d3772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bdb257f9dd8184c86cbf9e1… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Oct 12 23:30:05 2012 +0200 comctl32/tests: Expanding/collapsing a node always sends associated messages. --- dlls/comctl32/tests/treeview.c | 45 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c60ed4d..2fe468b 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -212,6 +212,13 @@ static const struct message parent_expand_kb_seq[] = { { 0 } }; +static const struct message parent_collapse_2nd_kb_seq[] = { + { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static const struct message parent_expand_empty_kb_seq[] = { { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, @@ -1082,8 +1089,6 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, ok(pTreeView->itemNew.mask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); - ok((pTreeView->itemNew.state & TVIS_EXPANDED) == 0, - "got wrong state %x\n", pTreeView->itemNew.state); ok(pTreeView->itemOld.mask == 0, "got wrong mask %x\n", pTreeView->itemOld.mask); @@ -1473,6 +1478,42 @@ static void test_expandnotify(void) ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); expect(TRUE, ret); + g_get_from_expand = TRUE; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "expand node", FALSE); + ok(g_item_expanding.state == TVIS_SELECTED, "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED), "got state on TVN_ITEMEXPANDED 0x%08x\n", + g_item_expanded.state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "expand node again", FALSE); + ok(g_item_expanding.state == (TVIS_SELECTED|TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDED 0x%08x\n", + g_item_expanded.state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_SUBTRACT, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "collapse node", FALSE); + ok(g_item_expanding.state == (TVIS_SELECTED|TVIS_EXPANDED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + ok(g_item_expanded.state == (TVIS_SELECTED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDED 0x%08x\n", + g_item_expanded.state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_SUBTRACT, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_collapse_2nd_kb_seq, "collapse node again", FALSE); + ok(g_item_expanding.state == (TVIS_SELECTED|TVIS_EXPANDEDONCE), "got state on TVN_ITEMEXPANDING 0x%08x\n", + g_item_expanding.state); + g_get_from_expand = FALSE; + flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); expect(FALSE, ret);

1 0

Jason Edmeades : cmd: cmd /c "pgmname" searches all extensions on PATHEXT.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 25cf0aa04665e4916c07f134b39c85c0bd4fa80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cf0aa04665e4916c07f134b… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 21:50:22 2012 +0100 cmd: cmd /c "pgmname" searches all extensions on PATHEXT. --- programs/cmd/tests/test_cmdline.cmd.exp | 8 ++-- programs/cmd/wcmdmain.c | 81 ++++++++++++++++++++----------- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 7e9ac32..61deff6 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -60,7 +60,7 @@ var=33(a)space@ @todo_wine(a)4@space@ ------ Testing invocation with CMD /C ------------- 0(a)space@ -(a)todo_wine@1(a)space@ +1(a)space@ @todo_wine(a)0@space@ 0(a)space@ @todo_wine(a)1@space@ @@ -74,7 +74,7 @@ var=33(a)space@ "hi" @todo_wine(a)1@space@ "\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\" -(a)todo_wine@1(a)space@ +1(a)space@ 0(a)space@ 1(a)space@ 0(a)space@ @@ -85,10 +85,10 @@ var=33(a)space@ 2(a)space@ 2(a)space@ 0(a)space@ -(a)todo_wine@5(a)space@ +5(a)space@ ------- Testing CMD /C qualifier treatment ------------ 0(a)space@ -(a)todo_wine@1(a)space@ +1(a)space@ THIS FAILS: cmd "/c"say one THIS FAILS: cmd ignoreme/c say one --------- Testing special characters -------------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7cd6bda..2aa116c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -47,6 +47,11 @@ BOOL echo_mode = TRUE; WCHAR anykey[100], version_string[100]; const WCHAR newlineW[] = {'\r','\n','\0'}; const WCHAR spaceW[] = {' ','\0'}; +static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; +static const WCHAR dfltPathExt[] = {'.','b','a','t',';', + '.','c','o','m',';', + '.','c','m','d',';', + '.','e','x','e','\0'}; static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE; @@ -1009,7 +1014,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL assumeInternal = FALSE; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; - static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; /* Quick way to get the filename @@ -1055,10 +1059,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Now extract PATHEXT */ len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { - static const WCHAR dfltPathExt[] = {'.','b','a','t',';', - '.','c','o','m',';', - '.','c','m','d',';', - '.','e','x','e','\0'}; strcpyW (pathext, dfltPathExt); } @@ -2445,10 +2445,15 @@ int wmain (int argc, WCHAR *argvW[]) is a valid executable, ie must exist, otherwise drop back to old mode */ if (!opt_s) { WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE); - static const WCHAR extEXEW[] = {'.','e','x','e','\0'}; - static const WCHAR extCOMW[] = {'.','c','o','m','\0'}; + WCHAR pathext[MAXSTRING]; BOOL found = FALSE; + /* Now extract PATHEXT */ + len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); + if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { + strcpyW (pathext, dfltPathExt); + } + /* If the supplied parameter has any directory information, look there */ WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); if (strchrW(thisArg, '\\') != NULL) { @@ -2461,18 +2466,28 @@ int wmain (int argc, WCHAR *argvW[]) if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); found = TRUE; - } else strcpyW(p, extEXEW); - - /* Does file exist with .exe appended */ - if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { - WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; - } else strcpyW(p, extCOMW); + } else { + WCHAR *thisExt = pathext; + + /* No - try with each of the PATHEXT extensions */ + while (!found && thisExt) { + WCHAR *nextExt = strchrW(thisExt, ';'); + + if (nextExt) { + memcpy(p, thisExt, (nextExt-thisExt) * sizeof(WCHAR)); + p[(nextExt-thisExt)] = 0x00; + thisExt = nextExt+1; + } else { + strcpyW(p, thisExt); + thisExt = NULL; + } - /* Does file exist with .com appended */ - if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { - WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; + /* Does file exist with this extension appended? */ + if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + } } /* Otherwise we now need to look in the path to see if we can find it */ @@ -2483,18 +2498,28 @@ int wmain (int argc, WCHAR *argvW[]) if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); found = TRUE; - } + } else { + WCHAR *thisExt = pathext; - /* Does file exist plus an extension of .exe? */ - if (SearchPathW(NULL, thisArg, extEXEW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { - WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; - } + /* No - try with each of the PATHEXT extensions */ + while (!found && thisExt) { + WCHAR *nextExt = strchrW(thisExt, ';'); - /* Does file exist plus an extension of .com? */ - if (SearchPathW(NULL, thisArg, extCOMW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { - WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; + if (nextExt) { + *nextExt = 0; + nextExt = nextExt+1; + } else { + nextExt = NULL; + } + + /* Does file exist with this extension? */ + if (SearchPathW(NULL, thisArg, thisExt, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s' with extension '%s'\n", wine_dbgstr_w(string), + wine_dbgstr_w(thisExt)); + found = TRUE; + } + thisExt = nextExt; + } } }

1 0

Jason Edmeades : cmd: Identify the program name using more appropriate parsing.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 4236c2007df8267b4bbfdc00f5f26e86f71ddc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4236c2007df8267b4bbfdc00f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 22:11:03 2012 +0100 cmd: Identify the program name using more appropriate parsing. --- programs/cmd/tests/test_cmdline.cmd.exp | 32 +++++++++++++++--------------- programs/cmd/wcmdmain.c | 23 +++++++++------------ 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 61deff6..4ea4ce0 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -48,37 +48,37 @@ var=33(a)space@ ------ Testing invocation of batch files ---------- 0(a)space@ 1(a)space@ -(a)todo_wine@1(a)space@ 1(a)space@ -(a)todo_wine@1(a)space@ +1(a)space@ +1(a)space@ 0(a)space@ -(a)todo_wine@1(a)space@ -(a)todo_wine@2(a)space@ +1(a)space@ +2(a)space@ 0(a)space@ 3(a)space@ -(a)todo_wine@3(a)space@ +3(a)space@ @todo_wine(a)4@space@ ------ Testing invocation with CMD /C ------------- 0(a)space@ 1(a)space@ -(a)todo_wine@0(a)space@ 0(a)space@ -(a)todo_wine@1(a)space@ 0(a)space@ -(a)todo_wine@1(a)space@ -(a)todo_wine@2(a)space@ +1(a)space@ +0(a)space@ +1(a)space@ +2(a)space@ 0(a)space@ -(a)todo_wine@3(a)space@ +3(a)space@ @todo_wine(a)4@space@ ---------- Testing CMD /C quoting ----------------- "hi" -(a)todo_wine@1(a)space@ +1(a)space@ "\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\" 1(a)space@ 0(a)space@ 1(a)space@ 0(a)space@ -(a)todo_wine@0(a)space@ +0(a)space@ 0(a)space@@or_broken(a)3@space@ 3(a)space@ 2(a)space@ @@ -100,7 +100,7 @@ THIS FAILS: cmd ignoreme/c say one {@space@ }@space@ 0(a)space@ -(a)todo_wine@0(a)space@ +0(a)space@ !@space@ @todo_wine(a)0@space@@or_broken@!@space@ @todo_wine(a)0@space@ @@ -117,8 +117,8 @@ THIS FAILS: cmd ignoreme/c say one @todo_wine(a)1:((1)),2:@space@ @todo_wine(a)1:(1)(2),2:@space@ @todo_wine(a)1:(1),2:(2)@space@ -(a)todo_wine@1:1,2:2(a)space@ -(a)todo_wine@1:1,2:2(a)space@ -(a)todo_wine@1:1,2:2(a)space@ +1:1,2:2(a)space@ +1:1,2:2(a)space@ +1:1,2:2(a)space@ 1:"p(a)space@"1,2:p"@space@"2(a)space@ 1:p"1(a)space@p",2:2(a)space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2aa116c..eb0897a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1008,6 +1008,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) MAX_PATH, including null character */ WCHAR *lastSlash; WCHAR pathext[MAXSTRING]; + WCHAR *firstParam; BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; @@ -1016,17 +1017,13 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR envPath[] = {'P','A','T','H','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; - /* Quick way to get the filename - * (but handle leading / as part of program name, not qualifier) - */ - for (len = 0; command[len] == '/'; len++) param1[len] = '/'; - WCMD_parse (command + len, quals, param1 + len, param2); - - if (!(*param1) && !(*param2)) - return; + /* Quick way to get the filename is to extract the first argument. */ + WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); + firstParam = WCMD_parameter(command, 0, NULL, NULL, FALSE); + if (!firstParam) return; /* Calculate the search path and stem to search for */ - if (strpbrkW (param1, delims) == NULL) { /* No explicit path given, search path */ + if (strpbrkW (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'}; strcpyW(pathtosearch, curDir); len = GetEnvironmentVariableW(envPath, &pathtosearch[2], (sizeof(pathtosearch)/sizeof(WCHAR))-2); @@ -1034,19 +1031,19 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR curDir[] = {'.','\0'}; strcpyW (pathtosearch, curDir); } - if (strchrW(param1, '.') != NULL) extensionsupplied = TRUE; - if (strlenW(param1) >= MAX_PATH) + if (strchrW(firstParam, '.') != NULL) extensionsupplied = TRUE; + if (strlenW(firstParam) >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); return; } - strcpyW(stemofsearch, param1); + strcpyW(stemofsearch, firstParam); } else { /* Convert eg. ..\fred to include a directory by removing file part */ - GetFullPathNameW(param1, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); + GetFullPathNameW(firstParam, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); lastSlash = strrchrW(pathtosearch, '\\'); if (lastSlash && strchrW(lastSlash, '.') != NULL) extensionsupplied = TRUE; strcpyW(stemofsearch, lastSlash+1);

1 0

Jason Edmeades : cmd: %* expands to first non-whitespace delimiter of first arg.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: f45f75ca7dece7b7549d457c6215aa314016b4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45f75ca7dece7b7549d457c6… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 22:24:35 2012 +0100 cmd: %* expands to first non-whitespace delimiter of first arg. --- programs/cmd/tests/test_cmdline.cmd | 10 ++++++++++ programs/cmd/tests/test_cmdline.cmd.exp | 8 ++++++++ programs/cmd/wcmdmain.c | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 7e08b29..0442a38 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -251,6 +251,16 @@ call tell;1;;2 if errorlevel 2 echo error %ErrorLevel% call tell "p "1 p" "2 call tell p"1 p";2 + +echo --------- Testing delimiters and parameter passing -------------- +echo @echo 0:%%0,1:%%1,2:%%2,All:'%%*'> tell.bat +call;tell 1 2 +call tell 1 2 +==call==tell==1==2 +call tell(1234) +call tell(12(34) +call tell(12;34) +echo --------- Finished -------------- del tell.bat say*.* exit :setError diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 4ea4ce0..0317a99 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -122,3 +122,11 @@ THIS FAILS: cmd ignoreme/c say one 1:1,2:2(a)space@ 1:"p(a)space@"1,2:p"@space@"2(a)space@ 1:p"1(a)space@p",2:2(a)space@ +--------- Testing delimiters and parameter passing -------------- +0:tell,1:1,2:2,All:'1 2'@or_broken(a)0:tell,1:1,2:2,All:' 1 2' +0:tell,1:1,2:2,All:'1 2'@or_broken(a)0:tell,1:1,2:2,All:' 1 2' +0:tell,1:1,2:2,All:'==1==2' +(a)todo_wine@0:tell,1:(1234),2:,All:'(1234)' +(a)todo_wine@0:tell,1:(12(34),2:,All:'(12(34)' +(a)todo_wine@0:tell,1:(12,2:34),All:'(12;34)' +(a)todo_wine@--------- Finished -------------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index eb0897a..f60ba84 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -843,10 +843,12 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, /* Replace use of %* if in batch program*/ } else if (!justFors && context && *(p+1)=='*') { WCHAR *startOfParms = NULL; - WCMD_parameter(context -> command, 1, &startOfParms, NULL, TRUE); - if (startOfParms != NULL) + WCMD_parameter(context -> command, 0, NULL, &startOfParms, TRUE); + if (startOfParms != NULL) { + startOfParms++; /* Skip to first delimiter then skip whitespace */ + while (*startOfParms==' ' || *startOfParms == '\t') startOfParms++; WCMD_strsubstW(p, p+2, startOfParms, -1); - else + } else WCMD_strsubstW(p, p+2, NULL, 0); } else if (forVariable &&

1 0

Detlef Riekenberg : dsound/tests: Handle broken E_FAIL in dsound8 for AC97.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 45c56bcc80e0e518f8be176fd987565351cfc419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c56bcc80e0e518f8be176fd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 23:38:13 2012 +0200 dsound/tests: Handle broken E_FAIL in dsound8 for AC97. --- dlls/dsound/tests/dsound8.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index ae2f7a7..ba04d9f 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1021,7 +1021,7 @@ static void test_hw_buffers(void) trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); - ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL), + ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), "CreateSoundBuffer(%u) failed: %08x\n", i, hr); if(hr != S_OK) break; @@ -1039,8 +1039,9 @@ static void test_hw_buffers(void) (caps.dwMaxHwMixingAllBuffers == 0 && hr == DSERR_INVALIDCALL) || /* no hw buffers at all */ hr == E_NOTIMPL || /* don't support hw buffers */ broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ + broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer gave wrong error: %08x\n", hr); + "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);

1 0

Detlef Riekenberg : dsound/tests: Handle broken E_FAIL of broken AC97 driver.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: b23450e38e83c8034104046be57de9149e5ad4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23450e38e83c8034104046be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 23:39:46 2012 +0200 dsound/tests: Handle broken E_FAIL of broken AC97 driver. --- dlls/dsound/tests/dsound.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 5b941a3..ad17d54 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1535,7 +1535,7 @@ static void test_hw_buffers(void) trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); - ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL), + ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), "CreateSoundBuffer(%u) failed: %08x\n", i, hr); if(hr != S_OK) break; @@ -1553,8 +1553,9 @@ static void test_hw_buffers(void) (caps.dwMaxHwMixingAllBuffers == 0 && hr == DSERR_INVALIDCALL) || /* no hw buffers at all */ hr == E_NOTIMPL || /* don't support hw buffers */ broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ + broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer gave wrong error: %08x\n", hr); + "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);

1 0

Vincent Povirk : mscoree: Update Wine Mono to 0.0.8.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: b3c0d3cd63e7603d6c576e3b89f3dd53da332f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c0d3cd63e7603d6c576e3b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 15 15:17:11 2012 -0500 mscoree: Update Wine Mono to 0.0.8. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3348cdb..60d2472 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -66,8 +66,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "0.0.4" -#define MONO_SHA "7d827f7d28a88ae0da95a136573783124ffce4b1" +#define MONO_VERSION "0.0.8" +#define MONO_SHA "dd349e72249ce5ff981be0e9dae33ac4a46a9f60" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c7a50c1..620fb9b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -652,7 +652,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "0.0.4"; + static const char* mono_version = "0.0.8"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Vincent Povirk : Revert "wine.inf: Add .NET keys to the 64-bit registry.".
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: d9fd5ede20e62a1d315018181e76b781adc2c3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fd5ede20e62a1d315018181… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 15 15:19:08 2012 -0500 Revert "wine.inf: Add .NET keys to the 64-bit registry.". This reverts commit c1279a6b03ed78a65ddf87755aff15700e086a12. --- tools/wine.inf.in | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f39b929..03a748a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -89,7 +89,6 @@ AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\ - Dotnet,\ DirectX,\ Fonts,\ MCI,\ @@ -511,42 +510,6 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Mouse,Beep,2,"No" -[DotNet] -HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\" -HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727" -HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319 -HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0 - -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0" - -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,"" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1" - [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00

1 0

André Hentschel : vcomp: Sync spec files.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Module: wine Branch: master Commit: 2a0055af2954c5d3aa8fe62e795cb5e529de4185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0055af2954c5d3aa8fe62e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 15 22:40:09 2012 +0200 vcomp: Sync spec files. --- dlls/vcomp100/vcomp100.spec | 16 ++++++++-------- dlls/vcomp90/vcomp90.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index d888577..7f52a7a 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -90,22 +90,22 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic -@ stub omp_get_max_threads -@ stub omp_get_nested +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested @ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ stub omp_get_num_threads -@ stub omp_get_thread_num +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index d888577..7f52a7a 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -90,22 +90,22 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic -@ stub omp_get_max_threads -@ stub omp_get_nested +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested @ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ stub omp_get_num_threads -@ stub omp_get_thread_num +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock

1 0