Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 63853: [BROWSEUI] - CComObject cannot be a class member and must be allocated using new. Fixes invalid free.
by tfaber＠svn.reactos.org 10 Aug '14

10 Aug '14

Author: tfaber Date: Sun Aug 10 18:39:05 2014 New Revision: 63853 URL: http://svn.reactos.org/svn/reactos?rev=63853&view=rev Log: [BROWSEUI] - CComObject cannot be a class member and must be allocated using new. Fixes invalid free. Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.h Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sun Aug 10 18:39:05 2014 @@ -481,14 +481,13 @@ fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; - fMenuCallback.AddRef(); + fMenuCallback = new CComObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; } CInternetToolbar::~CInternetToolbar() { - fMenuCallback.Release(); } void CInternetToolbar::AddDockItem(IUnknown *newItem, int bandID, int flags) @@ -540,7 +539,7 @@ IID_IShellMenu, reinterpret_cast<void **>(menuBar)); if (FAILED(hResult)) return hResult; - hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback)); + hResult = fMenuCallback->QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback)); if (FAILED(hResult)) return hResult; hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sun Aug 10 18:39:05 2014 @@ -90,7 +90,7 @@ CComPtr<IUnknown> fLogoBar; // the reactos logo CComPtr<IUnknown> fControlsBar; // navigation controls CComPtr<IUnknown> fNavigationBar; // address bar - CComObject<CMenuCallback> fMenuCallback; + CComPtr<CMenuCallback> fMenuCallback; CComPtr<IOleCommandTarget> fCommandTarget; GUID fCommandCategory; HWND fToolbarWindow;

1 0

[tfaber] 63852: [KERNEL32] - Fix an invalid free in DefineDosDeviceW, found by kernel32_apitest:dosdev
by tfaber＠svn.reactos.org 10 Aug '14

10 Aug '14

Author: tfaber Date: Sun Aug 10 16:23:05 2014 New Revision: 63852 URL: http://svn.reactos.org/svn/reactos?rev=63852&view=rev Log: [KERNEL32] - Fix an invalid free in DefineDosDeviceW, found by kernel32_apitest:dosdev Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Sun Aug 10 16:23:05 2014 @@ -219,7 +219,8 @@ } } - if (NtTargetPathU.Buffer) + if (NtTargetPathU.Buffer && + NtTargetPathU.Buffer != lpTargetPath) { RtlFreeHeap(RtlGetProcessHeap(), 0,

1 0

[tfaber] 63851: [KERNEL32] - Fix some style issues in DefineDosDevice
by tfaber＠svn.reactos.org 10 Aug '14

10 Aug '14

Author: tfaber Date: Sun Aug 10 16:20:43 2014 New Revision: 63851 URL: http://svn.reactos.org/svn/reactos?rev=63851&view=rev Log: [KERNEL32] - Fix some style issues in DefineDosDevice Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Sun Aug 10 16:20:43 2014 @@ -35,22 +35,18 @@ BOOL Result; if (lpDeviceName && - ! RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, - (LPSTR)lpDeviceName)) + !RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, lpDeviceName)) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } if (lpTargetPath && - ! RtlCreateUnicodeStringFromAsciiz(&TargetPathU, - (LPSTR)lpTargetPath)) + !RtlCreateUnicodeStringFromAsciiz(&TargetPathU, lpTargetPath)) { if (DeviceNameU.Buffer) { - RtlFreeHeap(RtlGetProcessHeap (), - 0, - DeviceNameU.Buffer); + RtlFreeUnicodeString(&DeviceNameU); } SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -62,16 +58,12 @@ if (TargetPathU.Buffer) { - RtlFreeHeap(RtlGetProcessHeap (), - 0, - TargetPathU.Buffer); + RtlFreeUnicodeString(&TargetPathU); } if (DeviceNameU.Buffer) { - RtlFreeHeap(RtlGetProcessHeap (), - 0, - DeviceNameU.Buffer); + RtlFreeUnicodeString(&DeviceNameU); } return Result; } @@ -114,7 +106,7 @@ ArgumentCount = 1; BufferSize = 0; - if (! lpTargetPath) + if (!lpTargetPath) { RtlInitUnicodeString(&NtTargetPathU, NULL); @@ -128,10 +120,10 @@ } else { - if (! RtlDosPathNameToNtPathName_U(lpTargetPath, - &NtTargetPathU, - 0, - 0)) + if (!RtlDosPathNameToNtPathName_U(lpTargetPath, + &NtTargetPathU, + NULL, + NULL)) { WARN("RtlDosPathNameToNtPathName_U() failed\n"); BaseSetLastNTError(STATUS_OBJECT_NAME_INVALID); @@ -151,7 +143,7 @@ CaptureBuffer = CsrAllocateCaptureBuffer(ArgumentCount, BufferSize); - if (! CaptureBuffer) + if (!CaptureBuffer) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); Result = FALSE; @@ -161,7 +153,7 @@ DefineDosDeviceRequest->Flags = dwFlags; CsrCaptureMessageBuffer(CaptureBuffer, - (PVOID)DeviceUpcaseNameU.Buffer, + DeviceUpcaseNameU.Buffer, DeviceUpcaseNameU.Length, (PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer); @@ -173,7 +165,7 @@ if (NtTargetPathU.Buffer) { CsrCaptureMessageBuffer(CaptureBuffer, - (PVOID)NtTargetPathU.Buffer, + NtTargetPathU.Buffer, NtTargetPathU.Length, (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer); } @@ -212,7 +204,7 @@ dbcv.dbcv_size = sizeof(DEV_BROADCAST_VOLUME); dbcv.dbcv_devicetype = DBT_DEVTYP_VOLUME; dbcv.dbcv_reserved = 0; - dbcv.dbcv_unitmask |= + dbcv.dbcv_unitmask |= (1 << (DeviceUpcaseNameU.Buffer[0] - L'A')); dbcv.dbcv_flags = DBTF_NET; (void) BSM_ptr(BSF_SENDNOTIFYMESSAGE | BSF_FLUSHDISK, @@ -293,7 +285,7 @@ { CurrentLength = min (ucchMax, MAXUSHORT / 2); TargetPathU.MaximumLength = TargetPathU.Length = (USHORT)CurrentLength * sizeof(WCHAR); - + TargetPathA.Length = 0; TargetPathA.MaximumLength = (USHORT)CurrentLength;

1 0

[hbelusca] 63850: [CONSOLE.CPL]: Add LBS_HASSTRINGS to font listboxes.
by hbelusca＠svn.reactos.org 10 Aug '14

10 Aug '14

