Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[gedmurphy] 22136: fix possible memory leak

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 1 02:39:51 2006 New Revision: 22136 URL: http://svn.reactos.ru/svn/reactos?rev=22136&view=rev Log: fix possible memory leak Modified: trunk/reactos/base/applications/screenshot/screenshot.c Modified: trunk/reactos/base/applications/screenshot/screenshot.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensho… ============================================================================== --- trunk/reactos/base/applications/screenshot/screenshot.c (original) +++ trunk/reactos/base/applications/screenshot/screenshot.c Thu Jun 1 02:39:51 2006 @@ -347,6 +347,8 @@ pScrSht = HeapAlloc(GetProcessHeap(), 0, sizeof(SCREENSHOT)); + if (pScrSht == NULL) + return -1; if (bFullScreen) { @@ -358,7 +360,13 @@ } if (pScrSht->hSelf == NULL) + { + HeapFree(GetProcessHeap(), + 0, + pScrSht); + return -1; + } if (CaptureScreen(pScrSht)) {

18 years, 6 months

[fireball] 22135: - Small update of the auditing doc - Test of new ViewVC post-commit hook

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 1 02:36:27 2006 New Revision: 22135 URL: http://svn.reactos.ru/svn/reactos?rev=22135&view=rev Log: - Small update of the auditing doc - Test of new ViewVC post-commit hook Modified: trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt Modified: trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt URL: http://svn.reactos.ru/svn/reactos/trunk/documentation/audit/ntoskrnl/io/pnp… ============================================================================== --- trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt (original) +++ trunk/documentation/audit/ntoskrnl/io/pnpmgr.txt Thu Jun 1 02:36:27 2006 @@ -41,7 +41,7 @@ Searches BusTypeGuid entry in the IopBusTypeGuidList list. If it is not found, create a new entry in the list and return its index Only ReactOS source code got in results of Google search. Function is heavily commented. There is a goto usage, however it's obvious and doesn't seem to come from reverse engineering. -Result: ? +Result: Probably clean (?) IopCreateDeviceNode() / IopFreeDeviceNode() Info: Google finds only ReactOS results. I haven't checked other information sources

18 years, 6 months

[amunger] 22134: Merge 22121 and 22122 from trunk.

by amunger＠svn.reactos.org

Author: amunger Date: Thu Jun 1 00:47:07 2006 New Revision: 22134 URL: http://svn.reactos.ru/svn/reactos?rev=22134&view=rev Log: Merge 22121 and 22122 from trunk. Added: branches/ros-branch-0_3_0/reactos/base/applications/screenshot/ - copied from r22122, trunk/reactos/base/applications/screenshot/ Modified: branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/base/ap… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/applications.rbuild Thu Jun 1 00:47:07 2006 @@ -46,11 +46,17 @@ <directory name="screensavers"> <xi:include href="screensavers/screensavers.rbuild" /> </directory> +<directory name="screenshot"> + <xi:include href="screenshot/screenshot.rbuild" /> +</directory> <directory name="servman"> <xi:include href="servman/servman.rbuild" /> </directory> <directory name="shutdown"> <xi:include href="shutdown/shutdown.rbuild" /> +</directory> +<directory name="sndvol32"> + <xi:include href="sndvol32/sndvol32.rbuild" /> </directory> <directory name="taskmgr"> <xi:include href="taskmgr/taskmgr.rbuild" /> Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/bo… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Thu Jun 1 00:47:07 2006 @@ -56,6 +56,7 @@ base\applications\regedit\clb\clb.dll 1 ;base\applications\reporterror\reporterror.exe 1 base\applications\sc\sc.exe 1 +base\applications\screenshot\screenshot.exe 1 base\applications\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 ;base\applications\sm\sm.exe 1

18 years, 6 months

[amunger] 22133: Merge 22077: Hack to fix blank installers.

by amunger＠svn.reactos.org

Author: amunger Date: Thu Jun 1 00:41:11 2006 New Revision: 22133 URL: http://svn.reactos.ru/svn/reactos?rev=22133&view=rev Log: Merge 22077: Hack to fix blank installers. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c Thu Jun 1 00:41:11 2006 @@ -11,6 +11,7 @@ #include <user32.h> +extern BOOL ControlsInitialized; /* * @implemented @@ -45,6 +46,12 @@ } } + /* Register built-in controls if not already done */ + if (! ControlsInitialized) + { + ControlsInitialized = ControlsInit(ClassName.Buffer); + } + Ret = NtUserGetClassInfo(hinst, &ClassName, (LPWNDCLASSEXW)lpwcx, @@ -85,6 +92,12 @@ { RtlInitUnicodeString(&ClassName, lpszClass); + } + + /* Register built-in controls if not already done */ + if (! ControlsInitialized) + { + ControlsInitialized = ControlsInit(ClassName.Buffer); } return NtUserGetClassInfo(hinst,

18 years, 6 months

[amunger] 22132: Merge 21956, 21957, 21960 from trunk. NtUserFindWindowEx fixes. Fixes missing volume icon in the TNA.

by amunger＠svn.reactos.org

