Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43061: - Fix copying of files / directories in explorer view - Part 2/2
by janderwald＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: janderwald Date: Thu Sep 17 15:45:08 2009 New Revision: 43061 URL: http://svn.reactos.org/svn/reactos?rev=43061&view=rev Log: - Fix copying of files / directories in explorer view - Part 2/2 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Sep 17 15:45:08 2009 @@ -1152,7 +1152,7 @@ WinSta = UserGetProcessWindowStation(); - Status = IntValidateWindowStationHandle(WinSta, UserMode, WINSTA_ACCESSCLIPBOARD, &WinStaObj); + Status = IntValidateWindowStationHandle(WinSta, UserMode, 0 /*WINSTA_ACCESSCLIPBOARD*/, &WinStaObj); if (!NT_SUCCESS(Status)) {

1 0

[janderwald] 43060: - Fix copying of files / directories in explorer view - Part 1/2
by janderwald＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: janderwald Date: Thu Sep 17 15:44:34 2009 New Revision: 43060 URL: http://svn.reactos.org/svn/reactos?rev=43060&view=rev Log: - Fix copying of files / directories in explorer view - Part 1/2 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Thu Sep 17 15:44:34 2009 @@ -1072,9 +1072,22 @@ } else { - /* target folder is desktop because cidl is zero */ - psfTarget = psfDesktop; - hr = S_OK; + IPersistFolder2 *ppf2 = NULL; + LPITEMIDLIST pidl; + + /* cidl is zero due to explorer view */ + hr = IShellFolder_QueryInterface (This->dcm.psf, &IID_IPersistFolder2, (LPVOID *) &ppf2); + if (SUCCEEDED(hr)) + { + hr = IPersistFolder2_GetCurFolder (ppf2, &pidl); + IPersistFolder2_Release(ppf2); + if (SUCCEEDED(hr)) + { + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfTarget); + ILFree(pidl); + TRACE("psfTarget %p\n", psfTarget); + } + } } if (FAILED(hr)) @@ -1133,6 +1146,7 @@ _ILFreeaPidl(apidl, lpcida->cidl); ReleaseStgMedium(&medium); IDataObject_Release(pda); +ERR("CP result %x\n",hr); return S_OK; }

1 0

[dreimer] 43059: Gettin close to RosBE 1.5B1. Fixed installer to be in sync to colin's renaming. Updated changelog and readme updated the variables for the new GCC
by dreimer＠svn.reactos.org 16 Sep '09

16 Sep '09

Author: dreimer Date: Wed Sep 16 19:04:29 2009 New Revision: 43059 URL: http://svn.reactos.org/svn/reactos?rev=43059&view=rev Log: Gettin close to RosBE 1.5B1. Fixed installer to be in sync to colin's renaming. Updated changelog and readme updated the variables for the new GCC Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Wed Sep 16 19:04:29 2009 @@ -31,7 +31,7 @@ $global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "Target: ") -replace ".*Target: (.+?)\b.*",'$1' remove-item gcchvers.tmp -$ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" -$ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" +$ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" +$ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include\c++"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include\c++""" Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Wed Sep 16 19:04:29 2009 @@ -1,4 +1,12 @@ *** Sep XXth, 2009 - RosBE 1.5 Released + +- Updated SVN to 1.6.5 (Daniel Reimer) +- Updated NASM to 2.07 (Daniel Reimer) +- Updated GCC to 4.4.2 20090915 (Dmitry Gorbachev) +- Updated BinUtils to 2.20.51 20090915 (Dmitry Gorbachev) + (with delay import feature (Timo Kreuzer)) +- Updated w32api to 3.13 (Dmitry Gorbachev) +- Updated mingwrt to 3.16 (Dmitry Gorbachev) - Installer Fixes: * Installer starts the Uninstaller of the old Version again. @@ -33,6 +41,8 @@ (Colin Finck, Gunnar) - Fix raddr2line.cmd to properly handle spaces in the path. (Colin Finck) - Added rosapps and rostests support to ssvn. (Daniel Reimer) +- clean supports now multiple clean commands like "clean aaa bbb" (Daniel Reimer, mota) +- Got rid of the TranslateOptions Hack (Daniel Reimer, Art Yerkes) *** Jun 29th, 2009 - RosBE 1.4.4 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Wed Sep 16 19:04:29 2009 @@ -34,7 +34,7 @@ for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_HOST_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_HOST_GCCTARGET=%%i -set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" -set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" -set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" -set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" +set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" +set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include\c++" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" +set ROSBE_TARGET_CFLAGS = -I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" +set ROSBE_TARGET_CXXFLAGS = -I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include\c++" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Sep 16 19:04:29 2009 @@ -129,15 +129,16 @@ File /r Components\Powershell\version.ps1 WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" ${else} - File /r Root\Build.cmd - File /r Root\Build-Multi.cmd + File /r Root\Basedir.cmd File /r Root\Build-Shared.cmd File /r Root\charch.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd File /r Root\Help.cmd + File /r Root\Make.cmd + File /r Root\Makex.cmd + File /r Root\Renv.cmd File /r Root\RosBE.cmd - File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd File /r Root\version.cmd @@ -251,7 +252,7 @@ ${If} $R4 = '6.1' File /r Components\Powershell\reladdr2line.ps1 ${else} - File /r Root\reladdr2line.cmd + File /r Root\raddr2line.cmd ${Endif} SetOutPath "$INSTDIR\Tools" SetOverwrite try @@ -296,14 +297,15 @@ ${If} $R4 = '6.1' SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\Build.cmd - File /r Root\Build-Multi.cmd + File /r Root\Basedir.cmd File /r Root\Build-Shared.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd File /r Root\Help.cmd + File /r Root\Make.cmd + File /r Root\Makex.cmd + File /r Root\Renv.cmd File /r Root\RosBE.cmd - File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd File /r Root\version.cmd @@ -311,7 +313,7 @@ File /r Root\chdefdir.cmd File /r Root\Config.cmd File /r Root\options.cmd - File /r Root\reladdr2line.cmd + File /r Root\raddr2line.cmd File /r Root\scut.cmd File /r Root\sSVN.cmd File /r Root\update.cmd @@ -449,10 +451,9 @@ StrCmp $ICONS_GROUP "" NO_SHORTCUTS RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" NO_SHORTCUTS: - Delete /REBOOTOK "$INSTDIR\Build.cmd" - Delete /REBOOTOK "$INSTDIR\Build-Multi.cmd" + Delete /REBOOTOK "$INSTDIR\Basedir.cmd" + Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" - Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.ps1" Delete /REBOOTOK "$INSTDIR\charch.cmd" @@ -465,10 +466,13 @@ Delete /REBOOTOK "$INSTDIR\Config.ps1" Delete /REBOOTOK "$INSTDIR\Help.cmd" Delete /REBOOTOK "$INSTDIR\Help.ps1" + Delete /REBOOTOK "$INSTDIR\Make.cmd" + Delete /REBOOTOK "$INSTDIR\Makex.cmd" Delete /REBOOTOK "$INSTDIR\options.cmd" Delete /REBOOTOK "$INSTDIR\options.ps1" - Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" + Delete /REBOOTOK "$INSTDIR\raddr2line.cmd" Delete /REBOOTOK "$INSTDIR\reladdr2line.ps1" + Delete /REBOOTOK "$INSTDIR\Renv.cmd" Delete /REBOOTOK "$INSTDIR\RosBE.cmd" Delete /REBOOTOK "$INSTDIR\RosBE.ps1" Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd" @@ -483,7 +487,6 @@ Delete /REBOOTOK "$INSTDIR\README.pdf" Delete /REBOOTOK "$INSTDIR\rosbe.ico" Delete /REBOOTOK "$INSTDIR\uninstall.ico" - Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt" Delete /REBOOTOK "$INSTDIR\srclist.txt"

1 0

[cgutman] 43058: - Call SetLastError/GetLastError to do our work for WSASetLastError/WSAGetLastError - This will help find regressions before moving to ws2_32_new (ws2_32_new uses this method)
by cgutman＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: cgutman Date: Wed Sep 16 00:21:27 2009 New Revision: 43058 URL: http://svn.reactos.org/svn/reactos?rev=43058&view=rev Log: - Call SetLastError/GetLastError to do our work for WSASetLastError/WSAGetLastError - This will help find regressions before moving to ws2_32_new (ws2_32_new uses this method) Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Wed Sep 16 00:21:27 2009 @@ -39,17 +39,7 @@ EXPORT WSAGetLastError(VOID) { - PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; - - if (p) - { - return p->LastErrorValue; - } - else - { - /* FIXME: What error code should we use here? Can this even happen? */ - return ERROR_BAD_ENVIRONMENT; - } + return GetLastError(); } @@ -60,10 +50,7 @@ EXPORT WSASetLastError(IN INT iError) { - PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; - - if (p) - p->LastErrorValue = iError; + SetLastError(iError); }

1 0

[janderwald] 43057: - Set ProgramFiles, CommonProgramFiles environment variable See issue #4008 for more details.
by janderwald＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: janderwald Date: Wed Sep 16 00:14:12 2009 New Revision: 43057 URL: http://svn.reactos.org/svn/reactos?rev=43057&view=rev Log: - Set ProgramFiles, CommonProgramFiles environment variable See issue #4008 for more details. Modified: trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Wed Sep 16 00:14:12 2009 @@ -674,6 +674,10 @@ } } + SetEnvironmentVariableW(L"ProgramFiles", szProfilesPath); + SetEnvironmentVariableW(L"CommonProgramFiles", szCommonFilesDirPath); + + DPRINT("Success\n"); return TRUE;

1 0

