Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[sedwards] 39460: Always call TerminateProcess when exiting a session.
by sedwards＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: sedwards Date: Sat Feb 7 11:39:51 2009 New Revision: 39460 URL: http://svn.reactos.org/svn/reactos?rev=39460&view=rev Log: Always call TerminateProcess when exiting a session. Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Sat Feb 7 11:39:51 2009 @@ -10,6 +10,9 @@ * Written by fred.van.lieshout 'at' zonnet.nl * Use freely, no copyrights. * Use Linux. + * + * Parts Copyright Steven Edwards + * Public Domain * * TODO: * - access control @@ -615,7 +618,9 @@ } TerminateProcess(client->hProcess, 0); } - } + TerminateProcess(client->hProcess, 0); + } + TerminateProcess(client->hProcess, 0); } /* ErrorExit */

1 0

[janderwald] 39459: - Add a hack
by janderwald＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: janderwald Date: Sat Feb 7 09:43:14 2009 New Revision: 39459 URL: http://svn.reactos.org/svn/reactos?rev=39459&view=rev Log: - Add a hack Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sat Feb 7 09:43:14 2009 @@ -289,7 +289,7 @@ *lpValue = ptr; } -done:; +done: if (dwError != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, ptr); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Feb 7 09:43:14 2009 @@ -4012,33 +4012,36 @@ if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { - LPSERVICE_DESCRIPTIONW lpServiceDesriptonW; - LPSERVICE_DESCRIPTIONA lpServiceDesriptonA; - - lpServiceDesriptonA = Info.psd; - - if (lpServiceDesriptonA && - lpServiceDesriptonA->lpDescription) - { - dwLength = (strlen(lpServiceDesriptonA->lpDescription) + 1) * sizeof(WCHAR); - - lpServiceDesriptonW = HeapAlloc(GetProcessHeap(), + LPSERVICE_DESCRIPTIONW lpServiceDescriptonW; + LPSERVICE_DESCRIPTIONA lpServiceDescriptonA; + + lpServiceDescriptonA = Info.psd; + + ///if (lpServiceDescriptonA && + ///lpServiceDescriptonA->lpDescription) + ///{ + dwLength = (strlen(Info.lpDescription) + 1) * sizeof(WCHAR); + + lpServiceDescriptonW = HeapAlloc(GetProcessHeap(), 0, dwLength + sizeof(SERVICE_DESCRIPTIONW)); - if (!lpServiceDesriptonW) + if (!lpServiceDescriptonW) { return ERROR_NOT_ENOUGH_MEMORY; } + lpServiceDescriptonW->lpDescription = (LPWSTR)(lpServiceDescriptonW + 1); + MultiByteToWideChar(CP_ACP, 0, - lpServiceDesriptonA->lpDescription, + Info.lpDescription, -1, - lpServiceDesriptonW->lpDescription, + lpServiceDescriptonW->lpDescription, dwLength); - ptr = lpServiceDesriptonW; - } + ptr = lpServiceDescriptonW; + InfoW.psd = lpServiceDescriptonW; + ///} } else if (Info.dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { @@ -4162,12 +4165,13 @@ { LPSERVICE_DESCRIPTIONW lpServiceDescription; - lpServiceDescription = (LPSERVICE_DESCRIPTIONW)&Info; - lpServiceDescription->lpDescription = (LPWSTR)(&Info + sizeof(LPSERVICE_DESCRIPTIONW)); + lpServiceDescription = (LPSERVICE_DESCRIPTIONW)Info.psd; + lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpServiceDescription + sizeof(LPSERVICE_DESCRIPTIONW)); if (lpServiceDescription != NULL && lpServiceDescription->lpDescription != NULL) { + DPRINT1("Setting value %S\n", lpServiceDescription->lpDescription); RegSetValueExW(hServiceKey, L"Description", 0, @@ -4212,7 +4216,7 @@ LPWSTR lpDescriptionW = NULL; LPSTR lpDescription = NULL; - DPRINT("RQueryServiceConfig2W() called\n"); + DPRINT1("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n",hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (!lpBuffer) return ERROR_INVALID_ADDRESS; @@ -4261,7 +4265,7 @@ &lpDescriptionW); if (dwError == ERROR_SUCCESS) { - *pcbBytesNeeded += ((wcslen(lpDescriptionW) + 1)); + *pcbBytesNeeded += ((wcslen(lpDescriptionW) + 1) * sizeof(WCHAR)); } if (cbBufSize >= *pcbBytesNeeded)

1 0

