Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[ekohl] 68207: [USETUP] Add support for logical partitions to the partition deletion code.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 20 13:42:39 2015 New Revision: 68207 URL: http://svn.reactos.org/svn/reactos?rev=68207&view=rev Log: [USETUP] Add support for logical partitions to the partition deletion code. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 20 13:42:39 2015 @@ -2349,8 +2349,14 @@ PPARTENTRY PartEntry) { PPARTENTRY PrevPartEntry; - - if (PartEntry->ListEntry.Blink != &DiskEntry->PrimaryPartListHead) + PLIST_ENTRY ListHead; + + if (PartEntry->LogicalPartition) + ListHead = &DiskEntry->LogicalPartListHead; + else + ListHead = &DiskEntry->PrimaryPartListHead; + + if (PartEntry->ListEntry.Blink != ListHead) { PrevPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Blink, PARTENTRY, @@ -2370,8 +2376,14 @@ PPARTENTRY PartEntry) { PPARTENTRY NextPartEntry; - - if (PartEntry->ListEntry.Flink != &DiskEntry->PrimaryPartListHead) + PLIST_ENTRY ListHead; + + if (PartEntry->LogicalPartition) + ListHead = &DiskEntry->LogicalPartListHead; + else + ListHead = &DiskEntry->PrimaryPartListHead; + + if (PartEntry->ListEntry.Flink != ListHead) { NextPartEntry = CONTAINING_RECORD(PartEntry->ListEntry.Flink, PARTENTRY,

9 years, 6 months

[akhaldi] 68206: [REACTOS][VMWINST][WELCOME] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 20 13:03:46 2015 New Revision: 68206 URL: http://svn.reactos.org/svn/reactos?rev=68206&view=rev Log: [REACTOS][VMWINST][WELCOME] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt trunk/reactos/base/setup/vmwinst/CMakeLists.txt trunk/reactos/base/setup/welcome/CMakeLists.txt Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/CMakeLi… ============================================================================== --- trunk/reactos/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/CMakeLists.txt [iso-8859-1] Sat Jun 20 13:03:46 2015 @@ -1,4 +1,6 @@ +file(GLOB reactos_rc_deps res/*.*) +add_rc_deps(reactos.rc ${reactos_rc_deps}) add_executable(reactos reactos.c reactos.rc) target_link_libraries(reactos uuid) set_module_type(reactos win32gui UNICODE) Modified: trunk/reactos/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/CMakeLi… ============================================================================== --- trunk/reactos/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Sat Jun 20 13:03:46 2015 @@ -1,4 +1,6 @@ +file(GLOB vmwinst_rc_deps resources/*.*) +add_rc_deps(vmwinst.rc ${vmwinst_rc_deps}) add_executable(vmwinst vmwinst.c vmwinst.rc) target_link_libraries(vmwinst ${PSEH_LIB}) set_module_type(vmwinst win32gui UNICODE) Modified: trunk/reactos/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/CMakeLi… ============================================================================== --- trunk/reactos/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/CMakeLists.txt [iso-8859-1] Sat Jun 20 13:03:46 2015 @@ -1,4 +1,6 @@ +file(GLOB welcome_rc_deps res/*.*) +add_rc_deps(welcome.rc ${welcome_rc_deps}) add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui UNICODE) add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll)

9 years, 6 months

