Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[greatlrd] 38630: Implement DCIEndAccess not tested in all case yet

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 7 08:22:38 2009 New Revision: 38630 URL: http://svn.reactos.org/svn/reactos?rev=38630&view=rev Log: Implement DCIEndAccess not tested in all case yet Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Wed Jan 7 08:22:38 2009 @@ -7,7 +7,7 @@ DCICreatePrimary@8 DCIDestroy@4 DCIDraw@4 -; DCIEndAccess + DCIEndAccess@4 DCIEnum@20 DCIOpenProvider@0 DCISetClipList@8 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Wed Jan 7 08:22:38 2009 @@ -613,7 +613,7 @@ /* Note DCIBeginAccess never return DCI_OK MSDN say it does, but it dose not return it */ -int +DCIRVAL WINAPI DCIBeginAccess(LPDCISURFACEINFO pdci, int x, int y, int dx, int dy) { @@ -628,8 +628,6 @@ DDHAL_CREATESURFACEDATA DdCreateSurfaceData; DDHAL_DESTROYSURFACEDATA DdDestorySurfaceData; - - pDciSurface_int = (LPDCISURFACE_INT) (((DWORD) pdci) - sizeof(DCISURFACE_LCL)) ; /* Check see if we have lost surface or not */ @@ -656,9 +654,7 @@ ReStart: DdLockData.ddRVal = DDERR_GENERIC; - - - + EnterCriticalSection(&gcsWinWatchLock); /* Try lock our surface here @@ -788,6 +784,7 @@ } } } + /* Get HalInfo from DirectX hardware accalation fail or something else so we lost the surface */ pDciSurface_int->DciSurface_lcl.LostSurface = TRUE; @@ -824,6 +821,31 @@ return retValue; } +void +WINAPI +DCIEndAccess(LPDCISURFACEINFO pdci) +{ + DDHAL_UNLOCKDATA DdUnlockData; + LPDCISURFACE_INT pDciSurface_int; + + pDciSurface_int = (LPDCISURFACE_INT) (((DWORD) pdci) - sizeof(DCISURFACE_LCL)) ; + + if ( pDciSurface_int->DciSurface_lcl.LostSurface == 0 ) + { + DdUnlockData.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; + DdUnlockData.lpDDSurface = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; + + EnterCriticalSection(&gcsWinWatchLock); + + pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.Unlock(&DdUnlockData); + + LeaveCriticalSection(&gcsWinWatchLock); + } + + pDciSurface_int->DciSurfaceInfo.wSelSurface = 0; + pDciSurface_int->DciSurfaceInfo.dwOffSurface = 0; +} + /***********************************************************************************************************/ /***********************************************************************************************************/

15 years, 8 months