[janderwald] 39458: - Add a hack
by janderwald＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: janderwald Date: Sat Feb 7 09:35:07 2009 New Revision: 39458 URL: http://svn.reactos.org/svn/reactos?rev=39458&view=rev Log: - Add a hack Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Feb 7 09:35:07 2009 @@ -229,10 +229,11 @@ { case SERVICE_CONFIG_DESCRIPTION: Info.psd = (LPSERVICE_DESCRIPTIONA)&lpInfo; + Info.lpDescription = ((LPSERVICE_DESCRIPTIONA)lpInfo)->lpDescription; //HACK break; case SERVICE_CONFIG_FAILURE_ACTIONS: - Info.psfa = (LPSERVICE_FAILURE_ACTIONSA)&lpInfo; + Info.psfa = (LPSERVICE_FAILURE_ACTIONSA)lpInfo; break; default: @@ -2000,7 +2001,7 @@ { DWORD dwError; - TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", + DbgPrint("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p, cbBufSize %lu, pcbBytesNeeded %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION &&

1 0

[sedwards] 39457: - Reimplement TerminateShell function using WaitForSingleObject to avoid some of the excessive usage of Sleep. Let me know if you spot a bug.
by sedwards＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: sedwards Date: Sat Feb 7 09:21:15 2009 New Revision: 39457 URL: http://svn.reactos.org/svn/reactos?rev=39457&view=rev Log: - Reimplement TerminateShell function using WaitForSingleObject to avoid some of the excessive usage of Sleep. Let me know if you spot a bug. Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c Modified: trunk/rosapps/applications/sysutils/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/teln… ============================================================================== --- trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/telnetd/telnetd.c [iso-8859-1] Sat Feb 7 09:21:15 2009 @@ -17,19 +17,14 @@ * - Unify Debugging output and return StatusCodes */ -#include <stdio.h> -#include <windows.h> - #include "telnetd.h" #define telnetd_printf printf - #if 0 -extern void syslog (int priority, const char *fmt, ...); - -int telnetd_printf(const char *format, ...) -{ - syslog (6, format); +static inline int telnetd_printf(const char *format, ...); +{ + printf(format,...); + syslog (6, format); } #endif @@ -37,7 +32,6 @@ static BOOLEAN bShutdown = 0; static BOOLEAN bSocketInterfaceInitialised = 0; - static int sock; /* In the future, some options might be passed here to handle @@ -50,6 +44,9 @@ */ int main(int argc, char **argv) { + printf("Attempting to start Simple TelnetD\n"); + +// DetectPlatform(); SetConsoleCtrlHandler(Cleanup, 1); if (!StartSocketInterface()) @@ -142,7 +139,6 @@ if (client == NULL) ErrorExit("failed to allocate memory for client"); - client->socket = client_socket; CreateThread(NULL, 0, UserLoginThread, client, 0, &threadID); @@ -574,35 +570,52 @@ /* TerminateShell */ static void TerminateShell(client_t *client) { - DWORD exitCode; - DWORD dwWritten; - char stop[] = "\003\r\nexit\r\n"; /* Ctrl-C + exit */ - - GetExitCodeProcess(client->hProcess, &exitCode); - if (exitCode == STILL_ACTIVE) { - telnetd_printf("user shell still active, send Ctrl-Break to group-id %lu\n", client->dwProcessId ); - - if (!GenerateConsoleCtrlEvent( CTRL_BREAK_EVENT, client->dwProcessId )) - telnetd_printf("Failed to send Ctrl_break\n"); - - Sleep(500); - - if (!GenerateConsoleCtrlEvent( CTRL_C_EVENT, client->dwProcessId )) - telnetd_printf("Failed to send Ctrl_C\n"); - - Sleep(500); - - if (!WriteFile(client->hChildStdinWr, stop, sizeof(stop), &dwWritten, NULL)) - telnetd_printf("Error writing to pipe\n"); - - Sleep(500); + DWORD exitCode; + DWORD dwWritten; + char stop[] = "\003\r\nexit\r\n"; /* Ctrl-C + exit */ GetExitCodeProcess(client->hProcess, &exitCode); - if (exitCode == STILL_ACTIVE) { - telnetd_printf("user shell still active, attempt to terminate it now...\n"); - TerminateProcess(client->hProcess, 0); - } - } + + if (exitCode == STILL_ACTIVE) + { + HANDLE hEvent = NULL; + DWORD dwWaitResult; + + telnetd_printf("user shell still active, send Ctrl-Break to group-id %lu\n", client->dwProcessId ); + + hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if (hEvent == NULL) + printf("CreateEvent error\n"); + + if (!GenerateConsoleCtrlEvent( CTRL_BREAK_EVENT, client->dwProcessId )) + telnetd_printf("Failed to send Ctrl_break\n"); + + if (!GenerateConsoleCtrlEvent( CTRL_C_EVENT, client->dwProcessId )) + telnetd_printf("Failed to send Ctrl_C\n"); + + if (!WriteFile(client->hChildStdinWr, stop, sizeof(stop), &dwWritten, NULL)) + telnetd_printf("Error writing to pipe\n"); + + /* wait for our handler to be called */ + dwWaitResult=WaitForSingleObject(hEvent, 500); + + if (WAIT_FAILED==dwWaitResult) + telnetd_printf("WaitForSingleObject failed\n"); + + GetExitCodeProcess(client->hProcess, &exitCode); + if (exitCode == STILL_ACTIVE) + { + telnetd_printf("user shell still active, attempt to terminate it now...\n"); + + if (hEvent != NULL) + { + if (!CloseHandle(hEvent)) + telnetd_printf("CloseHandle"); + } + TerminateProcess(client->hProcess, 0); + } + } } /* ErrorExit */

