Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 23563: * implement unattend switch for intl * makes ReactOS gui setup run unattended (untill VmWare popsup)
by janderwald＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: janderwald Date: Sat Aug 12 23:32:57 2006 New Revision: 23563 URL: http://svn.reactos.org/svn/reactos?rev=23563&view=rev Log: * implement unattend switch for intl * makes ReactOS gui setup run unattended (untill VmWare popsup) Modified: trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Sat Aug 12 23:32:57 2006 @@ -26,6 +26,8 @@ #include <windows.h> #include <commctrl.h> #include <cpl.h> +#include <setupapi.h> +#include <tchar.h> #include "intl.h" #include "resource.h" @@ -38,7 +40,7 @@ HINSTANCE hApplet = 0; - +HINF hSetupInf = INVALID_HANDLE_VALUE; /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -58,6 +60,71 @@ psp->pfnDlgProc = DlgProc; } +BOOL +OpenSetupInf() +{ + LPTSTR lpCmdLine; + LPTSTR lpSwitch; + size_t len; + + lpCmdLine = GetCommandLine(); + + lpSwitch = _tcsstr(lpCmdLine, _T("/f:\"")); + + if(!lpSwitch) + { + return FALSE; + } + + len = _tcslen(lpSwitch); + if (len < 5) + { + return FALSE; + } + + if(lpSwitch[len-1] != _T('\"')) + { + return FALSE; + } + + lpSwitch[len-1] = _T('\0'); + + hSetupInf = SetupOpenInfFile(&lpSwitch[4], + NULL, + INF_STYLE_OLDNT, + NULL); + + return (hSetupInf != INVALID_HANDLE_VALUE); +} + +LONG ParseSetupInf() +{ + INFCONTEXT InfContext; + INT LocaleID; + TCHAR szBuffer[30]; + + if (!SetupFindFirstLine(hSetupInf, + _T("Unattend"), + _T("LocaleID"), + &InfContext)) + { + return -1; + } + + if (!SetupGetStringField(&InfContext, + 1, + szBuffer, + sizeof(szBuffer) / sizeof(TCHAR), + NULL)) + { + return -1; + } + LocaleID = _ttoi(szBuffer); + SetNewLocale((LCID)LocaleID); + SetupCloseInfFile(hSetupInf); + + return 0; +} LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) @@ -65,6 +132,11 @@ PROPSHEETPAGE psp[6]; PROPSHEETHEADER psh; TCHAR Caption[256]; + + if (OpenSetupInf()) + { + return ParseSetupInf(); + } LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Sat Aug 12 23:32:57 2006 @@ -55,6 +55,9 @@ WPARAM wParam, LPARAM lParam); + +void SetNewLocale(LCID lcid); + #endif /* __CPL_INTL_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Sat Aug 12 23:32:57 2006 @@ -11,6 +11,7 @@ <library>user32</library> <library>comctl32</library> <library>advapi32</library> + <library>setupapi</library> <file>currency.c</file> <file>date.c</file> <file>general.c</file>

1 0

[janderwald] 23562: * make rundll32 work w/o kernel32 hack * thnx to Alex_Ionescu for hint
by janderwald＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: janderwald Date: Sat Aug 12 23:29:08 2006 New Revision: 23562 URL: http://svn.reactos.org/svn/reactos?rev=23562&view=rev Log: * make rundll32 work w/o kernel32 hack * thnx to Alex_Ionescu for hint Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Sat Aug 12 23:29:08 2006 @@ -724,7 +724,7 @@ ZeroMemory(&StartupInfo, sizeof(STARTUPINFO)); StartupInfo.cb = sizeof(STARTUPINFO); - if (!CreateProcess(_T("rundll32.exe"), + if (!CreateProcess(NULL, lpCommandLine, NULL, NULL, @@ -752,6 +752,7 @@ LPARAM lParam) { PSETUPDATA SetupData; + TCHAR szBuffer[MAX_PATH]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -777,14 +778,16 @@ { case IDC_CUSTOMLOCALE: { - RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL intl.cpl,,5")); + _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5")); + RunControlPanelApplet(hwndDlg, szBuffer); /* FIXME: Update input locale name */ } break; case IDC_CUSTOMLAYOUT: { - RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL main.cpl,@1")); + _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); + RunControlPanelApplet(hwndDlg, szBuffer); } break; } @@ -802,7 +805,8 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup) { - RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); + _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); + RunControlPanelApplet(hwndDlg, szBuffer); SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; }