[dchapyshev] 38629: - Add more resources - More dialogs implementation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jan 7 07:50:54 2009 New Revision: 38629 URL: http://svn.reactos.org/svn/reactos?rev=38629&view=rev Log: - Add more resources - More dialogs implementation Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/hdwwiz/resource.h Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -124,10 +124,27 @@ { case PSN_SETACTIVE: { - /* Disable "Next" button */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + if ((SendDlgItemMessage(hwndDlg, IDC_CONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED) || + (SendDlgItemMessage(hwndDlg, IDC_NOTCONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + } + else + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } } break; + + case PSN_WIZNEXT: + { + if (SendDlgItemMessage(hwndDlg, IDC_NOTCONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED) + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_NOTCONNECTEDPAGE); + else + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE); + + return TRUE; + } } } break; @@ -168,10 +185,83 @@ return FALSE; } +static INT_PTR CALLBACK +NotConnectedPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + /* Set title font */ + SendDlgItemMessage(hwndDlg, IDC_FINISHTITLE, WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE); + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH | PSWIZB_BACK); + } + break; + + case PSN_WIZBACK: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_ISCONNECTEDPAGE); + return TRUE; + } + } + } + break; + } + + return FALSE; +} + +static INT_PTR CALLBACK +ProbeListPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + } + break; + + case PSN_WIZNEXT: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_FINISHPAGE); + return TRUE; + } + } + } + break; + } + + return FALSE; +} + static VOID HardwareWizardInit(HWND hwnd) { - HPROPSHEETPAGE ahpsp[3]; + HPROPSHEETPAGE ahpsp[5]; PROPSHEETPAGE psp = {0}; PROPSHEETHEADER psh; UINT nPages = 0; @@ -207,6 +297,17 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_ISCONNECTEDPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); + /* Create probe list page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PROBELISTTITLE); + psp.pszHeaderSubTitle = NULL; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = ProbeListPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_PROBELISTPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + /* Create finish page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; @@ -214,6 +315,15 @@ psp.lParam = 0; psp.pfnDlgProc = FinishPageDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create not connected page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hApplet; + psp.lParam = 0; + psp.pfnDlgProc = NotConnectedPageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_NOTCONNECTEDPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the property sheet */ Modified: trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/bg-BG.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Äîáàâÿíå íà îáîðóäâàíå" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Pøidat hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Ðñüóèåóç óõóêåõþí" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/en-US.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Add hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/es-ES.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Añade Nuevo Hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Ajout de matériel" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -122,6 +122,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Hardver hozzáadása" @@ -129,4 +141,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/id-ID.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Tambah hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/it-IT.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Aggiungi hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "n[hEFAÌÇÁ" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Hardware toevoegen" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Legg til maskinvare" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -126,6 +126,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Dodaj sprzêt" @@ -133,4 +145,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Adicionar hardware" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "Äëÿ ïðåêðàùåíèÿ ðàáîòû ìàñòåðà íàæìèòå êíîïêó ""Îòìåíà"".", IDC_STATUSTEXT, 114, 158, 192, 19 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìàñòåð óñòàíîâêè îáîðóäîâàíèÿ", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "×òîáû ïðîäîëæèòü, ïîäêëþ÷èòå ýòî óñòðîéñòâî ê êîìïüþòåðó.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Îòêëþ÷èòü êîìïüþòåð ïîñëå íàæàòèÿ êíîïêè ""Ãîòîâî"", ÷òîáû ìîæíî áûëî îòêðûòü êîðïóñ è ïîäêëþ÷èòü óñòðîéñòâî.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 30, BS_TOP | BS_MULTILINE + LTEXT "Â áîëüøèíñòâå ñëó÷àåâ ReactOS àâòîìàòè÷åñêè óñòàíîâèò íîâîå îáîðóäîâàíèå ïîñëå åãî ïîäêëþ÷åíèÿ. Åñëè ReactOS íå îáíàðóæèò åãî, íàäî áóäåò âíîâü çàïóñòèòü ýòîò ìàñòåð äëÿ óñòàíîâêè ïðîãðàììíîé ïîääåðæêè.", -1, 114, 98, 193, 44 + LTEXT "Äëÿ çàêðûòèÿ ìàñòåðà íàæìèòå êíîïêó ""Ãîòîâî"".", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Óñòàíîâêà îáîðóäîâàíèÿ" @@ -128,6 +140,5 @@ IDS_SEARCHTITLE "Ïîäîæäèòå, âûïîëíÿåòñÿ ïîèñê..." IDS_SEARCHTEXT "Ýòîò ìàñòåð âûïîëíÿåò ïîèñê îáîðóäîâàíèÿ, êîòîðîå íåäàâíî áûëî ïîäêëþ÷åíî ê êîìïüþòåðó, íî åùå íå áûëî óñòàíîâëåíî." IDS_ISCONNECTED "Ïîäêëþ÷åíî ëè óñòðîéñòâî?" + IDS_PROBELISTTITLE "Íà ýòîì êîìïüþòåðå óæå óñòàíîâëåíî ñëåäóþùåå îáîðóäîâàíèå" END - - Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -125,6 +125,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Prida hardvér" @@ -132,4 +144,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/th-TH.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -121,6 +121,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "à¾ÔèÁ¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" @@ -128,4 +140,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -129,6 +129,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Äîäàòè óñòàòêóâàííÿ" @@ -136,4 +148,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/zh-CN.rc [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -127,6 +127,18 @@ LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 END +IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Add Hardware Wizard" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 + LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 +END + STRINGTABLE BEGIN IDS_CPLNAME "Ìí¼ÓÓ²¼þ" @@ -134,4 +146,5 @@ IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." IDS_ISCONNECTED "Is the hardware connected?" + IDS_PROBELISTTITLE "The following hardware is already installed on your computer" END Modified: trunk/reactos/dll/cpl/hdwwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/resource.h [iso-8859-1] Wed Jan 7 07:50:54 2009 @@ -13,6 +13,7 @@ /* Strings */ #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 +#define IDS_PROBELISTTITLE 1005 #define IDS_SEARCHTEXT 1020 #define IDS_SEARCHTITLE 1025 #define IDS_ISCONNECTED 1113 @@ -22,6 +23,7 @@ #define IDD_SEARCHPAGE 204 #define IDD_ISFOUNDPAGE 205 #define IDD_ISCONNECTEDPAGE 206 +#define IDD_NOTCONNECTEDPAGE 207 #define IDD_PROBELISTPAGE 208 #define IDD_HWSTATUSPAGE 209 #define IDD_SELECTWAYPAGE 210 @@ -50,6 +52,7 @@ #define IDC_WARNINGICON 502 #define IDC_CONNECTED 504 #define IDC_NOTCONNECTED 505 +#define IDC_TURNOFFCHECKBOX 506 #endif /* __CPL_RESOURCE_H */

15 years, 8 months