1 0

[cwittich] 39456: fix a comment
by cwittich＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: cwittich Date: Sat Feb 7 09:15:01 2009 New Revision: 39456 URL: http://svn.reactos.org/svn/reactos?rev=39456&view=rev Log: fix a comment Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Feb 7 09:15:01 2009 @@ -727,7 +727,7 @@ ControlPacket->dwSize = TotalLength; wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); - /* Send the start command */ + /* Send the control packet */ WriteFile(Service->ControlPipeHandle, ControlPacket, sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)),

1 0

[janderwald] 39455: - Add a new member to SC_RPC_CONFIG_INFOA structure - This hack is currently required to pass LPSERVICE_DESCRIPTION onto services via rpc as the member is lpDescription is a variable length string pointer
by janderwald＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: janderwald Date: Sat Feb 7 09:06:59 2009 New Revision: 39455 URL: http://svn.reactos.org/svn/reactos?rev=39455&view=rev Log: - Add a new member to SC_RPC_CONFIG_INFOA structure - This hack is currently required to pass LPSERVICE_DESCRIPTION onto services via rpc as the member is lpDescription is a variable length string pointer Modified: trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Feb 7 09:06:59 2009 @@ -189,6 +189,7 @@ [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp; [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps; } DUMMYUNIONNAME; + [string, range(0, 8 * 1024)] LPSTR lpDescription; //FIXME } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA; typedef struct _SC_RPC_CONFIG_INFOW {

1 0

[dchapyshev] 39454: - Partially revert r39453
by dchapyshev＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: dchapyshev Date: Sat Feb 7 06:55:43 2009 New Revision: 39454 URL: http://svn.reactos.org/svn/reactos?rev=39454&view=rev Log: - Partially revert r39453 Removed: trunk/reactos/base/applications/winhstb/ Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sat Feb 7 06:55:43 2009 @@ -73,9 +73,6 @@ <directory name="winhlp32"> <xi:include href="winhlp32/winhlp32.rbuild" /> </directory> - <directory name="winhstb"> - <xi:include href="winhstb/winhstb.rbuild" /> - </directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Feb 7 06:55:43 2009 @@ -75,7 +75,6 @@ base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 base\applications\winhlp32\winhlp32.exe 4 -base\applications\winhstb\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\audiosrv\audiosrv.exe 1

1 0

