April 2007 - Wine-commits - list.winehq.org

Jason Edmeades : cmd.exe: Make dir support multiple parameters.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: fc8a9a20c609c15b0616a242dcfbe822607f6e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8a9a20c609c15b0616a242d… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 5 22:47:56 2007 +0100 cmd.exe: Make dir support multiple parameters. --- programs/cmd/directory.c | 312 ++++++++++++++++++++++++++++++++-------------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 223 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc8a9a20c609c15b0616a…

1 0

Jason Edmeades : cmd.exe: Make dir a* b* or dir a* b* /s mirror windows.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 426a3c11c5a22dc82cddc0400c6646940c0fbe76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426a3c11c5a22dc82cddc0400… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 5 22:47:57 2007 +0100 cmd.exe: Make dir a* b* or dir a* b* /s mirror windows. --- programs/cmd/directory.c | 169 ++++++++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=426a3c11c5a22dc82cddc…

1 0

Jason Edmeades : cmd.exe: Partially fix 'dir *.' ( ie files with no extension).
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 7e2d1b4ade7c4f2d6975e959131aaef6937d6b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2d1b4ade7c4f2d6975e9591… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 5 22:47:58 2007 +0100 cmd.exe: Partially fix 'dir *.' (ie files with no extension). --- programs/cmd/directory.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 95c64a1..ac1e59d 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -316,7 +316,6 @@ void WCMD_directory (char *cmd) { WINE_TRACE("Using location '%s'\n", fullname); status = GetFullPathName (fullname, sizeof(path), path, NULL); - WINE_TRACE("Using path '%s'\n", path); /* * If the path supplied does not include a wildcard, and the endpoint of the @@ -333,8 +332,13 @@ void WCMD_directory (char *cmd) { strcat (path, "\\*"); } } + } else { + /* Special case wildcard search with no extension (ie parameters ending in '.') as + GetFullPathName strips off the additional '.' */ + if (fullname[strlen(fullname)-1] == '.') strcat(path, "."); } + WINE_TRACE("Using path '%s'\n", path); thisEntry = (DIRECTORY_STACK *) HeapAlloc(GetProcessHeap(),0,sizeof(DIRECTORY_STACK)); if (fullParms == NULL) fullParms = thisEntry; if (prevEntry != NULL) prevEntry->next = thisEntry;

1 0