[akhaldi] 68205: [MMSYS] Move the speaker bitmap up 5 pixels. By Jared Smudde. CORE-9790

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 20 13:02:14 2015 New Revision: 68205 URL: http://svn.reactos.org/svn/reactos?rev=68205&view=rev Log: [MMSYS] Move the speaker bitmap up 5 pixels. By Jared Smudde. CORE-9790 Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "ÐÐ¾ÑÑÐ°Ð²ÑÐ½Ðµ Ð½Ð° &Ð·Ð½Ð°ÑÐµ Ð·Ð° Ð·Ð²ÑÐºÐ° Ð² Ð·Ð°Ð´Ð°ÑÐ½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "Ð Ð°Ð·Ñ&Ð¸ÑÐµÐ½Ð¸...", IDC_ADVANCED_BTN, 154, 105, 80, 15 GROUPBOX "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ð³Ð¾Ð²Ð¾ÑÐ¸ÑÐµÐ»Ñ", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Ð§ÑÐµÐ· Ð´Ð¾Ð»Ð½Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐºÐ°Ð¶ÐµÑÐµ ÑÐ¸Ð»Ð°ÑÐ° Ð¸ Ð´ÑÑÐ³Ð¸ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð° Ð½Ð° Ð²ÑÐµÐºÐ¸ Ð³Ð¾Ð²Ð¾ÑÐ¸ÑÐµÐ» Ð¿Ð¾Ð¾ÑÐ´ÐµÐ»Ð½Ð¾.", -1, 70, 155, 150, 36 PUSHBUTTON "Ð¡Ð¸Ð»Ð° Ð½Ð° &Ð³Ð¾Ð²Ð¾ÑÐ¸ÑÐµÐ»Ñ...", IDC_SPEAKER_VOL_BTN, 72, 195, 80, 15 PUSHBUTTON "Ð Ð°Ð·&ÑÐ¸ÑÐµÐ½Ð¸...", IDC_ADVANCED2_BTN, 154, 195, 80, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -21,7 +21,7 @@ CHECKBOX "UmÃstit &ikonu hlasitosti na panel Ãºloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&UpÅesnit...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "NastavenÃ reproduktorÅ¯", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "NastavenÃ nÃÅ¾e lze pouÅ¾Ãt ke zmÄnÄnÃ hlasitosti jednotlivÃ½ch reproduktorÅ¯ a dalÅ¡Ãch nastavenÃ.", -1, 70, 155, 150, 36 PUSHBUTTON "&Hlasitost reproduktorÅ¯...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "U&pÅesnit...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "LautstÃ¤rkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Lautsprechereinstellungen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Verwenden Sie die unteren Einstellungen um die LautstÃ¤rke einzelner GerÃ¤te und andere Einstellungen zu verÃ¤ndern.", -1, 70, 155, 150, 36 PUSHBUTTON "&LautstÃ¤rke...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "E&rweitert...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Colocar un icono de volumen en la &barra de tareas", IDC_ICON_IN_TASKBAR, 30, 92, 180, 10 PUSHBUTTON "Propiedades avan&zadas...", IDC_ADVANCED_BTN, 140, 105, 88, 15 GROUPBOX "ConfiguraciÃ³n del altavoz ", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Utilice esta configuraciÃ³n para cambiar el volumen del altavoz y otras configuraciones.", -1, 70, 155, 150, 36 PUSHBUTTON "Vol&umen de altavoz...", IDC_SPEAKER_VOL_BTN, 60, 195, 75, 15 PUSHBUTTON "Propiedades &avanzadas...", IDC_ADVANCED2_BTN, 140, 195, 88, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Placer une icÃ´ne du volume dans la barre de tÃ¢ches", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vancÃ©...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "ParamÃ¨tres des enceintes", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Utilisez les paramÃ¨tres ci-dessous pour changer le volume de chaque enceinte et modifier d'autres rÃ©glagles.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume des enceinte&s...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&vancÃ©...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -18,7 +18,7 @@ CHECKBOX "×©×× ×¡×× ×¢××¦×× ××©××¨×ª ×××©××××ª", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "××ª×§××...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "××××¨××ª ×¨××§××××", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "×¢××¦××ª ×¨××§××××...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "××ª×§××...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Mettere l'icona del &volume nella barra dei task", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Avanzate...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Impostazione altoparlanti", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Usare le impostazioni seguenti per modificare per i singoli altoparlanti il volume ed altre impostazioni.", -1, 70, 155, 150, 36 PUSHBUTTON "Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&vanzate...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "P&ictogram voor het volume in het systeemvak plaatsen", IDC_ICON_IN_TASKBAR, 25, 92, 190, 10 PUSHBUTTON "Ge&avanceerd...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Luidsprekerinstellingen", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Met de onderstaande knoppen kunt u het\nvolume en andere instellingen van de\nluidsprekers wijzigen.", -1, 70, 155, 150, 36 PUSHBUTTON "&Luidsprekervolume..", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "&Geavanceerd...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Plasser volum &ikon i oppgavelinjen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vansert...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "HÃ¸ytaller innstilling", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Bruk innstillingen under for Ã¥ endre individuell hÃ¸ytaller volum og andre innstillinger.", -1, 70, 155, 150, 36 PUSHBUTTON "&HÃ¸ytallervolum...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&vansert...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -29,7 +29,7 @@ CHECKBOX "UmieÅÄ &ikonÄ gÅoÅnoÅci w zasobniku systemowym", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Zaawansowane...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Ustawienia gÅoÅnikÃ³w", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "UÅ¼yj ustawieÅ poniÅ¼ej aby zmieniÄ indywidualny poziom gÅoÅnoÅci i dostosowaÄ ustawienia zaawansowane.", -1, 70, 155, 150, 36 PUSHBUTTON "&GÅoÅniki...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Z&aawansowane...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Speaker settings", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Use the settings below to change individual speaker volume and other settings.", -1, 70, 155, 150, 36 PUSHBUTTON "&Speaker Volume...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -21,7 +21,7 @@ CHECKBOX "AfiÈeazÄ pictogramÄ Ã®n &zona de notificare", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "A&vansateâ¦", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "OpÈiuni difuzoare", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "FolosiÈi opÈiunile de mai jos pentru a ajusta volumul fiecÄrui difuzor Ã®n parte sau pentru alte modificÄri Ã®n configuraÈia difuzoarelor.", -1, 70, 155, 150, 36 PUSHBUTTON "V&olum difuzoareâ¦", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Avansat&eâ¦", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -16,7 +16,7 @@ CHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ &Ð·Ð½Ð°ÑÐ¾Ðº Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð·Ð°Ð´Ð°Ñ", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾...", IDC_ADVANCED_BTN, 155, 110, 75, 15 GROUPBOX "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð¸Ð½Ð°Ð¼Ð¸ÐºÐ¾Ð²", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½ÑÐµ Ð½Ð¸Ð¶Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ Ð¸Ð½Ð´Ð¸Ð²Ð¸Ð´ÑÐ°Ð»ÑÐ½ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÐ¸ Ð´Ð¸Ð½Ð°Ð¼Ð¸ÐºÐ¾Ð² Ð¸ Ð´ÑÑÐ³Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð².", -1, 70, 155, 150, 36 PUSHBUTTON "ÐÑÐ¾Ð¼&ÐºÐ¾ÑÑÑ...", IDC_SPEAKER_VOL_BTN, 70, 200, 80, 15 PUSHBUTTON "Ð&Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾...", IDC_ADVANCED2_BTN, 155, 200, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -21,7 +21,7 @@ CHECKBOX "UmiestniÅ¥ &ikonu hlasitosti na panel Ãºloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&SpresniÅ¥...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Nastavenie reproduktorov", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Tieto moÅ¾nosti pouÅ¾ite na zmenu hlasitosti jednotlivÃ½ch reproduktorov a inÃ½ch nastavenÃ.", -1, 70, 155, 150, 36 PUSHBUTTON "&HlasitosÅ¥ reproduktorov...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Spr&esniÅ¥...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -20,7 +20,7 @@ CHECKBOX "Vendos &ikonen volumit nÃ« tabele", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "Konfigurimi Boxeve", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "PÃ«rdor konfigurimet e mÃ«poshtme pÃ«r tÃ« ndryshuar volumin individual to boxeve dhe konfigurimet tÃ« tjera.", -1, 70, 155, 150, 36 PUSHBUTTON "&Volumi boxeve...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "A&dvanced...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -18,7 +18,7 @@ CHECKBOX "&GÃ¶rev ÃubuÄunda Ses DÃ¼zeyi Simgesini YerleÅtir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "G&eliÅmiÅ...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "HoparlÃ¶r AyarlarÄ±", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "Tek hoparlÃ¶rÃ¼n, ses dÃ¼zeyini ve diÄer ayarlarÄ±nÄ± deÄiÅtirmek iÃ§in aÅaÄÄ±daki ayarlarÄ± kullanÄ±nÄ±z.", -1, 70, 155, 150, 36 PUSHBUTTON "&HoparlÃ¶r Ses DÃ¼zeyi...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "Ge&liÅmiÅ...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -24,7 +24,7 @@ CHECKBOX "ÐÐ¾ÐºÐ°&Ð·ÑÐ²Ð°ÑÐ¸ Ð·Ð½Ð°ÑÐ¾Ðº Ð³ÑÑÐ½Ð¾ÑÑÑ Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ñ Ð·Ð°Ð²Ð´Ð°Ð½Ñ", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð½Ð°Ð¼ÑÐºÑÐ²", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "ÐÐ° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ ÑÐ¾Ð·ÑÐ°ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð¸Ð¶ÑÐµ ÐºÐ½Ð¾Ð¿Ð¾Ðº Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ð½Ð°ÑÐ¸ ÑÐ½Ð´Ð¸Ð²ÑÐ´ÑÐ°Ð»ÑÐ½Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÑ Ð³ÑÑÐ½Ð¾ÑÑÑ Ð´Ð¸Ð½Ð°Ð¼ÑÐºÑÐ² ÑÐ° ÑÐ½ÑÐ¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ².", -1, 70, 155, 150, 36 PUSHBUTTON "&ÐÑÑÐ½ÑÑÑÑ Ð´Ð¸Ð½Ð°Ð¼ÑÐºÑÐ²...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "ÐÐ¾Ð´&Ð°ÑÐºÐ¾Ð²Ð¾...", IDC_ADVANCED2_BTN, 150, 195, 75, 15 Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] Sat Jun 20 13:02:14 2015 @@ -23,7 +23,7 @@ CHECKBOX "å°é³éå¾æ æ¾å¥ä»»å¡æ (&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "é«çº§(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 GROUPBOX "æ¬å£°å¨è®¾ç½®", IDC_SPEAKER_SET_BTN, 7, 140, 230, 80 - CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 + CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 155, 70, 70 LTEXT "ç¨ä¸åè®¾ç½®æ´æ¹æ¯ä¸ªæ¬å£°å¨é³éåå¶ä»è®¾ç½®ã", -1, 70, 155, 150, 36 PUSHBUTTON "æ¬å£°å¨é³é(&S)...", IDC_SPEAKER_VOL_BTN, 70, 195, 75, 15 PUSHBUTTON "é«çº§(&D)...", IDC_ADVANCED2_BTN, 150, 195, 75, 15