[dchapyshev] 39453: - Add stub program for winhlp32 (should be located in system32) - winhlp32 now it is located in c:\reactos BUG: Stub program and winhlp32 have an identical name of a file, but are located in different directories. At installation winhlp32 it is copied in system32 and c:\reactos. We need to think up a way to install two or more files with identical names
by dchapyshev＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: dchapyshev Date: Sat Feb 7 05:21:07 2009 New Revision: 39453 URL: http://svn.reactos.org/svn/reactos?rev=39453&view=rev Log: - Add stub program for winhlp32 (should be located in system32) - winhlp32 now it is located in c:\reactos BUG: Stub program and winhlp32 have an identical name of a file, but are located in different directories. At installation winhlp32 it is copied in system32 and c:\reactos. We need to think up a way to install two or more files with identical names Added: trunk/reactos/base/applications/winhstb/ (with props) trunk/reactos/base/applications/winhstb/res/ (with props) trunk/reactos/base/applications/winhstb/res/4000.ico (with props) trunk/reactos/base/applications/winhstb/resource.h (with props) trunk/reactos/base/applications/winhstb/winhstb.c (with props) trunk/reactos/base/applications/winhstb/winhstb.rbuild (with props) trunk/reactos/base/applications/winhstb/winhstb.rc (with props) Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -73,6 +73,9 @@ <directory name="winhlp32"> <xi:include href="winhlp32/winhlp32.rbuild" /> </directory> + <directory name="winhstb"> + <xi:include href="winhstb/winhstb.rbuild" /> + </directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" allowwarnings="true" unicode="no"> +<module name="winhlp32" type="win32gui" installname="winhlp32.exe" allowwarnings="true" unicode="no"> <include base="winhlp32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__ROS_LONG64__" /> Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 7 05:21:07 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/winhstb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 7 05:21:07 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/winhstb/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/winhstb/res/4000.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/winhstb/res/4000.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/winhstb/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/resource.h (added) +++ trunk/reactos/base/applications/winhstb/resource.h [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,2 @@ +/* Icons */ +#define IDI_MAIN 4000 Propchange: trunk/reactos/base/applications/winhstb/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/winhstb/winhstb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/winhstb.c (added) +++ trunk/reactos/base/applications/winhstb/winhstb.c [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,46 @@ +/* + * PROJECT: winhlp32.exe + * FILE: base\applications\winhlp32\winhstb\winhstb.c + * PURPOSE: Stub winhelp32 + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include <windows.h> +#include <tchar.h> +#include <shellapi.h> +#include <shlwapi.h> +#include "resource.h" + +#define WINHLP _T("winhlp32.exe") + +int +WINAPI +_tWinMain(HINSTANCE hCurInst, + HINSTANCE hPrevInst, + LPTSTR lpsCmdLine, + int nCmdShow) +{ + TCHAR szPath[MAX_PATH]; + + if(GetWindowsDirectory(szPath, MAX_PATH)) + { + PathAppend(szPath, WINHLP); + ShellExecute(NULL, + NULL, + szPath, + lpsCmdLine, + NULL, + nCmdShow); + } + else + { + ShellExecute(NULL, + NULL, + WINHLP, + lpsCmdLine, + NULL, + nCmdShow); + } + + return 0; +} Propchange: trunk/reactos/base/applications/winhstb/winhstb.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/winhstb/winhstb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/winhstb.rbuild (added) +++ trunk/reactos/base/applications/winhstb/winhstb.rbuild [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="winhstb" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no"> + <include base="winhstb">.</include> + <library>user32</library> + <library>kernel32</library> + <library>shell32</library> + <library>shlwapi</library> + <file>winhstb.c</file> + <file>winhstb.rc</file> +</module> Propchange: trunk/reactos/base/applications/winhstb/winhstb.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/winhstb/winhstb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhstb/… ============================================================================== --- trunk/reactos/base/applications/winhstb/winhstb.rc (added) +++ trunk/reactos/base/applications/winhstb/winhstb.rc [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -1,0 +1,11 @@ +#include "resource.h" +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WinHlp32 Stub\0" +#define REACTOS_STR_INTERNAL_NAME "winhstb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "winhlp32.exe\0" +#include <reactos/version.rc> + +IDI_MAIN ICON "res/4000.ico" Propchange: trunk/reactos/base/applications/winhstb/winhstb.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Feb 7 05:21:07 2009 @@ -74,7 +74,8 @@ base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 base\applications\taskmgr\taskmgr.exe 1 -base\applications\winhlp32\winhlp32.exe 1 +base\applications\winhlp32\winhlp32.exe 4 +base\applications\winhstb\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 base\services\audiosrv\audiosrv.exe 1

1 0

[khornicek] 39452: - update polish translation of usetup by Olaf Siejka
by khornicek＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: khornicek Date: Sat Feb 7 04:36:57 2009 New Revision: 39452 URL: http://svn.reactos.org/svn/reactos?rev=39452&view=rev Log: - update polish translation of usetup by Olaf Siejka Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sat Feb 7 04:36:57 2009 @@ -1483,8 +1483,8 @@ }, { //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" + "Instalator nie m¢g ustawi lokalizacji geograficznej.\n" + "ENTER = Restart komputera" }, { NULL,

1 0

[cwittich] 39451: fix ScmRpcStatusToWinError handling
by cwittich＠svn.reactos.org 07 Feb '09

07 Feb '09

Author: cwittich Date: Sat Feb 7 03:11:31 2009 New Revision: 39451 URL: http://svn.reactos.org/svn/reactos?rev=39451&view=rev Log: fix ScmRpcStatusToWinError handling Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Feb 7 03:11:31 2009 @@ -195,12 +195,11 @@ case RPC_X_SS_IN_NULL_CONTEXT: return ERROR_INVALID_HANDLE; - case RPC_X_NULL_REF_POINTER: case RPC_X_ENUM_VALUE_OUT_OF_RANGE: case RPC_X_BYTE_COUNT_TOO_SMALL: return ERROR_INVALID_PARAMETER; - case STATUS_ACCESS_VIOLATION: + case RPC_X_NULL_REF_POINTER: return ERROR_INVALID_ADDRESS; default:

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009