Author: hbelusca Date: Sun Aug 10 15:27:24 2014 New Revision: 63850 URL: http://svn.reactos.org/svn/reactos?rev=63850&view=rev Log: [CONSOLE.CPL]: Add LBS_HASSTRINGS to font listboxes. Modified: branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc branches/condrv_restructure/dll/cpl/console/lang/en-US.rc branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc Modified: branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -35,7 +35,7 @@ LTEXT "ÐÑÐ¾Ð·Ð¾ÑÐµÑÐµÐ½ Ð¿ÑÐµÐ³Ð»ÐµÐ´:", -1, 10, 10, 94, 10 LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Ð¨ÑÐ¸ÑÑ:", -1, 10, 105, 33, 10 CHECKBOX "&ÐÐ¾Ð»ÑÑÐµÑÐ¸ ÑÑÐ¸ÑÑÐ¾Ð²Ðµ", IDC_CHECK_BOLD_FONTS, 38, 105, 85, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -41,7 +41,7 @@ LTEXT "NÃ¡hled okna:", -1, 10, 10, 94, 10 LTEXT "Velikost:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&PÃsmo:", -1, 10, 105, 33, 10 CHECKBOX "&TuÄnÃ¡ pÃsma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Fenstervorschau", -1, 10, 7, 65, 10 LTEXT "GrÃ¶Ãe", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Schrift", -1, 10, 105, 35, 10 CHECKBOX "&Fette Schriften", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/en-US.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -35,7 +35,7 @@ LTEXT "Window Preview:", -1, 10, 10, 94, 10 LTEXT "Size:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font:", -1, 10, 105, 33, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Ventana de PrevisualizaciÃ³n", -1, 10, 7, 65, 10 LTEXT "TamaÃ±o", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Fuente", -1, 10, 105, 35, 10 CHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "FenÃªtre de PrÃ©visualisation :", -1, 10, 10, 94, 10 LTEXT "Taille :", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Police :", -1, 10, 105, 33, 10 CHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "×ª×¦××× ××§××××:", -1, 10, 10, 94, 10 LTEXT "××××:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "×××¤×:", -1, 10, 105, 33, 10 CHECKBOX "×××¤× ×× ×××××©××", IDC_CHECK_BOLD_FONTS, 41, 105, 33, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Tinjauan Jendela", -1, 10, 7, 65, 10 LTEXT "Ukuran", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font", -1, 10, 105, 35, 10 CHECKBOX "Font &tebal", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Anteprima", -1, 10, 7, 65, 10 LTEXT "Dimansione", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font", -1, 10, 105, 35, 10 CHECKBOX "&Grassetto fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -35,7 +35,7 @@ LTEXT "Vindu forhÃ¥ndsvisning:", -1, 10, 10, 94, 10 LTEXT "StÃ¸rrelse:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Skrift:", -1, 10, 105, 33, 10 CHECKBOX "&Fet skrift", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -42,7 +42,7 @@ LTEXT "Okno podglÄdu", -1, 10, 7, 65, 10 LTEXT "Rozmiar", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Czcionka", -1, 10, 105, 35, 10 CHECKBOX "&Pogrubiona czcionka", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -44,7 +44,7 @@ LTEXT "Previzionare:", -1, 10, 10, 94, 10 LTEXT "&MÄrime:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "F&ont:", -1, 10, 105, 33, 10 CHECKBOX "&Aldin", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "ÐÐºÐ½Ð¾ Ð¿ÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ°:", -1, 10, 10, 94, 10 LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Ð¨ÑÐ¸ÑÑ:", -1, 10, 105, 33, 10 CHECKBOX "&ÐÐ¸ÑÐ½ÑÐ¹", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -39,7 +39,7 @@ LTEXT "UkÃ¡Å¾ka okna:", -1, 10, 10, 94, 10 LTEXT "VeÄ¾kosÅ¥:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&PÃsmo:", -1, 10, 105, 33, 10 CHECKBOX "&TuÄnÃ© pÃsma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -39,7 +39,7 @@ LTEXT "Dritare Preview:", -1, 10, 10, 94, 10 LTEXT "MasÃ«:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font:", -1, 10, 105, 33, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Pencere Ãn Ä°zlemesi:", -1, 10, 10, 94, 10 LTEXT "&Boyutlar:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&YazÄ± Tipi:", -1, 10, 105, 33, 10 CHECKBOX "&KalÄ±n YazÄ± Tipleri", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "ÐÑÐ°Ð·Ð¾Ðº Ð²ÑÐºÐ½Ð°", -1, 10, 10, 94, 10 LTEXT "Size:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Ð¨ÑÐ¸ÑÑ:", -1, 10, 105, 33, 10 CHECKBOX "&ÐÐ¸ÑÐ½Ñ", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "çªå£é¢è§ï¼", -1, 10, 10, 94, 10 LTEXT "å¤§å°ï¼", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&åä½(&F)ï¼", -1, 10, 105, 33, 10 CHECKBOX "ç²ä½(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL

1 0

[hbelusca] 63849: [KERNEL32][CONSRV]: Implement a basic RegisterConsoleVDM (see revision 62371 for more details).
by hbelusca＠svn.reactos.org 09 Aug '14

09 Aug '14