9 years, 6 months

[akhaldi] 68204: [BROWSEUI] Make the view->go to menu items reflect the toolbar buttons status. By Barrett Karish with some slight changes by me. CORE-9800

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 20 12:59:55 2015 New Revision: 68204 URL: http://svn.reactos.org/svn/reactos?rev=68204&view=rev Log: [BROWSEUI] Make the view->go to menu items reflect the toolbar buttons status. By Barrett Karish with some slight changes by me. CORE-9800 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jun 20 12:59:55 2015 @@ -1520,6 +1520,7 @@ void CShellBrowser::UpdateGotoMenu(HMENU theMenu) { CComPtr<ITravelLog> travelLog; + CComPtr<ITravelEntry> unusedEntry; int position; MENUITEMINFO menuItemInfo; HRESULT hResult; @@ -1530,6 +1531,35 @@ hResult = GetTravelLog(&travelLog); if (FAILED_UNEXPECTEDLY(hResult)) return; + + hResult = travelLog->GetTravelEntry(static_cast<IDropTarget *>(this), + TLOG_BACK, + &unusedEntry); + + if (SUCCEEDED(hResult)) + { + SHEnableMenuItem(theMenu, IDM_GOTO_BACK, TRUE); + unusedEntry.Release(); + } + else + SHEnableMenuItem(theMenu, IDM_GOTO_BACK, FALSE); + + hResult = travelLog->GetTravelEntry(static_cast<IDropTarget *>(this), + TLOG_FORE, + &unusedEntry); + + if (SUCCEEDED(hResult)) + { + SHEnableMenuItem(theMenu, IDM_GOTO_FORWARD, TRUE); + unusedEntry.Release(); + } + else + SHEnableMenuItem(theMenu, IDM_GOTO_FORWARD, FALSE); + + SHEnableMenuItem(theMenu, + IDM_GOTO_UPONELEVEL, + !_ILIsDesktop(fCurrentDirectoryPIDL)); + hResult = travelLog->InsertMenuEntries(static_cast<IDropTarget *>(this), theMenu, position, IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, TLMENUF_BACKANDFORTH | TLMENUF_CHECKCURRENT); if (SUCCEEDED(hResult))

9 years, 6 months