1 0

[janderwald] 23561: revert my useless code
by janderwald＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: janderwald Date: Sat Aug 12 22:16:17 2006 New Revision: 23561 URL: http://svn.reactos.org/svn/reactos?rev=23561&view=rev Log: revert my useless code Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 22:16:17 2006 @@ -1227,70 +1227,7 @@ DPRINT("Quoted CmdLine: %S\n", QuotedCmdLine); } -#if 0 - else if(lpApplicationName && lpCommandLine) - { - int len; - int Size = 0; - WCHAR * AppName; - - AppName = wcsrchr(lpApplicationName, L'\\'); - if (AppName) - { - AppName++; - } - else - { - AppName = (WCHAR*)lpApplicationName; - } - - len = wcslen(AppName); - if (!_wcsnicmp(AppName, lpCommandLine, len-4) && lpCommandLine[len-4] == L' ') - { - /* remove application name */ - NullBuffer = wcschr(lpCommandLine, L' '); - } - else if (!_wcsnicmp(lpApplicationName, lpCommandLine, wcslen(lpApplicationName))) - { - NullBuffer = lpCommandLine + wcslen(lpApplicationName) + 1; - } - else - { - NullBuffer = (WCHAR*)lpCommandLine; - } - - if (NullBuffer) - { - Size = wcslen(NullBuffer) + 1; - } - - /* Allocate a buffer */ - QuotedCmdLine = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - (Size + wcslen(lpApplicationName) + 2 + 1) * - sizeof(WCHAR)); - if (QuotedCmdLine == NULL) - { - DPRINT1("Cannot allocate memory for quoted command line\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto Cleanup; - } - - /* Copy the first quote */ - wcscpy(QuotedCmdLine, L"\""); - - /* Add the command line and the finishing quote */ - wcscat(QuotedCmdLine, lpApplicationName); - wcscat(QuotedCmdLine, L"\""); - - if (Size) - { - wcscat(QuotedCmdLine, L" "); - wcscat(QuotedCmdLine, NullBuffer); - } - lpCommandLine = QuotedCmdLine; - } -#endif + if (Escape) { if (QuotedCmdLine == NULL)

1 0

[janderwald] 23560: disable code for now
by janderwald＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: janderwald Date: Sat Aug 12 21:41:38 2006 New Revision: 23560 URL: http://svn.reactos.org/svn/reactos?rev=23560&view=rev Log: disable code for now Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 21:41:38 2006 @@ -1227,6 +1227,7 @@ DPRINT("Quoted CmdLine: %S\n", QuotedCmdLine); } +#if 0 else if(lpApplicationName && lpCommandLine) { int len; @@ -1289,7 +1290,7 @@ } lpCommandLine = QuotedCmdLine; } - +#endif if (Escape) { if (QuotedCmdLine == NULL)

1 0

[janderwald] 23559: * handle special case
by janderwald＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: janderwald Date: Sat Aug 12 21:29:38 2006 New Revision: 23559 URL: http://svn.reactos.org/svn/reactos?rev=23559&view=rev Log: * handle special case Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 21:29:38 2006 @@ -673,7 +673,7 @@ * key (see http://blogs.msdn.com/oldnewthing/archive/2005/12/19/505449.aspx) */ - DPRINT1("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" + DPRINT("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" " lpEnvironment: %p lpCurrentDirectory: %S dwCreationFlags: %lx\n", lpApplicationName, lpCommandLine, lpEnvironment, lpCurrentDirectory, dwCreationFlags); @@ -1248,6 +1248,10 @@ { /* remove application name */ NullBuffer = wcschr(lpCommandLine, L' '); + } + else if (!_wcsnicmp(lpApplicationName, lpCommandLine, wcslen(lpApplicationName))) + { + NullBuffer = lpCommandLine + wcslen(lpApplicationName) + 1; } else {

1 0

[jimtabor] 23558: Remove hack for TS messages.
by jimtabor＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: jimtabor Date: Sat Aug 12 19:55:03 2006 New Revision: 23558 URL: http://svn.reactos.org/svn/reactos?rev=23558&view=rev Log: Remove hack for TS messages. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Sat Aug 12 19:55:03 2006 @@ -1103,19 +1103,13 @@ /* Copy data if required */ if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) { - - DPRINT1("Copy message to kernel from the User! %x from %x\n", KernelMem, UserModeMsg->lParam); - RtlCopyMemory(KernelMem, (PVOID) UserModeMsg->lParam, Size); - Status = STATUS_SUCCESS; - - -// Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); -// if (! NT_SUCCESS(Status)) -// { -// DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); -// ExFreePool(KernelMem); -// return Status; -// } + Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); + ExFreePool(KernelMem); + return Status; + } } else {