Author: hbelusca Date: Sat Aug 9 19:47:40 2014 New Revision: 63849 URL: http://svn.reactos.org/svn/reactos?rev=63849&view=rev Log: [KERNEL32][CONSRV]: Implement a basic RegisterConsoleVDM (see revision 62371 for more details). Modified: branches/condrv_restructure/dll/win32/kernel32/client/vdm.c branches/condrv_restructure/include/psdk/wincon.h branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -1640,26 +1640,101 @@ /* - * @unimplemented + * @implemented (undocumented) */ BOOL WINAPI -RegisterConsoleVDM ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8, - DWORD Unknown9, - DWORD Unknown10 - ) -{ - STUB; - return FALSE; +RegisterConsoleVDM(IN DWORD dwRegisterFlags, + IN HANDLE hStartHardwareEvent, + IN HANDLE hEndHardwareEvent, + IN HANDLE hErrorHardwareEvent, + IN DWORD dwUnusedVar, + OUT LPDWORD lpVideoStateLength, + OUT PVOID* lpVideoState, // PVIDEO_HARDWARE_STATE_HEADER* + IN PVOID lpUnusedBuffer, + IN DWORD dwUnusedBufferLength, + IN COORD dwVDMBufferSize, + OUT PVOID* lpVDMBuffer) +{ + BOOL Success; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_REGISTERVDM RegisterVDMRequest = &ApiMessage.Data.RegisterVDMRequest; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + + /* Set up the data to send to the Console Server */ + RegisterVDMRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + RegisterVDMRequest->RegisterFlags = dwRegisterFlags; + + if (dwRegisterFlags != 0) + { + RegisterVDMRequest->StartHardwareEvent = hStartHardwareEvent; + RegisterVDMRequest->EndHardwareEvent = hEndHardwareEvent; + RegisterVDMRequest->ErrorHardwareEvent = hErrorHardwareEvent; + + RegisterVDMRequest->VDMBufferSize = dwVDMBufferSize; + +#if 0 + RegisterVDMRequest->UnusedBufferLength = dwUnusedBufferLength; + + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, dwUnusedBufferLength); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Capture the buffer to write */ + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpUnusedBuffer, + dwUnusedBufferLength, + (PVOID*)&RegisterVDMRequest->UnusedBuffer); +#endif + } + else + { + // CaptureBuffer = NULL; + } + + /* Call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepRegisterVDM), + sizeof(*RegisterVDMRequest)); + + /* Check for success */ + Success = NT_SUCCESS(ApiMessage.Status); + + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + + /* Retrieve the results */ + if (Success) + { + if (dwRegisterFlags != 0) + { + _SEH2_TRY + { + *lpVideoStateLength = RegisterVDMRequest->VideoStateLength; + *lpVideoState = RegisterVDMRequest->VideoState; + *lpVDMBuffer = RegisterVDMRequest->VDMBuffer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; + } + } + else + { + BaseSetLastNTError(ApiMessage.Status); + } + + /* Return success status */ + return Success; } @@ -1756,9 +1831,8 @@ { DPRINT1("VDMOperationStarted(%d)\n", Unknown0); - return - BaseUpdateVDMEntry(VdmEntryUpdateControlCHandler, - NULL, - 0, - Unknown0); -} + return BaseUpdateVDMEntry(VdmEntryUpdateControlCHandler, + NULL, + 0, + Unknown0); +} Modified: branches/condrv_restructure/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… ============================================================================== --- branches/condrv_restructure/include/psdk/wincon.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/psdk/wincon.h [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -618,6 +618,12 @@ // BOOL WINAPI SetStdHandle(_In_ DWORD, _In_ HANDLE); /* Undocumented */ BOOL WINAPI VerifyConsoleIoHandle(_In_ HANDLE); +/* Undocumented */ +BOOL +WINAPI +RegisterConsoleVDM(_In_ DWORD, _In_ HANDLE, _In_ HANDLE, _In_ HANDLE, _In_ DWORD, + _Out_ LPDWORD, _Out_ PVOID*, _In_ PVOID, _In_ DWORD, _In_ COORD, + _Out_ PVOID*); BOOL WINAPI Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -806,6 +806,28 @@ BOOL Ansi; } CONSOLE_GETKBDLAYOUTNAME, *PCONSOLE_GETKBDLAYOUTNAME; +typedef struct +{ + HANDLE ConsoleHandle; + ULONG RegisterFlags; + HANDLE StartHardwareEvent; + HANDLE EndHardwareEvent; + HANDLE ErrorHardwareEvent; + + /* Unused member */ + ULONG UnusedVar; + + ULONG VideoStateLength; + PVOID VideoState; // PVIDEO_HARDWARE_STATE_HEADER + + /* Unused members */ + PVOID UnusedBuffer; + ULONG UnusedBufferLength; + + COORD VDMBufferSize; + PVOID VDMBuffer; +} CONSOLE_REGISTERVDM, *PCONSOLE_REGISTERVDM; + typedef struct _CONSOLE_API_MESSAGE { PORT_MESSAGE Header; @@ -903,6 +925,9 @@ CONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest; CONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest; CONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest; + + /* Virtual DOS Machine */ + CONSOLE_REGISTERVDM RegisterVDMRequest; } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -208,6 +208,13 @@ /* PUBLIC DRIVER APIS *********************************************************/ NTSTATUS NTAPI +ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCHAR_CELL CharInfo/*Buffer*/, + IN COORD CharInfoSize, + IN OUT PSMALL_RECT WriteRegion, + IN BOOLEAN DrawRegion); +NTSTATUS NTAPI ConDrvInvalidateBitMapRect(IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER Buffer, IN PSMALL_RECT Region) @@ -217,6 +224,19 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); + + /* In text-mode only, draw the VDM buffer if present */ + if (GetType(Buffer) == TEXTMODE_BUFFER) + { + PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; + + /*Status =*/ ConDrvWriteConsoleOutputVDM(Buffer->Header.Console, + TextBuffer, + Console->VDMBuffer, + Console->VDMBufferSize, + Region, + FALSE); + } /* If the output buffer is the current one, redraw the correct portion of the screen */ if (Buffer == Console->ActiveBuffer) TermDrawRegion(Console, Region); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -722,6 +722,68 @@ return STATUS_SUCCESS; } +/* + * NOTE: This function is strongly inspired by ConDrvWriteConsoleOutput... + */ +NTSTATUS NTAPI +ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCHAR_CELL CharInfo/*Buffer*/, + IN COORD CharInfoSize, + IN OUT PSMALL_RECT WriteRegion, + IN BOOLEAN DrawRegion) +{ + SHORT X, Y; + SMALL_RECT ScreenBuffer; + PCHAR_CELL CurCharInfo; + SMALL_RECT CapturedWriteRegion; + PCHAR_INFO Ptr; + + if (Console == NULL || Buffer == NULL || CharInfo == NULL || WriteRegion == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + CapturedWriteRegion = *WriteRegion; + + /* Make sure WriteRegion is inside the screen buffer */ + ConioInitRect(&ScreenBuffer, 0, 0, + Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); + if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion)) + { + /* + * It is okay to have a WriteRegion completely outside + * the screen buffer. No data is written then. + */ + return STATUS_SUCCESS; + } + + // CurCharInfo = CharInfo; + + for (Y = CapturedWriteRegion.Top; Y <= CapturedWriteRegion.Bottom; ++Y) + { + /**/CurCharInfo = CharInfo + Y * CharInfoSize.X + CapturedWriteRegion.Left;/**/ + + Ptr = ConioCoordToPointer(Buffer, CapturedWriteRegion.Left, Y); + for (X = CapturedWriteRegion.Left; X <= CapturedWriteRegion.Right; ++X) + { + ConsoleAnsiCharToUnicodeChar(Console, &Ptr->Char.UnicodeChar, &CurCharInfo->Char); + Ptr->Attributes = CurCharInfo->Attributes; + ++Ptr; + ++CurCharInfo; + } + } + + if (DrawRegion) TermDrawRegion(Console, &CapturedWriteRegion); + + *WriteRegion = CapturedWriteRegion; + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI ConDrvWriteConsole(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER ScreenBuffer, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -18,6 +18,15 @@ #define DEFAULT_SCREEN_ATTRIB (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) #define DEFAULT_POPUP_ATTRIB (FOREGROUND_BLUE | FOREGROUND_RED | \ BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY) + +/* VGA character cell */ +typedef struct _CHAR_CELL +{ + CHAR Char; + BYTE Attributes; +} CHAR_CELL, *PCHAR_CELL; +C_ASSERT(sizeof(CHAR_CELL) == 2); + /* Object type magic numbers */ typedef enum _CONSOLE_IO_OBJECT_TYPE @@ -300,6 +309,17 @@ PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to currently active screen buffer */ UINT OutputCodePage; + /**** Per-console Virtual DOS Machine Text-mode Buffer ****/ + COORD VDMBufferSize; /* Real size of the VDM buffer, in units of ??? */ + HANDLE VDMBufferSection; /* Handle to the memory shared section for the VDM buffer */ + PVOID VDMBuffer; /* Our VDM buffer */ + PVOID ClientVDMBuffer; /* A copy of the client view of our VDM buffer */ + HANDLE VDMClientProcess; /* Handle to the client process who opened the buffer, to unmap the view */ + + HANDLE StartHardwareEvent; + HANDLE EndHardwareEvent; + HANDLE ErrorHardwareEvent; + /****************************** Other properties ******************************/ UNICODE_STRING OriginalTitle; /* Original title of console, the one defined when the console leader is launched; it never changes. Always NULL-terminated */ UNICODE_STRING Title; /* Title of console. Always NULL-terminated */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -21,8 +21,132 @@ CSR_API(SrvRegisterConsoleVDM) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PCONSOLE_REGISTERVDM RegisterVDMRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.RegisterVDMRequest; + PCONSOLE Console; + + DPRINT1("SrvRegisterConsoleVDM(%d)\n", RegisterVDMRequest->RegisterFlags); + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + + if (RegisterVDMRequest->RegisterFlags != 0) + { + LARGE_INTEGER SectionSize; + ULONG Size, ViewSize = 0; + HANDLE ProcessHandle; + + /* + * Remember the handle to the process so that we can close or unmap + * correctly the allocated resources when the client releases the + * screen buffer. + */ + ProcessHandle = CsrGetClientThread()->Process->ProcessHandle; + Console->VDMClientProcess = ProcessHandle; + + Console->VDMBufferSize = RegisterVDMRequest->VDMBufferSize; + + Size = Console->VDMBufferSize.X * Console->VDMBufferSize.Y + * sizeof(CHAR_CELL); + + /* + * Create a memory section for the VDM buffer, to share with the client. + */ + SectionSize.QuadPart = Size; + Status = NtCreateSection(&Console->VDMBufferSection, + SECTION_ALL_ACCESS, + NULL, + &SectionSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Impossible to create a shared section ; Status = %lu\n", Status); + goto Quit; + } + + /* + * Create a view for our needs. + */ + ViewSize = 0; + Console->VDMBuffer = NULL; + Status = NtMapViewOfSection(Console->VDMBufferSection, + NtCurrentProcess(), + (PVOID*)&Console->VDMBuffer, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + NtClose(Console->VDMBufferSection); + goto Quit; + } + + /* + * Create a view for the client. We must keep a trace of it so that + * we can unmap it when the client releases the VDM buffer. + */ + ViewSize = 0; + Console->ClientVDMBuffer = NULL; + Status = NtMapViewOfSection(Console->VDMBufferSection, + ProcessHandle, + (PVOID*)&Console->ClientVDMBuffer, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + NtUnmapViewOfSection(NtCurrentProcess(), Console->VDMBuffer); + NtClose(Console->VDMBufferSection); + goto Quit; + } + + // TODO: Duplicate the event handles. + + RegisterVDMRequest->VDMBuffer = Console->ClientVDMBuffer; + + Status = STATUS_SUCCESS; + } + else + { + /* RegisterFlags == 0 means we are unregistering the VDM */ + + // TODO: Close the duplicated handles. + + if (Console->VDMBuffer) + { + /* + * Uninitialize the graphics screen buffer + * in the reverse way we initialized it. + */ + NtUnmapViewOfSection(Console->VDMClientProcess, Console->ClientVDMBuffer); + NtUnmapViewOfSection(NtCurrentProcess(), Console->VDMBuffer); + NtClose(Console->VDMBufferSection); + } + Console->VDMBuffer = Console->ClientVDMBuffer = NULL; + + Console->VDMBufferSize.X = Console->VDMBufferSize.Y = 0; + } + +Quit: + ConSrvReleaseConsole(Console, TRUE); + return Status; } CSR_API(SrvVDMConsoleOperation)