[tfaber] 68203: [ATL] - Implement CComClassFactorySingleton

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 20 12:08:13 2015 New Revision: 68203 URL: http://svn.reactos.org/svn/reactos?rev=68203&view=rev Log: [ATL] - Implement CComClassFactorySingleton Modified: trunk/reactos/lib/atl/atlcom.h Modified: trunk/reactos/lib/atl/atlcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcom.h?rev=68203… ============================================================================== --- trunk/reactos/lib/atl/atlcom.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcom.h [iso-8859-1] Sat Jun 20 12:08:13 2015 @@ -29,6 +29,7 @@ #define DECLARE_CLASSFACTORY_EX(cf) typedef ATL::CComCreator<ATL::CComObjectCached<cf> > _ClassFactoryCreatorClass; #define DECLARE_CLASSFACTORY() DECLARE_CLASSFACTORY_EX(ATL::CComClassFactory) +#define DECLARE_CLASSFACTORY_SINGLETON(obj) DECLARE_CLASSFACTORY_EX(ATL::CComClassFactorySingleton<obj>) class CComObjectRootBase { @@ -470,6 +471,11 @@ { } + virtual ~CComObjectCached() + { + this->FinalRelease(); + } + STDMETHOD_(ULONG, AddRef)() { ULONG newRefCount; @@ -495,6 +501,38 @@ STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) { return this->_InternalQueryInterface(iid, ppvObject); + } + + static HRESULT WINAPI CreateInstance(CComObjectCached<Base> **pp) + { + CComObjectCached<Base> *newInstance; + HRESULT hResult; + + ATLASSERT(pp != NULL); + if (pp == NULL) + return E_POINTER; + + hResult = E_OUTOFMEMORY; + newInstance = NULL; + ATLTRY(newInstance = new CComObjectCached<Base>()) + if (newInstance != NULL) + { + newInstance->SetVoid(NULL); + newInstance->InternalFinalConstructAddRef(); + hResult = newInstance->_AtlInitialConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->FinalConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->_AtlFinalConstruct(); + newInstance->InternalFinalConstructRelease(); + if (hResult != S_OK) + { + delete newInstance; + newInstance = NULL; + } + } + *pp = newInstance; + return hResult; } }; @@ -670,6 +708,62 @@ END_COM_MAP() }; +template <class T> +class CComClassFactorySingleton : + public CComClassFactory +{ +public: + HRESULT m_hrCreate; + IUnknown *m_spObj; + +public: + CComClassFactorySingleton() : + m_hrCreate(S_OK), + m_spObj(NULL) + { + } + + STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppvObj) + { + HRESULT hResult; + + if (ppvObj == NULL) + return E_POINTER; + *ppvObj = NULL; + + if (pUnkOuter != NULL) + hResult = CLASS_E_NOAGGREGATION; + else if (m_hrCreate == S_OK && m_spObj == NULL) + { + _SEH2_TRY + { + Lock(); + if (m_hrCreate == S_OK && m_spObj == NULL) + { + CComObjectCached<T> *pObj; + m_hrCreate = CComObjectCached<T>::CreateInstance(&pObj); + if (SUCCEEDED(m_hrCreate)) + { + m_hrCreate = pObj->QueryInterface(IID_IUnknown, reinterpret_cast<PVOID *>(&m_spObj)); + if (FAILED(m_hrCreate)) + delete pObj; + } + } + } + _SEH2_FINALLY + { + Unlock(); + } + _SEH2_END; + } + if (m_hrCreate == S_OK) + hResult = m_spObj->QueryInterface(riid, ppvObj); + else + hResult = m_hrCreate; + return hResult; + } +}; + template <class T, const CLSID *pclsid = &CLSID_NULL> class CComCoClass {

9 years, 6 months

[tfaber] 68202: [SHELL32] - Separate CDesktopFolder's IDropTarget out into its own class (since each caller needs its own instance) CORE-9839

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 20 10:26:22 2015 New Revision: 68202 URL: http://svn.reactos.org/svn/reactos?rev=68202&view=rev Log: [SHELL32] - Separate CDesktopFolder's IDropTarget out into its own class (since each caller needs its own instance) CORE-9839 Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Sat Jun 20 10:26:22 2015 @@ -48,7 +48,32 @@ * Desktopfolder implementation */ -class CDesktopFolder; +class CDesktopFolderDropTarget : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget +{ + private: + CComPtr<IShellFolder> m_psf; + BOOL m_fAcceptFmt; /* flag for pending Drop */ + UINT m_cfShellIDList; /* clipboardformat for IDropTarget */ + + void SF_RegisterClipFmt(); + BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + public: + CDesktopFolderDropTarget(); + + HRESULT WINAPI Initialize(IShellFolder *psf); + + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + + BEGIN_COM_MAP(CDesktopFolderDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + END_COM_MAP() +}; class CDesktopFolderEnum : public CEnumIDListBase @@ -254,21 +279,10 @@ return ret ? S_OK : E_FAIL; } -void CDesktopFolder::SF_RegisterClipFmt() -{ - TRACE ("(%p)\n", this); - - if (!cfShellIDList) - cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); -} - -CDesktopFolder::CDesktopFolder() -{ - pidlRoot = NULL; - sPathTarget = NULL; - cfShellIDList = 0; - SF_RegisterClipFmt(); - fAcceptFmt = FALSE; +CDesktopFolder::CDesktopFolder() : + sPathTarget(NULL), + pidlRoot(NULL) +{ } CDesktopFolder::~CDesktopFolder() @@ -491,7 +505,7 @@ if (IsEqualIID (riid, IID_IDropTarget)) { - hr = this->QueryInterface (IID_IDropTarget, ppvOut); + hr = ShellObjectCreatorInit<CDesktopFolderDropTarget>(this, IID_IDropTarget, ppvOut); } else if (IsEqualIID (riid, IID_IContextMenu)) { @@ -1326,7 +1340,29 @@ * set sensible places for the icons to live. * */ -BOOL CDesktopFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +void CDesktopFolderDropTarget::SF_RegisterClipFmt() +{ + TRACE ("(%p)\n", this); + + if (!m_cfShellIDList) + m_cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); +} + +CDesktopFolderDropTarget::CDesktopFolderDropTarget() : + m_psf(NULL), + m_fAcceptFmt(FALSE), + m_cfShellIDList(0) +{ +} + +HRESULT WINAPI CDesktopFolderDropTarget::Initialize(IShellFolder *psf) +{ + m_psf = psf; + SF_RegisterClipFmt(); + return S_OK; +} + +BOOL CDesktopFolderDropTarget::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) { /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ @@ -1335,7 +1371,7 @@ *pdwEffect = DROPEFFECT_NONE; - if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ + if (m_fAcceptFmt) { /* Does our interpretation of the keystate ... */ *pdwEffect = KeyStateToDropEffect (dwKeyState); if (*pdwEffect == DROPEFFECT_NONE) @@ -1349,27 +1385,27 @@ return FALSE; } -HRESULT WINAPI CDesktopFolder::DragEnter(IDataObject *pDataObject, +HRESULT WINAPI CDesktopFolderDropTarget::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); FORMATETC fmt; FORMATETC fmt2; - fAcceptFmt = FALSE; - - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + m_fAcceptFmt = FALSE; + + InitFormatEtc (fmt, m_cfShellIDList, TYMED_HGLOBAL); InitFormatEtc (fmt2, CF_HDROP, TYMED_HGLOBAL); if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) - fAcceptFmt = TRUE; + m_fAcceptFmt = TRUE; else if (SUCCEEDED(pDataObject->QueryGetData(&fmt2))) - fAcceptFmt = TRUE; + m_fAcceptFmt = TRUE; QueryDrop(dwKeyState, pdwEffect); return S_OK; } -HRESULT WINAPI CDesktopFolder::DragOver(DWORD dwKeyState, POINTL pt, +HRESULT WINAPI CDesktopFolderDropTarget::DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p)\n", this); @@ -1382,14 +1418,14 @@ return S_OK; } -HRESULT WINAPI CDesktopFolder::DragLeave() +HRESULT WINAPI CDesktopFolderDropTarget::DragLeave() { TRACE("(%p)\n", this); - fAcceptFmt = FALSE; + m_fAcceptFmt = FALSE; return S_OK; } -HRESULT WINAPI CDesktopFolder::Drop(IDataObject *pDataObject, +HRESULT WINAPI CDesktopFolderDropTarget::Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { TRACE("(%p) object dropped desktop\n", this); @@ -1438,18 +1474,24 @@ LPITEMIDLIST pidl = NULL; WCHAR szPath[MAX_PATH]; + STRRET strRet; //LPWSTR pathPtr; /* build a complete path to create a simple pidl */ - lstrcpynW(szPath, sPathTarget, MAX_PATH); - /*pathPtr = */PathAddBackslashW(szPath); - //hr = _ILCreateFromPathW(szPath, &pidl); - hr = this->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); - + hr = m_psf->GetDisplayNameOf(NULL, SHGDN_NORMAL | SHGDN_FORPARSING, &strRet); if (SUCCEEDED(hr)) { + hr = StrRetToBufW(&strRet, NULL, szPath, MAX_PATH); + ASSERT(SUCCEEDED(hr)); + /*pathPtr = */PathAddBackslashW(szPath); + //hr = _ILCreateFromPathW(szPath, &pidl); + hr = m_psf->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); + } + + if (SUCCEEDED(hr)) + { CComPtr<IDropTarget> pDT; - hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); + hr = m_psf->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); CoTaskMemFree(pidl); if (SUCCEEDED(hr)) SHSimulateDrop(pDT, pDataObject, dwKeyState, NULL, pdwEffect); Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] Sat Jun 20 10:26:22 2015 @@ -28,7 +28,6 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, - public IDropTarget, public ISFHelper { private: @@ -36,10 +35,6 @@ LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */ - UINT cfShellIDList; /* clipboardformat for IDropTarget */ - BOOL fAcceptFmt; /* flag for pending Drop */ - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); - void SF_RegisterClipFmt(); virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); public: @@ -77,13 +72,6 @@ // *** IPersistFolder2 methods *** virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); - // IDropTarget - virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT WINAPI DragLeave(); - virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); - - // *** ISFHelper methods *** virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); @@ -101,7 +89,6 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) COM_INTERFACE_ENTRY_IID(IID_ISFHelper, ISFHelper) END_COM_MAP() };

9 years, 6 months

[tfaber] 68201: [ATL] - Fix compilation when UNICODE is not defined CORE-9258 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 20 09:22:55 2015 New Revision: 68201 URL: http://svn.reactos.org/svn/reactos?rev=68201&view=rev Log: [ATL] - Fix compilation when UNICODE is not defined CORE-9258 #resolve Modified: trunk/reactos/lib/atl/atlbase.h trunk/reactos/lib/atl/statreg.h Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=6820… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sat Jun 20 09:22:55 2015 @@ -350,17 +350,25 @@ HRESULT WINAPI UpdateRegistryFromResource(LPCTSTR lpszRes, BOOL bRegister, struct _ATL_REGMAP_ENTRY *pMapEntries = NULL) { CRegObject registrar; - TCHAR modulePath[MAX_PATH]; + WCHAR modulePath[MAX_PATH]; HRESULT hResult; + PCWSTR lpwszRes; hResult = CommonInitRegistrar(registrar, modulePath, sizeof(modulePath) / sizeof(modulePath[0]), pMapEntries); if (FAILED(hResult)) return hResult; - +#ifdef UNICODE + lpwszRes = lpszRes; +#else + /* FIXME: this is a bit of a hack, need to re-evaluate */ + WCHAR resid[MAX_PATH]; + MultiByteToWideChar(CP_ACP, 0, lpszRes, -1, resid, MAX_PATH); + lpwszRes = resid; +#endif if (bRegister != FALSE) - hResult = registrar.ResourceRegisterSz(modulePath, lpszRes, _T("REGISTRY")); + hResult = registrar.ResourceRegisterSz(modulePath, lpwszRes, L"REGISTRY"); else - hResult = registrar.ResourceUnregisterSz(modulePath, lpszRes, _T("REGISTRY")); + hResult = registrar.ResourceUnregisterSz(modulePath, lpwszRes, L"REGISTRY"); return hResult; } @@ -368,7 +376,7 @@ HRESULT WINAPI UpdateRegistryFromResource(UINT nResID, BOOL bRegister, struct _ATL_REGMAP_ENTRY *pMapEntries = NULL) { CRegObject registrar; - TCHAR modulePath[MAX_PATH]; + WCHAR modulePath[MAX_PATH]; HRESULT hResult; hResult = CommonInitRegistrar(registrar, modulePath, sizeof(modulePath) / sizeof(modulePath[0]), pMapEntries); @@ -376,22 +384,22 @@ return hResult; if (bRegister != FALSE) - hResult = registrar.ResourceRegister(modulePath, nResID, _T("REGISTRY")); + hResult = registrar.ResourceRegister(modulePath, nResID, L"REGISTRY"); else - hResult = registrar.ResourceUnregister(modulePath, nResID, _T("REGISTRY")); + hResult = registrar.ResourceUnregister(modulePath, nResID, L"REGISTRY"); return hResult; } private: - HRESULT CommonInitRegistrar(CRegObject &registrar, TCHAR *modulePath, DWORD modulePathCount, struct _ATL_REGMAP_ENTRY *pMapEntries) + HRESULT CommonInitRegistrar(CRegObject &registrar, WCHAR *modulePath, DWORD modulePathCount, struct _ATL_REGMAP_ENTRY *pMapEntries) { HINSTANCE hInstance; DWORD dwFLen; HRESULT hResult; hInstance = _AtlBaseModule.GetModuleInstance(); - dwFLen = GetModuleFileName(hInstance, modulePath, modulePathCount); + dwFLen = GetModuleFileNameW(hInstance, modulePath, modulePathCount); if (dwFLen == modulePathCount) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); else if (dwFLen == 0) @@ -413,11 +421,11 @@ if (FAILED(hResult)) return hResult; - hResult = registrar.AddReplacement(_T("Module"), modulePath); + hResult = registrar.AddReplacement(L"Module", modulePath); if (FAILED(hResult)) return hResult; - hResult = registrar.AddReplacement(_T("Module_Raw"), modulePath); + hResult = registrar.AddReplacement(L"Module_Raw", modulePath); if (FAILED(hResult)) return hResult; Modified: trunk/reactos/lib/atl/statreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/statreg.h?rev=6820… ============================================================================== --- trunk/reactos/lib/atl/statreg.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/statreg.h [iso-8859-1] Sat Jun 20 09:22:55 2015 @@ -194,7 +194,7 @@ } private: - inline LONG RegDeleteTreeX(HKEY parentKey, LPCTSTR subKeyName) + inline LONG RegDeleteTreeX(HKEY parentKey, LPCWSTR subKeyName) { wchar_t szBuffer[256]; DWORD dwSize; @@ -203,7 +203,7 @@ LONG lRes; ATLASSERT(parentKey != NULL); - lRes = RegOpenKeyEx(parentKey, subKeyName, 0, KEY_READ | KEY_WRITE, &childKey); + lRes = RegOpenKeyExW(parentKey, subKeyName, 0, KEY_READ | KEY_WRITE, &childKey); if (lRes != ERROR_SUCCESS) return lRes; @@ -216,7 +216,7 @@ dwSize = sizeof(szBuffer) / sizeof(szBuffer[0]); } RegCloseKey(childKey); - return RegDeleteKey(parentKey, subKeyName); + return RegDeleteKeyW(parentKey, subKeyName); } HRESULT strbuf_init(strbuf *buf) @@ -387,7 +387,7 @@ if (iter == iter2) { - hResult = strbuf_write(_T("%"), buf, 1); + hResult = strbuf_write(L"%", buf, 1); if (FAILED(hResult)) return hResult; } @@ -499,10 +499,10 @@ DO_DELETE } key_type = NORMAL; - static const wchar_t *wstrNoRemove = _T("NoRemove"); - static const wchar_t *wstrForceRemove = _T("ForceRemove"); - static const wchar_t *wstrDelete = _T("Delete"); - static const wchar_t *wstrval = _T("val"); + static const wchar_t *wstrNoRemove = L"NoRemove"; + static const wchar_t *wstrForceRemove = L"ForceRemove"; + static const wchar_t *wstrDelete = L"Delete"; + static const wchar_t *wstrval = L"val"; iter = *pstr; hkey = NULL; @@ -549,7 +549,7 @@ { if (key_type == FORCE_REMOVE) RegDeleteTreeX(parent_key, buf->str); - lres = RegCreateKey(parent_key, buf->str, &hkey); + lres = RegCreateKeyW(parent_key, buf->str, &hkey); if (lres != ERROR_SUCCESS) { hres = HRESULT_FROM_WIN32(lres); @@ -562,7 +562,7 @@ hres = strbuf_write(buf->str, &name, -1); if (FAILED(hres)) return hres; - lres = RegOpenKey(parent_key, buf->str, &hkey); + lres = RegOpenKeyW(parent_key, buf->str, &hkey); if (lres != ERROR_SUCCESS) { } @@ -587,7 +587,7 @@ hres = get_word(&iter, buf); if (FAILED(hres)) break; - lres = RegSetValueEx(hkey, name.len ? name.str : NULL, 0, REG_SZ, (PBYTE)buf->str, + lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_SZ, (PBYTE)buf->str, (lstrlenW(buf->str) + 1) * sizeof(WCHAR)); if (lres != ERROR_SUCCESS) hres = HRESULT_FROM_WIN32(lres); @@ -596,7 +596,7 @@ hres = get_word(&iter, buf); if (FAILED(hres)) break; - lres = RegSetValueEx(hkey, name.len ? name.str : NULL, 0, REG_EXPAND_SZ, (PBYTE)buf->str, + lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_EXPAND_SZ, (PBYTE)buf->str, (lstrlenW(buf->str) + 1) * sizeof(WCHAR)); if (lres != ERROR_SUCCESS) hres = HRESULT_FROM_WIN32(lres); @@ -612,7 +612,7 @@ dw = wcstoul(&buf->str[2], &end, 16); else dw = wcstol(&buf->str[0], &end, 10); - lres = RegSetValueEx(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); + lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if (lres != ERROR_SUCCESS) hres = HRESULT_FROM_WIN32(lres); break; @@ -631,7 +631,7 @@ count = count / 2; for (curIndex = 0; curIndex < count; curIndex++) ((BYTE*)buf->str)[curIndex] = (HexToBin(buf->str[curIndex * 2]) << 4) | HexToBin(buf->str[curIndex * 2 + 1]); - lres = RegSetValueEx(hkey, name.len ? name.str : NULL, 0, REG_BINARY, (PBYTE)buf->str, count); + lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_BINARY, (PBYTE)buf->str, count); if (lres != ERROR_SUCCESS) hres = HRESULT_FROM_WIN32(lres); break; @@ -669,7 +669,7 @@ if (!do_register && (key_type == NORMAL || key_type == FORCE_REMOVE)) { - RegDeleteKey(parent_key, name.str); + RegDeleteKeyW(parent_key, name.str); } if (hkey && key_type != IS_VAL) @@ -699,20 +699,20 @@ const wchar_t *name; HKEY key; } root_keys[] = { - {_T("HKEY_CLASSES_ROOT"), HKEY_CLASSES_ROOT}, - {_T("HKEY_CURRENT_USER"), HKEY_CURRENT_USER}, - {_T("HKEY_LOCAL_MACHINE"), HKEY_LOCAL_MACHINE}, - {_T("HKEY_USERS"), HKEY_USERS}, - {_T("HKEY_PERFORMANCE_DATA"), HKEY_PERFORMANCE_DATA}, - {_T("HKEY_DYN_DATA"), HKEY_DYN_DATA}, - {_T("HKEY_CURRENT_CONFIG"), HKEY_CURRENT_CONFIG}, - {_T("HKCR"), HKEY_CLASSES_ROOT}, - {_T("HKCU"), HKEY_CURRENT_USER}, - {_T("HKLM"), HKEY_LOCAL_MACHINE}, - {_T("HKU"), HKEY_USERS}, - {_T("HKPD"), HKEY_PERFORMANCE_DATA}, - {_T("HKDD"), HKEY_DYN_DATA}, - {_T("HKCC"), HKEY_CURRENT_CONFIG}, + {L"HKEY_CLASSES_ROOT", HKEY_CLASSES_ROOT}, + {L"HKEY_CURRENT_USER", HKEY_CURRENT_USER}, + {L"HKEY_LOCAL_MACHINE", HKEY_LOCAL_MACHINE}, + {L"HKEY_USERS", HKEY_USERS}, + {L"HKEY_PERFORMANCE_DATA", HKEY_PERFORMANCE_DATA}, + {L"HKEY_DYN_DATA", HKEY_DYN_DATA}, + {L"HKEY_CURRENT_CONFIG", HKEY_CURRENT_CONFIG}, + {L"HKCR", HKEY_CLASSES_ROOT}, + {L"HKCU", HKEY_CURRENT_USER}, + {L"HKLM", HKEY_LOCAL_MACHINE}, + {L"HKU", HKEY_USERS}, + {L"HKPD", HKEY_PERFORMANCE_DATA}, + {L"HKDD", HKEY_DYN_DATA}, + {L"HKCC", HKEY_CURRENT_CONFIG}, }; iter = data;

