Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65807: [SHDOCVW] Bring exports closer to native. CORE-8936 CORE-8174
by akhaldi＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: akhaldi Date: Tue Dec 23 10:53:07 2014 New Revision: 65807 URL: http://svn.reactos.org/svn/reactos?rev=65807&view=rev Log: [SHDOCVW] Bring exports closer to native. CORE-8936 CORE-8174 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Tue Dec 23 10:53:07 2014 @@ -1,14 +1,17 @@ -# ordinal exports -101 stdcall -noname IEWinMain(str long) -102 stub -noname CreateShortcutInDirA -103 stub -noname CreateShortcutInDirW +101 stdcall -noname IEWinMain(str long) # FIXME: Inspect +102 stub -noname CreateShortcutInDirA # FIXME: Inspect +103 stub -noname CreateShortcutInDirW # FIXME: Inspect 104 stdcall -noname WhichPlatformFORWARD() -105 stub -noname CreateShortcutInDirEx -106 stub HlinkFindFrame -107 stub SetShellOfflineState -108 stub AddUrlToFavorites +105 stub -noname CreateShortcutInDirEx # FIXME: Inspect +106 stub AddUrlToFavorites +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetVersion(ptr) 110 stdcall -noname WinList_Init() 111 stub -noname WinList_Terminate +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stub DllRegisterWindowClasses 115 stub -noname CreateFromDesktop 116 stub -noname DDECreatePostNotify 117 stub -noname DDEHandleViewFolderNotify @@ -17,38 +20,52 @@ 120 stub -noname SHDesktopMessageLoop 121 stdcall -noname StopWatchModeFORWARD() 122 stdcall -noname StopWatchFlushFORWARD() -123 stdcall -noname StopWatchAFORWARD(long str long long long) -124 stdcall -noname StopWatchWFORWARD(long wstr long long long) +123 stdcall -noname StopWatchWFORWARD(long str long long long) +@ stdcall -private DllUnregisterServer() 125 stdcall -noname RunInstallUninstallStubs() +126 stub DoAddToFavDlg +127 stub DoAddToFavDlgW +128 stub DoFileDownload +129 stub DoFileDownloadEx 130 stdcall -noname RunInstallUninstallStubs2() 131 stub -noname SHCreateSplashScreen +132 stub DoOrganizeFavDlg +133 stub DoOrganizeFavDlgW +134 stub DoPrivacyDlg 135 stub -noname IsFileUrl 136 stub -noname IsFileUrlW 137 stub -noname PathIsFilePath 138 stub -noname URLSubLoadString 139 stub -noname OpenPidlOrderStream 140 stub -noname DragDrop -141 stub -noname IEInvalidateImageList -142 stub -noname IEMapPIDLToSystemImageListIndex +141 stub -noname IEInvalidateImageList # FIXME: Inspect +142 stub -noname IEMapPIDLToSystemImageListIndex # FIXME: Inspect 143 stub -noname ILIsWeb +144 stub HlinkFindFrame 145 stub -noname IEGetAttributesOf 146 stub -noname IEBindToObject 147 stub -noname IEGetNameAndFlags 148 stub -noname IEGetDisplayName 149 stub -noname IEBindToObjectEx -150 stub -noname _GetStdLocation -151 stdcall -noname URLSubRegQueryA(str str long ptr long long) -152 stub -noname CShellUIHelper_CreateInstance2 +150 stub -noname _GetStdLocation # FIXME: Inspect +151 stdcall -noname URLSubRegQueryA(str str long ptr long long) # FIXME: Inspect +152 stub -noname CShellUIHelper_CreateInstance2 # FIXME: Inspect 153 stub -noname IsURLChild -158 stdcall -noname SHRestricted2A(long str long) -159 stdcall -noname SHRestricted2W(long wstr long) -160 stub -noname SHIsRestricted2W -161 stub shdocvw_161 # CSearchAssistantOC::OnDraw -162 stub -noname CDDEAuto_Navigate +154 stub HlinkFrameNavigate +155 stub HlinkFrameNavigateNHL +156 stub IEWriteErrorLog +157 stdcall ImportPrivacySettings(wstr ptr ptr) +158 stdcall -noname SHRestricted2A(long str long) # FIXME: Inspect +159 stdcall -noname SHRestricted2W(long wstr long) # FIXME: Inspect +160 stub -noname SHIsRestricted2W # FIXME: Inspect +161 stub -noname shdocvw_161 # CSearchAssistantOC::OnDraw # FIXME: Inspect +162 stub -noname CDDEAuto_Navigate # FIXME: Inspect 163 stub SHAddSubscribeFavorite -164 stdcall -noname ResetProfileSharing(long) -165 stub -noname URLSubstitution -167 stub -noname IsIEDefaultBrowser +164 stdcall -noname ResetProfileSharing(long) # FIXME: Inspect +165 stub -noname URLSubstitution # FIXME: Inspect +166 stdcall OpenURL(long long str long) ieframe.OpenURL # FIXME: Inspect +167 stub -noname IsIEDefaultBrowser # FIXME: Inspect +168 stub SHGetIDispatchForFolder 169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr) 170 stdcall -noname ParseURLFromOutsideSourceW(wstr ptr ptr ptr) 171 stub -noname _DeletePidlDPA @@ -62,20 +79,24 @@ 179 stub -noname WinList_GetShellWindows 180 stub -noname WinList_RegisterPending 181 stub -noname WinList_Revoke +182 stdcall SetQueryNetSessionCount(long) 183 stub -noname SHMapNbspToSp +184 stub SetShellOfflineState 185 stub -noname FireEvent_Quit +186 stub SoftwareUpdateMessageBox 187 stub -noname SHDGetPageLocation 188 stub -noname SHIEErrorMsgBox -189 stub shdocvw_189 # FIXME: same as ordinal 148 +189 stub -noname IEGetDisplayName_2 # FIXME: Inspect 190 stub -noname SHRunIndirectRegClientCommandForward 191 stub -noname SHIsRegisteredClient 192 stub -noname SHGetHistoryPIDL +193 stub URLQualifyA 194 stub -noname IECleanUpAutomationObject 195 stub -noname IEOnFirstBrowserCreation 196 stub -noname IEDDE_WindowDestroyed 197 stub -noname IEDDE_NewWindow 198 stub -noname IsErrorUrl -199 stub shdocvw_199 +199 stub URLQualifyW 200 stub -noname SHGetViewStream 203 stub -noname NavToUrlUsingIEA 204 stub -noname NavToUrlUsingIEW @@ -91,40 +112,17 @@ 217 stub -noname GetDefaultInternetSearchUrlA 218 stdcall -noname IEParseDisplayNameWithBCW(long wstr ptr ptr) 219 stub -noname IEILIsEqual -220 stub shdocvw_220 221 stub -noname IECreateFromPathCPWithBCA 222 stub -noname IECreateFromPathCPWithBCW -223 stub -noname ResetWebSettings -224 stub -noname IsResetWebSettingsRequired +223 stub -noname ResetWebSettings # FIXME: Inspect +224 stub -noname IsResetWebSettingsRequired # FIXME: Inspect 225 stub -noname PrepareURLForDisplayUTF8W 226 stub -noname IEIsLinkSafe 227 stub -noname SHUseClassicToolbarGlyphs 228 stub -noname SafeOpenPromptForShellExec 229 stub -noname SafeOpenPromptForPackager - -@ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stdcall -private DllGetVersion(ptr) -@ stdcall -private DllInstall(long wstr) -@ stdcall -private DllRegisterServer() -@ stub DllRegisterWindowClasses -@ stdcall -private DllUnregisterServer() -@ stub DoAddToFavDlg -@ stub DoAddToFavDlgW -@ stub DoFileDownload -@ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW -@ stub DoPrivacyDlg -@ stub HlinkFrameNavigate -@ stub HlinkFrameNavigateNHL -@ stub IEAboutBox -@ stub IEWriteErrorLog -@ stdcall ImportPrivacySettings(wstr ptr ptr) -@ stdcall InstallReg_RunDLL(long long str long) -@ stdcall OpenURL(long long str long) ieframe.OpenURL -@ stub SHGetIDispatchForFolder -@ stdcall SetQueryNetSessionCount(long) -@ stub SoftwareUpdateMessageBox -@ stub URLQualifyA -@ stub URLQualifyW +230 stub -noname ShowUrlInNewBrowserInstance +231 stub -noname RecordExtensionCreation +232 stub -noname GetExtensionRecords +233 stub -noname GetExtensionRecordBlockReason +234 stub -noname ClearExtensionRecordsBlockReason