Author: amunger Date: Thu Jun 1 00:36:01 2006 New Revision: 22132 URL: http://svn.reactos.ru/svn/reactos?rev=22132&view=rev Log: Merge 21956, 21957, 21960 from trunk. NtUserFindWindowEx fixes. Fixes missing volume icon in the TNA. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c Thu Jun 1 00:36:01 2006 @@ -516,33 +516,51 @@ LPCSTR lpszClass, LPCSTR lpszWindow) { - UNICODE_STRING ucClassName; - UNICODE_STRING ucWindowName; + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; HWND Result; - if (lpszClass == NULL) - { - ucClassName.Buffer = NULL; - ucClassName.Length = 0; - } - else if (IS_ATOM(lpszClass)) + if (IS_ATOM(lpszClass)) { ucClassName.Buffer = (LPWSTR)lpszClass; ucClassName.Length = 0; + pucClassName = &ucClassName; } - else + else if (lpszClass != NULL) { - RtlCreateUnicodeStringFromAsciiz(&ucClassName, (LPSTR)lpszClass); + if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, + (LPSTR)lpszClass)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + pucClassName = &ucClassName; } - RtlCreateUnicodeStringFromAsciiz(&ucWindowName, (LPSTR)lpszWindow); - - Result = NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, - &ucWindowName); - - if (!IS_ATOM(lpszClass)) + if (lpszWindow != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, + (LPSTR)lpszWindow)) + { + if (!IS_ATOM(lpszClass) && lpszClass != NULL) + RtlFreeUnicodeString(&ucWindowName); + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + pucWindowName = &ucWindowName; + } + + Result = NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName); + + if (!IS_ATOM(lpszClass) && lpszClass != NULL) RtlFreeUnicodeString(&ucClassName); - RtlFreeUnicodeString(&ucWindowName); + if (lpszWindow != NULL) + RtlFreeUnicodeString(&ucWindowName); return Result; } @@ -557,27 +575,33 @@ LPCWSTR lpszClass, LPCWSTR lpszWindow) { - UNICODE_STRING ucClassName; - UNICODE_STRING ucWindowName; - - if (lpszClass == NULL) + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; + + if (IS_ATOM(lpszClass)) { - ucClassName.Buffer = NULL; ucClassName.Length = 0; + ucClassName.Buffer = (LPWSTR)lpszClass; + pucClassName = &ucClassName; } - else if (IS_ATOM(lpszClass)) + else if (lpszClass != NULL) { - RtlInitUnicodeString(&ucClassName, NULL); - ucClassName.Buffer = (LPWSTR)lpszClass; + RtlInitUnicodeString(&ucClassName, + lpszClass); + pucClassName = &ucClassName; } - else + + if (lpszWindow != NULL) { - RtlInitUnicodeString(&ucClassName, lpszClass); + RtlInitUnicodeString(&ucWindowName, + lpszWindow); + pucWindowName = &ucWindowName; } - RtlInitUnicodeString(&ucWindowName, lpszWindow); - - return NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, &ucWindowName); + return NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName); } Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h Thu Jun 1 00:36:01 2006 @@ -70,6 +70,10 @@ OUT PWINDOWCLASS **Link OPTIONAL); BOOL +IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, + OUT RTL_ATOM *Atom); + +BOOL IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IN BOOL FreeOnFailure); Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c Thu Jun 1 00:36:01 2006 @@ -835,12 +835,11 @@ } ClassSize = sizeof(WINDOWCLASS) + lpwcx->cbClsExtra; - ClassSize += ClassName->Length + sizeof(UNICODE_NULL); - ClassSize += MenuName->Length + sizeof(UNICODE_NULL); - if (ClassName->Length != 0) - ClassSize += RtlUnicodeStringToAnsiSize(ClassName); if (MenuName->Length != 0) + { + ClassSize += MenuName->Length + sizeof(UNICODE_NULL); ClassSize += RtlUnicodeStringToAnsiSize(MenuName); + } if (Desktop != NULL) { @@ -996,14 +995,11 @@ return Class; } -RTL_ATOM -IntGetClassAtom(IN PUNICODE_STRING ClassName, - IN HINSTANCE hInstance OPTIONAL, - IN PW32PROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL) -{ - RTL_ATOM Atom = (RTL_ATOM)0; +BOOL +IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, + OUT RTL_ATOM *Atom) +{ + BOOL Ret = FALSE; if (ClassName->Length != 0) { @@ -1038,8 +1034,12 @@ /* lookup the atom */ Status = RtlLookupAtomInAtomTable(gAtomTable, AtomName, - &Atom); - if (!NT_SUCCESS(Status)) + Atom); + if (NT_SUCCESS(Status)) + { + Ret = TRUE; + } + else { if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1054,10 +1054,25 @@ else { ASSERT(IS_ATOM(ClassName->Buffer)); - Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); - } - - if (BaseClass != NULL && Atom != (RTL_ATOM)0) + *Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); + Ret = TRUE; + } + + return Ret; +} + +RTL_ATOM +IntGetClassAtom(IN PUNICODE_STRING ClassName, + IN HINSTANCE hInstance OPTIONAL, + IN PW32PROCESSINFO pi OPTIONAL, + OUT PWINDOWCLASS *BaseClass OPTIONAL, + OUT PWINDOWCLASS **Link OPTIONAL) +{ + RTL_ATOM Atom = (RTL_ATOM)0; + + if (IntGetAtomFromStringOrAtom(ClassName, + &Atom) && + BaseClass != NULL && Atom != (RTL_ATOM)0) { PWINDOWCLASS Class; Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Thu Jun 1 00:36:01 2006 @@ -2344,7 +2344,7 @@ } -HWND FASTCALL +static HWND FASTCALL IntFindWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT ChildAfter, RTL_ATOM ClassAtom, @@ -2356,7 +2356,7 @@ ASSERT(Parent); - CheckWindowName = (WindowName && (WindowName->Length > 0)); + CheckWindowName = WindowName->Length != 0; if((List = IntWinListChildren(Parent))) { @@ -2425,14 +2425,73 @@ PUNICODE_STRING ucWindowName) { PWINDOW_OBJECT Parent, ChildAfter; - UNICODE_STRING ClassName, WindowName; - NTSTATUS Status; + UNICODE_STRING ClassName = {0}, WindowName = {0}; HWND Desktop, Ret = NULL; - RTL_ATOM ClassAtom; + RTL_ATOM ClassAtom = (RTL_ATOM)0; DECLARE_RETURN(HWND); DPRINT("Enter NtUserFindWindowEx\n"); UserEnterShared(); + + if (ucClassName != NULL || ucWindowName != NULL) + { + _SEH_TRY + { + if (ucClassName != NULL) + { + ClassName = ProbeForReadUnicodeString(ucClassName); + if (ClassName.Length != 0) + { + ProbeForRead(ClassName.Buffer, + ClassName.Length, + sizeof(WCHAR)); + } + else if (!IS_ATOM(ClassName.Buffer)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH_LEAVE; + } + + if (!IntGetAtomFromStringOrAtom(&ClassName, + &ClassAtom)) + { + _SEH_LEAVE; + } + } + + if (ucWindowName != NULL) + { + WindowName = ProbeForReadUnicodeString(ucWindowName); + if (WindowName.Length != 0) + { + ProbeForRead(WindowName.Buffer, + WindowName.Length, + sizeof(WCHAR)); + } + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + RETURN(NULL); + } + _SEH_END; + + if (ucClassName != NULL) + { + if (ClassName.Length == 0 && ClassName.Buffer != NULL && + !IS_ATOM(ClassName.Buffer)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(NULL); + } + else if (ClassAtom == (RTL_ATOM)0) + { + /* LastError code was set by IntGetAtomFromStringOrAtom */ + RETURN(NULL); + } + } + } Desktop = IntGetCurrentThreadDesktopWindow(); @@ -2456,158 +2515,91 @@ RETURN( NULL); } - /* copy the window name */ - Status = IntSafeCopyUnicodeString(&WindowName, ucWindowName); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto Cleanup3; - } - - /* safely copy the class name */ - Status = MmCopyFromCaller(&ClassName, ucClassName, sizeof(UNICODE_STRING)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto Cleanup2; - } - if(ClassName.Length > 0 && ClassName.Buffer) - { - WCHAR *buf; - /* safely copy the class name string (NULL terminated because class-lookup - depends on it... */ - buf = ExAllocatePoolWithTag(PagedPool, ClassName.Length + sizeof(WCHAR), TAG_STRING); - if(!buf) - { - SetLastWin32Error(STATUS_INSUFFICIENT_RESOURCES); - goto Cleanup2; - } - Status = MmCopyFromCaller(buf, ClassName.Buffer, ClassName.Length); - if(!NT_SUCCESS(Status)) - { - ExFreePool(buf); - SetLastNtError(Status); - goto Cleanup2; - } - ClassName.Buffer = buf; - /* make sure the string is null-terminated */ - buf += ClassName.Length / sizeof(WCHAR); - *buf = L'\0'; - } - - /* find the class object */ - if(ClassName.Buffer) - { - PWINSTATION_OBJECT WinStaObject; - - if (PsGetWin32Thread()->Desktop == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - goto Cleanup; - } - - WinStaObject = PsGetWin32Thread()->Desktop->WindowStation; - - Status = RtlLookupAtomInAtomTable( - WinStaObject->AtomTable, - ClassName.Buffer, - &ClassAtom); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to lookup class atom!\n"); - SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); - goto Cleanup; - } - } - - if(Parent->hSelf == Desktop) - { - HWND *List, *phWnd; - PWINDOW_OBJECT TopLevelWindow; - BOOLEAN CheckWindowName; - BOOLEAN CheckClassName; - BOOLEAN WindowMatches; - BOOLEAN ClassMatches; - - /* windows searches through all top-level windows if the parent is the desktop - window */ - - if((List = IntWinListChildren(Parent))) - { - phWnd = List; - - if(ChildAfter) - { - /* skip handles before and including ChildAfter */ - while(*phWnd && (*(phWnd++) != ChildAfter->hSelf)) - ; - } - - CheckWindowName = WindowName.Length > 0; - CheckClassName = ClassName.Buffer != NULL; - - /* search children */ - while(*phWnd) - { - if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++)))) - { - continue; - } - - /* Do not send WM_GETTEXT messages in the kernel mode version! - The user mode version however calls GetWindowText() which will - send WM_GETTEXT messages to windows belonging to its processes */ - WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( - &WindowName, &TopLevelWindow->WindowName, TRUE); - ClassMatches = !CheckClassName || - ClassAtom == TopLevelWindow->Class->Atom; - - if (WindowMatches && ClassMatches) - { - Ret = TopLevelWindow->hSelf; - break; - } - - if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName)) - { - /* window returns the handle of the top-level window, in case it found - the child window */ - Ret = TopLevelWindow->hSelf; - break; - } - - } - ExFreePool(List); - } - } - else - Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); + _SEH_TRY + { + if(Parent->hSelf == Desktop) + { + HWND *List, *phWnd; + PWINDOW_OBJECT TopLevelWindow; + BOOLEAN CheckWindowName; + BOOLEAN WindowMatches; + BOOLEAN ClassMatches; + + /* windows searches through all top-level windows if the parent is the desktop + window */ + + if((List = IntWinListChildren(Parent))) + { + phWnd = List; + + if(ChildAfter) + { + /* skip handles before and including ChildAfter */ + while(*phWnd && (*(phWnd++) != ChildAfter->hSelf)) + ; + } + + CheckWindowName = WindowName.Length != 0; + + /* search children */ + while(*phWnd) + { + if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++)))) + { + continue; + } + + /* Do not send WM_GETTEXT messages in the kernel mode version! + The user mode version however calls GetWindowText() which will + send WM_GETTEXT messages to windows belonging to its processes */ + WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( + &WindowName, &TopLevelWindow->WindowName, TRUE); + ClassMatches = (ClassAtom == (RTL_ATOM)0) || + ClassAtom == TopLevelWindow->Class->Atom; + + if (WindowMatches && ClassMatches) + { + Ret = TopLevelWindow->hSelf; + break; + } + + if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName)) + { + /* window returns the handle of the top-level window, in case it found + the child window */ + Ret = TopLevelWindow->hSelf; + break; + } + + } + ExFreePool(List); + } + } + else + Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); #if 0 - if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) - { - /* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should - search the message-only windows. Should this also be done if - Parent is the desktop window??? */ - PWINDOW_OBJECT MsgWindows; - - if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) - { - Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); - } - } + if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) + { + /* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should + search the message-only windows. Should this also be done if + Parent is the desktop window??? */ + PWINDOW_OBJECT MsgWindows; + + if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) + { + Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); + } + } #endif - -Cleanup: - if(ClassName.Length > 0 && ClassName.Buffer) - ExFreePool(ClassName.Buffer); - -Cleanup2: - RtlFreeUnicodeString(&WindowName); - -Cleanup3: + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + Ret = NULL; + } + _SEH_END; RETURN( Ret);

18 years, 6 months

[amunger] 22131: Revert 22130, since this is the easiest way to get the commit message correct.

by amunger＠svn.reactos.org

Author: amunger Date: Thu Jun 1 00:34:16 2006 New Revision: 22131 URL: http://svn.reactos.ru/svn/reactos?rev=22131&view=rev Log: Revert 22130, since this is the easiest way to get the commit message correct. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c Thu Jun 1 00:34:16 2006 @@ -516,51 +516,33 @@ LPCSTR lpszClass, LPCSTR lpszWindow) { - UNICODE_STRING ucClassName, *pucClassName = NULL; - UNICODE_STRING ucWindowName, *pucWindowName = NULL; + UNICODE_STRING ucClassName; + UNICODE_STRING ucWindowName; HWND Result; - if (IS_ATOM(lpszClass)) + if (lpszClass == NULL) + { + ucClassName.Buffer = NULL; + ucClassName.Length = 0; + } + else if (IS_ATOM(lpszClass)) { ucClassName.Buffer = (LPWSTR)lpszClass; ucClassName.Length = 0; - pucClassName = &ucClassName; } - else if (lpszClass != NULL) + else { - if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, - (LPSTR)lpszClass)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - pucClassName = &ucClassName; + RtlCreateUnicodeStringFromAsciiz(&ucClassName, (LPSTR)lpszClass); } - if (lpszWindow != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, - (LPSTR)lpszWindow)) - { - if (!IS_ATOM(lpszClass) && lpszClass != NULL) - RtlFreeUnicodeString(&ucWindowName); - - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - pucWindowName = &ucWindowName; - } - - Result = NtUserFindWindowEx(hwndParent, - hwndChildAfter, - pucClassName, - pucWindowName); - - if (!IS_ATOM(lpszClass) && lpszClass != NULL) + RtlCreateUnicodeStringFromAsciiz(&ucWindowName, (LPSTR)lpszWindow); + + Result = NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, + &ucWindowName); + + if (!IS_ATOM(lpszClass)) RtlFreeUnicodeString(&ucClassName); - if (lpszWindow != NULL) - RtlFreeUnicodeString(&ucWindowName); + RtlFreeUnicodeString(&ucWindowName); return Result; } @@ -575,33 +557,27 @@ LPCWSTR lpszClass, LPCWSTR lpszWindow) { - UNICODE_STRING ucClassName, *pucClassName = NULL; - UNICODE_STRING ucWindowName, *pucWindowName = NULL; - - if (IS_ATOM(lpszClass)) + UNICODE_STRING ucClassName; + UNICODE_STRING ucWindowName; + + if (lpszClass == NULL) { + ucClassName.Buffer = NULL; ucClassName.Length = 0; + } + else if (IS_ATOM(lpszClass)) + { + RtlInitUnicodeString(&ucClassName, NULL); ucClassName.Buffer = (LPWSTR)lpszClass; - pucClassName = &ucClassName; } - else if (lpszClass != NULL) + else { - RtlInitUnicodeString(&ucClassName, - lpszClass); - pucClassName = &ucClassName; + RtlInitUnicodeString(&ucClassName, lpszClass); } - if (lpszWindow != NULL) - { - RtlInitUnicodeString(&ucWindowName, - lpszWindow); - pucWindowName = &ucWindowName; - } - - return NtUserFindWindowEx(hwndParent, - hwndChildAfter, - pucClassName, - pucWindowName); + RtlInitUnicodeString(&ucWindowName, lpszWindow); + + return NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, &ucWindowName); } Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h Thu Jun 1 00:34:16 2006 @@ -70,10 +70,6 @@ OUT PWINDOWCLASS **Link OPTIONAL); BOOL -IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, - OUT RTL_ATOM *Atom); - -BOOL IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IN BOOL FreeOnFailure); Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c Thu Jun 1 00:34:16 2006 @@ -835,11 +835,12 @@ } ClassSize = sizeof(WINDOWCLASS) + lpwcx->cbClsExtra; + ClassSize += ClassName->Length + sizeof(UNICODE_NULL); + ClassSize += MenuName->Length + sizeof(UNICODE_NULL); + if (ClassName->Length != 0) + ClassSize += RtlUnicodeStringToAnsiSize(ClassName); if (MenuName->Length != 0) - { - ClassSize += MenuName->Length + sizeof(UNICODE_NULL); ClassSize += RtlUnicodeStringToAnsiSize(MenuName); - } if (Desktop != NULL) { @@ -995,11 +996,14 @@ return Class; } -BOOL -IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, - OUT RTL_ATOM *Atom) -{ - BOOL Ret = FALSE; +RTL_ATOM +IntGetClassAtom(IN PUNICODE_STRING ClassName, + IN HINSTANCE hInstance OPTIONAL, + IN PW32PROCESSINFO pi OPTIONAL, + OUT PWINDOWCLASS *BaseClass OPTIONAL, + OUT PWINDOWCLASS **Link OPTIONAL) +{ + RTL_ATOM Atom = (RTL_ATOM)0; if (ClassName->Length != 0) { @@ -1034,12 +1038,8 @@ /* lookup the atom */ Status = RtlLookupAtomInAtomTable(gAtomTable, AtomName, - Atom); - if (NT_SUCCESS(Status)) - { - Ret = TRUE; - } - else + &Atom); + if (!NT_SUCCESS(Status)) { if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1054,25 +1054,10 @@ else { ASSERT(IS_ATOM(ClassName->Buffer)); - *Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); - Ret = TRUE; - } - - return Ret; -} - -RTL_ATOM -IntGetClassAtom(IN PUNICODE_STRING ClassName, - IN HINSTANCE hInstance OPTIONAL, - IN PW32PROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL) -{ - RTL_ATOM Atom = (RTL_ATOM)0; - - if (IntGetAtomFromStringOrAtom(ClassName, - &Atom) && - BaseClass != NULL && Atom != (RTL_ATOM)0) + Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); + } + + if (BaseClass != NULL && Atom != (RTL_ATOM)0) { PWINDOWCLASS Class; Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Thu Jun 1 00:34:16 2006 @@ -2344,7 +2344,7 @@ } -static HWND FASTCALL +HWND FASTCALL IntFindWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT ChildAfter, RTL_ATOM ClassAtom, @@ -2356,7 +2356,7 @@ ASSERT(Parent); - CheckWindowName = WindowName->Length != 0; + CheckWindowName = (WindowName && (WindowName->Length > 0)); if((List = IntWinListChildren(Parent))) { @@ -2425,73 +2425,14 @@ PUNICODE_STRING ucWindowName) { PWINDOW_OBJECT Parent, ChildAfter; - UNICODE_STRING ClassName = {0}, WindowName = {0}; + UNICODE_STRING ClassName, WindowName; + NTSTATUS Status; HWND Desktop, Ret = NULL; - RTL_ATOM ClassAtom = (RTL_ATOM)0; + RTL_ATOM ClassAtom; DECLARE_RETURN(HWND); DPRINT("Enter NtUserFindWindowEx\n"); UserEnterShared(); - - if (ucClassName != NULL || ucWindowName != NULL) - { - _SEH_TRY - { - if (ucClassName != NULL) - { - ClassName = ProbeForReadUnicodeString(ucClassName); - if (ClassName.Length != 0) - { - ProbeForRead(ClassName.Buffer, - ClassName.Length, - sizeof(WCHAR)); - } - else if (!IS_ATOM(ClassName.Buffer)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - _SEH_LEAVE; - } - - if (!IntGetAtomFromStringOrAtom(&ClassName, - &ClassAtom)) - { - _SEH_LEAVE; - } - } - - if (ucWindowName != NULL) - { - WindowName = ProbeForReadUnicodeString(ucWindowName); - if (WindowName.Length != 0) - { - ProbeForRead(WindowName.Buffer, - WindowName.Length, - sizeof(WCHAR)); - } - } - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - RETURN(NULL); - } - _SEH_END; - - if (ucClassName != NULL) - { - if (ClassName.Length == 0 && ClassName.Buffer != NULL && - !IS_ATOM(ClassName.Buffer)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(NULL); - } - else if (ClassAtom == (RTL_ATOM)0) - { - /* LastError code was set by IntGetAtomFromStringOrAtom */ - RETURN(NULL); - } - } - } Desktop = IntGetCurrentThreadDesktopWindow(); @@ -2515,91 +2456,158 @@ RETURN( NULL); } - _SEH_TRY - { - if(Parent->hSelf == Desktop) - { - HWND *List, *phWnd; - PWINDOW_OBJECT TopLevelWindow; - BOOLEAN CheckWindowName; - BOOLEAN WindowMatches; - BOOLEAN ClassMatches; - - /* windows searches through all top-level windows if the parent is the desktop - window */ - - if((List = IntWinListChildren(Parent))) - { - phWnd = List; - - if(ChildAfter) - { - /* skip handles before and including ChildAfter */ - while(*phWnd && (*(phWnd++) != ChildAfter->hSelf)) - ; - } - - CheckWindowName = WindowName.Length != 0; - - /* search children */ - while(*phWnd) - { - if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++)))) - { - continue; - } - - /* Do not send WM_GETTEXT messages in the kernel mode version! - The user mode version however calls GetWindowText() which will - send WM_GETTEXT messages to windows belonging to its processes */ - WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( - &WindowName, &TopLevelWindow->WindowName, TRUE); - ClassMatches = (ClassAtom == (RTL_ATOM)0) || - ClassAtom == TopLevelWindow->Class->Atom; - - if (WindowMatches && ClassMatches) - { - Ret = TopLevelWindow->hSelf; - break; - } - - if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName)) - { - /* window returns the handle of the top-level window, in case it found - the child window */ - Ret = TopLevelWindow->hSelf; - break; - } - - } - ExFreePool(List); - } - } - else - Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); + /* copy the window name */ + Status = IntSafeCopyUnicodeString(&WindowName, ucWindowName); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto Cleanup3; + } + + /* safely copy the class name */ + Status = MmCopyFromCaller(&ClassName, ucClassName, sizeof(UNICODE_STRING)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto Cleanup2; + } + if(ClassName.Length > 0 && ClassName.Buffer) + { + WCHAR *buf; + /* safely copy the class name string (NULL terminated because class-lookup + depends on it... */ + buf = ExAllocatePoolWithTag(PagedPool, ClassName.Length + sizeof(WCHAR), TAG_STRING); + if(!buf) + { + SetLastWin32Error(STATUS_INSUFFICIENT_RESOURCES); + goto Cleanup2; + } + Status = MmCopyFromCaller(buf, ClassName.Buffer, ClassName.Length); + if(!NT_SUCCESS(Status)) + { + ExFreePool(buf); + SetLastNtError(Status); + goto Cleanup2; + } + ClassName.Buffer = buf; + /* make sure the string is null-terminated */ + buf += ClassName.Length / sizeof(WCHAR); + *buf = L'\0'; + } + + /* find the class object */ + if(ClassName.Buffer) + { + PWINSTATION_OBJECT WinStaObject; + + if (PsGetWin32Thread()->Desktop == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + goto Cleanup; + } + + WinStaObject = PsGetWin32Thread()->Desktop->WindowStation; + + Status = RtlLookupAtomInAtomTable( + WinStaObject->AtomTable, + ClassName.Buffer, + &ClassAtom); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lookup class atom!\n"); + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); + goto Cleanup; + } + } + + if(Parent->hSelf == Desktop) + { + HWND *List, *phWnd; + PWINDOW_OBJECT TopLevelWindow; + BOOLEAN CheckWindowName; + BOOLEAN CheckClassName; + BOOLEAN WindowMatches; + BOOLEAN ClassMatches; + + /* windows searches through all top-level windows if the parent is the desktop + window */ + + if((List = IntWinListChildren(Parent))) + { + phWnd = List; + + if(ChildAfter) + { + /* skip handles before and including ChildAfter */ + while(*phWnd && (*(phWnd++) != ChildAfter->hSelf)) + ; + } + + CheckWindowName = WindowName.Length > 0; + CheckClassName = ClassName.Buffer != NULL; + + /* search children */ + while(*phWnd) + { + if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++)))) + { + continue; + } + + /* Do not send WM_GETTEXT messages in the kernel mode version! + The user mode version however calls GetWindowText() which will + send WM_GETTEXT messages to windows belonging to its processes */ + WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( + &WindowName, &TopLevelWindow->WindowName, TRUE); + ClassMatches = !CheckClassName || + ClassAtom == TopLevelWindow->Class->Atom; + + if (WindowMatches && ClassMatches) + { + Ret = TopLevelWindow->hSelf; + break; + } + + if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName)) + { + /* window returns the handle of the top-level window, in case it found + the child window */ + Ret = TopLevelWindow->hSelf; + break; + } + + } + ExFreePool(List); + } + } + else + Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); #if 0 - if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) - { - /* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should - search the message-only windows. Should this also be done if - Parent is the desktop window??? */ - PWINDOW_OBJECT MsgWindows; - - if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) - { - Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); - } - } + if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) + { + /* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should + search the message-only windows. Should this also be done if + Parent is the desktop window??? */ + PWINDOW_OBJECT MsgWindows; + + if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) + { + Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); + } + } #endif - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - Ret = NULL; - } - _SEH_END; + +Cleanup: + if(ClassName.Length > 0 && ClassName.Buffer) + ExFreePool(ClassName.Buffer); + +Cleanup2: + RtlFreeUnicodeString(&WindowName); + +Cleanup3: RETURN( Ret);

18 years, 6 months

[amunger] 22130: svn-commit.tmp

by amunger＠svn.reactos.org

Author: amunger Date: Thu Jun 1 00:21:24 2006 New Revision: 22130 URL: http://svn.reactos.ru/svn/reactos?rev=22130&view=rev Log: svn-commit.tmp Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c Thu Jun 1 00:21:24 2006 @@ -516,33 +516,51 @@ LPCSTR lpszClass, LPCSTR lpszWindow) { - UNICODE_STRING ucClassName; - UNICODE_STRING ucWindowName; + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; HWND Result; - if (lpszClass == NULL) - { - ucClassName.Buffer = NULL; - ucClassName.Length = 0; - } - else if (IS_ATOM(lpszClass)) + if (IS_ATOM(lpszClass)) { ucClassName.Buffer = (LPWSTR)lpszClass; ucClassName.Length = 0; + pucClassName = &ucClassName; } - else + else if (lpszClass != NULL) { - RtlCreateUnicodeStringFromAsciiz(&ucClassName, (LPSTR)lpszClass); + if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, + (LPSTR)lpszClass)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + pucClassName = &ucClassName; } - RtlCreateUnicodeStringFromAsciiz(&ucWindowName, (LPSTR)lpszWindow); - - Result = NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, - &ucWindowName); - - if (!IS_ATOM(lpszClass)) + if (lpszWindow != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, + (LPSTR)lpszWindow)) + { + if (!IS_ATOM(lpszClass) && lpszClass != NULL) + RtlFreeUnicodeString(&ucWindowName); + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + pucWindowName = &ucWindowName; + } + + Result = NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName); + + if (!IS_ATOM(lpszClass) && lpszClass != NULL) RtlFreeUnicodeString(&ucClassName); - RtlFreeUnicodeString(&ucWindowName); + if (lpszWindow != NULL) + RtlFreeUnicodeString(&ucWindowName); return Result; } @@ -557,27 +575,33 @@ LPCWSTR lpszClass, LPCWSTR lpszWindow) { - UNICODE_STRING ucClassName; - UNICODE_STRING ucWindowName; - - if (lpszClass == NULL) + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; + + if (IS_ATOM(lpszClass)) { - ucClassName.Buffer = NULL; ucClassName.Length = 0; + ucClassName.Buffer = (LPWSTR)lpszClass; + pucClassName = &ucClassName; } - else if (IS_ATOM(lpszClass)) + else if (lpszClass != NULL) { - RtlInitUnicodeString(&ucClassName, NULL); - ucClassName.Buffer = (LPWSTR)lpszClass; + RtlInitUnicodeString(&ucClassName, + lpszClass); + pucClassName = &ucClassName; } - else + + if (lpszWindow != NULL) { - RtlInitUnicodeString(&ucClassName, lpszClass); + RtlInitUnicodeString(&ucWindowName, + lpszWindow); + pucWindowName = &ucWindowName; } - RtlInitUnicodeString(&ucWindowName, lpszWindow); - - return NtUserFindWindowEx(hwndParent, hwndChildAfter, &ucClassName, &ucWindowName); + return NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName); } Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/include/class.h Thu Jun 1 00:21:24 2006 @@ -70,6 +70,10 @@ OUT PWINDOWCLASS **Link OPTIONAL); BOOL +IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, + OUT RTL_ATOM *Atom); + +BOOL IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IN BOOL FreeOnFailure); Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/class.c Thu Jun 1 00:21:24 2006 @@ -835,12 +835,11 @@ } ClassSize = sizeof(WINDOWCLASS) + lpwcx->cbClsExtra; - ClassSize += ClassName->Length + sizeof(UNICODE_NULL); - ClassSize += MenuName->Length + sizeof(UNICODE_NULL); - if (ClassName->Length != 0) - ClassSize += RtlUnicodeStringToAnsiSize(ClassName); if (MenuName->Length != 0) + { + ClassSize += MenuName->Length + sizeof(UNICODE_NULL); ClassSize += RtlUnicodeStringToAnsiSize(MenuName); + } if (Desktop != NULL) { @@ -996,14 +995,11 @@ return Class; } -RTL_ATOM -IntGetClassAtom(IN PUNICODE_STRING ClassName, - IN HINSTANCE hInstance OPTIONAL, - IN PW32PROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL) -{ - RTL_ATOM Atom = (RTL_ATOM)0; +BOOL +IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, + OUT RTL_ATOM *Atom) +{ + BOOL Ret = FALSE; if (ClassName->Length != 0) { @@ -1038,8 +1034,12 @@ /* lookup the atom */ Status = RtlLookupAtomInAtomTable(gAtomTable, AtomName, - &Atom); - if (!NT_SUCCESS(Status)) + Atom); + if (NT_SUCCESS(Status)) + { + Ret = TRUE; + } + else { if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1054,10 +1054,25 @@ else { ASSERT(IS_ATOM(ClassName->Buffer)); - Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); - } - - if (BaseClass != NULL && Atom != (RTL_ATOM)0) + *Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer); + Ret = TRUE; + } + + return Ret; +} + +RTL_ATOM +IntGetClassAtom(IN PUNICODE_STRING ClassName, + IN HINSTANCE hInstance OPTIONAL, + IN PW32PROCESSINFO pi OPTIONAL, + OUT PWINDOWCLASS *BaseClass OPTIONAL, + OUT PWINDOWCLASS **Link OPTIONAL) +{ + RTL_ATOM Atom = (RTL_ATOM)0; + + if (IntGetAtomFromStringOrAtom(ClassName, + &Atom) && + BaseClass != NULL && Atom != (RTL_ATOM)0) { PWINDOWCLASS Class; Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsyst… ============================================================================== --- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Thu Jun 1 00:21:24 2006 @@ -2344,7 +2344,7 @@ } -HWND FASTCALL +static HWND FASTCALL IntFindWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT ChildAfter, RTL_ATOM ClassAtom, @@ -2356,7 +2356,7 @@ ASSERT(Parent); - CheckWindowName = (WindowName && (WindowName->Length > 0)); + CheckWindowName = WindowName->Length != 0; if((List = IntWinListChildren(Parent))) { @@ -2425,14 +2425,73 @@ PUNICODE_STRING ucWindowName) { PWINDOW_OBJECT Parent, ChildAfter; - UNICODE_STRING ClassName, WindowName; - NTSTATUS Status; + UNICODE_STRING ClassName = {0}, WindowName = {0}; HWND Desktop, Ret = NULL; - RTL_ATOM ClassAtom; + RTL_ATOM ClassAtom = (RTL_ATOM)0; DECLARE_RETURN(HWND); DPRINT("Enter NtUserFindWindowEx\n"); UserEnterShared(); + + if (ucClassName != NULL || ucWindowName != NULL) + { + _SEH_TRY + { + if (ucClassName != NULL) + { + ClassName = ProbeForReadUnicodeString(ucClassName); + if (ClassName.Length != 0) + { + ProbeForRead(ClassName.Buffer, + ClassName.Length, + sizeof(WCHAR)); + } + else if (!IS_ATOM(ClassName.Buffer)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH_LEAVE; + } + + if (!IntGetAtomFromStringOrAtom(&ClassName, + &ClassAtom)) + { + _SEH_LEAVE; + } + } + + if (ucWindowName != NULL) + { + WindowName = ProbeForReadUnicodeString(ucWindowName); + if (WindowName.Length != 0) + { + ProbeForRead(WindowName.Buffer, + WindowName.Length, + sizeof(WCHAR)); + } + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + RETURN(NULL); + } + _SEH_END; + + if (ucClassName != NULL) + { + if (ClassName.Length == 0 && ClassName.Buffer != NULL && + !IS_ATOM(ClassName.Buffer)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(NULL); + } + else if (ClassAtom == (RTL_ATOM)0) + { + /* LastError code was set by IntGetAtomFromStringOrAtom */ + RETURN(NULL); + } + } + } Desktop = IntGetCurrentThreadDesktopWindow(); @@ -2456,158 +2515,91 @@ RETURN( NULL); } - /* copy the window name */ - Status = IntSafeCopyUnicodeString(&WindowName, ucWindowName); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto Cleanup3; - } - - /* safely copy the class name */ - Status = MmCopyFromCaller(&ClassName, ucClassName, sizeof(UNICODE_STRING)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto Cleanup2; - } - if(ClassName.Length > 0 && ClassName.Buffer) - { - WCHAR *buf; - /* safely copy the class name string (NULL terminated because class-lookup - depends on it... */ - buf = ExAllocatePoolWithTag(PagedPool, ClassName.Length + sizeof(WCHAR), TAG_STRING); - if(!buf) - { - SetLastWin32Error(STATUS_INSUFFICIENT_RESOURCES); - goto Cleanup2; - } - Status = MmCopyFromCaller(buf, ClassName.Buffer, ClassName.Length); - if(!NT_SUCCESS(Status)) - { - ExFreePool(buf); - SetLastNtError(Status); - goto Cleanup2; - } - ClassName.Buffer = buf; - /* make sure the string is null-terminated */ - buf += ClassName.Length / sizeof(WCHAR); - *buf = L'\0'; - } - - /* find the class object */ - if(ClassName.Buffer) - { - PWINSTATION_OBJECT WinStaObject; - - if (PsGetWin32Thread()->Desktop == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - goto Cleanup; - } - - WinStaObject = PsGetWin32Thread()->Desktop->WindowStation; - - Status = RtlLookupAtomInAtomTable( - WinStaObject->AtomTable, - ClassName.Buffer, - &ClassAtom); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to lookup class atom!\n"); - SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); - goto Cleanup; - } - } - - if(Parent->hSelf == Desktop) - { - HWND *List, *phWnd; - PWINDOW_OBJECT TopLevelWindow; - BOOLEAN CheckWindowName; - BOOLEAN CheckClassName; - BOOLEAN WindowMatches; - BOOLEAN ClassMatches; - - /* windows searches through all top-level windows if the parent is the desktop - window */ - - if((List = IntWinListChildren(Parent))) - { - phWnd = List; - - if(ChildAfter) - { - /* skip handles before and including ChildAfter */ - while(*phWnd && (*(phWnd++) != ChildAfter->hSelf)) - ; - } - - CheckWindowName = WindowName.Length > 0; - CheckClassName = ClassName.Buffer != NULL; - - /* search children */ - while(*phWnd) - { - if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++)))) - { - continue; - } - - /* Do not send WM_GETTEXT messages in the kernel mode version! - The user mode version however calls GetWindowText() which will - send WM_GETTEXT messages to windows belonging to its processes */ - WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( - &WindowName, &TopLevelWindow->WindowName, TRUE); - ClassMatches = !CheckClassName || - ClassAtom == TopLevelWindow->Class->Atom; - - if (WindowMatches && ClassMatches) - { - Ret = TopLevelWindow->hSelf; - break; - } - - if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName)) - { - /* window returns the handle of the top-level window, in case it found - the child window */ - Ret = TopLevelWindow->hSelf; - break; - } - - } - ExFreePool(List); - } - } - else - Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); + _SEH_TRY + { + if(Parent->hSelf == Desktop) + { + HWND *List, *phWnd; + PWINDOW_OBJECT TopLevelWindow; + BOOLEAN CheckWindowName; + BOOLEAN WindowMatches; + BOOLEAN ClassMatches; + + /* windows searches through all top-level windows if the parent is the desktop + window */ + + if((List = IntWinListChildren(Parent))) + { + phWnd = List; + + if(ChildAfter) + { + /* skip handles before and including ChildAfter */ + while(*phWnd && (*(phWnd++) != ChildAfter->hSelf)) + ; + } + + CheckWindowName = WindowName.Length != 0; + + /* search children */ + while(*phWnd) + { + if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++)))) + { + continue; + } + + /* Do not send WM_GETTEXT messages in the kernel mode version! + The user mode version however calls GetWindowText() which will + send WM_GETTEXT messages to windows belonging to its processes */ + WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( + &WindowName, &TopLevelWindow->WindowName, TRUE); + ClassMatches = (ClassAtom == (RTL_ATOM)0) || + ClassAtom == TopLevelWindow->Class->Atom; + + if (WindowMatches && ClassMatches) + { + Ret = TopLevelWindow->hSelf; + break; + } + + if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName)) + { + /* window returns the handle of the top-level window, in case it found + the child window */ + Ret = TopLevelWindow->hSelf; + break; + } + + } + ExFreePool(List); + } + } + else + Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName); #if 0 - if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) - { - /* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should - search the message-only windows. Should this also be done if - Parent is the desktop window??? */ - PWINDOW_OBJECT MsgWindows; - - if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) - { - Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); - } - } + if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL) + { + /* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should + search the message-only windows. Should this also be done if + Parent is the desktop window??? */ + PWINDOW_OBJECT MsgWindows; + + if((MsgWindows = UserGetWindowObject(IntGetMessageWindow()))) + { + Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName); + } + } #endif - -Cleanup: - if(ClassName.Length > 0 && ClassName.Buffer) - ExFreePool(ClassName.Buffer); - -Cleanup2: - RtlFreeUnicodeString(&WindowName); - -Cleanup3: + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + Ret = NULL; + } + _SEH_END; RETURN( Ret);

18 years, 6 months

[cwittich] 22129: -fixed bug 1513 -some changes to De.rc

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed May 31 19:28:43 2006 New Revision: 22129 URL: http://svn.reactos.ru/svn/reactos?rev=22129&view=rev Log: -fixed bug 1513 -some changes to De.rc Modified: trunk/reactos/dll/cpl/main/De.rc trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/De.rc?rev=2212… ============================================================================== --- trunk/reactos/dll/cpl/main/De.rc (original) +++ trunk/reactos/dll/cpl/main/De.rc Wed May 31 19:28:43 2006 @@ -22,11 +22,11 @@ CAPTION "Click Lock" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Short", -1, 35, 50, 30, 10 - LTEXT "Long", -1, 140, 50, 30, 10 + LTEXT "Kurz", -1, 35, 50, 30, 10 + LTEXT "Lang", -1, 140, 50, 30, 10 CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 175, 75, 50, 15 + PUSHBUTTON "&Abbrechen", IDCANCEL, 175, 75, 50, 15 LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END @@ -43,50 +43,50 @@ GROUPBOX "Double-click speed", -1, 5, 75, 230, 70 LTEXT "Double-click the folder to test your settings. If the folder does not open or close, try using a slower setting.", -1, 10, 85, 160, 30 LTEXT "Spee&d: Slow", -1, 10, 120, 90, 8 - LTEXT "Fast", -1, 140, 120, 30, 8 + LTEXT "Schnell", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_OWNERDRAW, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "ClickLock", -1, 5, 150, 230, 70 CHECKBOX "&Turn on ClickLock", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 - PUSHBUTTON "&Settings...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 + PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 LTEXT "Enables you to highlight or drag without holding down the mouse button. To set, briefly press the mouse button. To release, click the mouse button again", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Pointer" +CAPTION "Zeiger" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Scheme", -1, 5, 5, 170, 45 + GROUPBOX "Schema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + PUSHBUTTON "&Löschen", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE - LTEXT "&Customize", -1, 5, 60, 40, 10 + LTEXT "&Anpassen", -1, 5, 60, 40, 10 CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 - PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 + PUSHBUTTON "&Durchsuchen", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU -CAPTION "Save Scheme" +CAPTION "Schema speichern" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this cursor scheme as:", -1, 5, 5, 100, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 115, 45, 50, 15 + PUSHBUTTON "&Abbrechen", IDCANCEL, 115, 45, 50, 15 END IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Pointer Options" +CAPTION "Zeiger Optionen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Motion", -1, 5, 5, 230, 60 + GROUPBOX "Bewegung", -1, 5, 5, 230, 60 LTEXT "Sele&ct a pointer speed:", -1, 60, 15, 110, 10 LTEXT "Slow", -1, 60, 30, 20, 10 CONTROL "",IDC_SLIDER_MOUSE_SENSITIVITY, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 @@ -99,8 +99,8 @@ LTEXT "A&utomatically move pointer to the default button in a dialog box", -1, 73, 75, 152, 20 GROUPBOX "Visibility", -1, 5, 105, 230, 90 CHECKBOX "&Display pointer trails", IDC_CHECK_POINTER_TRAIL, 60, 110, 80, 10 - LTEXT "Short", -1, 60, 130, 30, 10 - LTEXT "Long", -1, 160, 130, 30, 10 + LTEXT "Kurz", -1, 60, 130, 30, 10 + LTEXT "Lang", -1, 160, 130, 30, 10 ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 @@ -111,7 +111,7 @@ IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Wheel" +CAPTION "Rad" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Scrolling", -1, 5, 5, 230, 80 @@ -130,7 +130,7 @@ IDS_CPLDESCRIPTION_1 "Mauseinstellungen ändern." IDS_CPLNAME_2 "Tastatur" IDS_CPLDESCRIPTION_2 "Tastatureinstellungen ändern." - IDS_ARROW "Normal Select" + IDS_ARROW "Normal Select" IDS_HELP "Help Select" IDS_APPSTARTING "Working in Background" IDS_WAIT "Busy" @@ -145,5 +145,5 @@ IDS_UPARROW "Alternative Select" IDS_HAND "Link Select" IDS_NONE "(None)" - IDS_SYSTEM_SCHEME "(system scheme)" + IDS_SYSTEM_SCHEME "(systemschema)" END Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed May 31 19:28:43 2006 @@ -1109,6 +1109,7 @@ case WM_INITDIALOG: { ShowDialogWheelControls(hwndDlg); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES), UDM_SETRANGE, 0, MAKELONG ((short) 100, (short) 0)); if (g_WheelScrollLines != UINT_MAX) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_WHEEL_SCROLL_LINES);

18 years, 6 months

[greatlrd] 22128: recommit french translatoins : patch from bug 1539 : the patch are provide by usurp

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 31 19:18:02 2006 New Revision: 22128 URL: http://svn.reactos.ru/svn/reactos?rev=22128&view=rev Log: recommit french translatoins : patch from bug 1539 : the patch are provide by usurp Modified: trunk/reactos/dll/win32/newdev/Fr.rc Modified: trunk/reactos/dll/win32/newdev/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/Fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/newdev/Fr.rc (original) +++ trunk/reactos/dll/win32/newdev/Fr.rc Wed May 31 19:18:02 2006 @@ -1,4 +1,4 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION |

18 years, 6 months

[janderwald] 22127: add french translation

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed May 31 19:04:01 2006 New Revision: 22127 URL: http://svn.reactos.ru/svn/reactos?rev=22127&view=rev Log: add french translation Added: trunk/reactos/dll/win32/newdev/Fr.rc Modified: trunk/reactos/dll/win32/newdev/newdev.rc Added: trunk/reactos/dll/win32/newdev/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/Fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/win32/newdev/Fr.rc (added) +++ trunk/reactos/dll/win32/newdev/Fr.rc Wed May 31 19:04:01 2006 @@ -1,0 +1,94 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bienvenue",IDC_WELCOMETITLE,115,8,195,24 + LTEXT "Cet assistant installe un nouveau pilote pour:", + IDC_STATIC,115,40,195,16 + LTEXT "Cliquer sur Suivant pour continuer.",IDC_STATIC,115,169,195,17 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,129,55,164,11 + CONTROL "Installer le pilote automatiquement",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,115,112,178,13 + CONTROL "Installer le pilote depuis un endroit spécifié",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,115,133,164,14 +END + +IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "L'installation a échoué",IDC_FINISHTITLE,115,8,195,24 + LTEXT "Le périphérique n'a pu être installé car le pilote est introuvable.", + IDC_STATIC,115,40,195,19 + LTEXT "Clicquer sur Précédent si vous avez un disque pilote ou vous connaissez le chemin du pilote.", + IDC_STATIC,113,98,181,24 + CONTROL "Ne plus afficher ce message",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,114,170,180,11 +END + +IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "L'installation a échoué",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Le matériel n'a pu etre installé en raison d'une erreur inattendue.", + IDC_STATIC,120,40,195,19 + LTEXT "Matériel inconnu",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Rechercher à cet endroit",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "Choisir le pilote manuellement",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "Rechercher un disque amovible",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "Inclure cet endroit",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Parcourir",IDC_BROWSE,248,69,45,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Matériel Inconnu",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de matériel" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Matériel Inconnu",IDC_DEVICE,51,20,169,16 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation terminée",IDC_FINISHTITLE,115,8,195,11 + LTEXT "L'assistant a fini d'installer le pilote pour:", + IDC_STATIC,115,32,195,19 + LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,115,174, + 179,11 + LTEXT "MATERIEL INCONNU",IDC_DEVICE,148,53,147,12 +END + Modified: trunk/reactos/dll/win32/newdev/newdev.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rc?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.rc (original) +++ trunk/reactos/dll/win32/newdev/newdev.rc Wed May 31 19:04:01 2006 @@ -11,3 +11,4 @@ #include "De.rc" #include "Hu.rc" #include "Ru.rc" +#include "Fr.rc"

18 years, 6 months

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