9 years, 6 months

[tfaber] 68200: [SHELL32_APITEST] - Add a test showing that repeated calls to SHGetDesktopFolder return pointers to the same object, and that its CreateViewObject method instead creates new objects...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 20 09:07:29 2015 New Revision: 68200 URL: http://svn.reactos.org/svn/reactos?rev=68200&view=rev Log: [SHELL32_APITEST] - Add a test showing that repeated calls to SHGetDesktopFolder return pointers to the same object, and that its CreateViewObject method instead creates new objects. CORE-9839 Added: trunk/rostests/apitests/shell32/CShellDesktop.cpp (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/testlist.c Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Sat Jun 20 09:07:29 2015 @@ -1,7 +1,13 @@ set_cpp(WITH_RUNTIME) -add_executable(shell32_apitest menu.cpp testlist.c) + +include_directories(${REACTOS_SOURCE_DIR}/lib/atl) + +add_executable(shell32_apitest + CShellDesktop.cpp + menu.cpp + testlist.c) target_link_libraries(shell32_apitest wine uuid) set_module_type(shell32_apitest win32cui) -add_importlibs(shell32_apitest msvcrt kernel32 user32 gdi32 shell32 ole32 shlwapi) +add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 shlwapi msvcrt kernel32) add_cd_file(TARGET shell32_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/shell32/CShellDesktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellDe… ============================================================================== --- trunk/rostests/apitests/shell32/CShellDesktop.cpp (added) +++ trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] Sat Jun 20 09:07:29 2015 @@ -0,0 +1,86 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CShellDesktop + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "shelltest.h" +#include <atlbase.h> +#include <atlcom.h> +#include <strsafe.h> + +#define NDEBUG +#include <debug.h> +#include <shellutils.h> + +static +VOID +TestShellFolder( + _In_ IShellFolder2 *psf2) +{ + HRESULT hr; + CComPtr<IDropTarget> pdt; + CComPtr<IDropTarget> pdt_2; + CComPtr<IContextMenu> pcm; + CComPtr<IContextMenu> pcm_2; + CComPtr<IShellView> psv; + CComPtr<IShellView> psv_2; + + hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget, &pdt)); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget, &pdt_2)); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(pdt != pdt_2, "Expected %p != %p\n", static_cast<PVOID>(pdt), static_cast<PVOID>(pdt_2)); + + hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &pcm)); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &pcm_2)); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(pcm != pcm_2, "Expected %p != %p\n", static_cast<PVOID>(pcm), static_cast<PVOID>(pcm_2)); + + hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IShellView, &psv)); + ok(hr == S_OK, "hr = %lx\n", hr); + + hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IShellView, &psv_2)); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(psv != psv_2, "Expected %p != %p\n", static_cast<PVOID>(psv), static_cast<PVOID>(psv_2)); +} + +START_TEST(CShellDesktop) +{ + HRESULT hr; + CComPtr<IShellFolder2> psf2; + CComPtr<IShellFolder2> psf2_2; + CComPtr<IShellFolder> psf; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(CLSID_ShellDesktop, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellFolder2, &psf2)); + ok(hr == S_OK, "hr = %lx\n", hr); + if (FAILED(hr)) + { + skip("Could not instantiate CShellDesktop\n"); + return; + } + + /* second create should give us a pointer to the same object */ + hr = CoCreateInstance(CLSID_ShellDesktop, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IShellFolder2, &psf2_2)); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(psf2 == psf2_2, "Expected %p == %p\n", static_cast<PVOID>(psf2), static_cast<PVOID>(psf2_2)); + + /* SHGetDesktopFolder should also give us the same pointer */ + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "hr = %lx\n", hr); + ok(psf == static_cast<IShellFolder *>(psf2), "Expected %p == %p\n", static_cast<PVOID>(psf), static_cast<PVOID>(psf2)); + + TestShellFolder(psf2); +} Propchange: trunk/rostests/apitests/shell32/CShellDesktop.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Sat Jun 20 09:07:29 2015 @@ -3,11 +3,12 @@ #define STANDALONE #include <wine/test.h> +extern void func_CShellDesktop(void); extern void func_menu(void); const struct test winetest_testlist[] = { + { "CShellDesktop", func_CShellDesktop }, { "menu", func_menu }, - { 0, 0 } };