1 0

[akhaldi] 65806: [SHLWAPI] Fix inverted StopWatch forwards. Accepted upstream. CORE-8954
by akhaldi＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: akhaldi Date: Tue Dec 23 10:50:10 2014 New Revision: 65806 URL: http://svn.reactos.org/svn/reactos?rev=65806&view=rev Log: [SHLWAPI] Fix inverted StopWatch forwards. Accepted upstream. CORE-8954 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Tue Dec 23 10:50:10 2014 @@ -303,12 +303,12 @@ } /****************************************************************** - * StopWatchWFORWARD (SHDOCVW.@) - */ -DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, + * StopWatchAFORWARD (SHDOCVW.@) + */ +DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(243))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); @@ -316,12 +316,12 @@ } /****************************************************************** - * StopWatchAFORWARD (SHDOCVW.@) - */ -DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, + * StopWatchWFORWARD (SHDOCVW.@) + */ +DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(244))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp);

1 0

[dquintana] 65805: [EXPLORER] * Fix count of visible buttons getting out of sync when removing buttons. Fixes empty space at the end of the notification toolbar. CORE-8840 #resolve #comment This sh...
by dquintana＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: dquintana Date: Tue Dec 23 01:55:48 2014 New Revision: 65805 URL: http://svn.reactos.org/svn/reactos?rev=65805&view=rev Log: [EXPLORER] * Fix count of visible buttons getting out of sync when removing buttons. Fixes empty space at the end of the notification toolbar. CORE-8840 #resolve #comment This should be fixed as of r65805. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Tue Dec 23 01:55:48 2014 @@ -132,7 +132,6 @@ tbBtn.fsState |= TBSTATE_HIDDEN; m_VisibleButtonCount--; } - } /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ @@ -209,6 +208,12 @@ return; DeleteButton(index); + + if (!(notifyItem->dwState & NIS_HIDDEN)) + { + m_VisibleButtonCount--; + } + delete notifyItem; }

