November 2012 - Wine-commits

Detlef Riekenberg : schtasks: Add a stub schtasks.exe.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 37035e53cd0f4dec9b89ffbee87f480abaae25c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37035e53cd0f4dec9b89ffbee… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:02:06 2012 +0100 schtasks: Add a stub schtasks.exe. --- configure | 1 + configure.ac | 1 + programs/schtasks/Makefile.in | 7 +++++++ programs/schtasks/schtasks.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3cd967c..bc31918 100755 --- a/configure +++ b/configure @@ -15933,6 +15933,7 @@ wine_fn_config_program rpcss enable_rpcss install wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install +wine_fn_config_program schtasks enable_schtasks install wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services install diff --git a/configure.ac b/configure.ac index d527c73..1adb6fd 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_PROGRAM(rpcss,,[install]) WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) WINE_CONFIG_PROGRAM(sc,,[install]) +WINE_CONFIG_PROGRAM(schtasks,,[install]) WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[install]) diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in new file mode 100644 index 0000000..e1747eb --- /dev/null +++ b/programs/schtasks/Makefile.in @@ -0,0 +1,7 @@ +MODULE = schtasks.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + schtasks.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c new file mode 100644 index 0000000..a3af346 --- /dev/null +++ b/programs/schtasks/schtasks.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schtasks); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jason Edmeades : cmd: Don' t overflow parameter length when copying substring.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 7c3f3d09dd589430060f3f0bee6d813e213c65f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3f3d09dd589430060f3f0be… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 25 21:17:13 2012 +0100 cmd: Don't overflow parameter length when copying substring. --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmdmain.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index aeaa14d..8a7e3fa 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -275,7 +275,7 @@ P0S q qwe er -(a)todo_wine@'ty'@or_broken@'' +'ty'@or_broken@'' 't'@or_broken@'' ert(a)or_broken@qwerty e(a)or_broken@qwerty diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 89c1327..534e5a6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -730,6 +730,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, else if (copybytes < 0) copybytes = 0; WCMD_strsubstW(start, endOfVar + 1, startCopy, copybytes); } else { + substrlength = min(substrlength, len - (startCopy- thisVarContents + 1)); WCMD_strsubstW(start, endOfVar + 1, startCopy, substrlength); }

1 0