9 years, 6 months

[tfaber] 68199: [APITESTS] - Make CUnknownBase constructor parameters optional

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 20 08:51:07 2015 New Revision: 68199 URL: http://svn.reactos.org/svn/reactos?rev=68199&view=rev Log: [APITESTS] - Make CUnknownBase constructor parameters optional Modified: trunk/rostests/apitests/include/unknownbase.h Modified: trunk/rostests/apitests/include/unknownbase.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/unknownb… ============================================================================== --- trunk/rostests/apitests/include/unknownbase.h [iso-8859-1] (original) +++ trunk/rostests/apitests/include/unknownbase.h [iso-8859-1] Sat Jun 20 08:51:07 2015 @@ -10,7 +10,7 @@ virtual const QITAB* GetQITab() = 0; public: - CUnknownBase(bool autoDelete, LONG initialRef) + CUnknownBase(bool autoDelete = true, LONG initialRef = 0) : m_lRef(initialRef), m_AutoDelete(autoDelete) {

9 years, 6 months

[hbelusca] 68198: [ROSAPPS]: Merge the two existing CATs into one and improve it (see r66942, r66989 and r66990).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 19 22:38:34 2015 New Revision: 68198 URL: http://svn.reactos.org/svn/reactos?rev=68198&view=rev Log: [ROSAPPS]: Merge the two existing CATs into one and improve it (see r66942, r66989 and r66990). Added: trunk/rosapps/applications/cmdutils/cat/ - copied from r68197, trunk/rosapps/applications/sysutils/utils/cat/ trunk/rosapps/applications/cmdutils/cat/cat.c (contents, props changed) - copied, changed from r66988, trunk/reactos/tools/cat.c Removed: trunk/rosapps/applications/sysutils/tcat/ trunk/rosapps/applications/sysutils/utils/cat/ Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt trunk/rosapps/applications/cmdutils/cat/CMakeLists.txt trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/utils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Fri Jun 19 22:38:34 2015 @@ -1,4 +1,5 @@ add_subdirectory(appwiz) +add_subdirectory(cat) add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime) Modified: trunk/rosapps/applications/cmdutils/cat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cat/… ============================================================================== --- trunk/rosapps/applications/cmdutils/cat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/cat/CMakeLists.txt [iso-8859-1] Fri Jun 19 22:38:34 2015 @@ -1,5 +1,5 @@ add_executable(cat cat.c) set_module_type(cat win32cui) -add_importlibs(cat ntdll user32 msvcrt kernel32) +add_importlibs(cat msvcrt kernel32) add_cd_file(TARGET cat DESTINATION reactos/bin FOR all) Copied: trunk/rosapps/applications/cmdutils/cat/cat.c (from r66988, trunk/reactos/tools/cat.c) URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cat/… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/cat/cat.c [iso-8859-1] Fri Jun 19 22:38:34 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS conCATenation tool - * FILE: tools/cat.c + * FILE: cmdutils/cat/cat.c * PURPOSE: Concatenates STDIN or an arbitrary number of files to STDOUT * PROGRAMMERS: David Welch * Semyon Novikov (tappak) @@ -11,12 +11,15 @@ #include <stdio.h> #ifdef _WIN32 -#include <fcntl.h> +#include <string.h> // Required for _stricmp() +#include <fcntl.h> // Required for _setmode flags +#include <io.h> // Required for _setmode() #else +#include <strings.h> // Required for strcasecmp() #define O_TEXT 0x4000 #define O_BINARY 0x8000 -#define setmode(fd, mode) // This function is useless in *nix world. -#define stricmp strcasecmp +#define _setmode(fd, mode) // This function is useless in *nix world +#define _stricmp strcasecmp #endif #define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) @@ -40,10 +43,10 @@ if (argc >= 2) { - if (stricmp(argv[1], "-h" ) == 0 || - stricmp(argv[1], "--help") == 0 || - stricmp(argv[1], "/?" ) == 0 || - stricmp(argv[1], "/help" ) == 0) + if (_stricmp(argv[1], "-h" ) == 0 || + _stricmp(argv[1], "--help") == 0 || + _stricmp(argv[1], "/?" ) == 0 || + _stricmp(argv[1], "/help" ) == 0) { help(); return 0; @@ -51,7 +54,7 @@ } /* Set STDOUT to binary */ - setmode(fileno(stdout), O_BINARY); + _setmode(_fileno(stdout), O_BINARY); /* Special case where we run 'cat' without any argument: we use STDIN */ if (argc <= 1) @@ -59,7 +62,7 @@ unsigned int ch; /* Set STDIN to binary */ - setmode(fileno(stdin), O_BINARY); + _setmode(_fileno(stdin), O_BINARY); #if 0 // Version using feof() ch = fgetc(stdin); Propchange: trunk/rosapps/applications/cmdutils/cat/cat.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/cmdutils/cat/cat.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jun 19 22:38:34 2015 @@ -0,0 +1,22 @@ +/branches/GSoC_2011/GSoC_Network/tools/cat.c:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/tools/cat.c:51550 +/branches/GSoC_2011/TcpIpDriver/tools/cat.c:51551-53074,53076-53119 +/branches/GSoC_Network/tools/cat.c:51545-51546 +/branches/cmake-bringup/tools/cat.c:50484,50693,50719,51544-52564 +/branches/condrv_restructure/tools/cat.c:63104-65657 +/branches/header-work/tools/cat.c:45691-47721 +/branches/kd++/tools/cat.c:58883-58973 +/branches/kernel-fun/reactos/tools/cat.c:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm/tools/cat.c:59241-63176 +/branches/reactos-yarotows/tools/cat.c:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/tools/cat.c:49994-49995 +/branches/ros-amd64-bringup/reactos/tools/cat.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/tools/cat.c:36852 +/branches/ros-branch-0_3_15-lt2013/tools/cat.c:59059 +/branches/ros-csrss/tools/cat.c:57561-58762 +/branches/shell-experiments/tools/cat.c:61927-65494 +/branches/shell32_new-bringup/tools/cat.c:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/tools/cat.c:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/tools/cat.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk/tools/cat.c:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup/tools/cat.c:54809-54998 Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Fri Jun 19 22:38:34 2015 @@ -11,6 +11,5 @@ add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo) -add_subdirectory(tcat) add_subdirectory(tlist) add_subdirectory(utils) Modified: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] Fri Jun 19 22:38:34 2015 @@ -1,5 +1,4 @@ add_subdirectory(binpatch) -add_subdirectory(cat) add_subdirectory(driver) add_subdirectory(infinst) add_subdirectory(nts2w32err)

9 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015