1 0

[dquintana] 65804: [EXPLORER] * Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis. * In Windows, fixes the taskbar having a size grip with the t...
by dquintana＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: dquintana Date: Tue Dec 23 01:31:36 2014 New Revision: 65804 URL: http://svn.reactos.org/svn/reactos?rev=65804&view=rev Log: [EXPLORER] * Improve an older change that I commited by mistake, with the improvbements based on a patch by Giannis. * In Windows, fixes the taskbar having a size grip with the taskbar is themed and locked. * In ReactOS, the size grip never seems to disappear, contrary to Giannis' concerns in the issue. * Because of the above, I decided to commit the changes, and let the sizing edge inconsistency be a followup to the issue. CORE-6966 #resolve #comment A modified version of the patch was commited in r65804. Thanks. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Tue Dec 23 01:31:36 2014 @@ -1435,7 +1435,7 @@ else m_Theme = NULL; - if (m_Theme) + if (Locked && m_Theme) { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); } @@ -1443,6 +1443,7 @@ { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); return TRUE; } @@ -1787,9 +1788,8 @@ BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock) { - BOOL bPrevLock; - - bPrevLock = Locked; + BOOL bPrevLock = Locked; + if (Locked != bLock) { Locked = bLock; @@ -1800,8 +1800,20 @@ { /* Reset?? */ Locked = bPrevLock; + return bPrevLock; } } + + if (Locked && m_Theme) + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); + } + else + { + SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); + } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + } return bPrevLock;

1 0