Jason Edmeades : cmd.exe: Only search for supplied command as-is if it includes an extension.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: b573f68b36187190166bee3d0a42243b006f6bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b573f68b36187190166bee3d0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 5 22:47:53 2007 +0100 cmd.exe: Only search for supplied command as-is if it includes an extension. Files with no extensions cannot be run as-is. This enables a directory with 'fred' and 'fred.bat' to correctly run fred.bat if just fred is executed. --- programs/cmd/wcmdmain.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2b5644a..4a2d239 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -34,7 +34,7 @@ const char * const inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "DATE", "DEL", "DIR", "ECHO", "ERASE", "FOR", "GOTO", "HELP", "IF", "LABEL", "MD", "MKDIR", "MOVE", "PATH", "PAUSE", "PROMPT", "REM", "REN", "RENAME", "RD", "RMDIR", "SET", "SHIFT", - "TIME", "TITLE", "TYPE", "VERIFY", "VER", "VOL", + "TIME", "TITLE", "TYPE", "VERIFY", "VER", "VOL", "ENDLOCAL", "SETLOCAL", "PUSHD", "POPD", "ASSOC", "COLOR", "FTYPE", "EXIT" }; @@ -877,8 +877,11 @@ void WCMD_run_program (char *command, int called) { strcat(thisDir, stemofsearch); pos = &thisDir[strlen(thisDir)]; /* Pos = end of name */ - if (GetFileAttributes(thisDir) != INVALID_FILE_ATTRIBUTES) { - found = TRUE; + /* 1. If extension supplied, see if that file exists */ + if (extensionsupplied) { + if (GetFileAttributes(thisDir) != INVALID_FILE_ATTRIBUTES) { + found = TRUE; + } } /* 2. Any .* matches? */ @@ -1227,7 +1230,7 @@ void WCMD_output_asis (const char *message) { if (paged_mode) { do { if ((ptr = strchr(message, '\n')) != NULL) ptr++; - WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, + WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, (ptr) ? ptr - message : lstrlen(message), &count, NULL); if (ptr) { if (++line_count >= max_height - 1) {

1 0

Jason Edmeades : cmd.exe: Attempt to launch pgm even if fails to locate it.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 5704b4bec94688fac291bee1c75ccd76039107ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5704b4bec94688fac291bee1c… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 5 22:47:54 2007 +0100 cmd.exe: Attempt to launch pgm even if fails to locate it. --- programs/cmd/wcmdmain.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4a2d239..dc586f2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -814,6 +814,7 @@ void WCMD_run_program (char *command, int called) { BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; + BOOL assumeInternal = FALSE; DWORD len; @@ -849,6 +850,7 @@ void WCMD_run_program (char *command, int called) { /* Loop through the search path, dir by dir */ pathposn = pathtosearch; + WINE_TRACE("Searching in '%s' for '%s'\n", pathtosearch, stemofsearch); while (!launched && pathposn) { char thisDir[MAX_PATH] = ""; @@ -917,8 +919,20 @@ void WCMD_run_program (char *command, int 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", thisDir); + } + /* Once found, launch it */ - if (found) { + if (found || assumeInternal) { STARTUPINFO st; PROCESS_INFORMATION pe; SHFILEINFO psfi; @@ -938,7 +952,7 @@ void WCMD_run_program (char *command, int called) { /* thisDir contains the file to be launched, but with what? eg. a.exe will require a.exe to be launched, a.html may be iexplore */ - hinst = FindExecutable (param1, NULL, temp); + hinst = FindExecutable (thisDir, NULL, temp); if ((INT_PTR)hinst < 32) console = 0; else @@ -948,9 +962,10 @@ void WCMD_run_program (char *command, int called) { st.cb = sizeof(STARTUPINFO); init_msvcrt_io_block(&st); - /* Launch the process and if a CUI wait on it to complete */ - status = CreateProcess (thisDir, command, NULL, NULL, TRUE, - 0, NULL, NULL, &st, &pe); + /* 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 = CreateProcess (assumeInternal?NULL : thisDir, + command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); if ((opt_c || opt_k) && !opt_s && !status && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { /* strip first and last quote characters and try again */ @@ -966,10 +981,10 @@ void WCMD_run_program (char *command, int called) { errorlevel = 9009; return; } - if (!console) errorlevel = 0; + if (!assumeInternal && !console) errorlevel = 0; else { - if (!HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE); + if (assumeInternal || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0; }

1 0

Felix Nawothnig : comctl32: Allow destruction of toolbar in BN_CLICKED handler.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 765791387393c5251744b88e7615766c22b09ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765791387393c5251744b88e7… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Fri Apr 6 00:27:21 2007 +0200 comctl32: Allow destruction of toolbar in BN_CLICKED handler. --- dlls/comctl32/toolbar.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b8c76e5..e08a15f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5860,6 +5860,10 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) { SendMessageW (infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(infoPtr->buttons[nHit].idCommand, BN_CLICKED), (LPARAM)hwnd); + + /* In case we have just been destroyed... */ + if(!IsWindow(hwnd)) + return 0; } }

1 0

Rolf Kalbermatter : notepad: Fix text label.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 054ed55d71dea4d2762d3850da00b434b876908a URL: http://source.winehq.org/git/wine.git/?a=commit;h=054ed55d71dea4d2762d3850d… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Fri Apr 6 08:39:56 2007 +0200 notepad: Fix text label. --- programs/notepad/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index fd69972..0697f5f 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -74,12 +74,12 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Page Setup" { -LTEXT "&Header (millimeters):", 0x140, 10, 07, 40, 15 +LTEXT "&Header:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP LTEXT "&Footer:", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "&Margins:", 0x144, 10, 43,160, 45 +GROUPBOX "&Margins (millimeters):", 0x144, 10, 43,160, 45 LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD

1 0

Chris Robinson : quartz: Avoid releasing NULL objects.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: d51098ef11705ef20d9875240e2954e270083296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51098ef11705ef20d9875240… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Apr 4 09:21:58 2007 -0700 quartz: Avoid releasing NULL objects. --- dlls/quartz/filtergraph.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8f87870..51ea94a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -274,7 +274,10 @@ static ULONG Filtergraph_Release(IFilterGraphImpl *This) { IBaseFilter_Release(This->ppFiltersInGraph[i]); } for (i = 0; i < This->nItfCacheEntries; i++) - IUnknown_Release(This->ItfCacheEntries[i].iface); + { + if (This->ItfCacheEntries[i].iface) + IUnknown_Release(This->ItfCacheEntries[i].iface); + } IFilterMapper2_Release(This->pFilterMapper2); CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue);

1 0

Chris Robinson : quartz: Send a notification when the filter graph clock changes.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: f352d9de988c453de9ae22742172f11e2d4d719f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f352d9de988c453de9ae22742… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Apr 5 13:19:30 2007 -0700 quartz: Send a notification when the filter graph clock changes. --- dlls/quartz/filtergraph.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 51ea94a..e6c19f5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -190,6 +190,7 @@ typedef struct _IFilterGraphImpl { int EcCompleteCount; int HandleEcComplete; int HandleEcRepaint; + int HandleEcClockChanged; OAFilterState state; CRITICAL_SECTION cs; ITF_CACHE_ENTRY ItfCacheEntries[MAX_ITF_CACHE_ENTRIES]; @@ -4109,6 +4110,8 @@ static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, This->HandleEcComplete = FALSE; else if (lEvCode == EC_REPAINT) This->HandleEcRepaint = FALSE; + else if (lEvCode == EC_CLOCK_CHANGED) + This->HandleEcClockChanged = FALSE; else return S_FALSE; @@ -4125,6 +4128,8 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, This->HandleEcComplete = TRUE; else if (lEvCode == EC_REPAINT) This->HandleEcRepaint = TRUE; + else if (lEvCode == EC_CLOCK_CHANGED) + This->HandleEcClockChanged = TRUE; else return S_FALSE; @@ -4293,6 +4298,19 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC This->refClock = pClock; if (This->refClock) IReferenceClock_AddRef(This->refClock); + + if (This->HandleEcClockChanged) + { + IMediaEventSink *pEventSink; + HRESULT eshr; + + eshr = IMediaFilter_QueryInterface(iface, &IID_IMediaEventSink, (LPVOID)&pEventSink); + if (SUCCEEDED(eshr)) + { + IMediaEventSink_Notify(pEventSink, EC_CLOCK_CHANGED, 0, 0); + IMediaEventSink_Release(pEventSink); + } + } } } LeaveCriticalSection(&This->cs); @@ -4594,6 +4612,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); fimpl->HandleEcComplete = TRUE; fimpl->HandleEcRepaint = TRUE; + fimpl->HandleEcClockChanged = TRUE; fimpl->notif.hWnd = 0; fimpl->notif.disabled = FALSE; fimpl->nRenderers = 0;

1 0

Felix Nawothnig : comctl32: Fix item rect calculation.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: a4d3e46e65d0e61c71789073b00099383c4fc99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d3e46e65d0e61c71789073b… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Thu Apr 5 23:44:23 2007 +0200 comctl32: Fix item rect calculation. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68a1ddb..6861504 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1980,7 +1980,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) || ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK))) Icon.right += infoPtr->iconSize.cx; - Icon.bottom = Icon.top + infoPtr->nItemHeight; + Icon.bottom = Icon.top + infoPtr->iconSize.cy; } if(lprcIcon) *lprcIcon = Icon; TRACE(" - icon=%s\n", wine_dbgstr_rect(&Icon));

1 0