Jason Edmeades : attrib: Support relative paths as args.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 8e575940ad81688fe8cffc500f256a18ab8630c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e575940ad81688fe8cffc500… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 25 22:42:46 2012 +0100 attrib: Support relative paths as args. --- programs/attrib/attrib.c | 19 ++++++++++++++----- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index ca15980..25117cc 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -129,11 +129,11 @@ int wmain(int argc, WCHAR *argv[]) WIN32_FIND_DATAW fd; WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; WCHAR name[MAX_PATH]; + WCHAR *namepart; WCHAR curdir[MAX_PATH]; DWORD attrib_set = 0; DWORD attrib_clear = 0; const WCHAR help_option[] = {'/','?','\0'}; - const WCHAR slash[] = {'\\','\0'}; const WCHAR start[] = {'*','\0'}; int i = 1; @@ -143,13 +143,11 @@ int wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); - strcatW(curdir, slash); - strcpyW(name, curdir); - strcatW(name, start); + strcpyW(name, start); while (i < argc) { WCHAR *param = argv[i++]; + WINE_TRACE("Processing arg: '%s'\n", wine_dbgstr_w(param)); if ((param[0] == '+') || (param[0] == '-')) { DWORD attrib = 0; switch (param[1]) { @@ -178,6 +176,15 @@ int wmain(int argc, WCHAR *argv[]) } } + /* Name may be a relative or explicit path, so calculate curdir based on + current locations, stripping off the filename */ + WINE_TRACE("Supplied name: '%s'\n", wine_dbgstr_w(name)); + GetFullPathNameW(name, sizeof(curdir)/sizeof(WCHAR), curdir, &namepart); + WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); + strcpyW(name, curdir); + if (namepart) *namepart = 0x00; + + /* Search for files based on the location and filespec supplied */ hff = FindFirstFileW(name, &fd); if (hff == INVALID_HANDLE_VALUE) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_FILENOTFOUND), name); @@ -195,6 +202,8 @@ int wmain(int argc, WCHAR *argv[]) fd.dwFileAttributes |= attrib_set; if (!fd.dwFileAttributes) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; + strcpyW(name, curdir); + strcatW(name, fd.cFileName); SetFileAttributesW(name, fd.dwFileAttributes); } else { static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8a7e3fa..42f578d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -959,14 +959,14 @@ foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -(a)todo_wine@A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 +A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 @todo_wine(a)A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1(a)or_broken@A R I @pwd@\foobar\level1 @todo_wine(a)A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2(a)or_broken@A R I @pwd@\foobar\baz\level2 A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar(a)or_broken@A I @pwd@\foobar\bar --- folders processing @pwd@\foobar(a)or_broken@ @pwd@\foobar(a)or_broken@ I @pwd@\foobar @todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz(a)or_broken@ R I @pwd@\foobar\baz -(a)todo_wine@A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto +A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto toto lulu file created in read-only dir

1 0

Jason Edmeades : attrib: Add support for attrib /s.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: e26c2a5691bdc86156ee4768ae121e79cc05802f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26c2a5691bdc86156ee4768a… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 26 00:22:56 2012 +0100 attrib: Add support for attrib /s. --- programs/attrib/attrib.c | 191 +++++++++++++++++++++--------- programs/cmd/tests/test_builtins.cmd.exp | 4 +- 2 files changed, 136 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e26c2a5691bdc86156ee4…

1 0

Jason Edmeades : attrib: Add attrib /d support.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: f2699f9f6007ecaf019ec456fc09e274e3f136b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2699f9f6007ecaf019ec456f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 26 00:25:30 2012 +0100 attrib: Add attrib /d support. --- programs/attrib/attrib.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index bce9c06..e2cec36 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -132,13 +132,15 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) * filespec [I] The filespec to search for * recurse [I] Whether to recurse (search subdirectories before * current directory) + * includedirs [I] Whether to set directory attributes as well * attrib_set [I] Attributes to set * attrib_clear [I] Attributes to clear * * Returns TRUE if at least one file displayed / modified * ========================================================================= */ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, - BOOL recurse, DWORD attrib_set, DWORD attrib_clear) + BOOL recurse, BOOL includedirs, + DWORD attrib_set, DWORD attrib_clear) { BOOL found = FALSE; WCHAR buffer[MAX_PATH]; @@ -174,7 +176,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, strcpyW(buffer, rootdir); strcatW(buffer, fd.cFileName); strcatW(buffer, slashW); - ATTRIB_processdirectory(buffer, filespec, recurse, attrib_set, attrib_clear); + ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, + attrib_set, attrib_clear); } while (FindNextFileW(hff, &fd) != 0); } @@ -198,6 +201,9 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) continue; + if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (attrib_set || attrib_clear) { fd.dwFileAttributes &= ~attrib_clear; fd.dwFileAttributes |= attrib_set; @@ -248,7 +254,9 @@ int wmain(int argc, WCHAR *argv[]) DWORD attrib_set = 0; DWORD attrib_clear = 0; BOOL attrib_recurse = 0; - const WCHAR help_option[] = {'/','?','\0'}; + BOOL attrib_includedirs = FALSE; + static const WCHAR help_option[] = {'/','?','\0'}; + static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; @@ -280,7 +288,7 @@ int wmain(int argc, WCHAR *argv[]) } } else if (param[0] == '/') { if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { - WINE_FIXME("Option /D not yet supported\n"); + attrib_includedirs = TRUE; } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { WINE_FIXME("Option /R not yet supported\n"); } else if (((param[1] == 'S') || (param[1] == 's')) && !param[2]) { @@ -305,9 +313,13 @@ int wmain(int argc, WCHAR *argv[]) name[0] = 0; } + /* If a directory is explicitly supplied on the command line, and no + wildcards are in the name, then allow it to be changed/displayed */ + if (strpbrkW(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse, - attrib_set, attrib_clear); + attrib_includedirs, attrib_set, attrib_clear); if (!found) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_FILENOTFOUND), originalname); }

1 0