1 0

[hbelusca] 63848: [NTVDM]: Studying ntvdm, we can find the significance of some of the parameters. Others seem unused.
by hbelusca＠svn.reactos.org 09 Aug '14

09 Aug '14

Author: hbelusca Date: Sat Aug 9 18:48:31 2014 New Revision: 63848 URL: http://svn.reactos.org/svn/reactos?rev=63848&view=rev Log: [NTVDM]: Studying ntvdm, we can find the significance of some of the parameters. Others seem unused. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sat Aug 9 18:48:31 2014 @@ -23,7 +23,7 @@ /* * Activate this line if you want to use the real - * RegisterConsoleVDM API of Windows/ReactOS. + * RegisterConsoleVDM API of ReactOS/Windows. */ // #define USE_REAL_REGISTERCONSOLEVDM @@ -314,33 +314,33 @@ BOOL WINAPI -__RegisterConsoleVDM(IN DWORD dwDosVDMFlag, - IN HANDLE hEventHandle1, - IN HANDLE hEventHandle2, - IN HANDLE hEventHandle3, - IN DWORD Unused1, - OUT PULONG returned_val_1, - OUT PVOID* returned_val_2, - IN PVOID lpUnknownBuffer, - IN DWORD dwUnknownBufferLength, +__RegisterConsoleVDM(IN DWORD dwRegisterFlags, + IN HANDLE hStartHardwareEvent, + IN HANDLE hEndHardwareEvent, + IN HANDLE hErrorHardwareEvent, + IN DWORD dwUnusedVar, + OUT LPDWORD lpVideoStateLength, + OUT PVOID* lpVideoState, // PVIDEO_HARDWARE_STATE_HEADER* + IN PVOID lpUnusedBuffer, + IN DWORD dwUnusedBufferLength, IN COORD dwVDMBufferSize, OUT PVOID* lpVDMBuffer) { - UNREFERENCED_PARAMETER(hEventHandle3); - UNREFERENCED_PARAMETER(Unused1); - UNREFERENCED_PARAMETER(returned_val_1); - UNREFERENCED_PARAMETER(returned_val_2); - UNREFERENCED_PARAMETER(lpUnknownBuffer); - UNREFERENCED_PARAMETER(dwUnknownBufferLength); + UNREFERENCED_PARAMETER(hErrorHardwareEvent); + UNREFERENCED_PARAMETER(dwUnusedVar); + UNREFERENCED_PARAMETER(lpVideoStateLength); + UNREFERENCED_PARAMETER(lpVideoState); + UNREFERENCED_PARAMETER(lpUnusedBuffer); + UNREFERENCED_PARAMETER(dwUnusedBufferLength); SetLastError(0); - DPRINT1("__RegisterConsoleVDM(%d)\n", dwDosVDMFlag); + DPRINT1("__RegisterConsoleVDM(%d)\n", dwRegisterFlags); if (lpVDMBuffer == NULL) return FALSE; - if (dwDosVDMFlag != 0) - { - // if (EventHandle_1 == NULL || EventHandle_2 == NULL) return FALSE; + if (dwRegisterFlags != 0) + { + // if (hStartHardwareEvent == NULL || hEndHardwareEvent == NULL) return FALSE; if (VDMBuffer != NULL) return FALSE; VDMBufferSize = dwVDMBufferSize; @@ -451,7 +451,7 @@ /* * Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14, &ConsoleHandle); * in the two following APIs: - * SrvRegisterConsoleVDM (corresponding win32 API: RegisterConsoleVDM) + * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM) * SrvVDMConsoleOperation (corresponding Win32 API: ) * to check whether the current process is a VDM process, and fails otherwise with the * error 0xC0000022 ().

1 0

[dquintana] 63847: [BROWSEUI] * Fix usage of outdated CMergedFolder to use the proper interface.
by dquintana＠svn.reactos.org 09 Aug '14

09 Aug '14