[dquintana] 65803: [EXPLORER] * Handle WM_CONTEXTMENU in the notification area so it does not spread upwards to the taskbar window. * In theory, only one of the two handlers would be necessary, and...
by dquintana＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: dquintana Date: Tue Dec 23 01:13:05 2014 New Revision: 65803 URL: http://svn.reactos.org/svn/reactos?rev=65803&view=rev Log: [EXPLORER] * Handle WM_CONTEXTMENU in the notification area so it does not spread upwards to the taskbar window. * In theory, only one of the two handlers would be necessary, and it is true when testing in Windows, but in ReactOS, the handler in CSysPagerWnd was not enough. This may be worth a look by the win32k experts to see if it's a bug, or Windows was correcting my error. CORE-8870 #resolve #comment Should be fixed in r65803. Thanks for reporting. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Tue Dec 23 01:13:05 2014 @@ -533,12 +533,19 @@ return Ret; } + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + bHandled = TRUE; + return 0; + } + DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTaskSwitchWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) END_MSG_MAP() @@ -1529,6 +1536,12 @@ return FALSE; } + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + bHandled = TRUE; + return 0; + } + DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTaskSwitchWnd) @@ -1539,6 +1552,7 @@ MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_SETFONT, OnSetFont) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) // FIXME: This handler is not necessary in Windows MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) MESSAGE_HANDLER(TNWM_UPDATETIME, OnUpdateTime) MESSAGE_HANDLER(TNWM_SHOWCLOCK, OnShowClock)

1 0

[spetreolle] 65802: [WHOAMI] Fix warning into the russian file.
by spetreolle＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: spetreolle Date: Mon Dec 22 23:44:25 2014 New Revision: 65802 URL: http://svn.reactos.org/svn/reactos?rev=65802&view=rev Log: [WHOAMI] Fix warning into the russian file. Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 23:44:25 2014 @@ -41,7 +41,7 @@ IDS_ERROR_NH_LIST "ÐÐ¨ÐÐÐÐ: ÐÐ°ÑÐ°Ð¼ÐµÑÑ /NH Ð½ÐµÐ»ÑÐ·Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð¼ LIST.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" IDS_HELP "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n\ ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ, Ð³ÑÑÐ¿Ð¿Ðµ Ð¸ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾ Ð²Ð¾ÑÐµÐ´ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹.\n\ - ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½\Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ + ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½/Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ \n\ ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo' - 'csv', 'list' Ð¸ 'table'.\n\ ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ '/nh' ÑÑÐ¾Ð±Ñ ÑÐºÑÑÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² ÑÐ°Ð±Ð»Ð¸ÑÐµ.\n\

1 0

[pschweitzer] 65801: [FASTFAT] So far, totally disable VPB swapout on dismount. It appears to have brought more issues than it actually solves. A more accurate implementation will be required. CORE...
by pschweitzer＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: pschweitzer Date: Mon Dec 22 23:00:22 2014 New Revision: 65801 URL: http://svn.reactos.org/svn/reactos?rev=65801&view=rev Log: [FASTFAT] So far, totally disable VPB swapout on dismount. It appears to have brought more issues than it actually solves. A more accurate implementation will be required. CORE-8928 #comment Can you please retry with r65801 Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Dec 22 23:00:22 2014 @@ -7,8 +7,10 @@ #include <pseh/pseh2.h> #define USE_ROS_CC_AND_FS +#if 0 #ifndef _MSC_VER #define ENABLE_SWAPOUT +#endif #endif #define ROUND_DOWN(n, align) \

1 0

[pschweitzer] 65800: [SHELL32] Update French translation
by pschweitzer＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: pschweitzer Date: Mon Dec 22 22:55:07 2014 New Revision: 65800 URL: http://svn.reactos.org/svn/reactos?rev=65800&view=rev Log: [SHELL32] Update French translation Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Dec 22 22:55:07 2014 @@ -44,18 +44,18 @@ /* menubar EDIT menu */ MENU_003 MENU BEGIN - MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM "&Annuler\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT - MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT - MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM "C&ouper\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copier\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "Co&ller\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "CrÃ©er un &lien", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO - MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM "Copier vers le &dossier...", FCIDM_SHVIEW_COPYTO + MENUITEM "&DÃ©placer vers le dossier...", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL - MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION + MENUITEM "&Tout sÃ©lectionner\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Inverser la sÃ©lection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -813,5 +813,5 @@ IDS_UNKNOWN_APP "Application inconnue" IDS_EXE_DESCRIPTION "Description :" - IDS_MENU_EMPTY "(Empty)" -END + IDS_MENU_EMPTY "(Vide)" +END

1 0