Jason Edmeades : cmd: Fix for loops within for loops.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: ae4571fb796dc03d91a63d6c5c2a80a08f587578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4571fb796dc03d91a63d6c5… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 21:43:08 2012 +0000 cmd: Fix for loops within for loops. --- programs/cmd/batch.c | 35 ++++++++----- programs/cmd/builtins.c | 77 ++++++++++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 20 ++++---- programs/cmd/wcmd.h | 17 +++++-- programs/cmd/wcmdmain.c | 84 +++++++++++++---------------- 5 files changed, 141 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae4571fb796dc03d91a63…

1 0

Jason Edmeades : xcopy: Fix resource leak (coverity).
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 4a1349023743b42fda02e96cdc0a6c5f4d716581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1349023743b42fda02e96cd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 21:53:39 2012 +0000 xcopy: Fix resource leak (coverity). --- programs/xcopy/xcopy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cec0828..ffd2c56 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -627,6 +627,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Find next one */ findres = FindNextFileW(h, finddata); } + FindClose(h); } cleanup:

1 0

Jason Edmeades : attrib: Remove redundant code.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 458e573584801dee7d7f961d212ffda698a11960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458e573584801dee7d7f961d2… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 22:17:21 2012 +0000 attrib: Remove redundant code. --- programs/attrib/attrib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index e2cec36..443a0c0 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -289,8 +289,6 @@ int wmain(int argc, WCHAR *argv[]) } else if (param[0] == '/') { if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { attrib_includedirs = TRUE; - } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { - WINE_FIXME("Option /R not yet supported\n"); } else if (((param[1] == 'S') || (param[1] == 's')) && !param[2]) { attrib_recurse = TRUE; } else {

1 0

Alexandre Julliard : user32: Force refreshing the non-client area when the window surface is changed.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: d2607ff6c9390d47e591657074188700fadfece6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2607ff6c9390d47e59165707… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 14:52:28 2012 +0100 user32: Force refreshing the non-client area when the window surface is changed. --- dlls/user32/winpos.c | 6 +++--- server/window.c | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5a2f1f2..eda5b78 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2025,6 +2025,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } old_width = win->rectClient.right - win->rectClient.left; old_visible_rect = win->visible_rect; + old_surface = win->surface; + if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ SERVER_START_REQ( set_window_pos ) { @@ -2055,7 +2057,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->rectWindow = *window_rect; win->rectClient = *client_rect; win->visible_rect = visible_rect; - old_surface = win->surface; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) @@ -2076,8 +2077,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { if (surface_win) update_surface_region( surface_win ); - if (old_surface != new_surface || - ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( win, &old_window_rect ); } diff --git a/server/window.c b/server/window.c index 368171f..fc40d55 100644 --- a/server/window.c +++ b/server/window.c @@ -1724,14 +1724,6 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->bottom - old_client_rect.bottom != y_offset || !valid_rects || memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); - /* if part of the non-client area was exposed, consider it changed */ - if (exposed_rgn && !frame_changed) - { - get_region_extents( exposed_rgn, &rect ); - offset_rect( &rect, client_rect->left, client_rect->top ); - frame_changed = (rect.left < client_rect->left || rect.top < client_rect->top || - rect.right > client_rect->right || rect.bottom > client_rect->bottom); - } } if (frame_changed || client_changed)

1 0

Detlef Riekenberg : mstask: Implement GetTargetComputer.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 493d85898889e4d67e1d2e65c8fb6e7abdef7cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=493d85898889e4d67e1d2e65c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 6 00:20:12 2012 +0100 mstask: Implement GetTargetComputer. --- dlls/mstask/task_scheduler.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 1d2ac21..44609b8 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -93,8 +93,30 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( ITaskScheduler* iface, LPWSTR *ppwszComputer) { - FIXME("%p, %p: stub\n", iface, ppwszComputer); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + LPWSTR buffer; + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for the zero */ + + TRACE("(%p)->(%p)\n", This, ppwszComputer); + + if (!ppwszComputer) + return E_INVALIDARG; + + /* extra space for two '\' and a zero */ + buffer = CoTaskMemAlloc((MAX_COMPUTERNAME_LENGTH + 3) * sizeof(WCHAR)); + if (buffer) + { + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + *ppwszComputer = buffer; + return S_OK; + } + CoTaskMemFree(buffer); + } + *ppwszComputer = NULL; + return HRESULT_FROM_WIN32(GetLastError()); } static HRESULT WINAPI MSTASK_ITaskScheduler_Enum(

1 0