[greatlrd] 38628: Implement DCIBeginAccess not tested in all case yet

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jan 7 07:47:18 2009 New Revision: 38628 URL: http://svn.reactos.org/svn/reactos?rev=38628&view=rev Log: Implement DCIBeginAccess not tested in all case yet Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Wed Jan 7 07:47:18 2009 @@ -1,6 +1,6 @@ EXPORTS -; DCIBeginAccess + DCIBeginAccess@20 DCICloseProvider@4 DCICreateOffscreen@40 DCICreateOverlay@12 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Wed Jan 7 07:47:18 2009 @@ -9,8 +9,7 @@ #include <ddrawgdi.h> #include <pseh/pseh.h> - - +/* ToDO protect some function with pseh */ /* Winwatch internal struct */ typedef struct _WINWATCH_INT @@ -612,6 +611,220 @@ +/* Note DCIBeginAccess never return DCI_OK MSDN say it does, but it dose not return it */ + +int +WINAPI +DCIBeginAccess(LPDCISURFACEINFO pdci, int x, int y, int dx, int dy) +{ + int retValue = DCI_FAIL_GENERIC; + int myRetValue = 0; + DDHALINFO ddHalInfo; + BOOL bNewMode = FALSE; + DDHAL_LOCKDATA DdLockData; + DDSURFACEDESC DdSurfaceDesc; + LPDCISURFACE_INT pDciSurface_int; + LPDDRAWI_DDRAWSURFACE_LCL tmp_DdSurfLcl; + DDHAL_CREATESURFACEDATA DdCreateSurfaceData; + DDHAL_DESTROYSURFACEDATA DdDestorySurfaceData; + + + + pDciSurface_int = (LPDCISURFACE_INT) (((DWORD) pdci) - sizeof(DCISURFACE_LCL)) ; + + /* Check see if we have lost surface or not */ + if ( pDciSurface_int->DciSurface_lcl.LostSurface != FALSE) + { + /* Surface was lost, so we set return error code and return */ + retValue = DCI_FAIL_INVALIDSURFACE; + } + else + { + /* Surface was not lost */ + + /* Setup DdLock when we need get our surface pointer */ + DdLockData.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; + DdLockData.lpDDSurface = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; + DdLockData.bHasRect = 1; + DdLockData.dwFlags = 0; + DdLockData.rArea.top = y; + DdLockData.rArea.left = x; + DdLockData.rArea.right = dx + x; + DdLockData.rArea.bottom = y + dy; + + /* if we lost the surface or if the display have been change we need restart from here */ + ReStart: + + DdLockData.ddRVal = DDERR_GENERIC; + + + + EnterCriticalSection(&gcsWinWatchLock); + + /* Try lock our surface here + * + * Note MS DCIMAN32.DLL does not check see if the driver support Lock or not or if it NULL or the flag + * it will not crash it will return a error code instead, for SEH will capture it. + */ + + pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.Lock( &DdLockData ); + + + /* We need wait until DdLock is ready and finish to draw */ + while ( DdLockData.ddRVal == DDERR_WASSTILLDRAWING ) + { + pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.Lock( &DdLockData ); + } + + /* DdLock is now ready to continue */ + + LeaveCriticalSection(&gcsWinWatchLock); + + /* Check DdLock return value */ + if ( DdLockData.ddRVal == DD_OK) + { + /* Check DdLock sussess so we fill in few members into the struct pdci */ + + pdci->dwOffSurface = (ULONG_PTR) ( ( ((DWORD)DdLockData.lpSurfData) - ( ( pdci->dwBitCount / 8 ) * x ) ) - ( pdci->lStride * y ) ); + + retValue = DCI_STATUS_POINTERCHANGED; + } + else if ( DdLockData.ddRVal == DDERR_SURFACELOST) + { + /* Check DdLock did not sussess so we need recreate it, maybe becose the display have been change ? */ + + /* Restart the DirectX hardware acclartions */ + if ( DdReenableDirectDrawObject( &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal, &bNewMode ) == 0) + { + /* We fail restart it, so we return error code */ + retValue = DCI_ERR_SURFACEISOBSCURED; + } + else + { + /* Get HalInfo from DirectX hardware accalation */ + myRetValue = DdQueryDirectDrawObject ( &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal, + &ddHalInfo, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + if ( myRetValue == FALSE ) + { + if ( ( pDciSurface_int->DciSurfaceInfo.dwWidth != ddHalInfo.vmiData.dwDisplayWidth) || + ( pDciSurface_int->DciSurfaceInfo.dwHeight != ddHalInfo.vmiData.dwDisplayHeight ) || + ( pDciSurface_int->DciSurfaceInfo.lStride != ddHalInfo.vmiData.lDisplayPitch ) || + ( pDciSurface_int->DciSurfaceInfo.dwBitCount != ddHalInfo.vmiData.ddpfDisplay.dwRGBBitCount ) ) + { + + /* Here we try recreate the lost surface in follow step + * 1. Destory the old surface + * 2. Create the new surface + * 3. ResetVisrgn + */ + + /* + * Setup Destorysurface the lost surface so we do not lost any + * hDC or hDD handles and memory leaks and destory it + */ + + DdDestorySurfaceData.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; + DdDestorySurfaceData.lpDDSurface = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; + DdDestorySurfaceData.ddRVal = DDERR_GENERIC; + DdDestorySurfaceData.DestroySurface = pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface; + + if ( (pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) != DDHAL_SURFCB32_DESTROYSURFACE ) + { + if ( pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface != 0 ) + { + pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface( &DdDestorySurfaceData ) ; + } + } + + /* + * Setup our new surface to create it + */ + + tmp_DdSurfLcl = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; + + memset(&DdSurfaceDesc,0, sizeof(DDSURFACEDESC)); + DdSurfaceDesc.dwSize = sizeof(DDSURFACEDESC); + DdSurfaceDesc.dwFlags = DDSD_CAPS; + DdSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VISIBLE; + + DdCreateSurfaceData.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; + DdCreateSurfaceData.lpDDSurfaceDesc = &DdSurfaceDesc; + DdCreateSurfaceData.lplpSList = &tmp_DdSurfLcl; + DdCreateSurfaceData.dwSCnt = 1; + DdCreateSurfaceData.ddRVal = DDERR_GENERIC; + DdCreateSurfaceData.CreateSurface = pDciSurface_int->DciSurface_lcl.DDCallbacks.CreateSurface; + + if ( ( pDciSurface_int->DciSurface_lcl.DDCallbacks.CreateSurface != NULL) && + ((pDciSurface_int->DciSurface_lcl.DDCallbacks.dwFlags & DDHAL_CB32_CREATESURFACE) == DDHAL_CB32_CREATESURFACE)) + { + if ( ( pDciSurface_int->DciSurface_lcl.DDCallbacks.CreateSurface( &DdCreateSurfaceData ) == 1 ) && + ( DdCreateSurfaceData.ddRVal == DD_OK ) ) + { + /* + * RestVisrgn + */ + if ( DdResetVisrgn( &pDciSurface_int->DciSurface_lcl.SurfaceLocal, (HWND)-1 ) != 0) + { + /* The surface was lost, so we need restart DCIBeginAccess, + * we can retstart it in two ways + * 1. call on DCIBeginAccess each time + * 2. use a goto. + * + * Why I decide not to call it again, + * is it will use more stack space and we do not known + * how many times it will restart it self, and + * it will cost cpu time and stack memory. + * + * The goto did seam best slovtions to this issue, and + * it will not cost us extra stack space or cpu time, + * and we do not need setup DdLockData again, and do other + * check as well. + */ + goto ReStart; + } + } + } + } + } + /* Get HalInfo from DirectX hardware accalation fail or something else so we lost the surface */ + pDciSurface_int->DciSurface_lcl.LostSurface = TRUE; + + retValue = DCI_FAIL_INVALIDSURFACE; + + /* + * Setup Destorysurface the lost surface so we do not lost any hDC or hDD handles and memory leaks + * and destory it and free all DirectX rescures + */ + DdDestorySurfaceData.lpDD = &pDciSurface_int->DciSurface_lcl.DirectDrawGlobal; + DdDestorySurfaceData.lpDDSurface = &pDciSurface_int->DciSurface_lcl.SurfaceLocal; + DdDestorySurfaceData.ddRVal = DDERR_GENERIC; + DdDestorySurfaceData.DestroySurface = pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface; + + if ( (pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_DESTROYSURFACE) != DDHAL_SURFCB32_DESTROYSURFACE ) + { + if ( pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface != 0 ) + { + if ( pDciSurface_int->DciSurface_lcl.DDSurfaceCallbacks.DestroySurface( &DdDestorySurfaceData ) == DDHAL_DRIVER_HANDLED ) + { + if ( DdDestorySurfaceData.ddRVal == DD_OK ) + { + DdDeleteDirectDrawObject(&pDciSurface_int->DciSurface_lcl.DirectDrawGlobal); + } + } + } + } + + } + + } + } + + return retValue; +} + + /***********************************************************************************************************/ /***********************************************************************************************************/ /***********************************************************************************************************/

15 years, 8 months

[cwittich] 38627: fix formatting

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 7 05:49:17 2009 New Revision: 38627 URL: http://svn.reactos.org/svn/reactos?rev=38627&view=rev Log: fix formatting Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Wed Jan 7 05:49:17 2009 @@ -952,8 +952,8 @@ DispatchToUser: _SEH2_TRY { - ULONG Size; - ULONG_PTR Stack, NewStack; + ULONG Size; + ULONG_PTR Stack, NewStack; /* Make sure we have a valid SS and that this isn't V86 mode */ if ((TrapFrame->HardwareSegSs != (KGDT_R3_DATA | RPL_MASK)) ||

15 years, 8 months

[dchapyshev] 38626: - Set parent window for the wizard - Call DisableThreadLibraryCalls for DLL_PROCESS_ATTACH case

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jan 7 04:58:29 2009 New Revision: 38626 URL: http://svn.reactos.org/svn/reactos?rev=38626&view=rev Log: - Set parent window for the wizard - Call DisableThreadLibraryCalls for DLL_PROCESS_ATTACH case Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Wed Jan 7 04:58:29 2009 @@ -45,11 +45,7 @@ typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); -BOOL CALLBACK -InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot) -{ - return FALSE; -} +/* STATIC FUNCTIONS *********************************************************/ static HFONT CreateTitleFont(VOID) @@ -224,7 +220,7 @@ psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; psh.hInstance = hApplet; - psh.hwndParent = NULL; + psh.hwndParent = hwnd; psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; @@ -240,7 +236,15 @@ DeleteObject(hTitleFont); } -VOID CALLBACK +/* FUNCTIONS ****************************************************************/ + +BOOL WINAPI +InstallNewDevice(HWND hwndParent, LPGUID ClassGuid, PDWORD pReboot) +{ + return FALSE; +} + +VOID WINAPI AddHardwareWizard(HWND hwnd, LPWSTR lpName) { if (lpName != NULL) @@ -254,10 +258,7 @@ /* Control Panel Callback */ LONG CALLBACK -CPlApplet(HWND hwndCpl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) +CPlApplet(HWND hwndCpl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { switch (uMsg) { @@ -285,7 +286,6 @@ return FALSE; } - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { @@ -295,6 +295,7 @@ { case DLL_PROCESS_ATTACH: hApplet = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); break; }

15 years, 8 months

[gedmurphy] 38625: enable RQueryServiceObjectSecurity

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 7 04:38:17 2009 New Revision: 38625 URL: http://svn.reactos.org/svn/reactos?rev=38625&view=rev Log: enable RQueryServiceObjectSecurity Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Wed Jan 7 04:38:17 2009 @@ -738,7 +738,6 @@ DWORD cbBufSize, LPBOUNDED_DWORD_256K pcbBytesNeeded) { -#if 0 PSERVICE_HANDLE hSvc; PSERVICE lpService; ULONG DesiredAccess = 0; @@ -782,7 +781,7 @@ Status = RtlQuerySecurityObject(lpService->lpSecurityDescriptor, dwSecurityInformation, (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, - dwSecuityDescriptorSize, + cbBufSize, &dwBytesNeeded); /* FIXME: Unlock the service list */ @@ -807,9 +806,6 @@ } return dwError; -#endif - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; }

15 years, 8 months

[hyperion] 38624: modified ntoskrnl/ke/i386/exp.c Slight refactoring to make exception-safety auditing easier Remove an unnecessary local variable, reuse another instead

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jan 7 04:36:06 2009 New Revision: 38624 URL: http://svn.reactos.org/svn/reactos?rev=38624&view=rev Log: modified ntoskrnl/ke/i386/exp.c Slight refactoring to make exception-safety auditing easier Remove an unnecessary local variable, reuse another instead Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Wed Jan 7 04:36:06 2009 @@ -831,10 +831,7 @@ IN BOOLEAN FirstChance) { CONTEXT Context; - ULONG_PTR Stack, NewStack; - ULONG Size; EXCEPTION_RECORD LocalExceptRecord; - EXCEPTION_RECORD SehExceptRecord; /* Increase number of Exception Dispatches */ KeGetCurrentPrcb()->KeExceptionDispatchCount++; @@ -955,6 +952,9 @@ DispatchToUser: _SEH2_TRY { + ULONG Size; + ULONG_PTR Stack, NewStack; + /* Make sure we have a valid SS and that this isn't V86 mode */ if ((TrapFrame->HardwareSegSs != (KGDT_R3_DATA | RPL_MASK)) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) @@ -1008,17 +1008,17 @@ /* Dispatch exception to user-mode */ _SEH2_YIELD(return); } - _SEH2_EXCEPT((RtlCopyMemory(&SehExceptRecord, _SEH2_GetExceptionInformation()->ExceptionRecord, sizeof(EXCEPTION_RECORD)), EXCEPTION_EXECUTE_HANDLER)) + _SEH2_EXCEPT((RtlCopyMemory(&LocalExceptRecord, _SEH2_GetExceptionInformation()->ExceptionRecord, sizeof(EXCEPTION_RECORD)), EXCEPTION_EXECUTE_HANDLER)) { /* Check if we got a stack overflow and raise that instead */ - if ((NTSTATUS)SehExceptRecord.ExceptionCode == + if ((NTSTATUS)LocalExceptRecord.ExceptionCode == STATUS_STACK_OVERFLOW) { /* Copy the exception address and record */ - SehExceptRecord.ExceptionAddress = + LocalExceptRecord.ExceptionAddress = ExceptionRecord->ExceptionAddress; RtlCopyMemory(ExceptionRecord, - (PVOID)&SehExceptRecord, + (PVOID)&LocalExceptRecord, sizeof(EXCEPTION_RECORD)); /* Do the exception again */ @@ -1086,7 +1086,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Save exception code */ - Status = ExceptionCode; + Status = _SEH2_GetExceptionCode(); } _SEH2_END; if (!NT_SUCCESS(Status)) return Status;

15 years, 8 months

[hyperion] 38623: modified dll/win32/kernel32/misc/console.c We have _SEH2_FINALLY: use it

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jan 7 04:23:29 2009 New Revision: 38623 URL: http://svn.reactos.org/svn/reactos?rev=38623&view=rev Log: modified dll/win32/kernel32/misc/console.c We have _SEH2_FINALLY: use it Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Wed Jan 7 04:23:29 2009 @@ -162,7 +162,7 @@ BasepAnsiStringToHeapUnicodeString(lpExeName, (LPWSTR*) &lpExeNameW); bRetVal = AddConsoleAliasW(lpSourceW, lpTargetW, lpExeNameW); - + /* Clean up */ if (lpSourceW) RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpSourceW); @@ -183,7 +183,7 @@ LPCWSTR lpTarget, LPCWSTR lpExeName) { - PCSR_API_MESSAGE Request; + PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; ULONG SourceLength; @@ -192,7 +192,7 @@ ULONG Size; ULONG RequestLength; WCHAR * Ptr; - + DPRINT("AddConsoleAliasW enterd with lpSource %S lpTarget %S lpExeName %S\n", lpSource, lpTarget, lpExeName); ExeLength = wcslen(lpExeName) + 1; @@ -202,10 +202,10 @@ Size = (ExeLength + SourceLength + TargetLength) * sizeof(WCHAR); RequestLength = sizeof(CSR_API_MESSAGE) + Size; - + Request = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, RequestLength); Ptr = (WCHAR*)(((ULONG_PTR)Request) + sizeof(CSR_API_MESSAGE)); - + wcscpy(Ptr, lpSource); Request->Data.AddConsoleAlias.SourceLength = SourceLength; Ptr = (WCHAR*)(((ULONG_PTR)Request) + sizeof(CSR_API_MESSAGE) + SourceLength * sizeof(WCHAR)); @@ -332,7 +332,7 @@ DWORD TargetBufferLength, LPWSTR lpExeName) { - PCSR_API_MESSAGE Request; + PCSR_API_MESSAGE Request; PCSR_CAPTURE_BUFFER CaptureBuffer; ULONG CsrRequest; NTSTATUS Status; @@ -353,11 +353,11 @@ RequestLength = Size + sizeof(CSR_API_MESSAGE); Request = RtlAllocateHeap(GetProcessHeap(), 0, RequestLength); - + CaptureBuffer = CsrAllocateCaptureBuffer(1, TargetBufferLength); if (!CaptureBuffer) { - RtlFreeHeap(GetProcessHeap(), 0, Request); + RtlFreeHeap(GetProcessHeap(), 0, Request); return 0; } @@ -419,7 +419,7 @@ lpwSource = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSourceSize); MultiByteToWideChar(CP_ACP, 0, lpSource, -1, lpwSource, dwSourceSize); - dwExeNameSize = (strlen(lpExeName)+1) * sizeof(WCHAR); + dwExeNameSize = (strlen(lpExeName)+1) * sizeof(WCHAR); lpwExeName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwExeNameSize); MultiByteToWideChar(CP_ACP, 0, lpExeName, -1, lpwExeName, dwExeNameSize); @@ -446,7 +446,7 @@ GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - CSR_API_MESSAGE Request; + CSR_API_MESSAGE Request; PCSR_CAPTURE_BUFFER CaptureBuffer; ULONG CsrRequest; NTSTATUS Status; @@ -515,7 +515,7 @@ DWORD WINAPI GetConsoleAliasExesLengthW (VOID) { - CSR_API_MESSAGE Request; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; @@ -566,7 +566,7 @@ DWORD AliasBufferLength, LPWSTR ExeName) { - CSR_API_MESSAGE Request; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; DWORD dwLength; @@ -623,7 +623,7 @@ if (dwRetVal) dwRetVal = WideCharToMultiByte(CP_ACP, 0, lpwAliasBuffer, dwRetVal, AliasBuffer, AliasBufferLength, NULL, NULL); - + HeapFree(GetProcessHeap(), 0, lpwAliasBuffer); return dwRetVal; } @@ -633,9 +633,9 @@ * @implemented */ DWORD WINAPI -GetConsoleAliasesLengthW (LPWSTR lpExeName) -{ - CSR_API_MESSAGE Request; +GetConsoleAliasesLengthW (LPWSTR lpExeName) +{ + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; @@ -675,7 +675,7 @@ dwRetVal = GetConsoleAliasesLengthW(lpExeNameW); if (dwRetVal) dwRetVal /= sizeof(WCHAR); - + /* Clean up */ if (lpExeNameW) RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpExeNameW); @@ -810,7 +810,7 @@ */ { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SETGET_CONSOLE_HW_STATE, CSR_CONSOLE); @@ -841,7 +841,7 @@ */ { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_INPUT_WAIT_HANDLE, CSR_CONSOLE); @@ -914,7 +914,7 @@ */ { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status = STATUS_SUCCESS; if(0 == _wcsicmp(wsName, L"CONIN$")) @@ -1036,7 +1036,7 @@ */ { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SETGET_CONSOLE_HW_STATE, CSR_CONSOLE); @@ -1201,7 +1201,7 @@ VerifyConsoleIoHandle(HANDLE Handle) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(VERIFY_HANDLE, CSR_NATIVE); @@ -1260,7 +1260,7 @@ */ { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(CLOSE_HANDLE, CSR_NATIVE); @@ -1362,7 +1362,7 @@ LPVOID lpReserved, BOOL bUnicode) { - PCSR_API_MESSAGE Request; + PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; USHORT nChars; @@ -1370,9 +1370,9 @@ DWORD Written = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE) + Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, + max(sizeof(CSR_API_MESSAGE), + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE) + min(nNumberOfCharsToWrite, CSRSS_MAX_WRITE_CONSOLE / CharSize) * CharSize)); if (Request == NULL) { @@ -1473,7 +1473,7 @@ PCONSOLE_READCONSOLE_CONTROL lpReserved, BOOL bUnicode) { - PCSR_API_MESSAGE Request; + PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; ULONG CharSize, CharsRead = 0; @@ -1481,7 +1481,7 @@ CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + min(nNumberOfCharsToRead, CSRSS_MAX_READ_CONSOLE / CharSize) * CharSize)); if (Request == NULL) { @@ -1511,8 +1511,8 @@ Status = CsrClientCallServer(Request, NULL, CsrRequest, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + max(sizeof(CSR_API_MESSAGE), + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + Request->Data.ReadConsoleRequest.NrCharactersToRead * CharSize)); if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) @@ -1601,7 +1601,7 @@ BOOL WINAPI AllocConsole(VOID) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; HANDLE hStdError; @@ -1645,7 +1645,7 @@ // but I just tried to reverse what AllocConsole() does... CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(FREE_CONSOLE, CSR_CONSOLE); @@ -1674,7 +1674,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SCREEN_BUFFER_INFO, CSR_CONSOLE); @@ -1703,7 +1703,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_CURSOR, CSR_CONSOLE); @@ -1728,7 +1728,7 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(FILL_OUTPUT, CSR_CONSOLE); @@ -1842,7 +1842,7 @@ Request.Data.PeekConsoleInputRequest.Length = nLength; /* Call the server */ - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); @@ -1858,7 +1858,7 @@ /* Copy into the buffer */ DPRINT("Copying to buffer\n"); RtlCopyMemory(lpBuffer, - Request.Data.PeekConsoleInputRequest.InputRecord, + Request.Data.PeekConsoleInputRequest.InputRecord, sizeof(INPUT_RECORD) * *lpNumberOfEventsRead); } else @@ -1921,7 +1921,7 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + ULONG Read; NTSTATUS Status; @@ -2059,7 +2059,7 @@ Request.Data.WriteConsoleInputRequest.Length = nLength; /* Call the server */ - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); @@ -2171,7 +2171,7 @@ Request.Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; /* Call the server */ - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); @@ -2182,12 +2182,12 @@ { /* Copy into the buffer */ DPRINT("Copying to buffer\n"); - SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - + SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - Request.Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; - SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - + SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - Request.Data.ReadConsoleOutputRequest.ReadRegion.Top + 1; - RtlCopyMemory(lpBuffer, - Request.Data.ReadConsoleOutputRequest.CharInfo, + RtlCopyMemory(lpBuffer, + Request.Data.ReadConsoleOutputRequest.CharInfo, sizeof(CHAR_INFO) * SizeX * SizeY); } else @@ -2284,7 +2284,7 @@ Request.Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; /* Call the server */ - Status = CsrClientCallServer(&Request, + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); @@ -2365,7 +2365,7 @@ Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) + min (nChars, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR / CharSize) * CharSize)); if (Request == NULL) { @@ -2388,7 +2388,7 @@ Status = CsrClientCallServer(Request, NULL, CsrRequest, - max (sizeof(CSR_API_MESSAGE), + max (sizeof(CSR_API_MESSAGE), CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) + SizeBytes)); if(!NT_SUCCESS(Status) || !NT_SUCCESS(Request->Status)) { @@ -2555,7 +2555,7 @@ Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max (sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR) + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR) + min (nChars, CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR / CharSize) * CharSize)); if (Request == NULL) { @@ -2577,7 +2577,7 @@ memcpy(Request->Data.WriteConsoleOutputCharRequest.String, lpCharacter, BytesWrite); - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(Request, NULL, CsrRequest, max (sizeof(CSR_API_MESSAGE), @@ -2691,12 +2691,12 @@ Request->Data.WriteConsoleOutputAttribRequest.Length = Size; memcpy(Request->Data.WriteConsoleOutputAttribRequest.Attribute, lpAttribute, Size * sizeof(WORD)); - Status = CsrClientCallServer( Request, - NULL, - CsrRequest, + Status = CsrClientCallServer( Request, + NULL, + CsrRequest, max (sizeof(CSR_API_MESSAGE), CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB) + Size * sizeof(WORD))); - + if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Request->Status ) ) { RtlFreeHeap(RtlGetProcessHeap(), 0, Request); @@ -2730,7 +2730,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(FILL_OUTPUT_ATTRIB, CSR_CONSOLE); @@ -2763,7 +2763,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_MODE, CSR_CONSOLE); @@ -2792,7 +2792,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; if(lpNumberOfEvents == NULL) @@ -2847,7 +2847,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CURSOR_INFO, CSR_CONSOLE); @@ -2894,7 +2894,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_CONSOLE_MODE, CSR_CONSOLE); @@ -2922,7 +2922,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_SCREEN_BUFFER, CSR_CONSOLE); @@ -2949,7 +2949,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(FLUSH_INPUT_BUFFER, CSR_CONSOLE); @@ -2994,7 +2994,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_CURSOR_INFO, CSR_CONSOLE); @@ -3020,7 +3020,7 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SCROLL_CONSOLE_SCREEN_BUFFER, CSR_CONSOLE); @@ -3134,7 +3134,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_ATTRIB, CSR_CONSOLE); @@ -3264,16 +3264,16 @@ CsrRequest = MAKE_CSR_API(GENERATE_CTRL_EVENT, CSR_CONSOLE); Request.Data.GenerateCtrlEvent.Event = dwCtrlEvent; Request.Data.GenerateCtrlEvent.ProcessGroup = dwProcessGroupId; - Status = CsrClientCallServer(&Request, - NULL, - CsrRequest, + Status = CsrClientCallServer(&Request, + NULL, + CsrRequest, sizeof(CSR_API_MESSAGE)); if(!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request.Status))) { SetLastErrorByStatus(Status); return FALSE; } - + return TRUE; } @@ -3303,9 +3303,9 @@ CsrRequest = MAKE_CSR_API(GET_TITLE, CSR_CONSOLE); - Status = CsrClientCallServer(Request, - NULL, - CsrRequest, + Status = CsrClientCallServer(Request, + NULL, + CsrRequest, CSR_API_MESSAGE_HEADER_SIZE(CSRSS_GET_TITLE) + CSRSS_MAX_TITLE_LENGTH * sizeof(WCHAR)); if(!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request->Status))) { @@ -3324,7 +3324,7 @@ } memcpy(lpConsoleTitle, Request->Data.GetTitleRequest.Title, nSize * sizeof(WCHAR)); lpConsoleTitle[nSize] = L'\0'; - + RtlFreeHeap(RtlGetProcessHeap(), 0, Request); return nSize; @@ -3389,7 +3389,7 @@ Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max (sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + min (wcslen(lpConsoleTitle), CSRSS_MAX_TITLE_LENGTH) * sizeof(WCHAR))); if (Request == NULL) { @@ -3438,7 +3438,7 @@ Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max (sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + min (strlen(lpConsoleTitle), CSRSS_MAX_TITLE_LENGTH) * sizeof(WCHAR))); if (Request == NULL) { @@ -3521,7 +3521,7 @@ GetConsoleCP( VOID ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_CP, CSR_CONSOLE); @@ -3548,7 +3548,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_CONSOLE_CP, CSR_CONSOLE); @@ -3573,7 +3573,7 @@ GetConsoleOutputCP( VOID ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_OUTPUT_CP, CSR_CONSOLE); @@ -3600,7 +3600,7 @@ ) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_CONSOLE_OUTPUT_CP, CSR_CONSOLE); @@ -3643,15 +3643,15 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - + CsrRequest = MAKE_CSR_API(GET_PROCESS_LIST, CSR_CONSOLE); Request->Data.GetProcessListRequest.nMaxIds = min (dwProcessCount, CSRSS_MAX_GET_PROCESS_LIST / sizeof(DWORD)); - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(Request, NULL, CsrRequest, max (sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_GET_PROCESS_LIST) + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_GET_PROCESS_LIST) + Request->Data.GetProcessListRequest.nMaxIds * sizeof(DWORD))); if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) { @@ -3712,7 +3712,7 @@ GetConsoleWindow (VOID) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_WINDOW, CSR_CONSOLE); @@ -3734,7 +3734,7 @@ BOOL WINAPI SetConsoleIcon(HICON hicon) { CSR_API_MESSAGE Request; ULONG CsrRequest; - + NTSTATUS Status; CsrRequest = MAKE_CSR_API(SET_CONSOLE_ICON, CSR_CONSOLE); @@ -3757,7 +3757,6 @@ BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR lpInputExeName) { - BOOL Ret = FALSE; int lenName = lstrlenW(lpInputExeName); if(lenName < 1 || @@ -3769,25 +3768,18 @@ } RtlEnterCriticalSection(&ConsoleLock); - /* wrap copying into SEH as we may copy from invalid buffer and in case of an - exception the console lock would've never been released, which would cause - further calls (if the exception was handled by the caller) to recursively - acquire the lock... */ _SEH2_TRY { RtlCopyMemory(InputExeName, lpInputExeName, lenName * sizeof(WCHAR)); InputExeName[lenName] = L'\0'; - Ret = TRUE; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - lenName = 0; - SetLastErrorByStatus(_SEH2_GetExceptionCode()); + } + _SEH2_FINALLY + { + RtlLeaveCriticalSection(&ConsoleLock); } _SEH2_END; - RtlLeaveCriticalSection(&ConsoleLock); - - return Ret; + + return TRUE; } @@ -3838,35 +3830,26 @@ DWORD WINAPI GetConsoleInputExeNameW(DWORD nBufferLength, LPWSTR lpBuffer) { - int lenName; + int lenName = 0; RtlEnterCriticalSection(&ConsoleLock); - lenName = lstrlenW(InputExeName); - if(lenName >= (int)nBufferLength) - { - /* buffer is not large enough, return the required size */ + _SEH2_TRY + { + lenName = lstrlenW(InputExeName); + if(lenName >= (int)nBufferLength) + { + /* buffer is not large enough, return the required size */ + SetLastError(ERROR_BUFFER_OVERFLOW); + lenName += 1; + } + RtlCopyMemory(lpBuffer, InputExeName, (lenName + 1) * sizeof(WCHAR)); + } + _SEH2_FINALLY + { RtlLeaveCriticalSection(&ConsoleLock); - SetLastError(ERROR_BUFFER_OVERFLOW); - return lenName + 1; - } - - /* wrap copying into SEH as we may copy to invalid buffer and in case of an - exception the console lock would've never been released, which would cause - further calls (if the exception was handled by the caller) to recursively - acquire the lock... */ - _SEH2_TRY - { - RtlCopyMemory(lpBuffer, InputExeName, (lenName + 1) * sizeof(WCHAR)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - lenName = 0; - SetLastErrorByStatus(_SEH2_GetExceptionCode()); } _SEH2_END; - - RtlLeaveCriticalSection(&ConsoleLock); return lenName; }

15 years, 8 months

[hyperion] 38622: Reverting poorly conceived commit

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jan 7 04:13:43 2009 New Revision: 38622 URL: http://svn.reactos.org/svn/reactos?rev=38622&view=rev Log: Reverting poorly conceived commit Modified: trunk/reactos/include/reactos/probe.h trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Wed Jan 7 04:13:43 2009 @@ -152,7 +152,7 @@ IN const UNICODE_STRING *UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; - WCHAR * volatile Buffer = NULL; + WCHAR *Buffer = NULL; ASSERT(Dest != NULL); /* Probe the structure and buffer*/ Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Wed Jan 7 04:13:43 2009 @@ -529,7 +529,7 @@ OUT PULONG Response) { NTSTATUS Status = STATUS_SUCCESS; - volatile PULONG_PTR SafeParams = NULL; + PULONG_PTR SafeParams = NULL; ULONG SafeResponse; UNICODE_STRING SafeString; ULONG i; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jan 7 04:13:43 2009 @@ -225,7 +225,7 @@ UNICODE_STRING WName; ARC_STATUS Result; PCH Value; - volatile ANSI_STRING AValue; + ANSI_STRING AValue; UNICODE_STRING WValue; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; @@ -703,12 +703,11 @@ { PSYSTEM_PROCESS_INFORMATION SpiCurrent; PSYSTEM_THREAD_INFORMATION ThreadInfo; - volatile PEPROCESS Process = NULL; - PEPROCESS SystemProcess; + PEPROCESS Process = NULL, SystemProcess; PETHREAD CurrentThread; ANSI_STRING ImageName; int CurrentSize, ImageNameLength = 32; // image name len in bytes - PLIST_ENTRY CurrentEntry; + PLIST_ENTRY CurrentEntry; ULONG TotalSize = 0, ThreadsCount; ULONG TotalUser, TotalKernel; PUCHAR Current; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Wed Jan 7 04:13:43 2009 @@ -360,7 +360,7 @@ { NTSTATUS Status = STATUS_SUCCESS; ULONG StringLength; - volatile PWCHAR StringBuffer = NULL; + PWCHAR StringBuffer = NULL; UNICODE_STRING LocalName; PAGED_CODE(); @@ -440,7 +440,7 @@ NTSTATUS Status = STATUS_SUCCESS; PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_QUALITY_OF_SERVICE SecurityQos; - volatile PUNICODE_STRING LocalObjectName = NULL; + PUNICODE_STRING LocalObjectName = NULL; PAGED_CODE(); /* Zero out the Capture Data */ @@ -1258,14 +1258,14 @@ { ULONG i; POBJECT_TYPE ObjectType = (PVOID)Object; - + /* Loop our locks */ for (i = 0; i < 4; i++) { /* Delete each one */ ExDeleteResourceLite(&ObjectType->ObjectLocks[i]); } - + /* Delete our main mutex */ ExDeleteResourceLite(&ObjectType->Mutex); } @@ -1413,7 +1413,7 @@ POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags; POBJECT_BASIC_INFORMATION BasicInfo; ULONG InfoLength; - volatile PVOID Object = NULL; + PVOID Object = NULL; NTSTATUS Status = STATUS_SUCCESS; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE();

15 years, 8 months

[hyperion] 38621: modified include/reactos/probe.h modified ntoskrnl/ex/harderr.c modified ntoskrnl/ex/sysinfo.c modified ntoskrnl/ob/oblife.c PSEH can't make code exception-safe (yet). Add explicit "volatile"s where it might be necessary

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jan 7 03:54:13 2009 New Revision: 38621 URL: http://svn.reactos.org/svn/reactos?rev=38621&view=rev Log: modified include/reactos/probe.h modified ntoskrnl/ex/harderr.c modified ntoskrnl/ex/sysinfo.c modified ntoskrnl/ob/oblife.c PSEH can't make code exception-safe (yet). Add explicit "volatile"s where it might be necessary Modified: trunk/reactos/include/reactos/probe.h trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Wed Jan 7 03:54:13 2009 @@ -152,7 +152,7 @@ IN const UNICODE_STRING *UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; - WCHAR *Buffer = NULL; + WCHAR * volatile Buffer = NULL; ASSERT(Dest != NULL); /* Probe the structure and buffer*/ Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Wed Jan 7 03:54:13 2009 @@ -529,7 +529,7 @@ OUT PULONG Response) { NTSTATUS Status = STATUS_SUCCESS; - PULONG_PTR SafeParams = NULL; + volatile PULONG_PTR SafeParams = NULL; ULONG SafeResponse; UNICODE_STRING SafeString; ULONG i; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jan 7 03:54:13 2009 @@ -225,7 +225,7 @@ UNICODE_STRING WName; ARC_STATUS Result; PCH Value; - ANSI_STRING AValue; + volatile ANSI_STRING AValue; UNICODE_STRING WValue; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; @@ -703,11 +703,12 @@ { PSYSTEM_PROCESS_INFORMATION SpiCurrent; PSYSTEM_THREAD_INFORMATION ThreadInfo; - PEPROCESS Process = NULL, SystemProcess; + volatile PEPROCESS Process = NULL; + PEPROCESS SystemProcess; PETHREAD CurrentThread; ANSI_STRING ImageName; int CurrentSize, ImageNameLength = 32; // image name len in bytes - PLIST_ENTRY CurrentEntry; + PLIST_ENTRY CurrentEntry; ULONG TotalSize = 0, ThreadsCount; ULONG TotalUser, TotalKernel; PUCHAR Current; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Wed Jan 7 03:54:13 2009 @@ -360,7 +360,7 @@ { NTSTATUS Status = STATUS_SUCCESS; ULONG StringLength; - PWCHAR StringBuffer = NULL; + volatile PWCHAR StringBuffer = NULL; UNICODE_STRING LocalName; PAGED_CODE(); @@ -440,7 +440,7 @@ NTSTATUS Status = STATUS_SUCCESS; PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_QUALITY_OF_SERVICE SecurityQos; - PUNICODE_STRING LocalObjectName = NULL; + volatile PUNICODE_STRING LocalObjectName = NULL; PAGED_CODE(); /* Zero out the Capture Data */ @@ -1258,14 +1258,14 @@ { ULONG i; POBJECT_TYPE ObjectType = (PVOID)Object; - + /* Loop our locks */ for (i = 0; i < 4; i++) { /* Delete each one */ ExDeleteResourceLite(&ObjectType->ObjectLocks[i]); } - + /* Delete our main mutex */ ExDeleteResourceLite(&ObjectType->Mutex); } @@ -1413,7 +1413,7 @@ POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags; POBJECT_BASIC_INFORMATION BasicInfo; ULONG InfoLength; - PVOID Object = NULL; + volatile PVOID Object = NULL; NTSTATUS Status = STATUS_SUCCESS; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE();

15 years, 8 months

← Newer
1
...
60
61
62
63
64
65
66
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009