[hbelusca] 65799: In absence of patchbot, let's test patch directly on... trunk!! Yeah!! Let's break trunk! (or not, we'll see...) [USER32][USERSRV][WIN32K] - Flag CSRSS threads as such. - Each tim...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 21:23:00 2014 New Revision: 65799 URL: http://svn.reactos.org/svn/reactos?rev=65799&view=rev Log: In absence of patchbot, let's test patch directly on... trunk!! Yeah!! Let's break trunk! (or not, we'll see...) [USER32][USERSRV][WIN32K] - Flag CSRSS threads as such. - Each time a win32 thread is "created" (or a win32k system call is done) a PsConvertToGuiThread call is done, that makes a Win32ThreadCallout which calls UserCreateThreadInfo. We should call back ClientThreadSetup to set client-side info. - Introduce a ClientThreadSetupHelper function to try to understand what happens when doing direct calls to ClientThreadSetup and via win32k callbacks. - Reenable CSR call in user32::DllMain but add shame hacks in Init(..) to force NtUserProcessConnect callbacks (yet they should not be done there): see the code comment associated for more details. - Temporarily disable ClientThreadSetupHelper call in ClientThreadSetup because it makes things fail, like console input thread failing and so on... - ... and in ClientThreadSetupHelper, some correct code is commented out because it currently breaks other things (like menu initialization etc...), and HACKS ARE ADDED!! (see especially the "if (gpsi)" one, that should not exist, but if removed we fail sometimes in MenuInit because gpsi becomes NULL for some reason, if some other code that makes redundant calls to NtUserProcessConnect, is uncommented). To sum up I tried to scaffold the thing as it should be, but with disabled code to not break everything. CORE-8949 #comment Revision 65799 committed the patch v1. Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -385,12 +385,19 @@ Status = STATUS_NO_MEMORY; goto error; } + ptiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); if (ptiCurrent->KeyboardLayout) UserReferenceObject(ptiCurrent->KeyboardLayout); + ptiCurrent->TIF_flags &= ~TIF_INCLEANUP; - if (Process == gpepCSRSS) /* If this thread is owned by CSRSS, mark it as such */ - ptiCurrent->TIF_flags |= TIF_CSRSSTHREAD; + + /* CSRSS threads have some special features */ + if (Process == gpepCSRSS) + ptiCurrent->TIF_flags = TIF_CSRSSTHREAD | TIF_DONTATTACHQUEUE; + + // FIXME: Flag SYSTEM threads with... TIF_SYSTEMTHREAD !! + ptiCurrent->pcti = &ptiCurrent->cti; /* Initialize the CLIENTINFO */ @@ -475,7 +482,7 @@ } } - /* mark the thread as fully initialized */ + /* Mark the thread as fully initialized */ ptiCurrent->TIF_flags |= TIF_GUITHREADINITIALIZED; if (!(ptiCurrent->ppi->W32PF_flags & (W32PF_ALLOWFOREGROUNDACTIVATE | W32PF_APPSTARTING)) && @@ -484,7 +491,26 @@ ptiCurrent->TIF_flags |= TIF_ALLOWFOREGROUNDACTIVATE; } ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; - TRACE_CH(UserThread,"UserCreateW32Thread pti 0x%p\n",ptiCurrent); + + /* Last things to do only if we are not a SYSTEM or CSRSS thread */ + if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD))) + { + /* Callback to User32 Client Thread Setup */ + TRACE_CH(UserThread,"Call co_IntClientThreadSetup...\n"); + Status = co_IntClientThreadSetup(); + if (!NT_SUCCESS(Status)) + { + ERR_CH(UserThread,"ClientThreadSetup failed with Status 0x%08lx\n", Status); + goto error; + } + TRACE_CH(UserThread,"co_IntClientThreadSetup succeeded!\n"); + } + else + { + TRACE_CH(UserThread,"co_IntClientThreadSetup cannot be called...\n"); + } + + TRACE_CH(UserThread,"UserCreateW32Thread pti 0x%p\n", ptiCurrent); return STATUS_SUCCESS; error: Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -128,10 +128,6 @@ Status = UserCreateThreadInfo(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) return Status; -// Callback to User32 Client Thread Setup - - co_IntClientThreadSetup(); - // } // Set Global SERVERINFO Error flags. // Load Resources. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -17,6 +17,7 @@ ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; +BOOLEAN gfFirstThread = TRUE; HICON hIconSmWindows = NULL, hIconWindows = NULL; WCHAR szAppInit[KEY_LENGTH]; @@ -203,9 +204,119 @@ User32DeliverUserAPC, }; + + +VOID +WINAPI +GdiProcessSetup(VOID); + +BOOL +WINAPI +ClientThreadSetupHelper(BOOL IsCallback) +{ + /* + * Normally we are called by win32k so the win32 thread pointers + * should be valid as they are set in win32k::UserCreateThreadInfo. + */ + PCLIENTINFO ClientInfo = GetWin32ClientInfo(); + BOOLEAN IsFirstThread = _InterlockedExchange8((PCHAR)&gfFirstThread, FALSE); + + TRACE("In ClientThreadSetup(IsCallback == %s, gfServerProcess = %s, IsFirstThread = %s)\n", + IsCallback ? "TRUE" : "FALSE", gfServerProcess ? "TRUE" : "FALSE", IsFirstThread ? "TRUE" : "FALSE"); + + if (IsFirstThread) + GdiProcessSetup(); + + /* Check for already initialized thread, and bail out if so */ + if (ClientInfo->CI_flags & CI_INITTHREAD) + { + ERR("ClientThreadSetup: Thread already initialized.\n"); + return FALSE; + } + + /* + * CSRSS couldn't use user32::DllMain CSR server-to-server call to connect + * to win32k. So it is delayed to a manually-call to ClientThreadSetup. + * Also this needs to be done only for the first thread (since the connection + * is per-process). + */ + // if (gfServerProcess && IsFirstThread) // Disabling this test is a HACK!! + { + NTSTATUS Status; + USERCONNECT UserCon; + + RtlZeroMemory(&UserCon, sizeof(UserCon)); + + /* Minimal setup of the connect info structure */ + UserCon.ulVersion = USER_VERSION; + + /* Connect to win32k */ + Status = NtUserProcessConnect(NtCurrentProcess(), + &UserCon, + sizeof(UserCon)); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Retrieve data */ + g_ppi = ClientInfo->ppi; // Snapshot PI, used as pointer only! + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); + + // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); + } + + TRACE("Checkpoint (register PFN)\n"); + if (!RegisterClientPFN()) + { + TRACE("RegisterClientPFN failed\n"); + return FALSE; + } + + /* Mark this thread as initialized */ + ClientInfo->CI_flags |= CI_INITTHREAD; + + /* Initialization that should be done once per process */ + if (IsFirstThread) + { + TRACE("Checkpoint (Allocating TLS)\n"); + + /* Allocate an index for user32 thread local data */ + User32TlsIndex = TlsAlloc(); + if (User32TlsIndex == TLS_OUT_OF_INDEXES) + return FALSE; + + // HAAAAAAAAAACK!!!!!! + // ASSERT(gpsi); + if (!gpsi) ERR("AAAAAAAAAAAHHHHHHHHHHHHHH!!!!!!!! gpsi == NULL !!!!\n"); + if (gpsi) + { + TRACE("Checkpoint (MessageInit)\n"); + + if (MessageInit()) + { + TRACE("Checkpoint (MenuInit)\n"); + if (MenuInit()) + { + TRACE("Checkpoint initialization done OK\n"); + InitializeCriticalSection(&U32AccelCacheLock); + LoadAppInitDlls(); + return TRUE; + } + MessageCleanup(); + } + + TlsFree(User32TlsIndex); + return FALSE; + } + } + + return TRUE; +} + /* -* @unimplemented -*/ + * @implemented + */ BOOL WINAPI ClientThreadSetup(VOID) @@ -221,7 +332,7 @@ // However, all the other calls are made as normal, and WINSRV.DLL loads // USER32.dll, the DllMain runs, and eventually the first NtUser system call is // made which initializes Win32k (and initializes the thread, but as mentioned - // above, the thread is marked as TIF_CSRSSTHREAD. + // above, the thread is marked as TIF_CSRSSTHREAD). // // In the DllMain of User32, there is also a CsrClientConnectToServer call to // server 2 (winsrv). When this is done from CSRSS, the "InServer" flag is set, @@ -241,73 +352,74 @@ // continue as normal. // - // GetConnected(); - - UNIMPLEMENTED; + // return ClientThreadSetupHelper(FALSE); // Disabling this call is a HACK!! return TRUE; } BOOL -Init(VOID) -{ - NTSTATUS Status; - USERCONNECT UserCon; - - TRACE("user32::Init()\n"); - - /* Set PEB data */ +Init(PUSERCONNECT UserCon /*PUSERSRV_API_CONNECTINFO*/) +{ + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("user32::Init(0x%p) -->\n", UserCon); + + RtlInitializeCriticalSection(&gcsUserApiHook); + + /* Initialize callback table in PEB data */ NtCurrentPeb()->KernelCallbackTable = apfnDispatch; NtCurrentPeb()->PostProcessInitRoutine = NULL; - /* Minimal setup of the connect info structure */ - UserCon.ulVersion = USER_VERSION; - - /* Connect to win32k */ - Status = NtUserProcessConnect(NtCurrentProcess(), - &UserCon, - sizeof(UserCon)); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Retrieve data */ - g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - - RtlInitializeCriticalSection(&gcsUserApiHook); - - //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 */ - User32TlsIndex = TlsAlloc(); - if (User32TlsIndex == TLS_OUT_OF_INDEXES) - return FALSE; - - if (MessageInit()) - { - if (MenuInit()) + /* + * Retrieve data from the connect info structure if the initializing + * process is not CSRSS. In case it is, this will be done from inside + * ClientThreadSetup. + */ + // if (!gfServerProcess) // Disabling this test is a HACK!! + { + // FIXME: HACK!! We should fixup for the NtUserProcessConnect fixups + // because it was made in the context of CSRSS process and not ours!! + // So... as long as we don't fix that, we need to redo again a call + // to NtUserProcessConnect... How perverse is that?! { - InitializeCriticalSection(&U32AccelCacheLock); - LoadAppInitDlls(); - return TRUE; + RtlZeroMemory(UserCon, sizeof(*UserCon)); + + /* Minimal setup of the connect info structure */ + UserCon->ulVersion = USER_VERSION; + + ERR("HACK: Hackish NtUserProcessConnect call!!\n"); + /* Connect to win32k */ + Status = NtUserProcessConnect(NtCurrentProcess(), + UserCon, + sizeof(*UserCon)); + if (!NT_SUCCESS(Status)) return FALSE; } - MessageCleanup(); - } - - TlsFree(User32TlsIndex); - return FALSE; + + // + // We continue as we should do... + // + + /* Retrieve data */ + g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! + g_ulSharedDelta = UserCon->siClient.ulSharedDelta; + gpsi = SharedPtrToUser(UserCon->siClient.psi); + gHandleTable = SharedPtrToUser(UserCon->siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); + } + + TRACE("<-- user32::Init()\n"); + + return NT_SUCCESS(Status); } VOID Cleanup(VOID) { + UnloadAppInitDlls(); DeleteCriticalSection(&U32AccelCacheLock); MenuCleanup(); MessageCleanup(); + TlsFree(User32TlsIndex); DeleteFrameBrushes(); - UnloadAppInitDlls(); - TlsFree(User32TlsIndex); } INT WINAPI @@ -321,8 +433,6 @@ case DLL_PROCESS_ATTACH: { -#if 0 - #define WIN_OBJ_DIR L"\\Windows" #define SESSION_DIR L"\\Sessions" @@ -335,8 +445,12 @@ PPEB Peb = NtCurrentPeb(); ULONG SessionId = Peb->SessionId; // gSessionId + TRACE("user32::DllMain\n"); + /* Don't bother us for each thread */ DisableThreadLibraryCalls(hInstanceDll); + + RtlZeroMemory(&ConnectInfo, sizeof(ConnectInfo)); /* Minimal setup of the connect info structure */ ConnectInfo.ulVersion = USER_VERSION; @@ -357,6 +471,8 @@ WIN_OBJ_DIR); } + TRACE("Checkpoint (call CSR)\n"); + /* Connect to the USER Server */ Status = CsrClientConnectToServer(SessionDir, USERSRV_SERVERDLL_INDEX, @@ -369,16 +485,13 @@ return FALSE; } -#else - gfServerProcess = FALSE; -#endif + TRACE("Checkpoint (CSR called)\n"); User32Instance = hInstanceDll; - if (!RegisterClientPFN()) - return FALSE; - - if (!Init()) + /* Finish initialization */ + TRACE("Checkpoint (call Init)\n"); + if (!Init(&ConnectInfo)) return FALSE; break; @@ -398,44 +511,13 @@ return GdiDllInitialize(hInstanceDll, dwReason, reserved); } -// FIXME: This function IS A BIIG HACK!! -VOID -FASTCALL -GetConnected(VOID) -{ - NTSTATUS Status; - USERCONNECT UserCon; - - TRACE("user32::GetConnected()\n"); - - if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) - NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - - if (gpsi && g_ppi) return; - - /* Minimal setup of the connect info structure */ - UserCon.ulVersion = USER_VERSION; - - /* Connect to win32k */ - Status = NtUserProcessConnect(NtCurrentProcess(), - &UserCon, - sizeof(UserCon)); - if (!NT_SUCCESS(Status)) return; - - /* Retrieve data */ - g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); -} - NTSTATUS WINAPI User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) { - TRACE("ClientThreadSetup\n"); - ClientThreadSetup(); + TRACE("User32CallClientThreadSetupFromKernel -->\n"); + ClientThreadSetupHelper(TRUE); + TRACE("<-- User32CallClientThreadSetupFromKernel\n"); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Mon Dec 22 21:23:00 2014 @@ -147,7 +147,7 @@ // PUSERCONNECT PUSERSRV_API_CONNECTINFO ConnectInfo = (PUSERSRV_API_CONNECTINFO)ConnectionInfo; - DPRINT1("UserClientConnect\n"); + DPRINT("UserClientConnect\n"); /* Check if we don't have an API port yet */ if (CsrApiPort == NULL)

1 0

[hbelusca] 65798: [USERSRV] - Reenable UserClientConnect callback, it's not the problematic code that made bots to fail at 3rd stage and caused r65716 to be committed. - Put the system threads hack...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 19:50:00 2014 New Revision: 65798 URL: http://svn.reactos.org/svn/reactos?rev=65798&view=rev Log: [USERSRV] - Reenable UserClientConnect callback, it's not the problematic code that made bots to fail at 3rd stage and caused r65716 to be committed. - Put the system threads hack *after* having called NtUserInitialize (that really initializes user-kernel interface with win32k), and not before. Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Mon Dec 22 19:50:00 2014 @@ -191,12 +191,7 @@ CSR_SERVER_DLL_INIT(UserServerDllInitialization) { -/*** From win32csr... ***/ - HANDLE ServerThread; - CLIENT_ID ClientId; NTSTATUS Status; - UINT i; -/*** END - From win32csr... ***/ /* Initialize the memory */ UserServerHeap = RtlGetProcessHeap(); @@ -210,36 +205,12 @@ LoadedServerDll->NameTable = UserServerApiNameTable; #endif LoadedServerDll->SizeOfProcessData = 0; -#if 0 LoadedServerDll->ConnectCallback = UserClientConnect; -#else - LoadedServerDll->ConnectCallback = NULL; -#endif LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = UserServerHardError; LoadedServerDll->ShutdownProcessCallback = UserClientShutdown; UserServerDllInstance = LoadedServerDll->ServerHandle; - -/*** From win32csr... See r54125 ***/ - /* Start the Raw Input Thread and the Desktop Thread */ - for (i = 0; i < 2; ++i) - { - Status = RtlCreateUserThread(NtCurrentProcess(), - NULL, TRUE, 0, 0, 0, - CreateSystemThreads, - (PVOID)i, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - { - DPRINT1("Cannot start Raw Input Thread!\n"); - } - } -/*** END - From win32csr... ***/ /* Create the power request event */ Status = NtCreateEvent(&ghPowerRequestEvent, @@ -278,6 +249,32 @@ return Status; } +/*** From win32csr... See r54125 ***/ + { + HANDLE ServerThread; + CLIENT_ID ClientId; + UINT i; + + /* Start the Raw Input Thread and the Desktop Thread */ + for (i = 0; i < 2; ++i) + { + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, TRUE, 0, 0, 0, + CreateSystemThreads, + (PVOID)i, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + { + DPRINT1("Cannot start Raw Input Thread!\n"); + } + } + } +/*** END - From win32csr... ***/ + /* All done */ return STATUS_SUCCESS; }

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