1 0

[jimtabor] 23557: Implement SendNotifyMessage. Needs more testing.
by jimtabor＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: jimtabor Date: Sat Aug 12 19:50:45 2006 New Revision: 23557 URL: http://svn.reactos.org/svn/reactos?rev=23557&view=rev Log: Implement SendNotifyMessage. Needs more testing. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Sat Aug 12 19:50:45 2006 @@ -1901,8 +1901,30 @@ WPARAM wParam, LPARAM lParam) { - UNIMPLEMENTED; - return FALSE; + MSG AnsiMsg, UcMsg; + MSG KMMsg; + LRESULT Result; + + AnsiMsg.hwnd = hWnd; + AnsiMsg.message = Msg; + AnsiMsg.wParam = wParam; + AnsiMsg.lParam = lParam; + if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg)) + { + return FALSE; + } + + if (! MsgiUMToKMMessage(&UcMsg, &KMMsg, TRUE)) + { + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + return FALSE; + } + Result = NtUserSendNotifyMessage(KMMsg.hwnd, KMMsg.message, + KMMsg.wParam, KMMsg.lParam); + MsgiUMToKMCleanup(&UcMsg, &KMMsg); + MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); + + return Result; } @@ -1917,8 +1939,22 @@ WPARAM wParam, LPARAM lParam) { - UNIMPLEMENTED; - return FALSE; + MSG UMMsg, KMMsg; + LRESULT Result; + + UMMsg.hwnd = hWnd; + UMMsg.message = Msg; + UMMsg.wParam = wParam; + UMMsg.lParam = lParam; + if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) + { + return FALSE; + } + Result = NtUserSendNotifyMessage(KMMsg.hwnd, KMMsg.message, + KMMsg.wParam, KMMsg.lParam); + MsgiUMToKMCleanup(&UMMsg, &KMMsg); + + return Result; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Sat Aug 12 19:50:45 2006 @@ -1103,13 +1103,19 @@ /* Copy data if required */ if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) { - Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); - ExFreePool(KernelMem); - return Status; - } + + DPRINT1("Copy message to kernel from the User! %x from %x\n", KernelMem, UserModeMsg->lParam); + RtlCopyMemory(KernelMem, (PVOID) UserModeMsg->lParam, Size); + Status = STATUS_SUCCESS; + + +// Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); +// if (! NT_SUCCESS(Status)) +// { +// DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); +// ExFreePool(KernelMem); +// return Status; +// } } else { @@ -1700,16 +1706,98 @@ return 0; } + +BOOL FASTCALL +UserSendNotifyMessage(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Result = TRUE; + // Basicly the same as IntPostOrSendMessage + if (hWnd == HWND_BROADCAST) //Handle Broadcast + { + HWND *List; + PWINDOW_OBJECT DesktopWindow; + ULONG i; + + DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + List = IntWinListChildren(DesktopWindow); + + if (List != NULL) + { + for (i = 0; List[i]; i++) + { + UserSendNotifyMessage(List[i], Msg, wParam, lParam); + } + ExFreePool(List); + } + } + else + { + ULONG_PTR PResult; + PWINDOW_OBJECT Window; + NTSTATUS Status; + MSG UserModeMsg; + MSG KernelModeMsg; + PMSGMEMORY MsgMemoryEntry; + + if(!(Window = UserGetWindowObject(hWnd))) return FALSE; + + if(Window->MessageQueue != PsGetCurrentThreadWin32Thread()->MessageQueue) + { // Send message w/o waiting for it. + Result = UserPostMessage(hWnd, Msg, wParam, lParam); + } + else + { // Handle message and callback. + UserModeMsg.hwnd = hWnd; + UserModeMsg.message = Msg; + UserModeMsg.wParam = wParam; + UserModeMsg.lParam = lParam; + MsgMemoryEntry = FindMsgMemory(UserModeMsg.message); + Status = CopyMsgToKernelMem(&KernelModeMsg, &UserModeMsg, MsgMemoryEntry); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + Result = co_IntSendMessageTimeoutSingle( + KernelModeMsg.hwnd, KernelModeMsg.message, + KernelModeMsg.wParam, KernelModeMsg.lParam, + SMTO_NORMAL, 0, &PResult); + + Status = CopyMsgToUserMem(&UserModeMsg, &KernelModeMsg); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + } + return Result; +} + + BOOL STDCALL NtUserSendNotifyMessage(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - UNIMPLEMENTED; - - return 0; -} + DECLARE_RETURN(BOOL); + + DPRINT("EnterNtUserSendNotifyMessage\n"); + UserEnterExclusive(); + + RETURN(UserSendNotifyMessage(hWnd, Msg, wParam, lParam)); + +CLEANUP: + DPRINT("Leave NtUserSendNotifyMessage, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; + +} + BOOL STDCALL NtUserWaitMessage(VOID)