[jimtabor] 43056: - Patch by Smiley <johnyadams@hotmail.com>: remove redundant system calls when window structure is available to user space.
by jimtabor＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: jimtabor Date: Wed Sep 16 00:13:16 2009 New Revision: 43056 URL: http://svn.reactos.org/svn/reactos?rev=43056&view=rev Log: - Patch by Smiley <johnyadams(a)hotmail.com>: remove redundant system calls when window structure is available to user space. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Wed Sep 16 00:13:16 2009 @@ -49,9 +49,6 @@ #define NtUserSetGUIThreadHandle(field, hwnd) \ (BOOL)NtUserCallTwoParam((DWORD)field, (DWORD)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE) -#define NtUserSetMenuItemRect(menu, mir) \ - (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT) - #define NtUserSetMenuBarHeight(menu, height) \ (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT) @@ -81,20 +78,11 @@ #define NtUserSwapMouseButton(fSwap) \ (BOOL)NtUserCallOneParam((DWORD)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON) -#define NtUserGetMenu(hWnd) \ - (HMENU)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_GETMENU) - #define NtUserSetMessageExtraInfo(lParam) \ (LPARAM)NtUserCallOneParam((DWORD)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO) -#define NtUserIsWindowUnicode(hWnd) \ - (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWUNICODE) - #define NtUserGetWindowContextHelpId(hwnd) \ NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID) - -#define NtUserGetWindowInstance(hwnd) \ - (HINSTANCE)NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWINDOWINSTANCE) #define NtUserGetCursorPos(lpPoint) \ (BOOL)NtUserCallOneParam((DWORD)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION) Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Sep 16 00:13:16 2009 @@ -4234,7 +4234,12 @@ HMENU WINAPI GetMenu(HWND hWnd) { - return NtUserGetMenu(hWnd); + PWND Wnd = ValidateHwnd(hWnd); + + if (!Wnd) + return NULL; + + return (HMENU)Wnd->IDMenu; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Sep 16 00:13:16 2009 @@ -1129,14 +1129,12 @@ LPSTR lpszFileName, UINT cchFileNameMax) { - HINSTANCE hWndInst; - - if(!(hWndInst = NtUserGetWindowInstance(hwnd))) - { + PWND Wnd = ValidateHwnd(hwnd); + + if (!Wnd) return 0; - } - - return GetModuleFileNameA(hWndInst, lpszFileName, cchFileNameMax); + + return GetModuleFileNameA(Wnd->hModule, lpszFileName, cchFileNameMax); } @@ -1148,14 +1146,12 @@ LPWSTR lpszFileName, UINT cchFileNameMax) { - HINSTANCE hWndInst; - - if(!(hWndInst = NtUserGetWindowInstance(hwnd))) - { + PWND Wnd = ValidateHwnd(hwnd); + + if (!Wnd) return 0; - } - - return GetModuleFileNameW(hWndInst, lpszFileName, cchFileNameMax); + + return GetModuleFileNameW( Wnd->hModule, lpszFileName, cchFileNameMax ); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Sep 16 00:13:16 2009 @@ -3024,21 +3024,16 @@ #define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 #define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 #define ONEPARAM_ROUTINE_CSRSS_GUICHECK 0xffff0008 -#define ONEPARAM_ROUTINE_GETMENU 0xfffe0001 // usermode -#define ONEPARAM_ROUTINE_ISWINDOWUNICODE 0xfffe0002 -#define ONEPARAM_ROUTINE_GETCARETINFO 0xfffe0007 #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 #define ONEPARAM_ROUTINE_ISWINDOWINDESTROY 0xfffe000c #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 #define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 // CREATE_EMPTY_CURSOR_OBJECT ? #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 -#define TWOPARAM_ROUTINE_SETMENUITEMRECT 0xfffd0051 #define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 #define MSQ_STATE_CAPTURE 0x1 #define MSQ_STATE_ACTIVE 0x2 @@ -3048,8 +3043,6 @@ #define MSQ_STATE_CARET 0x6 #define TWOPARAM_ROUTINE_SETCARETPOS 0xfffd0060 #define TWOPARAM_ROUTINE_REGISTERLOGONPROC 0xfffd0062 -#define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 -#define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 #define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Sep 16 00:13:16 2009 @@ -178,35 +178,6 @@ } } - case ONEPARAM_ROUTINE_GETMENU: - { - PWINDOW_OBJECT Window; - DWORD Result; - - if(!(Window = UserGetWindowObject((HWND)Param))) - { - RETURN( FALSE); - } - - Result = (DWORD)Window->Wnd->IDMenu; - - RETURN( Result); - } - - case ONEPARAM_ROUTINE_ISWINDOWUNICODE: - { - PWINDOW_OBJECT Window; - DWORD Result; - - Window = UserGetWindowObject((HWND)Param); - if(!Window) - { - RETURN( FALSE); - } - Result = Window->Wnd->Unicode; - RETURN( Result); - } - case ONEPARAM_ROUTINE_WINDOWFROMDC: RETURN( (DWORD)IntWindowFromDC((HDC)Param)); @@ -225,20 +196,6 @@ case ONEPARAM_ROUTINE_SETCARETBLINKTIME: RETURN( (DWORD)IntSetCaretBlinkTime((UINT)Param)); - - case ONEPARAM_ROUTINE_GETWINDOWINSTANCE: - { - PWINDOW_OBJECT Window; - DWORD Result; - - if(!(Window = UserGetWindowObject((HWND)Param))) - { - RETURN( FALSE); - } - - Result = (DWORD)Window->Wnd->hModule; - RETURN( Result); - } case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO: RETURN( (DWORD)MsqSetMessageExtraInfo((LPARAM)Param)); @@ -457,25 +414,6 @@ IntReleaseMenuObject(MenuObject); RETURN( Ret); } - case TWOPARAM_ROUTINE_SETMENUITEMRECT: - { - BOOL Ret; - SETMENUITEMRECT smir; - PMENU_OBJECT MenuObject = IntGetMenuObject((HMENU)Param1); - if(!MenuObject) - RETURN( 0); - - if(!NT_SUCCESS(MmCopyFromCaller(&smir, (PVOID)Param2, sizeof(SETMENUITEMRECT)))) - { - IntReleaseMenuObject(MenuObject); - RETURN( 0); - } - - Ret = IntSetMenuItemRect(MenuObject, smir.uItem, smir.fByPosition, &smir.rcRect); - - IntReleaseMenuObject(MenuObject); - RETURN( (DWORD)Ret); - } case TWOPARAM_ROUTINE_SETGUITHRDHANDLE: {

1 0

[dchapyshev] 43055: - Add validation a computer name - Set limit for computer name length
by dchapyshev＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: dchapyshev Date: Tue Sep 15 17:36:35 2009 New Revision: 43055 URL: http://svn.reactos.org/svn/reactos?rev=43055&view=rev Log: - Add validation a computer name - Set limit for computer name length Modified: trunk/reactos/dll/win32/netid/lang/bg-BG.rc trunk/reactos/dll/win32/netid/lang/cs-CZ.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/el-GR.rc trunk/reactos/dll/win32/netid/lang/en-US.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/id-ID.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc trunk/reactos/dll/win32/netid/lang/nl-NL.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/sk-SK.rc trunk/reactos/dll/win32/netid/lang/uk-UA.rc trunk/reactos/dll/win32/netid/netid.c Modified: trunk/reactos/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/bg-BG… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Çàáåëåæêà: Ñàìî óïðàâíèöèòå ìîãàò äà ïðîìåíÿò îïîçíàâàòåëèòå íà êîìïþòúðà." 1022 "Çàáåëåæêà: Îïîçíàâàòåëÿò íà êîìïþòúðà íå ìîæå äà áúäå ñìåíåí, çàùîòî:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Ïî&äðîáíîñòè >>" 3220 "<< &Ïî&äðîáíîñòè" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/cs-CZ… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -76,6 +76,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Identifikaci tohoto poèítaèe mohou zmìnit pouze administrátoøi." 1022 "Poznámka: Identifikace poèítaèe nemùe být zmìnìna z následujících dùvodù:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Detaily >>" 3220 "<< &Detaily" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -78,6 +78,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/el-GR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/el-GR.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/en-US… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -75,6 +75,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo." 1022 "Nota: La identificación de este equipo no puede ser cambiada porque:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Detalles >>" 3220 "<< &Detalles" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur." 1022 "Note : L'identification de l'ordinateur ne peut pas être modifiée car :" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Détails >>" 3220 "<< &Détails" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/id-ID… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/id-ID.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -71,6 +71,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Nota: Solo gli Amministratori possono cambiare l'identificazione di questo computer." 1022 "Nota: L'identificazione di questo computer non può essere cambiata perchè:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Dettagli >>" 3220 "<< &Dettagli" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen." 1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden omdat:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "OBS: Bare administratorer kan endre identifisering for denne datamaskinen." 1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Detaljer >>" 3220 "<< &Detaljer" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -78,6 +78,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Uwaga: Tylko Administratorzy mog¹ zmieniaæ identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie zosta³ zmieniony, powód:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Szczegó³y >>" 3220 "<< &Szczegó³y" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -70,6 +70,7 @@ 25 "Ìîæíî èçìåíèòü èìÿ è ïðèíàäëåæíîñòü ýòîãî êîìïüþòåðà. Èçìåíåíèÿ ìîãóò ïîâëèÿòü íà äîñòóï ê ñåòåâûì ðåñóðñàì." 1021 "Ïðèìå÷àíèå: òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíèòü èäåíòèôèêàöèþ ýòîãî êîìïüþòåðà." 1022 "Ïðèìå÷àíèå: èäåíòèôèêàöèÿ ýòîãî êîìïüþòåðà íå ìîæåò áûòü èçìåíåíà, ïîòîìó ÷òî:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Ïîäðîáíî >>" 3220 "<< &Ïîäðîáíî" 4000 "Èíôîðìàöèÿ" Modified: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sk-SK… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -77,6 +77,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Iba správcovia môu zmeni identifikáciu tohto poèítaèa." 1022 "Poznámka: Identifikácia poèítaèa nemôe by zmenená, lebo:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Podrobnosti >>" 3220 "<< &Podrobnosti" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -78,6 +78,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà ìîæóòü ëèøå àäì³í³ñòðàòîðè." 1022 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà íåìîæëèâî, îñê³ëüêè:" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Ïîäðîáèö³ >>" 3220 "<< &Ïîäðîáèö³" 4000 "Information" Modified: trunk/reactos/dll/win32/netid/netid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.c?re… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/netid.c [iso-8859-1] Tue Sep 15 17:36:35 2009 @@ -14,6 +14,12 @@ #include <prsht.h> #include "resource.h" +static INT_PTR CALLBACK +NetIDPageProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam); + static HINSTANCE hDllInstance; @@ -55,6 +61,28 @@ EnableWindow(GetDlgItem(hDlg, 1004), FALSE); EnableWindow(GetDlgItem(hDlg, 116), FALSE); EnableWindow(GetDlgItem(hDlg, 1007), FALSE); +} + +static +BOOL +IsValidComputerName(LPCWSTR s) +{ + int i; + + for (i = 0; i <= wcslen(s); i++) + { + if (s[i] == L'!' || s[i] == L'@' || s[i] == L'#' || s[i] == L'$' + || s[i] == L'^' || s[i] == L'&' || s[i] == L'\\' || s[i] == L'|' + || s[i] == L')' || s[i] == L'(' || s[i] == L'{' || s[i] == L'"' + || s[i] == L'}' || s[i] == L'~' || s[i] == L'/' || s[i] == L'\'' + || s[i] == L'=' || s[i] == L':' || s[i] == L';' || s[i] == L'+' + || s[i] == L'<' || s[i] == L'>' || s[i] == L'?' || s[i] == L'[' + || s[i] == L']' || s[i] == L'`' || s[i] == L'%' || s[i] == L'_' + || s[i] == L'.') + return FALSE; + } + + return TRUE; } static @@ -74,6 +102,8 @@ if (LoadString(hDllInstance, 25, MsgText, sizeof(MsgText) / sizeof(TCHAR))) SetDlgItemText(hDlg, 1017, MsgText); + + SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0); if (GetComputerName(ComputerName, &Size)) { @@ -143,6 +173,16 @@ { switch (LOWORD(wParam)) { + case 1002: + if (HIWORD(wParam) == EN_CHANGE) + { + TCHAR szText[MAX_COMPUTERNAME_LENGTH + 1]; + + GetWindowText(GetDlgItem(hDlg, 1002), szText, MAX_COMPUTERNAME_LENGTH + 1); + SetDlgItemText(hDlg, 1001, szText); + } + break; + case 1008: /* Domain radio button */ case 1004: /* Workgroup radio button */ if (SendDlgItemMessage(hDlg, 1008, BM_GETCHECK, 0, 0) == BST_CHECKED) @@ -172,13 +212,24 @@ { if (_tcscmp(ComputerName, NewComputerName) != 0) { - if (!SetComputerName(NewComputerName)) + if (!IsValidComputerName(NewComputerName)) + { + TCHAR szText[MAX_PATH], szMsgText[MAX_PATH]; + + LoadString(hDllInstance, 1030, szText, sizeof(szText) / sizeof(TCHAR)); + + swprintf(szMsgText, szText, NewComputerName); + MessageBox(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); + SetFocus(GetDlgItem(hDlg, 1002)); + break; + } + else if (!SetComputerName(NewComputerName)) { TCHAR szMsgText[MAX_PATH]; LoadString(hDllInstance, 4001, szMsgText, sizeof(szMsgText) / sizeof(TCHAR)); - MessageBox(0, szMsgText, NULL, MB_OK | MB_ICONERROR); + MessageBox(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR); } else { @@ -188,6 +239,8 @@ LoadString(hDllInstance, 24, szMsgText, sizeof(szMsgText) / sizeof(TCHAR)); MessageBox(hDlg, szMsgText, szMsgTitle, MB_OK | MB_ICONINFORMATION); + + NetIDPageProc(GetParent(hDlg), WM_INITDIALOG, 0, 0); } } }

1 0

[jimtabor] 43054: - Update win32k tests.
by jimtabor＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: jimtabor Date: Tue Sep 15 17:25:37 2009 New Revision: 43054 URL: http://svn.reactos.org/svn/reactos?rev=43054&view=rev Log: - Update win32k tests. Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def [iso-8859-1] Tue Sep 15 17:25:37 2009 @@ -497,7 +497,7 @@ NtUserRealWaitMessageEx@8 NtUserRedrawWindow@16 NtUserRegisterClassExWOW@28 -NtUserRegisterUserApiHook@8 +NtUserRegisterUserApiHook@16 NtUserRegisterHotKey@16 NtUserRegisterRawInputDevices@12 NtUserRegisterTasklist@4

1 0

[jimtabor] 43053: [User32] Theme Support Interface - This is part 1, Tested with Wine user32 tests, Seamonkey, FireFox and AbiWord. [References:] - http://www.reactos.org/wiki/RegisterUserApiHook - http://www.codeproject.com/KB/miscctrl/uxtheme.aspx - http://opcode0x90.wordpress.com/2007/05/11/user32__clientloadlibraryx/ - US Patent 6992681 and 6762767 - Theme aware management using fusion
by jimtabor＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: jimtabor Date: Tue Sep 15 17:24:09 2009 New Revision: 43053 URL: http://svn.reactos.org/svn/reactos?rev=43053&view=rev Log: [User32] Theme Support Interface - This is part 1, Tested with Wine user32 tests, Seamonkey, FireFox and AbiWord. [References:] - http://www.reactos.org/wiki/RegisterUserApiHook - http://www.codeproject.com/KB/miscctrl/uxtheme.aspx - http://opcode0x90.wordpress.com/2007/05/11/user32__clientloadlibraryx/ - US Patent 6992681 and 6762767 - Theme aware management using fusion Added: trunk/reactos/dll/win32/user32/misc/usrapihk.c (with props) Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1475,17 +1475,71 @@ /* * @implemented */ +BOOL WINAPI EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) +{ + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return NtUserEnableScrollBar(hwnd, nBar, flags); + + _SEH2_TRY + { + Ret = guah.EnableScrollBar(hwnd, nBar, flags); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} + +BOOL WINAPI +RealGetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) +{ + if (SB_CTL == SBType) + { + return SendMessageW(Wnd, SBM_GETSCROLLINFO, 0, (LPARAM) Info); + } + else + { + return NtUserGetScrollInfo(Wnd, SBType, Info); + } +} + +/* + * @implemented + */ BOOL WINAPI GetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) { - if (SB_CTL == SBType) - { - return SendMessageW(Wnd, SBM_GETSCROLLINFO, 0, (LPARAM) Info); - } - else - { - return NtUserGetScrollInfo(Wnd, SBType, Info); - } + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealGetScrollInfo(Wnd, SBType, Info); + + _SEH2_TRY + { + Ret = guah.GetScrollInfo(Wnd, SBType, Info); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; } /* @@ -1526,20 +1580,48 @@ } } +INT WINAPI +RealSetScrollInfo(HWND Wnd, int SBType, LPCSCROLLINFO Info, BOOL bRedraw) +{ + if (SB_CTL == SBType) + { + return SendMessageW(Wnd, SBM_SETSCROLLINFO, (WPARAM) bRedraw, (LPARAM) Info); + } + else + { + return NtUserSetScrollInfo(Wnd, SBType, Info, bRedraw); + } +} + /* * @implemented */ INT WINAPI SetScrollInfo(HWND Wnd, int SBType, LPCSCROLLINFO Info, BOOL bRedraw) { - if (SB_CTL == SBType) - { - return SendMessageW(Wnd, SBM_SETSCROLLINFO, (WPARAM) bRedraw, (LPARAM) Info); - } - else - { - return NtUserSetScrollInfo(Wnd, SBType, Info, bRedraw); - } + BOOL Hook; + INT Ret = 0; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealSetScrollInfo(Wnd, SBType, Info, bRedraw); + + _SEH2_TRY + { + Ret = guah.SetScrollInfo(Wnd, SBType, Info, bRedraw); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; + } /* Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -42,6 +42,76 @@ /* SEH Support with PSEH */ #include <pseh/pseh2.h> +/* Temporarily in here for now. */ +typedef struct _USERAPIHOOKINFO +{ + DWORD m_size; + LPCWSTR m_dllname1; + LPCWSTR m_funname1; + LPCWSTR m_dllname2; + LPCWSTR m_funname2; +} USERAPIHOOKINFO,*PUSERAPIHOOKINFO; + +typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); + +typedef struct _UAHOWP +{ + BYTE* MsgBitArray; + DWORD Size; +} UAHOWP, *PUAHOWP; + +typedef struct tagUSERAPIHOOK +{ + DWORD size; + WNDPROC DefWindowProcA; + WNDPROC DefWindowProcW; + UAHOWP DefWndProcArray; + FARPROC GetScrollInfo; + FARPROC SetScrollInfo; + FARPROC EnableScrollBar; + FARPROC AdjustWindowRectEx; + FARPROC SetWindowRgn; + WNDPROC_OWP PreWndProc; + WNDPROC_OWP PostWndProc; + UAHOWP WndProcArray; + WNDPROC_OWP PreDefDlgProc; + WNDPROC_OWP PostDefDlgProc; + UAHOWP DlgProcArray; + FARPROC GetSystemMetrics; + FARPROC SystemParametersInfoA; + FARPROC SystemParametersInfoW; + FARPROC ForceResetUserApiHook; + FARPROC DrawFrameControl; + FARPROC DrawCaption; + FARPROC MDIRedrawFrame; + FARPROC GetRealWindowOwner; +} USERAPIHOOK, *PUSERAPIHOOK; + +typedef enum _UAPIHK +{ + uahLoadInit, + uahStop, + uahShutdown +} UAPIHK, *PUAPIHK; + +extern RTL_CRITICAL_SECTION gcsUserApiHook; +extern USERAPIHOOK guah; +typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info); +BOOL FASTCALL BeginIfHookedUserApiHook(VOID); +BOOL FASTCALL EndUserApiHook(VOID); +BOOL FASTCALL IsInsideUserApiHook(VOID); +VOID FASTCALL ResetUserApiHook(PUSERAPIHOOK); +BOOL FASTCALL IsMsgOverride(UINT,PUAHOWP); + +#define LOADUSERAPIHOOK \ + if (!gfServerProcess && \ + !IsInsideUserApiHook() && \ + (gpsi->dwSRVIFlags & SRVINFO_APIHOOK) && \ + !RtlIsThreadWithinLoaderCallout()) \ + { \ + NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK); \ + } \ + /* FIXME: Use ntgdi.h then cleanup... */ LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC); @@ -49,6 +119,7 @@ extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO gpsi; +extern BOOL gfServerProcess; static __inline PVOID SharedPtrToUser(PVOID Ptr) Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -45,7 +45,7 @@ DWORD SCROLL_HitTest( HWND hwnd, INT nBar, POINT pt, BOOL bDragging ); -LRESULT FASTCALL IntCallWindowProcW(BOOL IsAnsiProc, WNDPROC WndProc, +LRESULT FASTCALL IntCallWindowProcW(BOOL IsAnsiProc, WNDPROC WndProc, PWND pWnd, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); @@ -66,3 +66,4 @@ HWND* WIN_ListChildren (HWND hWndparent); ULONG_PTR FASTCALL IntGetWndProc(PWND, BOOL); +DWORD WINAPI GetRealWindowOwner(HWND); Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -90,18 +90,49 @@ #undef COPYS } +int WINAPI +RealGetSystemMetrics(int nIndex) +{ + GetConnected(); +// FIXME("Global Server Data -> %x\n",gpsi); + if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; + return gpsi->aiSysMet[nIndex]; +} + /* * @implemented */ int WINAPI GetSystemMetrics(int nIndex) { - GetConnected(); -// FIXME("Global Sever Data -> %x\n",gpsi); - if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; - return gpsi->aiSysMet[nIndex]; -} - + BOOL Hook; + int Ret = 0; + + if (!gpsi) // Fixme! Hax! Need Timos delay load support? + { + return RealGetSystemMetrics(nIndex); + } + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealGetSystemMetrics(nIndex); + + _SEH2_TRY + { + Ret = guah.GetSystemMetrics(nIndex); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} /* * @unimplemented @@ -110,11 +141,9 @@ { return SystemParametersInfoA(SPI_SETDESKWALLPAPER,0,(PVOID)filename,TRUE); } -/* - * @implemented - */ + BOOL WINAPI -SystemParametersInfoA(UINT uiAction, +RealSystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) @@ -275,6 +304,58 @@ return NtUserSystemParametersInfo(uiAction, uiParam, pvParam, fWinIni); } +BOOL WINAPI +RealSystemParametersInfoW(UINT uiAction, + UINT uiParam, + PVOID pvParam, + UINT fWinIni) +{ + switch(uiAction) + { + + case SPI_SETDESKWALLPAPER: + { + UNICODE_STRING ustrWallpaper; + + RtlInitUnicodeString(&ustrWallpaper, pvParam); + return NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, &ustrWallpaper, fWinIni); + } + } + return NtUserSystemParametersInfo(uiAction, uiParam, pvParam, fWinIni); +} + + +/* + * @implemented + */ +BOOL WINAPI +SystemParametersInfoA(UINT uiAction, + UINT uiParam, + PVOID pvParam, + UINT fWinIni) +{ + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealSystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); + + _SEH2_TRY + { + Ret = guah.SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} /* * @implemented @@ -285,20 +366,28 @@ PVOID pvParam, UINT fWinIni) { - switch(uiAction) - { - - case SPI_SETDESKWALLPAPER: - { - UNICODE_STRING ustrWallpaper; - - RtlInitUnicodeString(&ustrWallpaper, pvParam); - return NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, &ustrWallpaper, fWinIni); - } - } - return NtUserSystemParametersInfo(uiAction, uiParam, pvParam, fWinIni); -} - + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealSystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); + + _SEH2_TRY + { + Ret = guah.SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} /* * @implemented Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -13,6 +13,7 @@ PUSER_HANDLE_ENTRY gHandleEntries = NULL; PSERVERINFO gpsi = NULL; ULONG_PTR g_ulSharedDelta; +BOOL gfServerProcess = FALSE; WCHAR szAppInit[KEY_LENGTH]; @@ -244,6 +245,10 @@ gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); + + RtlInitializeCriticalSection(&gcsUserApiHook); + gfServerProcess = TRUE; // FIXME HAX! Used in CsrClientConnectToServer(,,,,&gfServerProcess); + //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); /* Allocate an index for user32 thread local data. */ Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -485,25 +485,6 @@ return FALSE; } -typedef BOOL (CALLBACK *THEME_HOOK_FUNC) (DWORD state,PVOID arg2); //return type and 2nd parameter unknown -/* - * @unimplemented - */ -BOOL WINAPI RegisterUserApiHook(HINSTANCE instance,THEME_HOOK_FUNC proc) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL WINAPI UnregisterUserApiHook(VOID) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented */ Added: trunk/reactos/dll/win32/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/usra… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/usrapihk.c (added) +++ trunk/reactos/dll/win32/user32/misc/usrapihk.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1,0 +1,397 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS user32.dll + * FILE: dll/win32/user32/misc/usrapihk.c + * PURPOSE: User32.dll User32 Api Hook interface and support functions + * PROGRAMMER: + * + * + * + * Information: + * http://www.reactos.org/wiki/RegisterUserApiHook + * + */ +#include <user32.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); + +BOOL WINAPI RealAdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD); +LRESULT WINAPI RealDefWindowProcA(HWND,UINT,WPARAM,LPARAM); +LRESULT WINAPI RealDefWindowProcW(HWND,UINT,WPARAM,LPARAM); +BOOL WINAPI RealDrawFrameControl(HDC,LPRECT,UINT,UINT); +BOOL WINAPI RealGetScrollInfo(HWND,INT,LPSCROLLINFO); +int WINAPI RealGetSystemMetrics(int); +BOOL WINAPI RealMDIRedrawFrame(HWND,DWORD); +INT WINAPI RealSetScrollInfo(HWND,int,LPCSCROLLINFO,BOOL); +BOOL WINAPI RealSystemParametersInfoA(UINT,UINT,PVOID,UINT); +BOOL WINAPI RealSystemParametersInfoW(UINT,UINT,PVOID,UINT); + +/* GLOBALS *******************************************************************/ + +DWORD gcLoadUserApiHook = 0; +LONG gcCallUserApiHook = 0; +DWORD gfUserApiHook; +HINSTANCE ghmodUserApiHook = NULL; +USERAPIHOOKPROC gpfnInitUserApi; +RTL_CRITICAL_SECTION gcsUserApiHook; +// API Hooked Message group bitmaps +BYTE grgbDwpLiteHookMsg[128]; +BYTE grgbWndLiteHookMsg[128]; +BYTE grgbDlgLiteHookMsg[128]; + +/* INTERNAL ******************************************************************/ + +/* + Pre and Post Message handler stub. + */ +LRESULT +WINAPI +DefaultOWP(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, ULONG_PTR lResult, PDWORD pData) +{ + return 0; +} + +/* + Check for API Hooked Message Overrides. Using message bitmapping.. One bit + corresponds to one message number. + */ +BOOL +FASTCALL +IsMsgOverride( UINT Msg, PUAHOWP puaowpOverride) +{ + UINT nMsg = Msg / 8; // Group Indexed, (Msg 1024) / 8 = (0 -> 127) bytes Max + + if ( puaowpOverride && nMsg < puaowpOverride->Size ) + { + return (puaowpOverride->MsgBitArray[nMsg] & (1 << (Msg & WM_SETFOCUS))); + } + return FALSE; +} + +VOID +FASTCALL +CopyMsgMask(PUAHOWP Dest, PUAHOWP Src, PVOID hkmsg, DWORD Size) +{ + DWORD nSize; + + if ( Src && Src->Size > 0 ) + { + Dest->MsgBitArray = hkmsg; + nSize = Src->Size; + if ( Size < nSize) nSize = Size; + Dest->Size = nSize; + RtlCopyMemory(Dest->MsgBitArray, Src->MsgBitArray, nSize); + return; + } + + Dest->MsgBitArray = NULL; + Dest->Size = 0; + return; +} + + +BOOL +FASTCALL +IsInsideUserApiHook(VOID) +{ + if ( ghmodUserApiHook && gfUserApiHook ) return TRUE; + return FALSE; +} + +BOOL +FASTCALL +BeginIfHookedUserApiHook(VOID) +{ + InterlockedIncrement(&gcCallUserApiHook); + if (IsInsideUserApiHook()) return TRUE; + + InterlockedDecrement(&gcCallUserApiHook); + return FALSE; +} + +BOOL +FASTCALL +ForceResetUserApiHook(HINSTANCE hInstance) +{ + if ( ghmodUserApiHook == hInstance && + RtlIsThreadWithinLoaderCallout() ) + { + ResetUserApiHook(&guah); + gpfnInitUserApi = NULL; + return TRUE; + } + return FALSE; +} + +VOID +FASTCALL +ResetUserApiHook(PUSERAPIHOOK puah) +{ + // Setup Structure..... + puah->size = sizeof(USERAPIHOOK); + puah->DefWindowProcA = (WNDPROC)RealDefWindowProcA; + puah->DefWindowProcW = (WNDPROC)RealDefWindowProcW; + puah->DefWndProcArray.MsgBitArray = NULL; + puah->DefWndProcArray.Size = 0; + puah->GetScrollInfo = (FARPROC)RealGetScrollInfo; + puah->SetScrollInfo = (FARPROC)RealSetScrollInfo; + puah->EnableScrollBar = (FARPROC)NtUserEnableScrollBar; + puah->AdjustWindowRectEx = (FARPROC)RealAdjustWindowRectEx; + puah->SetWindowRgn = (FARPROC)NtUserSetWindowRgn; + puah->PreWndProc = (WNDPROC_OWP)DefaultOWP; + puah->PostWndProc = (WNDPROC_OWP)DefaultOWP; + puah->WndProcArray.MsgBitArray = NULL; + puah->WndProcArray.Size = 0; + puah->PreDefDlgProc = (WNDPROC_OWP)DefaultOWP; + puah->PostDefDlgProc = (WNDPROC_OWP)DefaultOWP; + puah->DlgProcArray.MsgBitArray = NULL; + puah->DlgProcArray.Size = 0; + puah->GetSystemMetrics = (FARPROC)RealGetSystemMetrics; + puah->SystemParametersInfoA = (FARPROC)RealSystemParametersInfoA; + puah->SystemParametersInfoW = (FARPROC)RealSystemParametersInfoW; + puah->ForceResetUserApiHook = (FARPROC)ForceResetUserApiHook; + puah->DrawFrameControl = (FARPROC)RealDrawFrameControl; + puah->DrawCaption = (FARPROC)NtUserDrawCaption; + puah->MDIRedrawFrame = (FARPROC)RealMDIRedrawFrame; + puah->GetRealWindowOwner = (FARPROC)GetRealWindowOwner; +} + +BOOL +FASTCALL +EndUserApiHook(VOID) +{ + HMODULE hModule; + USERAPIHOOKPROC pfn; + BOOL Ret = FALSE; + + if ( !InterlockedDecrement(&gcCallUserApiHook) ) + { + if ( !gcLoadUserApiHook ) + { + RtlEnterCriticalSection(&gcsUserApiHook); + + pfn = gpfnInitUserApi; + hModule = ghmodUserApiHook; + ghmodUserApiHook = NULL; + gpfnInitUserApi = NULL; + + RtlLeaveCriticalSection(&gcsUserApiHook); + + if ( pfn ) Ret = pfn(uahStop, 0); + + if ( hModule ) Ret = FreeLibrary(hModule); + } + } + return Ret; +} + +BOOL +WINAPI +ClearUserApiHook(HINSTANCE hInstance) +{ + HMODULE hModule; + USERAPIHOOKPROC pfn = NULL, pfn1 = NULL; + + RtlEnterCriticalSection(&gcsUserApiHook); + hModule = ghmodUserApiHook; + if ( ghmodUserApiHook == hInstance ) + { + pfn1 = gpfnInitUserApi; + if ( --gcLoadUserApiHook == 1 ) + { + gfUserApiHook = 0; + ResetUserApiHook(&guah); + if ( gcCallUserApiHook ) + { + hInstance = NULL; + pfn1 = NULL; + pfn = gpfnInitUserApi; + gcLoadUserApiHook = 1; + } + else + { + hInstance = hModule; + ghmodUserApiHook = NULL; + gpfnInitUserApi = NULL; + } + } + } + RtlLeaveCriticalSection(&gcsUserApiHook); + + if ( pfn ) + { + pfn(uahShutdown, 0); // Shutdown. + + RtlEnterCriticalSection(&gcsUserApiHook); + pfn1 = gpfnInitUserApi; + + if ( --gcLoadUserApiHook == 1 ) + { + if ( gcCallUserApiHook ) + { + hInstance = NULL; + pfn1 = NULL; + } + else + { + hInstance = ghmodUserApiHook; + ghmodUserApiHook = NULL; + gpfnInitUserApi = NULL; + } + } + RtlLeaveCriticalSection(&gcsUserApiHook); + } + + if ( pfn1 ) pfn1(uahStop, 0); + + return hInstance != 0; +} + +BOOL +WINAPI +InitUserApiHook(HINSTANCE hInstance, USERAPIHOOKPROC pfn) +{ + USERAPIHOOK uah; + + ResetUserApiHook(&uah); + + RtlEnterCriticalSection(&gcsUserApiHook); + + if (!pfn(uahLoadInit,(ULONG_PTR)&uah) || // Swap data, User32 to and Uxtheme from! + uah.ForceResetUserApiHook != (FARPROC)ForceResetUserApiHook || + uah.size <= 0 ) + { + RtlLeaveCriticalSection(&gcsUserApiHook); + return FALSE; + } + + if ( ghmodUserApiHook ) + { + if ( ghmodUserApiHook != hInstance ) + { + RtlLeaveCriticalSection(&gcsUserApiHook); + pfn(uahStop, 0); + return FALSE; + } + gcLoadUserApiHook++; + } + else + { + ghmodUserApiHook = hInstance; + // Do not over write GetRealWindowOwner. + RtlCopyMemory(&guah, &uah, sizeof(USERAPIHOOK) - sizeof(LONG)); + gpfnInitUserApi = pfn; + gcLoadUserApiHook = 1; + gfUserApiHook = 1; + // Copy Message Masks + CopyMsgMask(&guah.DefWndProcArray, + &uah.DefWndProcArray, + &grgbDwpLiteHookMsg, + sizeof(grgbDwpLiteHookMsg)); + + CopyMsgMask(&guah.WndProcArray, + &uah.WndProcArray, + &grgbWndLiteHookMsg, + sizeof(grgbWndLiteHookMsg)); + + CopyMsgMask(&guah.DlgProcArray, + &uah.DlgProcArray, + &grgbDlgLiteHookMsg, + sizeof(grgbDlgLiteHookMsg)); + } + RtlLeaveCriticalSection(&gcsUserApiHook); + return TRUE; +} + +BOOL +WINAPI +RealMDIRedrawFrame(HWND hWnd, DWORD flags) +{ + return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_REDRAWFRAME); +} + +BOOL +WINAPI +MDIRedrawFrame(HWND hWnd, DWORD flags) +{ + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealMDIRedrawFrame(hWnd, flags); + + _SEH2_TRY + { + Ret = guah.MDIRedrawFrame(hWnd, flags); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} + +USERAPIHOOK guah = +{ + sizeof(USERAPIHOOK), + (WNDPROC)RealDefWindowProcA, + (WNDPROC)RealDefWindowProcW, + {NULL, 0}, + (FARPROC)RealGetScrollInfo, + (FARPROC)RealSetScrollInfo, + (FARPROC)NtUserEnableScrollBar, + (FARPROC)RealAdjustWindowRectEx, + (FARPROC)NtUserSetWindowRgn, + (WNDPROC_OWP)DefaultOWP, + (WNDPROC_OWP)DefaultOWP, + {NULL, 0}, + (WNDPROC_OWP)DefaultOWP, + (WNDPROC_OWP)DefaultOWP, + {NULL, 0}, + (FARPROC)RealGetSystemMetrics, + (FARPROC)RealSystemParametersInfoA, + (FARPROC)RealSystemParametersInfoW, + (FARPROC)ForceResetUserApiHook, + (FARPROC)RealDrawFrameControl, + (FARPROC)NtUserDrawCaption, + (FARPROC)RealMDIRedrawFrame, + (FARPROC)GetRealWindowOwner, +}; + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah) +{ + UNICODE_STRING m_dllname1; + UNICODE_STRING m_funname1; + + if (puah->m_size == sizeof(USERAPIHOOKINFO)) + { + WARN("RegisterUserApiHook: %S and %S",puah->m_dllname1, puah->m_funname1); + RtlInitUnicodeString(&m_dllname1, puah->m_dllname1); + RtlInitUnicodeString(&m_funname1, puah->m_funname1); + return NtUserRegisterUserApiHook( &m_dllname1, &m_funname1, 0, 0); + } + return FALSE; +} + +/* + * @implemented + */ +BOOL WINAPI UnregisterUserApiHook(VOID) +{ + // Direct call to Win32k! Here only as a prototype..... + UNIMPLEMENTED; + return FALSE; +} Propchange: trunk/reactos/dll/win32/user32/misc/usrapihk.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/user32/misc/usrapihk.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -194,7 +194,7 @@ @ stdcall EditWndProc(long long long long) EditWndProcA @ stdcall EmptyClipboard() NtUserEmptyClipboard @ stdcall EnableMenuItem(long long long) -@ stdcall EnableScrollBar(long long long) NtUserEnableScrollBar +@ stdcall EnableScrollBar(long long long) @ stdcall EnableWindow(long long) @ stdcall EndDeferWindowPos(long) @ stdcall EndDialog(long long) @@ -557,7 +557,7 @@ @ stdcall RegisterShellHookWindow(long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist(long) NtUserRegisterTasklist -@ stub RegisterUserApiHook +@ stdcall RegisterUserApiHook(ptr) @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @@ -711,7 +711,7 @@ @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey @ stub UnregisterMessagePumpHook -@ stub UnregisterUserApiHook +@ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) @ stdcall UpdatePerUserSystemParameters(long long) Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -43,6 +43,7 @@ <file>rtlstr.c</file> <file>stubs.c</file> <file>timer.c</file> + <file>usrapihk.c</file> <file>winhelp.c</file> <file>winsta.c</file> <file>wsprintf.c</file> Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1879,10 +1879,10 @@ LRESULT WINAPI -DefWindowProcA(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +RealDefWindowProcA(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) { LRESULT Result = 0; PWND Wnd; @@ -2032,10 +2032,10 @@ LRESULT WINAPI -DefWindowProcW(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +RealDefWindowProcW(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) { LRESULT Result = 0; PWND Wnd; @@ -2175,3 +2175,68 @@ return Result; } +LRESULT WINAPI +DefWindowProcA(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Hook, msgOverride; + LRESULT Result = 0; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + if (Hook) + msgOverride = IsMsgOverride(Msg, &guah.DefWndProcArray); + + /* Bypass SEH and go direct. */ + if (!Hook || !msgOverride) + return RealDefWindowProcA(hWnd, Msg, wParam, lParam); + + _SEH2_TRY + { + Result = guah.DefWindowProcA(hWnd, Msg, wParam, lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Result; +} + +LRESULT WINAPI +DefWindowProcW(HWND hWnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Hook, msgOverride; + LRESULT Result = 0; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + if (Hook) + msgOverride = IsMsgOverride(Msg, &guah.DefWndProcArray); + + /* Bypass SEH and go direct. */ + if (!Hook || !msgOverride) + return RealDefWindowProcW(hWnd, Msg, wParam, lParam); + + _SEH2_TRY + { + Result = guah.DefWindowProcW(hWnd, Msg, wParam, lParam); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Result; +} Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1437,7 +1437,7 @@ * @implemented */ BOOL WINAPI -DrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) +RealDrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) { if (GetMapMode(hDC) != MM_TEXT) return FALSE; @@ -1461,6 +1461,32 @@ return FALSE; } +BOOL WINAPI +DrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) +{ + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealDrawFrameControl(hDC, rc, uType, uState); + + _SEH2_TRY + { + Ret = guah.DrawFrameControl(hDC, rc, uType, uState); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} + /* * @implemented */ 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1138,6 +1138,7 @@ LRESULT FASTCALL IntCallWindowProcW(BOOL IsAnsiProc, WNDPROC WndProc, + PWND pWnd, HWND hWnd, UINT Msg, WPARAM wParam, @@ -1145,7 +1146,9 @@ { MSG AnsiMsg; MSG UnicodeMsg; - LRESULT Result; + BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; + LRESULT Result = 0, PreResult = 0; + DWORD Data = 0; if (WndProc == NULL) { @@ -1153,33 +1156,116 @@ return FALSE; } + if (pWnd) + Dialog = (pWnd->fnid == FNID_DIALOG); + else + Dialog = FALSE; + + Hook = BeginIfHookedUserApiHook(); + if (Hook) + { + if (!Dialog) + MsgOverride = IsMsgOverride( Msg, &guah.WndProcArray); + else + MsgOverride = IsMsgOverride( Msg, &guah.DlgProcArray); + } + if (IsAnsiProc) - { + { UnicodeMsg.hwnd = hWnd; UnicodeMsg.message = Msg; UnicodeMsg.wParam = wParam; UnicodeMsg.lParam = lParam; if (! MsgiUnicodeToAnsiMessage(&AnsiMsg, &UnicodeMsg)) - { - return FALSE; - } + { + goto Exit; + } + + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + PreResult = guah.PreWndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam, (ULONG_PTR)&Result, &Data ); + else + PreResult = guah.PreDefDlgProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + if (PreResult) goto Exit; + Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + guah.PostWndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam, (ULONG_PTR)&Result, &Data ); + else + guah.PostDefDlgProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + if (! MsgiUnicodeToAnsiReply(&AnsiMsg, &UnicodeMsg, &Result)) - { - return FALSE; - } - return Result; - } + { + goto Exit; + } + } else - { - return WndProc(hWnd, Msg, wParam, lParam); - } + { + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + PreResult = guah.PreWndProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + else + PreResult = guah.PreDefDlgProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + if (PreResult) goto Exit; + + Result = WndProc(hWnd, Msg, wParam, lParam); + + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + guah.PostWndProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + else + guah.PostDefDlgProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + } + +Exit: + if (Hook) EndUserApiHook(); + return Result; } static LRESULT FASTCALL IntCallWindowProcA(BOOL IsAnsiProc, WNDPROC WndProc, + PWND pWnd, HWND hWnd, UINT Msg, WPARAM wParam, @@ -1187,7 +1273,9 @@ { MSG AnsiMsg; MSG UnicodeMsg; - LRESULT Result; + BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; + LRESULT Result = 0, PreResult = 0; + DWORD Data = 0; if (WndProc == NULL) { @@ -1195,29 +1283,111 @@ return FALSE; } + if (pWnd) + Dialog = (pWnd->fnid == FNID_DIALOG); + else + Dialog = FALSE; + + Hook = BeginIfHookedUserApiHook(); + if (Hook) + { + if (!Dialog) + MsgOverride = IsMsgOverride( Msg, &guah.WndProcArray); + else + MsgOverride = IsMsgOverride( Msg, &guah.DlgProcArray); + } + if (IsAnsiProc) - { - return WndProc(hWnd, Msg, wParam, lParam); - } + { + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + PreResult = guah.PreWndProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + else + PreResult = guah.PreDefDlgProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + if (PreResult) goto Exit; + + Result = WndProc(hWnd, Msg, wParam, lParam); + + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + guah.PostWndProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + else + guah.PostDefDlgProc(hWnd, Msg, wParam, lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + } else - { + { AnsiMsg.hwnd = hWnd; AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; if (! MsgiAnsiToUnicodeMessage(&UnicodeMsg, &AnsiMsg)) - { - return FALSE; - } + { + goto Exit; + } + + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + PreResult = guah.PreWndProc(UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam, (ULONG_PTR)&Result, &Data ); + else + PreResult = guah.PreDefDlgProc(UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + + if (PreResult) goto Exit; + Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); + if (Hook && MsgOverride) + { + _SEH2_TRY + { + if (!Dialog) + guah.PostWndProc(UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam, (ULONG_PTR)&Result, &Data ); + else + guah.PostDefDlgProc(UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam, (ULONG_PTR)&Result, &Data ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + if (! MsgiAnsiToUnicodeReply(&UnicodeMsg, &AnsiMsg, &Result)) - { - return FALSE; - } - return Result; - } + { + goto Exit; + } + } + +Exit: + if (Hook) EndUserApiHook(); + return Result; } @@ -1267,9 +1437,9 @@ the same. */ if (!Ansi) - return IntCallWindowProcW(IsAnsi, WndProc, hWnd, Msg, wParam, lParam); + return IntCallWindowProcW(IsAnsi, WndProc, Wnd, hWnd, Msg, wParam, lParam); else - return IntCallWindowProcA(IsAnsi, WndProc, hWnd, Msg, wParam, lParam); + return IntCallWindowProcA(IsAnsi, WndProc, Wnd, hWnd, Msg, wParam, lParam); } @@ -1283,6 +1453,7 @@ WPARAM wParam, LPARAM lParam) { + PWND pWnd; PCALLPROCDATA CallProc; if (lpPrevWndFunc == NULL) @@ -1291,8 +1462,10 @@ return 0; } + pWnd = ValidateHwnd(hWnd); + if (!IsCallProcHandle(lpPrevWndFunc)) - return IntCallWindowProcA(TRUE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); + return IntCallWindowProcA(TRUE, lpPrevWndFunc, pWnd, hWnd, Msg, wParam, lParam); else { CallProc = ValidateCallProc((HANDLE)lpPrevWndFunc); @@ -1300,6 +1473,7 @@ { return IntCallWindowProcA(!(CallProc->wType & UserGetCPDA2U), CallProc->pfnClientPrevious, + pWnd, hWnd, Msg, wParam, @@ -1324,6 +1498,7 @@ WPARAM wParam, LPARAM lParam) { + PWND pWnd; PCALLPROCDATA CallProc; /* FIXME - can the first parameter be NULL? */ @@ -1333,8 +1508,10 @@ return 0; } + pWnd = ValidateHwnd(hWnd); + if (!IsCallProcHandle(lpPrevWndFunc)) - return IntCallWindowProcW(FALSE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); + return IntCallWindowProcW(FALSE, lpPrevWndFunc, pWnd, hWnd, Msg, wParam, lParam); else { CallProc = ValidateCallProc((HANDLE)lpPrevWndFunc); @@ -1342,6 +1519,7 @@ { return IntCallWindowProcW(!(CallProc->wType & UserGetCPDA2U), CallProc->pfnClientPrevious, + pWnd, hWnd, Msg, wParam, @@ -1821,13 +1999,14 @@ MSG UMMsg, KMMsg; NTUSERSENDMESSAGEINFO Info; LRESULT Result; + PWND Window; + PTHREADINFO ti = GetW32ThreadInfo(); + + Window = ValidateHwnd(Wnd); + if (!Window) return FALSE; if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { - PWND Window; - PTHREADINFO ti = GetW32ThreadInfo(); - - Window = ValidateHwnd(Wnd); if (Window != NULL && Window->head.pti == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure @@ -1861,6 +2040,7 @@ /* We need to send the message ourselves */ Result = IntCallWindowProcW( Info.Ansi, Info.Proc, + Window, UMMsg.hwnd, UMMsg.message, UMMsg.wParam, @@ -1885,13 +2065,14 @@ MSG KMMsg; LRESULT Result; NTUSERSENDMESSAGEINFO Info; + PWND Window; + PTHREADINFO ti = GetW32ThreadInfo(); + + Window = ValidateHwnd(Wnd); + if (!Window) return FALSE; if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { - PWND Window; - PTHREADINFO ti = GetW32ThreadInfo(); - - Window = ValidateHwnd(Wnd); if (Window != NULL && Window->head.pti == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure @@ -1934,7 +2115,7 @@ the Unicode message though */ MsgiUMToKMCleanup(&UcMsg, &KMMsg); MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - Result = IntCallWindowProcA(Info.Ansi, Info.Proc, Wnd, Msg, wParam, lParam); + Result = IntCallWindowProcA(Info.Ansi, Info.Proc, Window, Wnd, Msg, wParam, lParam); } else { @@ -1943,6 +2124,7 @@ message to avoid another conversion */ Result = IntCallWindowProcW( Info.Ansi, Info.Proc, + Window, UcMsg.hwnd, UcMsg.message, UcMsg.wParam, @@ -2048,21 +2230,28 @@ } if (! Info.HandledByKernel) { + PWND pWnd; + pWnd = ValidateHwnd(hWnd); /* We need to send the message ourselves */ if (Info.Ansi) { /* Ansi message and Ansi window proc, that's easy. Clean up the Unicode message though */ MsgiAnsiToUnicodeCleanup(&UcMsg, &AnsiMsg); - Result = IntCallWindowProcA(Info.Ansi, Info.Proc, hWnd, Msg, wParam, lParam); + Result = IntCallWindowProcA(Info.Ansi, Info.Proc, pWnd, hWnd, Msg, wParam, lParam); } else { /* Unicode winproc. Although we started out with an Ansi message we already converted it to Unicode for the kernel call. Reuse that message to avoid another conversion */ - Result = IntCallWindowProcW(Info.Ansi, Info.Proc, UcMsg.hwnd, - UcMsg.message, UcMsg.wParam, UcMsg.lParam); + Result = IntCallWindowProcW( Info.Ansi, + Info.Proc, + pWnd, + UcMsg.hwnd, + UcMsg.message, + UcMsg.wParam, + UcMsg.lParam); if (! MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result)) { SPY_ExitMessage(SPY_RESULT_OK, hWnd, Msg, Result, wParam, lParam); @@ -2112,8 +2301,10 @@ lpdwResult, &Info); if (! Info.HandledByKernel) { + PWND pWnd; + pWnd = ValidateHwnd(hWnd); /* We need to send the message ourselves */ - Result = IntCallWindowProcW(Info.Ansi, Info.Proc, hWnd, Msg, wParam, lParam); + Result = IntCallWindowProcW(Info.Ansi, Info.Proc, pWnd, hWnd, Msg, wParam, lParam); if(lpdwResult) *lpdwResult = Result; @@ -2322,6 +2513,8 @@ { PWINDOWPROC_CALLBACK_ARGUMENTS CallbackArgs; MSG KMMsg, UMMsg; + PWND pWnd = NULL; + PCLIENTINFO pci = GetWin32ClientInfo(); /* Make sure we don't try to access mem beyond what we were given */ if (ArgumentLength < sizeof(WINDOWPROC_CALLBACK_ARGUMENTS)) @@ -2362,8 +2555,12 @@ { } + if (pci->CallbackWnd.hWnd == UMMsg.hwnd) + pWnd = pci->CallbackWnd.pvWnd; + CallbackArgs->Result = IntCallWindowProcW( CallbackArgs->IsAnsiProc, CallbackArgs->Proc, + pWnd, UMMsg.hwnd, UMMsg.message, UMMsg.wParam, Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1058,6 +1058,34 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +BOOL WINAPI +RealAdjustWindowRectEx(LPRECT lpRect, + DWORD dwStyle, + BOOL bMenu, + DWORD dwExStyle) +{ + SIZE BorderSize; + + if (bMenu) + { + lpRect->top -= GetSystemMetrics(SM_CYMENU); + } + if ((dwStyle & WS_CAPTION) == WS_CAPTION) + { + if (dwExStyle & WS_EX_TOOLWINDOW) + lpRect->top -= GetSystemMetrics(SM_CYSMCAPTION); + else + lpRect->top -= GetSystemMetrics(SM_CYCAPTION); + } + UserGetWindowBorders(dwStyle, dwExStyle, &BorderSize, TRUE); + InflateRect( + lpRect, + BorderSize.cx, + BorderSize.cy); + + return TRUE; +} + /* * @implemented */ @@ -1067,26 +1095,27 @@ BOOL bMenu, DWORD dwExStyle) { - SIZE BorderSize; - - if (bMenu) - { - lpRect->top -= GetSystemMetrics(SM_CYMENU); - } - if ((dwStyle & WS_CAPTION) == WS_CAPTION) - { - if (dwExStyle & WS_EX_TOOLWINDOW) - lpRect->top -= GetSystemMetrics(SM_CYSMCAPTION); - else - lpRect->top -= GetSystemMetrics(SM_CYCAPTION); - } - UserGetWindowBorders(dwStyle, dwExStyle, &BorderSize, TRUE); - InflateRect( - lpRect, - BorderSize.cx, - BorderSize.cy); - - return TRUE; + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return RealAdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); + + _SEH2_TRY + { + Ret = guah.AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; } @@ -1110,7 +1139,27 @@ BOOL WINAPI DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags) { - return NtUserDrawCaption(hWnd, hDC, lprc, uFlags); + BOOL Hook, Ret = FALSE; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return NtUserDrawCaption(hWnd, hDC, lprc, uFlags); + + _SEH2_TRY + { + Ret = guah.DrawCaption(hWnd, hDC, lprc, uFlags); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; } /* Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -131,7 +131,6 @@ lprcUpdate); } - /* * @implemented */ @@ -142,9 +141,29 @@ HRGN hRgn, BOOL bRedraw) { - return (int)NtUserSetWindowRgn(hWnd, hRgn, bRedraw); -} - + BOOL Hook; + int Ret = 0; + + LOADUSERAPIHOOK + + Hook = BeginIfHookedUserApiHook(); + + /* Bypass SEH and go direct. */ + if (!Hook) return (int)NtUserSetWindowRgn(hWnd, hRgn, bRedraw); + + _SEH2_TRY + { + Ret = guah.SetWindowRgn(hWnd, hRgn, bRedraw); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + EndUserApiHook(); + + return Ret; +} /* * @implemented Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -1875,6 +1875,12 @@ return (HWND)NtUserGetThreadState(THREADSTATE_FOCUSWINDOW); } +DWORD WINAPI +GetRealWindowOwner(HWND hwnd) +{ + return NtUserQueryWindow(hwnd, QUERY_WINDOW_REAL_ID); +} + /* * @implemented */ Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -560,6 +560,7 @@ #define COLOR_LAST COLOR_MENUBAR #define MAX_MB_STRINGS 11 +#define SRVINFO_APIHOOK 0x0010 #define SRVINFO_METRICS 0x0020 typedef struct tagOEMBITMAPINFO @@ -2359,11 +2360,13 @@ IN UINT uiNumDevices, IN UINT cbSize); -DWORD +BOOL NTAPI NtUserRegisterUserApiHook( - DWORD dwUnknown1, - DWORD dwUnknown2); + PUNICODE_STRING m_dllname1, + PUNICODE_STRING m_funname1, + DWORD dwUnknown3, + DWORD dwUnknown4); BOOL NTAPI @@ -2875,7 +2878,7 @@ NtUserUnregisterHotKey(HWND hWnd, int id); -DWORD +BOOL NTAPI NtUserUnregisterUserApiHook(VOID); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -949,13 +949,17 @@ return 0; } -DWORD +BOOL APIENTRY NtUserRegisterUserApiHook( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - UNIMPLEMENTED; + PUNICODE_STRING m_dllname1, + PUNICODE_STRING m_funname1, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UserEnterExclusive(); + UNIMPLEMENTED; + UserLeave(); return 0; } @@ -1080,7 +1084,7 @@ return 0; } -DWORD +BOOL APIENTRY NtUserUnregisterUserApiHook(VOID) { Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Sep 15 17:24:09 2009 @@ -493,7 +493,7 @@ NtUserRealWaitMessageEx 2 NtUserRedrawWindow 4 NtUserRegisterClassExWOW 7 -NtUserRegisterUserApiHook 2 +NtUserRegisterUserApiHook 4 NtUserRegisterHotKey 4 NtUserRegisterRawInputDevices 3 NtUserRegisterTasklist 1