Author: dquintana Date: Sat Aug 9 15:56:05 2014 New Revision: 63847 URL: http://svn.reactos.org/svn/reactos?rev=63847&view=rev Log: [BROWSEUI] * Fix usage of outdated CMergedFolder to use the proper interface. Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Sat Aug 9 15:56:05 2014 @@ -21,6 +21,7 @@ #include "CMergedFolder.h" +// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; @@ -309,7 +310,7 @@ return hr; } -HRESULT GetStartMenuFolder(IShellFolder ** ppsfStartMenu) +static HRESULT GetStartMenuFolder(IShellFolder ** ppsfStartMenu) { HRESULT hr; LPITEMIDLIST pidlUserStartMenu; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Aug 9 15:56:05 2014 @@ -30,6 +30,22 @@ #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) #define USE_CUSTOM_MENUBAND 1 + +#if 1 +// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) + +IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; +CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; + +interface IAugmentedShellFolder : public IShellFolder +{ + virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID, IShellFolder *, LPCITEMIDLIST, ULONG) = 0; + virtual HRESULT STDMETHODCALLTYPE GetNameSpaceID(LPCITEMIDLIST, LPGUID) = 0; + virtual HRESULT STDMETHODCALLTYPE QueryNameSpace(ULONG, LPGUID, IShellFolder **) = 0; + virtual HRESULT STDMETHODCALLTYPE EnumNameSpace(ULONG, PULONG) = 0; +}; + +#endif // navigation controls and menubar just send a message to parent window /* @@ -74,7 +90,11 @@ extern HRESULT CreateAddressBand(REFIID riid, void **ppv); typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); + +HMODULE hRShell = NULL; +PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = NULL; +PMENUBAND_CONSTRUCTOR pCMenuBand_Constructor = NULL; HRESULT IUnknown_HasFocusIO(IUnknown * punk) { @@ -392,15 +412,105 @@ { } +static HRESULT BindToDesktop(LPCITEMIDLIST pidl, IShellFolder ** ppsfResult) +{ + HRESULT hr; + CComPtr<IShellFolder> psfDesktop; + + *ppsfResult = NULL; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, ppsfResult)); + + return hr; +} + +static HRESULT GetFavoritesFolder(IShellFolder ** ppsfFavorites, LPITEMIDLIST * ppidl) +{ + HRESULT hr; + LPITEMIDLIST pidlUserFavorites; + LPITEMIDLIST pidlCommonFavorites; + CComPtr<IShellFolder> psfUserFavorites; + CComPtr<IShellFolder> psfCommonFavorites; + CComPtr<IAugmentedShellFolder> pasf; + + *ppsfFavorites = NULL; + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidlUserFavorites); + if (FAILED(hr)) + return hr; + + if (FAILED(SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &pidlCommonFavorites))) + { + hr = BindToDesktop(pidlUserFavorites, ppsfFavorites); + *ppidl = pidlUserFavorites; + return hr; + } + + hr = BindToDesktop(pidlUserFavorites, &psfUserFavorites); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = BindToDesktop(pidlCommonFavorites, &psfCommonFavorites); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + +#if 1 + if (!hRShell) + { + hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + } + + if (!pCMergedFolder_Constructor) + pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hRShell, "CMergedFolder_Constructor"); + + if (pCMergedFolder_Constructor) + { + hr = pCMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + } + else + { + hr = E_FAIL; + } +#else + hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); +#endif + if (FAILED_UNEXPECTEDLY(hr)) + { + *ppsfFavorites = psfUserFavorites.Detach(); + *ppidl = pidlUserFavorites; + ILFree(pidlCommonFavorites); + return hr; + } + + hr = pasf->AddNameSpace(NULL, psfUserFavorites, pidlUserFavorites, 0xFF00); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->AddNameSpace(NULL, psfCommonFavorites, pidlCommonFavorites, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->QueryInterface(IID_PPV_ARG(IShellFolder, ppsfFavorites)); + pasf.Release(); + + ILFree(pidlCommonFavorites); + ILFree(pidlUserFavorites); + + return hr; +} + HRESULT STDMETHODCALLTYPE CMenuCallback::GetObject(LPSMDATA psmd, REFIID riid, void **ppvObject) { CComPtr<IShellMenu> parentMenu; CComPtr<IShellMenu> newMenu; CComPtr<IShellFolder> favoritesFolder; LPITEMIDLIST favoritesPIDL; - CComPtr<IShellFolder> commonFavsFolder; - LPITEMIDLIST commonFavsPIDL; - CComPtr<IShellFolder> mergedFolder; HWND ownerWindow; HMENU parentHMenu; HMENU favoritesHMenu; @@ -428,12 +538,19 @@ if (favoritesHMenu == NULL) return E_FAIL; #if USE_CUSTOM_MENUBAND - HMODULE hrs = LoadLibrary(L"rshell.dll"); - - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); - if (func) + if (!hRShell) { - hResult = func(IID_PPV_ARG(IShellMenu, &newMenu)); + hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + } + + if (!pCMenuBand_Constructor) + pCMenuBand_Constructor = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + + if (pCMenuBand_Constructor) + { + hResult = pCMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &newMenu)); } else { @@ -452,36 +569,15 @@ hResult = newMenu->SetMenu(favoritesHMenu, ownerWindow, SMSET_TOP | SMSET_DONTOWN); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &favoritesPIDL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = SHBindToFolder(favoritesPIDL, &favoritesFolder); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + RegCreateKeyEx(HKEY_CURRENT_USER, szFavoritesKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &orderRegKey, &disposition); -#if 1 /*USE_MERGED_FAVORITES*/ - hResult = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &commonFavsPIDL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = SHBindToFolder(commonFavsPIDL, &commonFavsFolder); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - ILFree(commonFavsPIDL); - - PMERGEDFOLDER_CONSTRUCTOR mfconstruct = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hrs, "CMergedFolder_Constructor"); - if (mfconstruct) - { - hResult = mfconstruct(favoritesFolder, commonFavsFolder, IID_PPV_ARG(IShellFolder, &mergedFolder)); - } - else - { - mergedFolder = favoritesFolder; - } -#else - mergedFolder = favoritesFolder; -#endif - hResult = newMenu->SetShellFolder(mergedFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | SMINIT_CACHED | SMINV_ID); + + hResult = GetFavoritesFolder(&favoritesFolder, &favoritesPIDL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = newMenu->SetShellFolder(favoritesFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | SMINIT_CACHED | SMINV_ID); ILFree(favoritesPIDL); if (SUCCEEDED(hResult)) fFavoritesMenu.Attach(newMenu.Detach()); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Aug 9 15:56:05 2014 @@ -26,13 +26,11 @@ extern "C" BOOL WINAPI Shell_GetImageLists( _Out_ HIMAGELIST *phiml, - _Out_ HIMAGELIST *phimlSmall - ); + _Out_ HIMAGELIST *phimlSmall); extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); #include "newatlinterfaces.h" - /* TODO: @@ -1853,16 +1851,7 @@ { HMENU mainMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_MAINMENU)); - //DbgPrint("Menu from shell32:\n"); - //DbgDumpMenu(hmenuShared); - - //DbgPrint("Menu from browseui:\n"); - //DbgDumpMenu(mainMenu); - Shell_MergeMenus(hmenuShared, mainMenu, 0, 0, FCIDM_BROWSERLAST, MM_SUBMENUSHAVEIDS); - - //DbgPrint("Merged menu:\n"); - //DbgDumpMenu(hmenuShared); int GCCU(itemCount3) = GetMenuItemCount(hmenuShared); Unused(itemCount3); @@ -1879,9 +1868,6 @@ { CComPtr<IShellMenu> shellMenu; HRESULT hResult; - - //DbgPrint("SetMenuSB:\n"); - //DbgDumpMenu(hmenuShared); if (hmenuShared && IsMenu(hmenuShared) == FALSE) return E_FAIL; @@ -3206,13 +3192,7 @@ menuIndex = 5; } - //DbgPrint("Before relay:\n"); - //DbgDumpMenu(theMenu); - LRESULT ret = RelayMsgToShellView(uMsg, wParam, menuIndex, bHandled); - - //DbgPrint("After relay:\n"); - //DbgDumpMenu(theMenu); return ret; }

1 0

[dquintana] 63846: * Sync to trunk r63845.
by dquintana＠svn.reactos.org 09 Aug '14

09 Aug '14

Author: dquintana Date: Sat Aug 9 14:15:16 2014 New Revision: 63846 URL: http://svn.reactos.org/svn/reactos?rev=63846&view=rev Log: * Sync to trunk r63845. Added: branches/shell-experiments/dll/win32/cards/COPYING - copied unchanged from r63845, trunk/reactos/dll/win32/cards/COPYING branches/shell-experiments/subsystems/ntvdm/hardware/mouse.c - copied unchanged from r63845, trunk/reactos/subsystems/ntvdm/hardware/mouse.c branches/shell-experiments/subsystems/ntvdm/hardware/mouse.h - copied unchanged from r63845, trunk/reactos/subsystems/ntvdm/hardware/mouse.h branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyterm.c - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/terminal.c - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio_winsrv.h - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/rect.h - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/include/rect.h Removed: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/CMakeLists.txt branches/shell-experiments/base/applications/calc/lang/tr-TR.rc branches/shell-experiments/base/applications/charmap/about.c branches/shell-experiments/base/applications/charmap/charmap.c branches/shell-experiments/base/applications/charmap/lrgcell.c branches/shell-experiments/base/applications/charmap/map.c branches/shell-experiments/base/applications/charmap/settings.c branches/shell-experiments/base/applications/games/spider/spider.cpp branches/shell-experiments/base/applications/games/spider/spider.h branches/shell-experiments/base/applications/games/spider/spigame.cpp branches/shell-experiments/base/applications/mplay32/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/servman/lang/tr-TR.rc branches/shell-experiments/base/applications/mspaint/lang/tr-TR.rc branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt branches/shell-experiments/base/applications/rapps/rapps/ghostview.txt branches/shell-experiments/base/applications/rapps/rapps/miktex.txt branches/shell-experiments/base/applications/rapps/rapps/net20.txt branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt branches/shell-experiments/base/applications/rapps/rapps/smplayer.txt branches/shell-experiments/base/applications/regedit/lang/tr-TR.rc branches/shell-experiments/base/applications/screensavers/logon/lang/tr-TR.rc branches/shell-experiments/base/applications/sndrec32/lang/tr-TR.rc branches/shell-experiments/base/applications/taskmgr/lang/tr-TR.rc branches/shell-experiments/base/applications/winhlp32/lang/Tr.rc branches/shell-experiments/base/applications/wordpad/lang/Tr.rc branches/shell-experiments/base/setup/usetup/lang/tr-TR.h branches/shell-experiments/base/shell/explorer/CMakeLists.txt branches/shell-experiments/boot/bootdata/CMakeLists.txt branches/shell-experiments/boot/bootdata/packages/CMakeLists.txt branches/shell-experiments/cmake/CMakeMacros.cmake branches/shell-experiments/dll/cpl/access/lang/tr-TR.rc branches/shell-experiments/dll/cpl/console/console.c branches/shell-experiments/dll/cpl/console/layout.c branches/shell-experiments/dll/cpl/desk/lang/tr-TR.rc branches/shell-experiments/dll/cpl/input/lang/tr-TR.rc branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc branches/shell-experiments/dll/cpl/mmsys/lang/tr-TR.rc branches/shell-experiments/dll/cpl/powercfg/lang/tr-TR.rc branches/shell-experiments/dll/cpl/sysdm/lang/tr-TR.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/cs-CZ.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/de-DE.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/en-US.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/he-IL.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/pl-PL.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/ro-RO.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/sq-AL.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/tr-TR.rc branches/shell-experiments/dll/ntdll/csr/capture.c branches/shell-experiments/dll/win32/avifil32/lang/avifile_Tr.rc branches/shell-experiments/dll/win32/browseui/CMakeLists.txt branches/shell-experiments/dll/win32/browseui/precomp.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken1.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken11.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken12.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken3.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken4.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken6.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken8.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_6.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Two.bmp branches/shell-experiments/dll/win32/comctl32/lang/comctl_Tr.rc branches/shell-experiments/dll/win32/comctl32/rsrc.rc branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Tr.rc branches/shell-experiments/dll/win32/comdlg32/rsrc.rc branches/shell-experiments/dll/win32/credui/lang/credui_Tr.rc branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc branches/shell-experiments/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc branches/shell-experiments/dll/win32/getuname/getuname.rc branches/shell-experiments/dll/win32/jscript/lang/jscript_Tr.rc branches/shell-experiments/dll/win32/kernel32/client/console/alias.c branches/shell-experiments/dll/win32/kernel32/client/console/console.c branches/shell-experiments/dll/win32/kernel32/client/console/history.c branches/shell-experiments/dll/win32/kernel32/client/console/readwrite.c branches/shell-experiments/dll/win32/kernel32/client/handle.c branches/shell-experiments/dll/win32/kernel32/include/console.h branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc branches/shell-experiments/dll/win32/localui/lang/ui_Tr.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Tr.rc branches/shell-experiments/dll/win32/oledlg/lang/oledlg_Tr.rc branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/iconcache.cpp branches/shell-experiments/dll/win32/shell32/shfldr.h branches/shell-experiments/dll/win32/shell32/shlfolder.cpp branches/shell-experiments/drivers/filesystems/npfs/datasup.c branches/shell-experiments/drivers/filesystems/npfs/readsup.c branches/shell-experiments/drivers/filesystems/npfs/waitsup.c branches/shell-experiments/include/ndk/mmtypes.h branches/shell-experiments/include/reactos/libs/pseh/pseh3.h branches/shell-experiments/include/reactos/subsys/csr/csr.h branches/shell-experiments/include/reactos/subsys/win/conmsg.h branches/shell-experiments/lib/pseh/i386/pseh3.c branches/shell-experiments/ntoskrnl/CMakeLists.txt branches/shell-experiments/ntoskrnl/config/i386/cmhardwr.c branches/shell-experiments/ntoskrnl/include/internal/i386/ke.h branches/shell-experiments/ntoskrnl/include/internal/mm.h branches/shell-experiments/ntoskrnl/io/iomgr/iofunc.c branches/shell-experiments/ntoskrnl/mm/ARM3/miarm.h branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c branches/shell-experiments/ntoskrnl/mm/ARM3/pfnlist.c branches/shell-experiments/ntoskrnl/mm/ARM3/section.c branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c branches/shell-experiments/ntoskrnl/mm/balance.c branches/shell-experiments/ntoskrnl/mm/pagefile.c branches/shell-experiments/ntoskrnl/mm/section.c branches/shell-experiments/ntoskrnl/ntkrnlmp/CMakeLists.txt branches/shell-experiments/ntoskrnl/ob/oblife.c branches/shell-experiments/subsystems/ntvdm/CMakeLists.txt branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c branches/shell-experiments/subsystems/ntvdm/hardware/ps2.h branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.c branches/shell-experiments/win32ss/user/ntuser/clipboard.c branches/shell-experiments/win32ss/user/ntuser/cursoricon.c branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/menu.c branches/shell-experiments/win32ss/user/user32/misc/stubs.c branches/shell-experiments/win32ss/user/winsrv/consrv.cmake branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/coninput.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/graphics.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.h branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.c branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.h branches/shell-experiments/win32ss/user/winsrv/consrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/console.h branches/shell-experiments/win32ss/user/winsrv/consrv/consrv.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontendctl.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/input.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h branches/shell-experiments/win32ss/user/winsrv/consrv/handle.c branches/shell-experiments/win32ss/user/winsrv/consrv/handle.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/console.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/settings.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/term.h branches/shell-experiments/win32ss/user/winsrv/consrv/init.c branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.c branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.h branches/shell-experiments/win32ss/user/winsrv/consrv/procinit.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/CMakeLists.tx… Modified: branches/shell-experiments/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/screensavers/logon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/CMakeMa… Modified: branches/shell-experiments/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/acces… Modified: branches/shell-experiments/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/conso… Modified: branches/shell-experiments/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/conso… Modified: branches/shell-experiments/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/desk/… Modified: branches/shell-experiments/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/input… Modified: branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/main/… Modified: branches/shell-experiments/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/mmsys… Modified: branches/shell-experiments/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/power… Modified: branches/shell-experiments/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/sysdm… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/csr… Modified: branches/shell-experiments/dll/win32/avifil32/lang/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/avi… Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken1.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken11.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken12.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken3.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken4.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken6.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken8.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/credui/lang/credui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cre… Modified: branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/get… Modified: branches/shell-experiments/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/jsc… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/readsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/waitsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/m… Modified: branches/shell-experiments/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/pseh/i386… Modified: branches/shell-experiments/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/CMak… Modified: branches/shell-experiments/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/b… Modified: branches/shell-experiments/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/p… Modified: branches/shell-experiments/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/s… Modified: branches/shell-experiments/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ntkr… Modified: branches/shell-experiments/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ob/o… Modified: branches/shell-experiments/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Removed: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

[aandrejevic] 63845: [SHELL32] - Greatly optimize file icon retrieval by reducing the times we try to access the disk. - Store icons in a binary tree in the shell icon cache for faster retrieval. P...
by aandrejevic＠svn.reactos.org 09 Aug '14

09 Aug '14

Author: aandrejevic Date: Sat Aug 9 13:40:13 2014 New Revision: 63845 URL: http://svn.reactos.org/svn/reactos?rev=63845&view=rev Log: [SHELL32] - Greatly optimize file icon retrieval by reducing the times we try to access the disk. - Store icons in a binary tree in the shell icon cache for faster retrieval. Patch by Huw Campbell committed at the request of Giannis Adamopoulos. Modified: trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/iconcache.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -28,6 +28,7 @@ LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { int icon_idx; + bool cont=TRUE; WCHAR wszPath[MAX_PATH]; WCHAR wszCLSIDValue[CHARS_IN_GUID]; static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; @@ -36,27 +37,40 @@ static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; - if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile, - wszPath, MAX_PATH)) - { - WCHAR wszIconIndex[10]; - SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex, - wszIconIndex, 10); - *piIndex = _wtoi(wszIconIndex); - } - else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, - wszCLSIDValue, CHARS_IN_GUID) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - } - else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, - wszCLSIDValue, CHARS_IN_GUID) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - } - else + /* + Optimisation. GetCustomFolderAttribute has a critical lock on it, and isn't fast. + Test the water (i.e., see if the attribute exists) before questioning it three times + when most folders don't use it at all. + */ + WCHAR wszBigToe[3]; + if (!(uFlags & GIL_DEFAULTICON) && SHELL32_GetCustomFolderAttributes(pidl, shellClassInfo, + wszBigToe, 3)) + { + if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile, + wszPath, MAX_PATH)) + { + WCHAR wszIconIndex[10]; + SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex, + wszIconIndex, 10); + *piIndex = _wtoi(wszIconIndex); + cont=FALSE; + } + else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, + wszCLSIDValue, CHARS_IN_GUID) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + cont=FALSE; + } + else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, + wszCLSIDValue, CHARS_IN_GUID) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + cont=FALSE; + } + } + if (cont) { static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; @@ -322,6 +336,10 @@ &flags))) { initIcon->SetNormalIcon(wTemp, icon_idx); + // FIXME: if/when getIconLocationForFolder does something for + // GIL_FORSHORTCUT, code below should be uncommented. and + // the following line removed. + initIcon->SetShortcutIcon(wTemp, icon_idx); } if (SUCCEEDED(getIconLocationForFolder( pidl, GIL_DEFAULTICON, wTemp, MAX_PATH, @@ -330,13 +348,13 @@ { initIcon->SetDefaultIcon(wTemp, icon_idx); } - if (SUCCEEDED(getIconLocationForFolder( - pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH, - &icon_idx, - &flags))) - { - initIcon->SetShortcutIcon(wTemp, icon_idx); - } + // if (SUCCEEDED(getIconLocationForFolder( + // pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH, + // &icon_idx, + // &flags))) + // { + // initIcon->SetShortcutIcon(wTemp, icon_idx); + // } if (SUCCEEDED(getIconLocationForFolder( pidl, GIL_OPENICON, wTemp, MAX_PATH, &icon_idx, Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -64,14 +64,14 @@ * loaded from, their resource index and the fact if they have a shortcut * icon overlay or not. */ - if (e1->dwSourceIndex != e2->dwSourceIndex || /* first the faster one */ - (e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) - return 1; - - if (wcsicmp(e1->sSourceFile,e2->sSourceFile)) - return 1; - - return 0; + /* first the faster one */ + if (e1->dwSourceIndex != e2->dwSourceIndex) + return (e1->dwSourceIndex < e2->dwSourceIndex) ? -1 : 1; + + if ((e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) + return ((e1->dwFlags & GIL_FORSHORTCUT) < (e2->dwFlags & GIL_FORSHORTCUT)) ? -1 : 1; + + return wcsicmp(e1->sSourceFile,e2->sSourceFile); } /* declare SIC_LoadOverlayIcon() */ @@ -338,7 +338,8 @@ EnterCriticalSection(&SHELL32_SicCS); - indexDPA = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); + indexDPA = DPA_Search (sic_hdpa, lpsice, 0, SIC_CompareEntries, 0, DPAS_SORTED|DPAS_INSERTAFTER); + indexDPA = DPA_InsertPtr(sic_hdpa, indexDPA, lpsice); if ( -1 == indexDPA ) { ret = INVALID_INDEX; @@ -468,7 +469,7 @@ if (NULL != DPA_GetPtr (sic_hdpa, 0)) { /* search linear from position 0*/ - index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0); + index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, DPAS_SORTED); } if ( INVALID_INDEX == index ) Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -37,6 +37,7 @@ #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) BOOL SHELL32_GetCustomFolderAttribute (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR pwszAttribute, LPWSTR pwszValue, DWORD cchValue); +BOOL SHELL32_GetCustomFolderAttributes (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPWSTR pwszValue, DWORD cchValue); LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut); HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -80,6 +80,33 @@ } return FALSE; } + +BOOL SHELL32_GetCustomFolderAttributes( + LPCITEMIDLIST pidl, LPCWSTR pwszHeading, + LPWSTR pwszValue, DWORD cchValue) +{ + DWORD dwAttrib = FILE_ATTRIBUTE_SYSTEM; + WCHAR wszFolderPath[MAX_PATH]; + + /* Hack around not having system attribute on non-Windows file systems */ + if (0) + dwAttrib = _ILGetFileAttributes(pidl, NULL, 0); + + if (dwAttrib & FILE_ATTRIBUTE_SYSTEM) + { + if (!SHGetPathFromIDListW(pidl, wszFolderPath)) + return FALSE; + + static const WCHAR wszDesktopIni[] = + {'d','e','s','k','t','o','p','.','i','n','i',0}; + + PathAddBackslashW(wszFolderPath); + PathAppendW(wszFolderPath, wszDesktopIni); + return GetPrivateProfileSectionW(pwszHeading, pwszValue, cchValue, wszFolderPath); + } + return FALSE; +} + /*************************************************************************** * GetNextElement (internal function)

1 0

[hbelusca] 63844: [NTVDM]: Add a compile-time-defined switch to be able to use the RegisterConsoleVDM API of ReactOS/Windows, or an emulated one.
by hbelusca＠svn.reactos.org 09 Aug '14

09 Aug '14

Author: hbelusca Date: Sat Aug 9 13:22:50 2014 New Revision: 63844 URL: http://svn.reactos.org/svn/reactos?rev=63844&view=rev Log: [NTVDM]: Add a compile-time-defined switch to be able to use the RegisterConsoleVDM API of ReactOS/Windows, or an emulated one. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sat Aug 9 13:22:50 2014 @@ -20,6 +20,12 @@ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; + +/* + * Activate this line if you want to use the real + * RegisterConsoleVDM API of Windows/ReactOS. + */ +// #define USE_REAL_REGISTERCONSOLEVDM #define USE_REACTOS_COLORS // #define USE_DOSBOX_COLORS @@ -288,44 +294,12 @@ #include <ntddvdeo.h> -typedef -BOOL -(WINAPI *pRegisterConsoleVDM) -( - BOOL IsDosVDM_flag, - HANDLE EventHandle_1, - HANDLE EventHandle_2, - HANDLE EventHandle_3, - int Unused1, - PVOID returned_val_1, - PVOID *returned_val_2, - PVOID lpUnknownBuffer, - DWORD theUnknownBufferLength, - COORD theVDMBufferSize, - PCHAR *lpVDMBuffer -); - -#if 0 -BOOL -WINAPI -RegisterConsoleVDM -( - BOOL IsDosVDM_flag, - HANDLE EventHandle_1, - HANDLE EventHandle_2, - HANDLE EventHandle_3, - int Unused1, - PVOID returned_val_1, - PVOID *returned_val_2, - PVOID lpUnknownBuffer, - DWORD theUnknownBufferLength, - COORD theVDMBufferSize, - PVOID *lpVDMBuffer -); - -HMODULE hKernel32 = NULL; -pRegisterConsoleVDM RegisterConsoleVDM = NULL; -#endif +#ifdef USE_REAL_REGISTERCONSOLEVDM + +#define __RegisterConsoleVDM RegisterConsoleVDM +#define __InvalidateConsoleDIBits InvalidateConsoleDIBits + +#else /* * This private buffer, per-console, is used by @@ -340,49 +314,49 @@ BOOL WINAPI -__RegisterConsoleVDM(BOOL IsDosVDM_flag, - HANDLE EventHandle_1, - HANDLE EventHandle_2, - HANDLE EventHandle_3, - int Unused1, - PVOID returned_val_1, - PVOID *returned_val_2, - PVOID lpUnknownBuffer, - DWORD theUnknownBufferLength, - COORD theVDMBufferSize, - PCHAR *lpVDMBuffer) -{ - UNREFERENCED_PARAMETER(EventHandle_3); +__RegisterConsoleVDM(IN DWORD dwDosVDMFlag, + IN HANDLE hEventHandle1, + IN HANDLE hEventHandle2, + IN HANDLE hEventHandle3, + IN DWORD Unused1, + OUT PULONG returned_val_1, + OUT PVOID* returned_val_2, + IN PVOID lpUnknownBuffer, + IN DWORD dwUnknownBufferLength, + IN COORD dwVDMBufferSize, + OUT PVOID* lpVDMBuffer) +{ + UNREFERENCED_PARAMETER(hEventHandle3); UNREFERENCED_PARAMETER(Unused1); UNREFERENCED_PARAMETER(returned_val_1); UNREFERENCED_PARAMETER(returned_val_2); UNREFERENCED_PARAMETER(lpUnknownBuffer); - UNREFERENCED_PARAMETER(theUnknownBufferLength); + UNREFERENCED_PARAMETER(dwUnknownBufferLength); SetLastError(0); - DPRINT1("__RegisterConsoleVDM(%d)\n", IsDosVDM_flag); + DPRINT1("__RegisterConsoleVDM(%d)\n", dwDosVDMFlag); if (lpVDMBuffer == NULL) return FALSE; - if (IsDosVDM_flag) + if (dwDosVDMFlag != 0) { // if (EventHandle_1 == NULL || EventHandle_2 == NULL) return FALSE; if (VDMBuffer != NULL) return FALSE; - VDMBufferSize = theVDMBufferSize; + VDMBufferSize = dwVDMBufferSize; /* HACK: Cache -- to be removed in the real implementation */ CharBuff = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - theVDMBufferSize.X * theVDMBufferSize.Y - * sizeof(CHAR_INFO)); + VDMBufferSize.X * VDMBufferSize.Y + * sizeof(CHAR_INFO)); ASSERT(CharBuff); VDMBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - theVDMBufferSize.X * theVDMBufferSize.Y - * sizeof(CHAR_CELL)); - *lpVDMBuffer = (PCHAR)VDMBuffer; + VDMBufferSize.X * VDMBufferSize.Y + * sizeof(CHAR_CELL)); + *lpVDMBuffer = VDMBuffer; return (VDMBuffer != NULL); } else @@ -432,6 +406,8 @@ return InvalidateConsoleDIBits(hConsoleOutput, lpRect); } +#endif + /* PRIVATE FUNCTIONS **********************************************************/ static inline DWORD VgaGetAddressSize(VOID); @@ -458,6 +434,9 @@ ULONG Length = 0; PVIDEO_HARDWARE_STATE_HEADER State; +#ifdef USE_REAL_REGISTERCONSOLEVDM + PCHAR_INFO CharBuff = NULL; +#endif SHORT i, j; DWORD AddressSize, ScanlineSize; DWORD Address = 0; @@ -492,13 +471,21 @@ NULL, 0, TextResolution, - (PCHAR*)&TextFramebuffer); + (PVOID*)&TextFramebuffer); if (!Success) { DisplayMessage(L"RegisterConsoleVDM failed with error %d\n", GetLastError()); EmulatorTerminate(); return FALSE; } + +#ifdef USE_REAL_REGISTERCONSOLEVDM + CharBuff = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + TextResolution.X * TextResolution.Y + * sizeof(CHAR_INFO)); + ASSERT(CharBuff); +#endif /* * Resize the console @@ -559,6 +546,10 @@ /* Move to the next scanline */ Address += ScanlineSize; } + +#ifdef USE_REAL_REGISTERCONSOLEVDM + if (CharBuff) HeapFree(GetProcessHeap(), 0, CharBuff); +#endif VgaUpdateCursorPosition(); @@ -1950,7 +1941,7 @@ NULL, 0, dummySize, - (PCHAR*)&dummyPtr); + &dummyPtr); TextFramebuffer = NULL; @@ -2039,11 +2030,6 @@ CloseHandle(AnotherEvent); CloseHandle(EndEvent); CloseHandle(StartEvent); - -#if 0 - RegisterConsoleVDM = NULL; - FreeLibrary(hKernel32); -#endif } /* EOF */

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