1 0

[gedmurphy] 23556: fix a few resource leaks
by gedmurphy＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: gedmurphy Date: Sat Aug 12 19:17:29 2006 New Revision: 23556 URL: http://svn.reactos.org/svn/reactos?rev=23556&view=rev Log: fix a few resource leaks Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Sat Aug 12 19:17:29 2006 @@ -29,18 +29,27 @@ if (!AllocAndLoadString(&lpAppName, hInstance, IDS_APPNAME) || !AllocAndLoadString(&lpVersion, hInstance, IDS_VERSION) ) { - return 1; + return Ret; } len = (int)_tcslen(lpAppName) + (int)_tcslen(lpVersion); lpTitle = HeapAlloc(ProcessHeap, 0, (len + 2) * sizeof(TCHAR)); + if (lpTitle == NULL) + { + LocalFree((HLOCAL)lpAppName); + LocalFree((HLOCAL)lpVersion); + return Ret; + } wsprintf(lpTitle, _T("%s %s"), lpAppName, lpVersion); + + LocalFree((HLOCAL)lpAppName); + LocalFree((HLOCAL)lpVersion); if (TbdInitImpl()) { @@ -62,7 +71,6 @@ { if (bRet != (BOOL)-1) { - //if (Msg.message == WM_SIZE) MessageBox(NULL, _T("Got it"), NULL, 0); if (!MainWndTranslateMDISysAccel(hMainWnd, &Msg)) { @@ -87,7 +95,9 @@ TbdUninitImpl(); } - LocalFree((HLOCAL)lpAppName); + HeapFree(GetProcessHeap(), + 0, + lpTitle); return Ret; }

1 0

[gedmurphy] 23555: [AUDIT] smdll.dll This is a ReactOS native library
by gedmurphy＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: gedmurphy Date: Sat Aug 12 18:55:16 2006 New Revision: 23555 URL: http://svn.reactos.org/svn/reactos?rev=23555&view=rev Log: [AUDIT] smdll.dll This is a ReactOS native library Modified: trunk/reactos/dll/win32/smdll/dllmain.c (props changed) trunk/reactos/dll/win32/smdll/query.c (props changed) trunk/reactos/dll/win32/smdll/readme.txt (props changed) trunk/reactos/dll/win32/smdll/smdll.def (props changed) trunk/reactos/dll/win32/smdll/smdll.rc (props changed) Propchange: trunk/reactos/dll/win32/smdll/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/smdll/query.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/smdll/readme.txt ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/smdll/smdll.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/smdll/smdll.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 23554: revers Revision: 23549 | * allocate a terminating zero for every parsed argument The code cause a regress. and the old code is 100% correct. I spoken with janderwald about it *argc can be 0 when it call to CommandLineToArgv and he did not think of it. and agrument agrc is always 1, but that can not be take into accunt. for u do not paraser how many argc it exists you parser the current argv, like is it 0, is it 1 so on.
by greatlrd＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: greatlrd Date: Sat Aug 12 18:51:51 2006 New Revision: 23554 URL: http://svn.reactos.org/svn/reactos?rev=23554&view=rev Log: revers Revision: 23549 | * allocate a terminating zero for every parsed argument The code cause a regress. and the old code is 100% correct. I spoken with janderwald about it *argc can be 0 when it call to CommandLineToArgv and he did not think of it. and agrument agrc is always 1, but that can not be take into accunt. for u do not paraser how many argc it exists you parser the current argv, like is it 0, is it 1 so on. Modified: trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c (original) +++ trunk/reactos/base/system/rundll32/rundll32.c Sat Aug 12 18:51:51 2006 @@ -131,7 +131,7 @@ } // Allocate space for the pointers in argv and the strings in one block - argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + argc) * sizeof(TCHAR)); + argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + 1) * sizeof(TCHAR)); if (!argv) { // Memory allocation failed

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs