wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Gerald Pfeifer : progman: Remove unused variable from and fix formatting of DIALOG_Execute.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 1419a3fe1a80b89f95a8143b50b7124370b441fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1419a3fe1a80b89f95a8143b5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:30:49 2010 +0200 progman: Remove unused variable from and fix formatting of DIALOG_Execute. --- programs/progman/dialog.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index fc7c7fd..65eae87 100644 --- a/programs/progman/dialog.c +++ b/programs/progman/dialog.c @@ -622,11 +622,9 @@ static INT_PTR CALLBACK DIALOG_EXECUTE_DlgProc(HWND hDlg, UINT msg, VOID DIALOG_Execute(void) { - INT_PTR z; DLGPROC lpfnDlg = MakeProcInstance(DIALOG_EXECUTE_DlgProc, Globals.hInstance); - z=DialogBox(Globals.hInstance, STRING_EXECUTE, - Globals.hMainWnd, lpfnDlg); - FreeProcInstance(lpfnDlg); + DialogBox(Globals.hInstance, STRING_EXECUTE, Globals.hMainWnd, lpfnDlg); + FreeProcInstance(lpfnDlg); } /* Local Variables: */

1 0

Gerald Pfeifer : cmd: Remove variable argsProcessed which is not really used from WCMD_directory .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f40265b0b4f2a7d5819e28b8dbb650b2bd4efad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40265b0b4f2a7d5819e28b8d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:26:04 2010 +0200 cmd: Remove variable argsProcessed which is not really used from WCMD_directory. --- programs/cmd/directory.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 4e72d33..f397951 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -638,7 +638,6 @@ void WCMD_directory (WCHAR *cmd) { WCHAR *p; WCHAR string[MAXSTRING]; int argno = 0; - int argsProcessed = 0; WCHAR *argN = cmd; WCHAR lastDrive; BOOL trailerReqd = FALSE; @@ -831,7 +830,6 @@ void WCMD_directory (WCHAR *cmd) { } argno = 0; - argsProcessed = 0; argN = cmd; GetCurrentDirectoryW(MAX_PATH, cwd); strcatW(cwd, slashW);

1 0

Gerald Pfeifer : cmd: Remove variable doRecursive which is not really used from WCMD_for.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 02a0bd3a00e741d1ff0379c884f513b7ed3aa7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a0bd3a00e741d1ff0379c88… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 1 16:24:45 2010 +0200 cmd: Remove variable doRecursive which is not really used from WCMD_for. --- programs/cmd/builtins.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8049ed8..b75c0c4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -723,7 +723,6 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR *curPos = p; BOOL expandDirs = FALSE; BOOL useNumbers = FALSE; - BOOL doRecursive = FALSE; BOOL doFileset = FALSE; LONG numbers[3] = {0,0,0}; /* Defaults to 0 in native */ int itemNum; @@ -745,8 +744,8 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { { BOOL isRecursive = (*curPos == 'R'); - if (isRecursive) doRecursive = TRUE; - else doFileset = TRUE; + if (!isRecursive) + doFileset = TRUE; /* Skip whitespace */ curPos++;

1 0

Maarten Lankhorst : include: Add float functions to msvcrt.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: f4fcd81167f36efaaf00ecc876d45cbfda510835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fcd81167f36efaaf00ecc87… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 1 16:32:45 2010 +0200 include: Add float functions to msvcrt. --- include/msvcrt/float.h | 4 +++ include/msvcrt/math.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index a238d13..7d8f8ae 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -135,6 +135,10 @@ int __cdecl _finite(double); int __cdecl _isnan(double); int __cdecl _fpclass(double); +#ifdef __x86_64__ +float __cdecl _scalbf(float, __msvcrt_long); +#endif + #ifdef __cplusplus } #endif diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index a02378d..47c0f70 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -76,6 +76,61 @@ double __cdecl y0(double); double __cdecl y1(double); double __cdecl yn(int, double); +#ifdef __x86_64__ + +float __cdecl sinf(float); +float __cdecl cosf(float); +float __cdecl tanf(float); +float __cdecl sinhf(float); +float __cdecl coshf(float); +float __cdecl tanhf(float); +float __cdecl asinf(float); +float __cdecl acosf(float); +float __cdecl atanf(float); +float __cdecl atan2f(float, float); +float __cdecl expf(float); +float __cdecl logf(float); +float __cdecl log10f(float); +float __cdecl powf(float, float); +float __cdecl sqrtf(float); +float __cdecl ceilf(float); +float __cdecl floorf(float); +float __cdecl fabsf(float); +float __cdecl ldexpf(float, int); +float __cdecl frexpf(float, int*); +float __cdecl modff(float, float*); +float __cdecl fmodf(float, float); + +#else + +#define sinf(x) ((float)sin((double)(x))) +#define cosf(x) ((float)cos((double)(x))) +#define tanf(x) ((float)tan((double)(x))) +#define sinhf(x) ((float)sinh((double)(x))) +#define coshf(x) ((float)cosh((double)(x))) +#define tanhf(x) ((float)tanh((double)(x))) +#define asinf(x) ((float)asin((double)(x))) +#define acosf(x) ((float)acos((double)(x))) +#define atanf(x) ((float)atan((double)(x))) +#define atan2f(x,y) ((float)atan2((double)(x), (double)(y))) +#define expf(x) ((float)exp((double)(x))) +#define logf(x) ((float)log((double)(x))) +#define log10f(x) ((float)log10((double)(x))) +#define powf(x,y) ((float)pow((double)(x), (double)(y))) +#define sqrtf(x) ((float)sqrt((double)(x))) +#define ceilf(x) ((float)ceil((double)(x))) +#define floorf(x) ((float)floor((double)(x))) +#define frexpf(x) ((float)frexp((double)(x))) +#define modff(x,y) ((float)modf((double)(x), (double*)(y))) +#define fmodf(x,y) ((float)fmod((double)(x), (double)(y))) + +#endif + +#define fabsf(x) ((float)fabs((double)(x))) +#define ldexpf(x) ((float)ldexp((double)(x))) + +float __cdecl hypotf(float, float); + int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex);

1 0

Nikolay Sivov : rasdlg: Add RasEntryDlgW stub.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: dc04cee787b053d2436909d320d5f6e941fb03ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc04cee787b053d2436909d32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 3 15:03:49 2010 +0400 rasdlg: Add RasEntryDlgW stub. --- dlls/rasdlg/rasdlg.spec | 2 +- dlls/rasdlg/rasdlg_main.c | 8 ++++++++ include/Makefile.in | 1 + include/rasdlg.h | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/rasdlg/rasdlg.spec b/dlls/rasdlg/rasdlg.spec index f6a36d6..0dbd7b0 100644 --- a/dlls/rasdlg/rasdlg.spec +++ b/dlls/rasdlg/rasdlg.spec @@ -7,7 +7,7 @@ @ stub RasDialDlgA @ stub RasDialDlgW @ stub RasEntryDlgA -@ stub RasEntryDlgW +@ stdcall RasEntryDlgW(wstr wstr ptr) @ stub RasMonitorDlgA @ stub RasMonitorDlgW @ stub RasPhonebookDlgA diff --git a/dlls/rasdlg/rasdlg_main.c b/dlls/rasdlg/rasdlg_main.c index 00ceb89..255e6e6 100644 --- a/dlls/rasdlg/rasdlg_main.c +++ b/dlls/rasdlg/rasdlg_main.c @@ -21,6 +21,8 @@ #include "windef.h" #include "winbase.h" +#include "rasdlg.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rasdlg); @@ -42,3 +44,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +BOOL WINAPI RasEntryDlgW(LPWSTR phonebook, LPWSTR entry, RASENTRYDLGW *lpInfo) +{ + FIXME("(%s %s %p) stub\n", debugstr_w(phonebook), debugstr_w(entry), lpInfo); + return FALSE; +} diff --git a/include/Makefile.in b/include/Makefile.in index 3f9b43b..a064076 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -414,6 +414,7 @@ SRCDIR_INCLUDES = \ pshpack4.h \ pshpack8.h \ ras.h \ + rasdlg.h \ raserror.h \ reason.h \ regstr.h \ diff --git a/include/rasdlg.h b/include/rasdlg.h new file mode 100644 index 0000000..7f2a6d8 --- /dev/null +++ b/include/rasdlg.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2010 Nikolay Sivov for CodeWeavers + * + * 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 <ras.h> + +typedef struct tagRASENTRYDLGW +{ + DWORD dwSize; + HWND hwndOwner; + DWORD dwFlags; + LONG xDlg; + LONG yDlg; + WCHAR szEntry[ RAS_MaxEntryName + 1 ]; + DWORD dwError; + ULONG_PTR reserved; + ULONG_PTR reserved2; +} RASENTRYDLGW;

1 0

Hans Leidekker : sc: Implement the start and stop commands.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: e86ed3bf91e980cb875f463f17ac8d045989ab83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86ed3bf91e980cb875f463f1… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Mon May 3 12:57:57 2010 +0200 sc: Implement the start and stop commands. --- programs/sc/sc.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 32ffb85..e4df09a 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -219,7 +219,10 @@ int wmain( int argc, const WCHAR *argv[] ) static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR failureW[] = {'f','a','i','l','u','r','e',0}; static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + static const WCHAR startW[] = {'s','t','a','r','t',0}; + static const WCHAR stopW[] = {'s','t','o','p',0}; SC_HANDLE manager, service; + SERVICE_STATUS status; BOOL ret = FALSE; if (argc < 3) usage(); @@ -305,6 +308,28 @@ int wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!strcmpiW( argv[1], startW )) + { + service = OpenServiceW( manager, argv[2], SERVICE_START ); + if (service) + { + ret = StartServiceW( service, argc - 3, argv + 3 ); + if (!ret) WINE_TRACE("failed to start service %u\n", GetLastError()); + CloseServiceHandle( service ); + } + else WINE_TRACE("failed to open service %u\n", GetLastError()); + } + else if (!strcmpiW( argv[1], stopW )) + { + service = OpenServiceW( manager, argv[2], SERVICE_STOP ); + if (service) + { + ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); + if (!ret) WINE_TRACE("failed to stop service %u\n", GetLastError()); + CloseServiceHandle( service ); + } + else WINE_TRACE("failed to open service %u\n", GetLastError()); + } else WINE_FIXME("command not supported\n");

1 0

Hans Leidekker : sc: Implement the description and failure commands.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 3e1f5ba3828f033817b8366fdcb3e9714bbb48a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1f5ba3828f033817b8366fd… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Mon May 3 12:57:39 2010 +0200 sc: Implement the description and failure commands. --- programs/sc/sc.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1994fff..32ffb85 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -132,6 +132,81 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa return TRUE; } +static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *fa ) +{ + static const WCHAR runW[] = {'r','u','n',0}; + static const WCHAR restartW[] = {'r','e','s','t','a','r','t',0}; + static const WCHAR rebootW[] = {'r','e','b','o','o','t',0}; + unsigned int i, count; + WCHAR *actions, *p; + + actions = HeapAlloc( GetProcessHeap(), 0, (strlenW( arg ) + 1) * sizeof(WCHAR) ); + if (!actions) return FALSE; + + strcpyW( actions, arg ); + for (p = actions, count = 0; *p; p++) + { + if (*p == '/') + { + count++; + *p = 0; + } + } + count = count / 2 + 1; + + fa->cActions = count; + fa->lpsaActions = HeapAlloc( GetProcessHeap(), 0, fa->cActions * sizeof(SC_ACTION) ); + if (!fa->lpsaActions) + { + HeapFree( GetProcessHeap(), 0, actions ); + return FALSE; + } + + p = actions; + for (i = 0; i < count; i++) + { + if (!strcmpiW( p, runW )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; + else if (!strcmpiW( p, restartW )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; + else if (!strcmpiW( p, rebootW )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + else fa->lpsaActions[i].Type = SC_ACTION_NONE; + + p += strlenW( p ) + 1; + fa->lpsaActions[i].Delay = atoiW( p ); + p += strlenW( p ) + 1; + } + + HeapFree( GetProcessHeap(), 0, actions ); + return TRUE; +} + +static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE_ACTIONSW *fa ) +{ + static const WCHAR resetW[] = {'r','e','s','e','t','=',0}; + static const WCHAR rebootW[] = {'r','e','b','o','o','t','=',0}; + static const WCHAR commandW[] = {'c','o','m','m','a','n','d','=',0}; + static const WCHAR actionsW[] = {'a','c','t','i','o','n','s','=',0}; + unsigned int i; + + fa->dwResetPeriod = 0; + fa->lpRebootMsg = NULL; + fa->lpCommand = NULL; + fa->cActions = 0; + fa->lpsaActions = NULL; + + for (i = 0; i < argc; i++) + { + if (!strcmpiW( argv[i], resetW ) && i < argc - 1) fa->dwResetPeriod = atoiW( argv[i + 1] ); + if (!strcmpiW( argv[i], rebootW ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!strcmpiW( argv[i], commandW ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; + if (!strcmpiW( argv[i], actionsW )) + { + if (i == argc - 1) return FALSE; + if (!parse_failure_actions( argv[i + 1], fa )) return FALSE; + } + } + return TRUE; +} + static void usage( void ) { WINE_MESSAGE( "Usage: sc command servicename [parameter= value ...]\n" ); @@ -141,6 +216,8 @@ static void usage( void ) int wmain( int argc, const WCHAR *argv[] ) { static const WCHAR createW[] = {'c','r','e','a','t','e',0}; + static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR failureW[] = {'f','a','i','l','u','r','e',0}; static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; SC_HANDLE manager, service; BOOL ret = FALSE; @@ -185,6 +262,38 @@ int wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to create service %u\n", GetLastError()); } + else if (!strcmpiW( argv[1], descriptionW )) + { + service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); + if (service) + { + SERVICE_DESCRIPTIONW sd; + sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL; + ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd ); + if (!ret) WINE_TRACE("failed to set service description %u\n", GetLastError()); + CloseServiceHandle( service ); + } + else WINE_TRACE("failed to open service %u\n", GetLastError()); + } + else if (!strcmpiW( argv[1], failureW )) + { + service = OpenServiceW( manager, argv[2], SERVICE_CHANGE_CONFIG ); + if (service) + { + SERVICE_FAILURE_ACTIONSW sfa; + if (!parse_failure_params( argc - 3, argv + 3, &sfa )) + { + WINE_WARN("failed to parse failure parameters\n"); + CloseServiceHandle( manager ); + return 1; + } + ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); + if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); + HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); + CloseServiceHandle( service ); + } + else WINE_TRACE("failed to open service %u\n", GetLastError()); + } else if (!strcmpiW( argv[1], deleteW )) { service = OpenServiceW( manager, argv[2], DELETE );

1 0

Hans Leidekker : programs: Add a stubbed sc.exe.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 544da28e5396e6803f46ff1409330db009844c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544da28e5396e6803f46ff140… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Mon May 3 12:56:58 2010 +0200 programs: Add a stubbed sc.exe. This is a command line tool used to create and configure services. It's included in XP and used by the Akamai client installer. --- configure | 1 + configure.ac | 1 + programs/sc/Makefile.in | 12 ++++++++++++ programs/sc/sc.c | 27 +++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e1cdce7..52410fb 100755 --- a/configure +++ b/configure @@ -14768,6 +14768,7 @@ wine_fn_config_program regedit enable_regedit installbin wine_fn_config_program regsvr32 enable_regsvr32 installbin wine_fn_config_program rpcss enable_rpcss install wine_fn_config_program rundll32 enable_rundll32 install +wine_fn_config_program sc enable_sc install wine_fn_config_program secedit enable_secedit install wine_fn_config_program services enable_services install wine_fn_config_program spoolsv enable_spoolsv install diff --git a/configure.ac b/configure.ac index ac18264..227dee5 100644 --- a/configure.ac +++ b/configure.ac @@ -2696,6 +2696,7 @@ WINE_CONFIG_PROGRAM(regedit,installbin) WINE_CONFIG_PROGRAM(regsvr32,installbin) WINE_CONFIG_PROGRAM(rpcss,install) WINE_CONFIG_PROGRAM(rundll32,install) +WINE_CONFIG_PROGRAM(sc,install) WINE_CONFIG_PROGRAM(secedit,install) WINE_CONFIG_PROGRAM(services,install) WINE_CONFIG_PROGRAM(spoolsv,install) diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in new file mode 100644 index 0000000..71a20cc --- /dev/null +++ b/programs/sc/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = sc.exe +APPMODE = -mconsole -municode +IMPORTS = kernel32 +EXTRADEFS = -DWINE_NO_UNICODE_MACROS + +C_SRCS = sc.c + +@MAKE_PROG_RULES@ diff --git a/programs/sc/sc.c b/programs/sc/sc.c new file mode 100644 index 0000000..6eb9c9e --- /dev/null +++ b/programs/sc/sc.c @@ -0,0 +1,27 @@ +/* + * Copyright 2010 Hans Leidekker + * + * 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(sc); + +int wmain( int argc, WCHAR *argv[] ) +{ + WINE_FIXME("stub\n"); + return 1; +}

1 0

Hans Leidekker : sc: Implement the create and delete commands.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 5e9d2fc44ad90c8301e0369e3e60255a14a26f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9d2fc44ad90c8301e0369e3… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Mon May 3 12:57:22 2010 +0200 sc: Implement the create and delete commands. --- programs/sc/Makefile.in | 2 +- programs/sc/sc.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 181 insertions(+), 4 deletions(-) diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in index 71a20cc..4d34f5a 100644 --- a/programs/sc/Makefile.in +++ b/programs/sc/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = sc.exe APPMODE = -mconsole -municode -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = sc.c diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 6eb9c9e..1994fff 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -16,12 +16,189 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN + #include "wine/debug.h" +#include "wine/unicode.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <windows.h> WINE_DEFAULT_DEBUG_CHANNEL(sc); -int wmain( int argc, WCHAR *argv[] ) +struct create_params +{ + const WCHAR *displayname; + const WCHAR *binpath; + const WCHAR *group; + const WCHAR *depend; + const WCHAR *obj; + const WCHAR *password; + DWORD type; + DWORD start; + DWORD error; + BOOL tag; +}; + +static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_params *cp ) +{ + static const WCHAR displaynameW[] = {'d','i','s','p','l','a','y','n','a','m','e','=',0}; + static const WCHAR typeW[] = {'t','y','p','e','=',0}; + static const WCHAR startW[] = {'s','t','a','r','t','=',0}; + static const WCHAR errorW[] = {'e','r','r','o','r','=',0}; + static const WCHAR binpathW[] = {'b','i','n','p','a','t','h','=',0}; + static const WCHAR groupW[] = {'g','r','o','u','p','=',0}; + static const WCHAR tagW[] = {'t','a','g','=',0}; + static const WCHAR dependW[] = {'d','e','p','e','n','d','=',0}; + static const WCHAR objW[] = {'o','b','j','=',0}; + static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d','=',0}; + unsigned int i; + + cp->displayname = NULL; + cp->type = SERVICE_WIN32_OWN_PROCESS; + cp->start = SERVICE_DEMAND_START; + cp->error = SERVICE_ERROR_NORMAL; + cp->binpath = NULL; + cp->group = NULL; + cp->tag = FALSE; + cp->depend = NULL; + cp->obj = NULL; + cp->password = NULL; + + for (i = 0; i < argc; i++) + { + if (!strcmpiW( argv[i], displaynameW ) && i < argc - 1) cp->displayname = argv[i + 1]; + if (!strcmpiW( argv[i], binpathW ) && i < argc - 1) cp->binpath = argv[i + 1]; + if (!strcmpiW( argv[i], groupW ) && i < argc - 1) cp->group = argv[i + 1]; + if (!strcmpiW( argv[i], dependW ) && i < argc - 1) cp->depend = argv[i + 1]; + if (!strcmpiW( argv[i], objW ) && i < argc - 1) cp->obj = argv[i + 1]; + if (!strcmpiW( argv[i], passwordW ) && i < argc - 1) cp->password = argv[i + 1]; + + if (!strcmpiW( argv[i], tagW ) && i < argc - 1) + { + static const WCHAR yesW[] = {'y','e','s',0}; + if (!strcmpiW( argv[i], yesW )) + { + WINE_FIXME("tag argument not supported\n"); + cp->tag = TRUE; + } + } + if (!strcmpiW( argv[i], typeW ) && i < argc - 1) + { + static const WCHAR ownW[] = {'o','w','n',0}; + static const WCHAR shareW[] = {'s','h','a','r','e',0}; + static const WCHAR kernelW[] = {'k','e','r','n','e','l',0}; + static const WCHAR filesysW[] = {'f','i','l','e','s','y','s',0}; + static const WCHAR recW[] = {'r','e','c',0}; + static const WCHAR interactW[] = {'i','n','t','e','r','a','c','t',0}; + + if (!strcmpiW( argv[i + 1], ownW )) cp->type = SERVICE_WIN32_OWN_PROCESS; + if (!strcmpiW( argv[i + 1], shareW )) cp->type = SERVICE_WIN32_SHARE_PROCESS; + if (!strcmpiW( argv[i + 1], kernelW )) cp->type = SERVICE_KERNEL_DRIVER; + if (!strcmpiW( argv[i + 1], filesysW )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; + if (!strcmpiW( argv[i + 1], recW )) cp->type = SERVICE_RECOGNIZER_DRIVER; + if (!strcmpiW( argv[i + 1], interactW )) cp->type |= SERVICE_INTERACTIVE_PROCESS; + } + if (!strcmpiW( argv[i], startW ) && i < argc - 1) + { + static const WCHAR bootW[] = {'b','o','o','t',0}; + static const WCHAR systemW[] = {'s','y','s','t','e','m',0}; + static const WCHAR autoW[] = {'a','u','t','o',0}; + static const WCHAR demandW[] = {'d','e','m','a','n','d',0}; + static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; + + if (!strcmpiW( argv[i + 1], bootW )) cp->start = SERVICE_BOOT_START; + if (!strcmpiW( argv[i + 1], systemW )) cp->start = SERVICE_SYSTEM_START; + if (!strcmpiW( argv[i + 1], autoW )) cp->start = SERVICE_AUTO_START; + if (!strcmpiW( argv[i + 1], demandW )) cp->start = SERVICE_DEMAND_START; + if (!strcmpiW( argv[i + 1], disabledW )) cp->start = SERVICE_DISABLED; + } + if (!strcmpiW( argv[i], errorW ) && i < argc - 1) + { + static const WCHAR normalW[] = {'n','o','r','m','a','l',0}; + static const WCHAR severeW[] = {'s','e','v','e','r','e',0}; + static const WCHAR criticalW[] = {'c','r','i','t','i','c','a','l',0}; + static const WCHAR ignoreW[] = {'i','g','n','o','r','e',0}; + + if (!strcmpiW( argv[i + 1], normalW )) cp->error = SERVICE_ERROR_NORMAL; + if (!strcmpiW( argv[i + 1], severeW )) cp->error = SERVICE_ERROR_SEVERE; + if (!strcmpiW( argv[i + 1], criticalW )) cp->error = SERVICE_ERROR_CRITICAL; + if (!strcmpiW( argv[i + 1], ignoreW )) cp->error = SERVICE_ERROR_IGNORE; + } + } + if (!cp->binpath) return FALSE; + return TRUE; +} + +static void usage( void ) +{ + WINE_MESSAGE( "Usage: sc command servicename [parameter= value ...]\n" ); + exit( 1 ); +} + +int wmain( int argc, const WCHAR *argv[] ) { - WINE_FIXME("stub\n"); - return 1; + static const WCHAR createW[] = {'c','r','e','a','t','e',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + SC_HANDLE manager, service; + BOOL ret = FALSE; + + if (argc < 3) usage(); + + if (argv[2][0] == '\\' && argv[2][1] == '\\') + { + WINE_FIXME("server argument not supported\n"); + return 1; + } + + manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); + if (!manager) + { + WINE_ERR("failed to open service manager\n"); + return 1; + } + + if (!strcmpiW( argv[1], createW )) + { + struct create_params cp; + + if (argc < 4) + { + CloseServiceHandle( manager ); + usage(); + } + if (!parse_create_params( argc - 3, argv + 3, &cp )) + { + WINE_WARN("failed to parse create parameters\n"); + CloseServiceHandle( manager ); + return 1; + } + service = CreateServiceW( manager, argv[2], cp.displayname, SERVICE_ALL_ACCESS, + cp.type, cp.start, cp.error, cp.binpath, cp.group, NULL, + cp.depend, cp.obj, cp.password ); + if (service) + { + CloseServiceHandle( service ); + ret = TRUE; + } + else WINE_TRACE("failed to create service %u\n", GetLastError()); + } + else if (!strcmpiW( argv[1], deleteW )) + { + service = OpenServiceW( manager, argv[2], DELETE ); + if (service) + { + ret = DeleteService( service ); + if (!ret) WINE_TRACE("failed to delete service %u\n", GetLastError()); + CloseServiceHandle( service ); + } + else WINE_TRACE("failed to open service %u\n", GetLastError()); + } + else + WINE_FIXME("command not supported\n"); + + CloseServiceHandle( manager ); + return !ret; }

1 0

Eric Pouech : winedbg: Properly fix the previous patch about gcc 2. 95 not supporting printf attribute on function pointers.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: c4efb23d2752e9283574caf660055fa14a87abfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4efb23d2752e9283574caf66… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon May 3 08:12:22 2010 +0200 winedbg: Properly fix the previous patch about gcc 2.95 not supporting printf attribute on function pointers. --- programs/winedbg/db_disasm64.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 98f7ef2..7cf1394 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -32,24 +32,13 @@ #include <stdio.h> #include "debugger.h" -#ifndef __GNUC__ -#define __attribute__(X) +#if defined(__GNUC__) && (GCC_VERSION >= 30000) +static int (*db_printf)(const char* format, ...) __attribute__((format (printf,1,2))); +#else +static int (*db_printf)(const char* format, ...); #endif -static int db_debug = 0; -static int db_printf(const char* format, ...) __attribute__((format (printf,1,2))); -int db_printf(const char* format, ...) -{ - va_list valist; - int len = 0; - if (db_debug) - { - va_start(valist, format); - len = dbg_printf(format, valist); - va_end(valist); - } - return len; -} +static int no_printf(const char* format, ...) {return 0;} typedef DWORD_PTR db_addr_t; typedef BOOL boolean_t; @@ -93,7 +82,7 @@ static ULONG64 db_get_value(db_addr_t addr, int size, int is_signed) static void db_printsym(db_addr_t addr, unsigned unused) { - if (db_debug) + if (db_printf != no_printf) { ADDRESS64 a; @@ -1656,6 +1645,6 @@ db_disasm(db_addr_t loc, boolean_t altfmt) void be_x86_64_disasm_one_insn(ADDRESS64 *addr, int display) { - db_debug = display; + db_printf = display ? dbg_printf : no_printf; addr->Offset = db_disasm(addr->Offset, TRUE); }

1 0

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 May 2010