Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[jimtabor] 23557: Implement SendNotifyMessage. Needs more testing.

by jimtabor＠svn.reactos.org

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)

18 years, 4 months

[gedmurphy] 23556: fix a few resource leaks

by gedmurphy＠svn.reactos.org

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; }

18 years, 4 months

[gedmurphy] 23555: [AUDIT] smdll.dll This is a ReactOS native library

by gedmurphy＠svn.reactos.org

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 @@ -*

18 years, 4 months

[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

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

18 years, 4 months

[gedmurphy] 23553: [AUDIT] samlib.dll Confirmed to be clean by Eric Kohl

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Aug 12 18:48:29 2006 New Revision: 23553 URL: http://svn.reactos.org/svn/reactos?rev=23553&view=rev Log: [AUDIT] samlib.dll Confirmed to be clean by Eric Kohl Modified: trunk/reactos/dll/win32/samlib/debug.h (props changed) trunk/reactos/dll/win32/samlib/dllmain.c (props changed) trunk/reactos/dll/win32/samlib/samlib.c (props changed) trunk/reactos/dll/win32/samlib/samlib.def (props changed) trunk/reactos/dll/win32/samlib/samlib.rc (props changed) Propchange: trunk/reactos/dll/win32/samlib/debug.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/samlib/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/samlib/samlib.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/samlib/samlib.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/samlib/samlib.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 4 months

[gedmurphy] 23552: revert 23551, wrong directory. As my penance, I'll review this one next ; )

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Aug 12 18:47:31 2006 New Revision: 23552 URL: http://svn.reactos.org/svn/reactos?rev=23552&view=rev Log: revert 23551, wrong directory. As my penance, I'll review this one next ;) 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 = * Propchange: trunk/reactos/dll/win32/smdll/query.c ------------------------------------------------------------------------------ svn:needs-lock = * Propchange: trunk/reactos/dll/win32/smdll/readme.txt ------------------------------------------------------------------------------ svn:needs-lock = * Propchange: trunk/reactos/dll/win32/smdll/smdll.def ------------------------------------------------------------------------------ svn:needs-lock = * Propchange: trunk/reactos/dll/win32/smdll/smdll.rc ------------------------------------------------------------------------------ svn:needs-lock = *

18 years, 4 months

[gedmurphy] 23551: [AUDIT] samlib.dll Confirmed to be clean by Eric Kohl

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Aug 12 18:44:58 2006 New Revision: 23551 URL: http://svn.reactos.org/svn/reactos?rev=23551&view=rev Log: [AUDIT] samlib.dll Confirmed to be clean by Eric Kohl 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 @@ -*

18 years, 4 months

[janderwald] 23550: * remove unused export

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 18:22:40 2006 New Revision: 23550 URL: http://svn.reactos.org/svn/reactos?rev=23550&view=rev Log: * remove unused export Modified: trunk/reactos/dll/cpl/intl/intl.def Modified: trunk/reactos/dll/cpl/intl/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.def (original) +++ trunk/reactos/dll/cpl/intl/intl.def Sat Aug 12 18:22:40 2006 @@ -2,6 +2,5 @@ EXPORTS CPlApplet@16 -LocalePageProc@16 ; EOF

18 years, 4 months

[janderwald] 23549: * allocate a terminating zero for every parsed argument

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 18:17:44 2006 New Revision: 23549 URL: http://svn.reactos.org/svn/reactos?rev=23549&view=rev Log: * allocate a terminating zero for every parsed argument 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:17:44 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) + 1) * sizeof(TCHAR)); + argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + argc) * sizeof(TCHAR)); if (!argv) { // Memory allocation failed

18 years, 4 months

[janderwald] 23548: * unhack calling international control panel applet by using rundll32

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 12 18:14:52 2006 New Revision: 23548 URL: http://svn.reactos.org/svn/reactos?rev=23548&view=rev Log: * unhack calling international control panel applet by using rundll32 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 18:14:52 2006 @@ -715,48 +715,34 @@ } -static VOID -RunInputLocalePage(HWND hwnd) -{ - PROPSHEETPAGE psp = {0}; - PROPSHEETHEADER psh = {0}; - HMODULE hDll; -// TCHAR Caption[256]; - - hDll = LoadLibrary(_T("intl.cpl")); - if (hDll == NULL) - return; - - psp.dwSize = sizeof(PROPSHEETPAGE); - psp.dwFlags = PSP_DEFAULT; - psp.hInstance = hDll; - psp.pszTemplate = MAKEINTRESOURCE(105); /* IDD_LOCALEPAGE from intl.cpl */ - psp.pfnDlgProc = GetProcAddress(hDll, "LocalePageProc"); - -// LoadString(hDll, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; -// psh.hwndParent = hwnd; -// psh.hInstance = hDll; -// psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); - psh.pszCaption = _T("Title"); //Caption; - psh.nPages = 1; - psh.nStartPage = 0; - psh.ppsp = &psp; - - PropertySheet(&psh); - - FreeLibrary(hDll); -} - static BOOL -SetInputLocale() -{ - //TODO - //store the default locale - - return FALSE; +RunControlPanelApplet(HWND hwnd, TCHAR *lpCommandLine) +{ + STARTUPINFO StartupInfo; + PROCESS_INFORMATION ProcessInformation; + + ZeroMemory(&StartupInfo, sizeof(STARTUPINFO)); + StartupInfo.cb = sizeof(STARTUPINFO); + + if (!CreateProcess(_T("rundll32.exe"), + lpCommandLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation)) + { + MessageBox(hwnd, _T("Error: failed to launch rundll32"), _T("Error"), MB_ICONERROR); + return FALSE; + } + + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + return TRUE; } static INT_PTR CALLBACK @@ -785,24 +771,24 @@ break; case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) - { - switch (LOWORD(wParam)) - { - case IDC_CUSTOMLOCALE: - { - RunInputLocalePage(hwndDlg); - /* FIXME: Update input locale name */ - } - break; - - case IDC_CUSTOMLAYOUT: - { -// RunKeyboardLayoutControlPanel(hwndDlg); - } - break; - } - } + if (HIWORD(wParam) == BN_CLICKED) + { + switch (LOWORD(wParam)) + { + case IDC_CUSTOMLOCALE: + { + RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL intl.cpl,,5")); + /* FIXME: Update input locale name */ + } + break; + + case IDC_CUSTOMLAYOUT: + { + RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL main.cpl,@1")); + } + break; + } + } break; case WM_NOTIFY: @@ -814,8 +800,9 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData->UnattendSetup && SetInputLocale()) + if (SetupData->UnattendSetup) { + RunControlPanelApplet(hwndDlg, _T("shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; }

18 years, 4 months

← Newer
1
...
27
28
29
30
31
32
33
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2006