1 0

[dchapyshev] 43052: - Partially implement "Computer Name Changes" dialog. Computer name can be changed now. See issue #3304 for more details.
by dchapyshev＠svn.reactos.org 15 Sep '09

15 Sep '09

Author: dchapyshev Date: Tue Sep 15 15:45:34 2009 New Revision: 43052 URL: http://svn.reactos.org/svn/reactos?rev=43052&view=rev Log: - Partially implement "Computer Name Changes" dialog. Computer name can be changed now. See issue #3304 for more details. Modified: trunk/reactos/dll/win32/netid/lang/bg-BG.rc trunk/reactos/dll/win32/netid/lang/cs-CZ.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/el-GR.rc trunk/reactos/dll/win32/netid/lang/en-US.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/netid/lang/fr-FR.rc trunk/reactos/dll/win32/netid/lang/id-ID.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc trunk/reactos/dll/win32/netid/lang/nl-NL.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc trunk/reactos/dll/win32/netid/lang/pl-PL.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/sk-SK.rc trunk/reactos/dll/win32/netid/lang/uk-UA.rc trunk/reactos/dll/win32/netid/netid.c Modified: trunk/reactos/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/bg-BG… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Äîáðå äîøëè â ðàáîòíà ãðóïà %1." 23 "Äîáðå äîøëè â èìåíèå %1." 24 "Òðÿáâà äà ïðåçàïóñíåòå êîìïþòúðà, çà äà âëÿçàò ïðîìåíèòå â äåéñòâèå." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Çàáåëåæêà: Ñàìî óïðàâíèöèòå ìîãàò äà ïðîìåíÿò îïîçíàâàòåëèòå íà êîìïþòúðà." 1022 "Çàáåëåæêà: Îïîçíàâàòåëÿò íà êîìïþòúðà íå ìîæå äà áúäå ñìåíåí, çàùîòî:" 3210 "&Ïî&äðîáíîñòè >>" 3220 "<< &Ïî&äðîáíîñòè" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/cs-CZ… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -73,8 +73,11 @@ 22 "Vítejte v pracovní skupinì %1." 23 "Vítejte v doménì %1." 24 "Aby se zmìny mohly projevit, musí být poèítaè restartován." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Identifikaci tohoto poèítaèe mohou zmìnit pouze administrátoøi." 1022 "Poznámka: Identifikace poèítaèe nemùe být zmìnìna z následujících dùvodù:" 3210 "&Detaily >>" 3220 "<< &Detaily" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -75,8 +75,11 @@ 22 "Willkommen in der Arbeitsgruppe %1" 23 "Willkommen in der Domäne %1" 24 "Sie müssen den Computer neustarten, damit die Änderungen wirksam werden." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" 3210 "&Details >>" 3220 "<< &Details" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/el-GR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/el-GR.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" 3210 "&Details >>" 3220 "<< &Details" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/en-US… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" 3210 "&Details >>" 3220 "<< &Details" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -72,8 +72,11 @@ 22 "Bienvenido al grupo de trabajo %1." 23 "Bienvenido al dominio %1." 24 "Debe reiniciar el equipo para que los cambios tengan efecto." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo." 1022 "Nota: La identificación de este equipo no puede ser cambiada porque:" 3210 "&Detalles >>" 3220 "<< &Detalles" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Bienvenue dans le groupe de travail %1." 23 "Bienvenue dans le domaine %1." 24 "Vous devez redémarrer votre ordinateur pour que les changements soient pris en compte." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur." 1022 "Note : L'identification de l'ordinateur ne peut pas être modifiée car :" 3210 "&Détails >>" 3220 "<< &Détails" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/id-ID… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/id-ID.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" 3210 "&Details >>" 3220 "<< &Details" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -68,8 +68,11 @@ 22 "Benvenuto al gruppo di lavoro %1." 23 "Benvenuto al dominio %1." 24 "Il computer deve essre riavviato per rendere operative queste modifiche." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Nota: Solo gli Amministratori possono cambiare l'identificazione di questo computer." 1022 "Nota: L'identificazione di questo computer non può essere cambiata perchè:" 3210 "&Dettagli >>" 3220 "<< &Dettagli" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Welkom bij de werkgoep %1." 23 "Welkom bij het domein %1." 24 "U moet de computer herstarten om de wijzigingen van kracht te laten gaan." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen." 1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden omdat:" 3210 "&Details >>" 3220 "<< &Details" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Velkommen til %1 arbeidsgruppen." 23 "Velkommen til %1 domene." 24 "Du må starte denne datamaskinen på nytt for at endringene skal tre i kraft." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "OBS: Bare administratorer kan endre identifisering for denne datamaskinen." 1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:" 3210 "&Detaljer >>" 3220 "<< &Detaljer" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -75,8 +75,11 @@ 22 "Witamy w grupie roboczej %1." 23 "Witamy w domenie %1." 24 "Musisz zrestartowaæ komputer aby zmiany odnios³y skutek." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Uwaga: Tylko Administratorzy mog¹ zmieniaæ identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie zosta³ zmieniony, powód:" 3210 "&Szczegó³y >>" 3220 "<< &Szczegó³y" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -67,8 +67,11 @@ 22 "Äîáðî ïîæàëîâàòü â ðàáî÷óþ ãðóïïó %1." 23 "Äîáðî ïîæàëîâàòü â äîìåí %1." 24 "Íåîáõîäèìî ïåðåçàïóñòèòü êîìïüþòåð äëÿ òîãî, ÷òîáû ýòè èçìåíåíèÿ âñòóïèëè â ñèëó." + 25 "Ìîæíî èçìåíèòü èìÿ è ïðèíàäëåæíîñòü ýòîãî êîìïüþòåðà. Èçìåíåíèÿ ìîãóò ïîâëèÿòü íà äîñòóï ê ñåòåâûì ðåñóðñàì." 1021 "Ïðèìå÷àíèå: òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíèòü èäåíòèôèêàöèþ ýòîãî êîìïüþòåðà." 1022 "Ïðèìå÷àíèå: èäåíòèôèêàöèÿ ýòîãî êîìïüþòåðà íå ìîæåò áûòü èçìåíåíà, ïîòîìó ÷òî:" 3210 "&Ïîäðîáíî >>" 3220 "<< &Ïîäðîáíî" + 4000 "Èíôîðìàöèÿ" + 4001 "Íå óäàëîñü óñòàíîâèòü íîâîå èìÿ êîìïüþòåðà!" END Modified: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sk-SK… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -74,8 +74,11 @@ 22 "Vitajte v pracovnej skupine %1." 23 "Vitajte v doméne %1." 24 "Aby sa prejavili vykonané zmeny, musíte retartova poèítaè." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Iba správcovia môu zmeni identifikáciu tohto poèítaèa." 1022 "Poznámka: Identifikácia poèítaèa nemôe by zmenená, lebo:" 3210 "&Podrobnosti >>" 3220 "<< &Podrobnosti" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -75,8 +75,11 @@ 22 "Âàñ â³òàº ðîáî÷à ãðóïà %1." 23 "Âàñ â³òàº äîìåí %1." 24 "Ñë³ä ïåðåçàïóñòèòè êîìï'þòåð, ùîá ö³ çì³íè íàáðàëè ñèëè." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà ìîæóòü ëèøå àäì³í³ñòðàòîðè." 1022 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà íåìîæëèâî, îñê³ëüêè:" 3210 "&Ïîäðîáèö³ >>" 3220 "<< &Ïîäðîáèö³" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/netid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.c?re… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/netid.c [iso-8859-1] Tue Sep 15 15:45:34 2009 @@ -3,16 +3,210 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/netid/netid.c * PURPOSE: Network ID Page - * COPYRIGHT: Copyright Thomas Weidenmueller <w3seek(a)reactos.org> + * COPYRIGHT: Thomas Weidenmueller <w3seek(a)reactos.org> + * Dmitry Chapyshev <dmitry(a)reactos.org> * */ #include <windows.h> +#include <tchar.h> #include <lm.h> #include <prsht.h> #include "resource.h" static HINSTANCE hDllInstance; + + +static +INT_PTR CALLBACK +DNSSuffixPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDCANCEL: + case IDOK: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} + +static VOID +SetRadioBtnState(HWND hDlg, BOOL IsDomain) +{ + SendDlgItemMessage(hDlg, 1008, BM_SETCHECK, (WPARAM)IsDomain, 0); + SendDlgItemMessage(hDlg, 1004, BM_SETCHECK, (WPARAM)!IsDomain, 0); + EnableWindow(GetDlgItem(hDlg, 116), IsDomain); + EnableWindow(GetDlgItem(hDlg, 1007), !IsDomain); +} + +static VOID +DisableControls(HWND hDlg) +{ + EnableWindow(GetDlgItem(hDlg, 1008), FALSE); + EnableWindow(GetDlgItem(hDlg, 1004), FALSE); + EnableWindow(GetDlgItem(hDlg, 116), FALSE); + EnableWindow(GetDlgItem(hDlg, 1007), FALSE); +} + +static +INT_PTR CALLBACK +NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_INITDIALOG: + { + LPWKSTA_INFO_101 wki = NULL; + DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; + TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + TCHAR MsgText[MAX_PATH * 2]; + LPWSTR JoinName; + NETSETUP_JOIN_STATUS JoinStatus; + + if (LoadString(hDllInstance, 25, MsgText, sizeof(MsgText) / sizeof(TCHAR))) + SetDlgItemText(hDlg, 1017, MsgText); + + if (GetComputerName(ComputerName, &Size)) + { + SetDlgItemText(hDlg, 1002, ComputerName); + SetDlgItemText(hDlg, 1001, ComputerName); + } + + if (NetGetJoinInformation(NULL, &JoinName, &JoinStatus) != NERR_Success) + { + SetRadioBtnState(hDlg, FALSE); + + if (NetWkstaGetInfo(NULL, + 101, + (LPBYTE*)&wki) == NERR_Success) + { + SetDlgItemText(hDlg, + 1007, + wki->wki101_langroup); + } + else DisableControls(hDlg); + + if (wki) NetApiBufferFree(wki); + } + else + { + switch (JoinStatus) + { + case NetSetupDomainName: + SetDlgItemText(hDlg, 116, JoinName); + SetRadioBtnState(hDlg, TRUE); + break; + + case NetSetupWorkgroupName: + SetDlgItemText(hDlg, 1007, JoinName); + SetRadioBtnState(hDlg, FALSE); + break; + + case NetSetupUnjoined: + break; + + case NetSetupUnknownStatus: + default: + { + SetRadioBtnState(hDlg, FALSE); + + if (NetWkstaGetInfo(NULL, + 101, + (LPBYTE*)&wki) == NERR_Success) + { + SetDlgItemText(hDlg, + 1007, + wki->wki101_langroup); + } + else DisableControls(hDlg); + + if (wki) NetApiBufferFree(wki); + break; + } + } + + if (JoinName) NetApiBufferFree(JoinName); + } + } + break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case 1008: /* Domain radio button */ + case 1004: /* Workgroup radio button */ + if (SendDlgItemMessage(hDlg, 1008, BM_GETCHECK, 0, 0) == BST_CHECKED) + SetRadioBtnState(hDlg, TRUE); + else + SetRadioBtnState(hDlg, FALSE); + break; + + case 1003: + DialogBox(hDllInstance, + MAKEINTRESOURCE(IDD_PROPPAGEDNSANDNETBIOS), + hDlg, + DNSSuffixPropDlgProc); + break; + + case IDOK: + { + DWORD Size = MAX_COMPUTERNAME_LENGTH + 1; + TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + TCHAR NewComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + + if (GetComputerName(ComputerName, &Size)) + { + if (GetWindowText(GetDlgItem(hDlg, 1002), + NewComputerName, + (MAX_COMPUTERNAME_LENGTH + 1))) + { + if (_tcscmp(ComputerName, NewComputerName) != 0) + { + if (!SetComputerName(NewComputerName)) + { + TCHAR szMsgText[MAX_PATH]; + + LoadString(hDllInstance, 4001, szMsgText, sizeof(szMsgText) / sizeof(TCHAR)); + + MessageBox(0, szMsgText, NULL, MB_OK | MB_ICONERROR); + } + else + { + TCHAR szMsgTitle[MAX_PATH], szMsgText[MAX_PATH]; + + LoadString(hDllInstance, 4000, szMsgTitle, sizeof(szMsgTitle) / sizeof(TCHAR)); + LoadString(hDllInstance, 24, szMsgText, sizeof(szMsgText) / sizeof(TCHAR)); + + MessageBox(hDlg, szMsgText, szMsgTitle, MB_OK | MB_ICONINFORMATION); + } + } + } + } + + EndDialog(hDlg, LOWORD(wParam)); + } + break; + + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} static INT_PTR CALLBACK NetIDPageProc(IN HWND hwndDlg, @@ -23,7 +217,6 @@ INT_PTR Ret = 0; UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); switch (uMsg) { @@ -48,12 +241,23 @@ wki->wki101_langroup); } - if (wki != NULL) - NetApiBufferFree(wki); + if (wki) NetApiBufferFree(wki); Ret = TRUE; break; } + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_NETWORK_PROPERTY: + DialogBox(hDllInstance, + MAKEINTRESOURCE(IDD_PROPPAGECOMPNAMECHENGE), + hwndDlg, + NetworkPropDlgProc); + break; + } + break; } return Ret; @@ -66,7 +270,7 @@ psp.dwSize = sizeof(psp); psp.dwFlags = PSP_DEFAULT; - psp.hInstance= hDllInstance; + psp.hInstance = hDllInstance; psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGECOMPUTER); psp.pfnDlgProc = NetIDPageProc;

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