Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[ekohl] 63897: [NTOSKRNL:CONFIG] CmShutdownSystem: Close all hive files after flushing the hives.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 16 08:56:48 2014 New Revision: 63897 URL: http://svn.reactos.org/svn/reactos?rev=63897&view=rev Log: [NTOSKRNL:CONFIG] CmShutdownSystem: Close all hive files after flushing the hives. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Aug 16 08:56:48 2014 @@ -2043,12 +2043,35 @@ NTAPI CmShutdownSystem(VOID) { + PLIST_ENTRY ListEntry; + PCMHIVE Hive; + ULONG i; + /* Kill the workers */ if (!CmFirstTime) CmpShutdownWorkers(); /* Flush all hives */ CmpLockRegistryExclusive(); CmpDoFlushAll(TRUE); + + /* Close all hive files */ + ListEntry = CmpHiveListHead.Flink; + while (ListEntry != &CmpHiveListHead) + { + Hive = CONTAINING_RECORD(ListEntry, CMHIVE, HiveList); + + for (i = 0; i < HFILE_TYPE_MAX; i++) + { + if (Hive->FileHandles[i] != NULL) + { + ZwClose(Hive->FileHandles[i]); + Hive->FileHandles[i] = NULL; + } + } + + ListEntry = ListEntry->Flink; + } + CmpUnlockRegistry(); }

10 years, 4 months

[hbelusca] 63896: [CONSOLE.CPL][CONSRV]: Font fix n°1: correctly use the font size (for TT fonts only, at the moment).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 15 20:00:47 2014 New Revision: 63896 URL: http://svn.reactos.org/svn/reactos?rev=63896&view=rev Log: [CONSOLE.CPL][CONSRV]: Font fix n°1: correctly use the font size (for TT fonts only, at the moment). Modified: branches/condrv_restructure/dll/cpl/console/font.c branches/condrv_restructure/dll/cpl/console/layout.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h Modified: branches/condrv_restructure/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/font.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/font.c [iso-8859-1] Fri Aug 15 20:00:47 2014 @@ -72,7 +72,7 @@ GuiData->CharWidth = Metrics.tmMaxCharWidth; GuiData->CharHeight = Metrics.tmHeight + Metrics.tmExternalLeading; - /* Measure real char width more precisely if possible. */ + /* Measure real char width more precisely if possible */ if (GetTextExtentPoint32W(drawItem->hDC, L"R", 1, &CharSize)) GuiData->CharWidth = CharSize.cx; } @@ -102,12 +102,9 @@ HWND hwndCombo = (HWND)lParam; LPWSTR pszName = lplf->lfFaceName; - BOOL fFixed; - BOOL fTrueType; - /* Record the font's attributes (Fixedwidth and Truetype) */ - fFixed = ((lplf->lfPitchAndFamily & 0x03) == FIXED_PITCH); - fTrueType = (lplf->lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE; + // BOOL fFixed = ((lplf->lfPitchAndFamily & 0x03) == FIXED_PITCH); + // BOOL fTrueType = (lplf->lfOutPrecision == OUT_STROKE_PRECIS); /* * According to: http://support.microsoft.com/kb/247815 @@ -158,7 +155,8 @@ /* Reject TrueType fonts that are not FF_MODERN */ if ((FontType == TRUETYPE_FONTTYPE) && ((lplf->lfPitchAndFamily & 0xF0) != FF_MODERN)) { - DPRINT1("TrueType font '%S' rejected because it's not FF_MODERN (lfPitchAndFamily = %d)\n", pszName, lplf->lfPitchAndFamily); + DPRINT1("TrueType font '%S' rejected because it's not FF_MODERN (lfPitchAndFamily = %d)\n", + pszName, lplf->lfPitchAndFamily); return TRUE; } @@ -166,14 +164,16 @@ #if 0 if ((FontType != TRUETYPE_FONTTYPE) && (lplf->lfCharSet != OEM_CHARSET)) { - DPRINT1("Non-TrueType font '%S' rejected because it's not OEM_CHARSET %d\n", pszName, lplf->lfCharSet); + DPRINT1("Non-TrueType font '%S' rejected because it's not OEM_CHARSET %d\n", + pszName, lplf->lfCharSet); return TRUE; } #else // Improved criterium if ((FontType != TRUETYPE_FONTTYPE) && ((lplf->lfCharSet != ANSI_CHARSET) && (lplf->lfCharSet != DEFAULT_CHARSET) && (lplf->lfCharSet != OEM_CHARSET))) { - DPRINT1("Non-TrueType font '%S' rejected because it's not ANSI_CHARSET or DEFAULT_CHARSET or OEM_CHARSET (lfCharSet = %d)\n", pszName, lplf->lfCharSet); + DPRINT1("Non-TrueType font '%S' rejected because it's not ANSI_CHARSET or DEFAULT_CHARSET or OEM_CHARSET (lfCharSet = %d)\n", + pszName, lplf->lfCharSet); return TRUE; } #endif @@ -205,7 +205,8 @@ DPRINT1("Add font '%S' (lfPitchAndFamily = %d)\n", pszName, lplf->lfPitchAndFamily); /* Store this information in the list-item's userdata area */ - SendMessageW(hwndCombo, LB_SETITEMDATA, idx, MAKEWPARAM(fFixed, fTrueType)); + // SendMessageW(hwndCombo, LB_SETITEMDATA, idx, MAKEWPARAM(fFixed, fTrueType)); + SendMessageW(hwndCombo, LB_SETITEMDATA, idx, (WPARAM)FontType); } return TRUE; @@ -247,7 +248,7 @@ } else { - int i; + ULONG i; for (i = 0; i < sizeof(TrueTypePoints) / sizeof(TrueTypePoints[0]); ++i) { swprintf(FontSize, L"%2d", TrueTypePoints[i]); @@ -271,7 +272,6 @@ return FALSE; } } - static VOID Modified: branches/condrv_restructure/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/layout.c [iso-8859-1] Fri Aug 15 20:00:47 2014 @@ -107,6 +107,8 @@ HBRUSH hBrush; HFONT Font, OldFont; + COORD FontSize = GuiInfo->FontSize; + if (TextMode == Screen) CurrentAttrib = pConInfo->ci.ScreenAttrib; else if (TextMode == Popup) @@ -120,8 +122,11 @@ hBrush = CreateSolidBrush(nbkColor); if (!hBrush) return FALSE; - Font = CreateFontW(GuiInfo->FontSize.Y, - GuiInfo->FontSize.X, + FontSize.Y = FontSize.Y > 0 ? -MulDiv(FontSize.Y, GetDeviceCaps(drawItem->hDC, LOGPIXELSY), 72) + : FontSize.Y; + + Font = CreateFontW(FontSize.Y, + FontSize.X, 0, TA_BASELINE, GuiInfo->FontWeight, @@ -131,7 +136,7 @@ OEM_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, // NONANTIALIASED_QUALITY ; ANTIALIASED_QUALITY + DEFAULT_QUALITY, FIXED_PITCH | GuiInfo->FontFamily, GuiInfo->FaceName); if (Font == NULL) @@ -154,7 +159,7 @@ DrawTextW(drawItem->hDC, szPreviewText, wcslen(szPreviewText), &drawItem->rcItem, 0); SetTextColor(drawItem->hDC, ptColor); SetBkColor(drawItem->hDC, pbkColor); - DeleteObject((HGDIOBJ)hBrush); + DeleteObject(hBrush); SelectObject(drawItem->hDC, OldFont); DeleteObject(Font); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri Aug 15 20:00:47 2014 @@ -539,9 +539,14 @@ TEXTMETRICW Metrics; SIZE CharSize; + hDC = GetDC(GuiData->hWindow); + /* * Initialize a new NORMAL font and get its metrics. */ + + FontSize.Y = FontSize.Y > 0 ? -MulDiv(FontSize.Y, GetDeviceCaps(hDC, LOGPIXELSY), 72) + : FontSize.Y; NewFont = CreateFontW(FontSize.Y, FontSize.X, @@ -554,20 +559,13 @@ OEM_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, // NONANTIALIASED_QUALITY ; ANTIALIASED_QUALITY + DEFAULT_QUALITY, FIXED_PITCH | FontFamily, FaceName); if (NewFont == NULL) { DPRINT1("InitFonts: CreateFontW failed\n"); - return FALSE; - } - - hDC = GetDC(GuiData->hWindow); - if (hDC == NULL) - { - DPRINT1("InitFonts: GetDC failed\n"); - DeleteObject(NewFont); + ReleaseDC(GuiData->hWindow, hDC); return FALSE; } @@ -591,7 +589,7 @@ GuiData->CharWidth = Metrics.tmMaxCharWidth; GuiData->CharHeight = Metrics.tmHeight + Metrics.tmExternalLeading; - /* Measure real char width more precisely if possible. */ + /* Measure real char width more precisely if possible */ if (GetTextExtentPoint32W(hDC, L"R", 1, &CharSize)) GuiData->CharWidth = CharSize.cx; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Fri Aug 15 20:00:47 2014 @@ -76,7 +76,7 @@ COLORREF ColorTable[16]; ULONG CodePage; - HWND HWnd; + HWND hWnd; WCHAR ConsoleTitle[256]; } CONSOLE_STATE_INFO, *PCONSOLE_STATE_INFO;

10 years, 4 months

[tfaber] 63895: [APPWIZ] - Download Gecko from a URL that does not force HTTPS. CORE-8396

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Aug 15 12:34:12 2014 New Revision: 63895 URL: http://svn.reactos.org/svn/reactos?rev=63895&view=rev Log: [APPWIZ] - Download Gecko from a URL that does not force HTTPS. CORE-8396 Modified: trunk/reactos/dll/cpl/appwiz/addons.c Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] Fri Aug 15 12:34:12 2014 @@ -60,7 +60,7 @@ static HWND install_dialog = NULL; -static WCHAR GeckoUrl[] = L"http://dl.dropboxusercontent.com/u/743491/ReactOS/wine_gecko-2.24-x86.msi"; +static WCHAR GeckoUrl[] = L"http://svn.reactos.org/amine/wine_gecko-2.24-x86.msi"; /* SHA definitions are copied from advapi32. They aren't available in headers. */

10 years, 4 months

[dgorbachev] 63894: Fix build.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Aug 15 11:17:16 2014 New Revision: 63894 URL: http://svn.reactos.org/svn/reactos?rev=63894&view=rev Log: Fix build. Modified: trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=63… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Fri Aug 15 11:17:16 2014 @@ -46,7 +46,7 @@ set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) -set(CMAKE_AR ${MINGW_TOOLCHAIN_PREFIX}gcc-ar${MINGW_TOOLCHAIN_SUFFIX}) +#set(CMAKE_AR ${MINGW_TOOLCHAIN_PREFIX}gcc-ar${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})

10 years, 4 months

[dgorbachev] 63893: [CMAKE] Thin & Slim link-time optimization (requires up-to-date binutils).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Aug 15 11:12:09 2014 New Revision: 63893 URL: http://svn.reactos.org/svn/reactos?rev=63893&view=rev Log: [CMAKE] Thin & Slim link-time optimization (requires up-to-date binutils). Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=63893&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Fri Aug 15 11:12:09 2014 @@ -115,7 +115,7 @@ # Link-time code generation if(LTCG) - add_compile_flags("-flto -ffat-lto-objects") + add_compile_flags("-flto -fno-fat-lto-objects") endif() if(ARCH STREQUAL "i386") Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=63… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Fri Aug 15 11:12:09 2014 @@ -46,12 +46,9 @@ set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) +set(CMAKE_AR ${MINGW_TOOLCHAIN_PREFIX}gcc-ar${MINGW_TOOLCHAIN_SUFFIX}) -if(NOT LTCG) - set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") -else() - set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") -endif() +set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})

10 years, 4 months

[dquintana] 63892: [SHELL32] * Remove an obsolete hack that would only cause leaks now.

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Aug 15 10:59:23 2014 New Revision: 63892 URL: http://svn.reactos.org/svn/reactos?rev=63892&view=rev Log: [SHELL32] * Remove an obsolete hack that would only cause leaks now. Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Fri Aug 15 10:59:23 2014 @@ -1684,21 +1684,13 @@ const HKEY *ahkeyClsKeys, IContextMenu **ppcm) { - // FIXME: This needs to be freed somewhere (like in the destructor of the context menu) - LPCITEMIDLIST *apidl2 = (LPCITEMIDLIST *) SHAlloc(sizeof(LPCITEMIDLIST) * cidl); - - for (int i = 0; i < (int)cidl; i++) - { - apidl2[i] = apidl[i]; - } - DEFCONTEXTMENU pdcm; pdcm.hwnd = hwnd; pdcm.pcmcb = NULL; pdcm.pidlFolder = pidlFolder; pdcm.psf = psf; pdcm.cidl = cidl; - pdcm.apidl = apidl2; + pdcm.apidl = apidl; pdcm.punkAssociationInfo = NULL; pdcm.cKeys = nKeys; pdcm.aKeys = ahkeyClsKeys;

10 years, 4 months

[dquintana] 63891: [STOBJECT] * Turn some debug prints to traces. * New resources by Robert Naumann, for future use.

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Aug 15 10:49:04 2014 New Revision: 63891 URL: http://svn.reactos.org/svn/reactos?rev=63891&view=rev Log: [STOBJECT] * Turn some debug prints to traces. * New resources by Robert Naumann, for future use. Modified: branches/shell-experiments/dll/shellext/stobject/csystray.cpp branches/shell-experiments/dll/shellext/stobject/lang/de-DE.rc branches/shell-experiments/dll/shellext/stobject/lang/en-US.rc branches/shell-experiments/dll/shellext/stobject/resource.h branches/shell-experiments/dll/shellext/stobject/volume.cpp Modified: branches/shell-experiments/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/csystray.cpp [iso-8859-1] Fri Aug 15 10:49:04 2014 @@ -133,7 +133,7 @@ HRESULT CSysTray::CreateSysTrayThread() { - DbgPrint("CSysTray Init TODO: Initialize tray icon handlers.\n"); + TRACE("CSysTray Init TODO: Initialize tray icon handlers.\n"); HANDLE hThread = CreateThread(NULL, 0, s_SysTrayThreadProc, this, 0, NULL); @@ -192,7 +192,7 @@ return TRUE; } - DbgPrint("SysTray message received %u (%08p %08p)\n", uMsg, wParam, lParam); + TRACE("SysTray message received %u (%08p %08p)\n", uMsg, wParam, lParam); hr = ProcessIconMessage(uMsg, wParam, lParam); if (FAILED(hr)) Modified: branches/shell-experiments/dll/shellext/stobject/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] Fri Aug 15 10:49:04 2014 @@ -1,2 +1,51 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Energieanzeige" +FONT 8, "Ms Shell Dlg" +BEGIN + CONTROL "Energiestand", 1001, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "Symbol in der &Taskleiste anzeigen", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 123, 10 + CONTROL "&Details fÃ¼r jede Batterie anzeigen", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 129, 6, 123, 10 + CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "&Energieverwaltungseigenschaften einstellen" + IDS_PWR_METER "Batterieanzeige Ã¶&ffnen" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "%1!u!%% verbleibend" + IDS_PWR_CHARGING " (wird aufgeladen)" + IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" + IDS_PWR_AC "Mit Wechselstrom" + IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! Stunden (%3!u!%%) verbleibend" + IDS_PWR_MINUTES_REMAINING "%1!u! Min. (%2!u!%%) verbleibend" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "Hardware sicher entfernen" + IDS_HOTPLUG_REMOVE_2 "&Hardware sicher entfernen" + IDS_HOTPLUG_REMOVE_3 "%s entfernen" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - Laufwerk (%s)" + IDS_HOTPLUG_DRIVES " - Laufwerke (%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIERES "Diese Hardware erfordert \"Sicheres Entfernen\"" + IDS_HOTPLUG_CLICK "Klicken Sie auf dieses Symbol, und wÃ¤hlen Sie die zu entfernende Hardware, bevor Sie diese Hardware entfernen." + + //Volume related strings + IDS_VOL_VOLUME "LautstÃ¤rke" + IDS_VOL_ADJUST "&Audioeigenschaften einstellen" + IDS_VOL_OPEN "&LautstÃ¤rkeregelung Ã¶ffnen" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "LautstÃ¤rke (ausgeschaltet)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "Einrastfunktion" + IDS_KEYS_MOUSE "Tastaturmaus" + IDS_KEYS_FILTER "AnschlagverzÃ¶gerung" +END Modified: branches/shell-experiments/dll/shellext/stobject/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] Fri Aug 15 10:49:04 2014 @@ -1 +1,52 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Power Meter" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Power status", 1001, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "&Always show icon on the taskbar.", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "Show details for each &battery.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "&Adjust Power Properties" + IDS_PWR_METER "&Open Power Meter" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" + IDS_PWR_CHARGING " (charging)" + IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" + IDS_PWR_AC "On AC power" + IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" + IDS_PWR_MINUTES_REMAINING "%1!u! min (%2!u!%%) remaining" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "Safely Remove Hardware" + IDS_HOTPLUG_REMOVE_2 "&Safely Remove Hardware" + IDS_HOTPLUG_REMOVE_3 "Safely remove %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - Drive(%s)" + IDS_HOTPLUG_DRIVES " - Drives(%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIERES "This hardware requires \"Safe Removal\"" + IDS_HOTPLUG_CLICK "Before removing this hardware, click on this icon and select the hardware you want to remove." + + //Volume related strings + IDS_VOL_VOLUME "Volume" + IDS_VOL_ADJUST "&Adjust Audio Properties" + IDS_VOL_OPEN "&Open Volume Control" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "Volume (muted)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "StickyKeys" + IDS_KEYS_MOUSE "MouseKeys" + IDS_KEYS_FILTER "FilterKeys" +END + Modified: branches/shell-experiments/dll/shellext/stobject/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/resource.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/resource.h [iso-8859-1] Fri Aug 15 10:49:04 2014 @@ -1,8 +1,42 @@ #pragma once -#define IDI_BATTERY 200 -#define IDI_EXTRACT 210 -#define IDI_VOLUME 230 -#define IDI_VOLMUTE 231 +#define IDD_POWER_METER 100 -#define IDR_SYSTRAY 11001 +#define IDS_PWR_PROPERTIES 152 +#define IDS_PWR_METER 153 +#define IDS_PWR_RUN 157 +#define IDS_PWR_PERCENT_REMAINING 158 +#define IDS_PWR_CHARGING 159 +#define IDS_PWR_UNKNOWN_REMAINING 160 +#define IDS_PWR_AC 161 +#define IDS_PWR_HOURS_REMAINING 162 +#define IDS_PWR_MINUTES_REMAINING 163 + +#define IDI_BATTERY 200 +#define IDI_EXTRACT 210 + +#define IDS_HOTPLUG_REMOVE_1 211 +#define IDS_HOTPLUG_REMOVE_2 215 +#define IDS_HOTPLUG_REMOVE_3 216 +#define IDS_HOTPLUG_RUN 217 +#define IDS_HOTPLUG_COMMA 218 +#define IDS_HOTPLUG_DRIVE 219 +#define IDS_HOTPLUG_DRIVES 220 +#define IDS_HOTPLUG_A 221 +#define IDS_HOTPLUG_REQUIERES 222 +#define IDS_HOTPLUG_CLICK 223 + +#define IDI_VOLUME 230 +#define IDI_VOLMUTE 231 + +#define IDS_VOL_VOLUME 252 +#define IDS_VOL_ADJUST 255 +#define IDS_VOL_OPEN 256 +#define IDS_VOL_RUN 257 +#define IDS_VOL_MUTED 258 + +#define IDS_KEYS_STICKY 330 +#define IDS_KEYS_MOUSE 331 +#define IDS_KEYS_FILTER 332 + +#define IDR_SYSTRAY 11001 Modified: branches/shell-experiments/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/volume.cpp [iso-8859-1] Fri Aug 15 10:49:04 2014 @@ -32,7 +32,7 @@ DWORD waveOutId = 0; DWORD param2 = 0; - DbgPrint("Volume_FindDefaultMixerID\n"); + TRACE("Volume_FindDefaultMixerID\n"); result = waveOutMessage((HWAVEOUT) WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR) &waveOutId, (DWORD_PTR) &param2); if (result) @@ -40,19 +40,19 @@ if (waveOutId == (DWORD)-1) { - DbgPrint("WARNING: waveOut has no default device, trying with first available device...\n", waveOutId); + TRACE("WARNING: waveOut has no default device, trying with first available device...\n", waveOutId); mixerId = 0; } else { - DbgPrint("waveOut default device is %d\n", waveOutId); + TRACE("waveOut default device is %d\n", waveOutId); result = mixerGetID((HMIXEROBJ) waveOutId, &mixerId, MIXER_OBJECTF_WAVEOUT); if (result) return E_FAIL; - DbgPrint("mixerId for waveOut default device is %d\n", mixerId); + TRACE("mixerId for waveOut default device is %d\n", mixerId); } g_mixerId = mixerId; @@ -72,7 +72,7 @@ if (mixerCaps.cDestinations == 0) return S_FALSE; - DbgPrint("mixerCaps.cDestinations %d\n", mixerCaps.cDestinations); + TRACE("mixerCaps.cDestinations %d\n", mixerCaps.cDestinations); DWORD idx; for (idx = 0; idx < mixerCaps.cDestinations; idx++) @@ -84,14 +84,14 @@ if (mixerLine.dwComponentType >= MIXERLINE_COMPONENTTYPE_DST_SPEAKERS && mixerLine.dwComponentType <= MIXERLINE_COMPONENTTYPE_DST_HEADPHONES) break; - DbgPrint("Destination %d was not speakers or headphones.\n"); + TRACE("Destination %d was not speakers or headphones.\n"); } } if (idx >= mixerCaps.cDestinations) return E_FAIL; - DbgPrint("Valid destination %d found.\n"); + TRACE("Valid destination %d found.\n"); g_mixerLineID = mixerLine.dwLineID; @@ -105,7 +105,7 @@ if (mixerGetLineControlsW((HMIXEROBJ) g_mixerId, &mixerLineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE)) return E_FAIL; - DbgPrint("Found control id %d for mute: %d\n", mixerControl.dwControlID); + TRACE("Found control id %d for mute: %d\n", mixerControl.dwControlID); g_muteControlID = mixerControl.dwControlID; @@ -128,7 +128,7 @@ if (mixerGetControlDetailsW((HMIXEROBJ) g_mixerId, &mixerControlDetails, 0)) return E_FAIL; - DbgPrint("Obtained mute status %d\n", detailsResult); + TRACE("Obtained mute status %d\n", detailsResult); g_IsMute = detailsResult != 0; } @@ -140,7 +140,7 @@ { HRESULT hr; - DbgPrint("Volume_Init\n"); + TRACE("Volume_Init\n"); if (!g_hMixer) { @@ -168,7 +168,7 @@ HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray) { - DbgPrint("Volume_Update\n"); + TRACE("Volume_Update\n"); Volume_IsMute(); @@ -183,7 +183,7 @@ HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray) { - DbgPrint("Volume_Shutdown\n"); + TRACE("Volume_Shutdown\n"); return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_VOLUME, NULL, NULL); } @@ -201,9 +201,9 @@ if (uMsg != ID_ICON_VOLUME) return S_FALSE; - DbgPrint("Volume_Message\n"); - - DbgPrint("Calling update...\n"); + TRACE("Volume_Message\n"); + + TRACE("Calling update...\n"); Volume_Update(pSysTray); switch (lParam) @@ -211,7 +211,7 @@ case WM_LBUTTONDOWN: break; case WM_LBUTTONUP: - DbgPrint("TODO: display volume slider\n"); + TRACE("TODO: display volume slider\n"); break; case WM_LBUTTONDBLCLK: // FIXME: ensure we are loading the right one

10 years, 4 months

[tfaber] 63890: [SHELL32] - ACTUALLY fix ITEMIDLIST typing in IShellFolder/IShellFolder2 implementations CORE-8441

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Aug 15 10:38:11 2014 New Revision: 63890 URL: http://svn.reactos.org/svn/reactos?rev=63890&view=rev Log: [SHELL32] - ACTUALLY fix ITEMIDLIST typing in IShellFolder/IShellFolder2 implementations CORE-8441 Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp trunk/reactos/dll/win32/shell32/folders/admintools.h trunk/reactos/dll/win32/shell32/folders/cpanel.cpp trunk/reactos/dll/win32/shell32/folders/cpanel.h trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h trunk/reactos/dll/win32/shell32/folders/fonts.cpp trunk/reactos/dll/win32/shell32/folders/fonts.h trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/folders/mycomp.cpp trunk/reactos/dll/win32/shell32/folders/mycomp.h trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp trunk/reactos/dll/win32/shell32/folders/mydocuments.h trunk/reactos/dll/win32/shell32/folders/netplaces.cpp trunk/reactos/dll/win32/shell32/folders/netplaces.h trunk/reactos/dll/win32/shell32/folders/printers.cpp trunk/reactos/dll/win32/shell32/folders/printers.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.h Modified: trunk/reactos/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -116,7 +116,7 @@ * */ HRESULT WINAPI CAdminToolsFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, - DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) + DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), @@ -167,7 +167,7 @@ /************************************************************************** * CAdminToolsFolder::BindToObject */ -HRESULT WINAPI CAdminToolsFolder::BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CAdminToolsFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -178,7 +178,7 @@ /************************************************************************** * CAdminToolsFolder::BindToStorage */ -HRESULT WINAPI CAdminToolsFolder::BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CAdminToolsFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -190,7 +190,7 @@ /************************************************************************** * CAdminToolsFolder::CompareIDs */ -HRESULT WINAPI CAdminToolsFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CAdminToolsFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -234,7 +234,7 @@ /************************************************************************** * ISF_AdminTools_fnGetAttributesOf */ -HRESULT WINAPI CAdminToolsFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut) +HRESULT WINAPI CAdminToolsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { HRESULT hr = S_OK; static const DWORD dwAdminToolsAttributes = @@ -286,7 +286,7 @@ * LPVOID* ppvObject) //[out] Resulting Interface * */ -HRESULT WINAPI CAdminToolsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CAdminToolsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { LPITEMIDLIST pidl; @@ -349,7 +349,7 @@ * CAdminToolsFolder::GetDisplayNameOf * */ -HRESULT WINAPI CAdminToolsFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CAdminToolsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { HRESULT hr = S_OK; LPWSTR pszPath, pOffset; @@ -451,8 +451,8 @@ * DWORD dwFlags, //[in ] SHGNO formatting flags * LPITEMIDLIST* ppidlOut) //[out] simple pidl returned */ -HRESULT WINAPI CAdminToolsFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, /* simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +HRESULT WINAPI CAdminToolsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", this, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); @@ -490,14 +490,14 @@ } -HRESULT WINAPI CAdminToolsFolder::GetDetailsEx (LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CAdminToolsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME ("(%p): stub\n", this); return E_NOTIMPL; } -HRESULT WINAPI CAdminToolsFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CAdminToolsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; Modified: trunk/reactos/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/admintools.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/admintools.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -41,24 +41,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -312,7 +312,7 @@ LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, - LPITEMIDLIST *ppidl, + PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { WCHAR szElement[MAX_PATH]; @@ -408,7 +408,7 @@ * CControlPanelFolder::BindToObject */ HRESULT WINAPI CControlPanelFolder::BindToObject( - LPCITEMIDLIST pidl, + PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -422,7 +422,7 @@ * CControlPanelFolder::BindToStorage */ HRESULT WINAPI CControlPanelFolder::BindToStorage( - LPCITEMIDLIST pidl, + PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -437,7 +437,7 @@ * CControlPanelFolder::CompareIDs */ -HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -480,7 +480,7 @@ /************************************************************************** * CControlPanelFolder::GetAttributesOf */ -HRESULT WINAPI CControlPanelFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +HRESULT WINAPI CControlPanelFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; @@ -522,7 +522,7 @@ * */ HRESULT WINAPI CControlPanelFolder::GetUIObjectOf(HWND hwndOwner, - UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) + UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { LPITEMIDLIST pidl; IUnknown *pObj = NULL; @@ -576,7 +576,7 @@ /************************************************************************** * CControlPanelFolder::GetDisplayNameOf */ -HRESULT WINAPI CControlPanelFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CControlPanelFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { CHAR szName[MAX_PATH]; WCHAR wszName[MAX_PATH+1]; /* +1 for potential backslash */ @@ -656,8 +656,8 @@ * DWORD dwFlags, //[in ] SHGNO formatting flags * LPITEMIDLIST* ppidlOut) //[out] simple pidl returned */ -HRESULT WINAPI CControlPanelFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +HRESULT WINAPI CControlPanelFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /*simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { FIXME("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut); return E_FAIL; @@ -693,13 +693,13 @@ return S_OK; } -HRESULT WINAPI CControlPanelFolder::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CControlPanelFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME("(%p)\n", this); return E_NOTIMPL; } -HRESULT WINAPI CControlPanelFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { HRESULT hr; Modified: trunk/reactos/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/cpanel.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/cpanel.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -46,24 +46,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -300,7 +300,7 @@ LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, - LPITEMIDLIST *ppidl, + PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { WCHAR szElement[MAX_PATH]; @@ -462,7 +462,7 @@ * CDesktopFolder::BindToObject */ HRESULT WINAPI CDesktopFolder::BindToObject( - LPCITEMIDLIST pidl, + PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -477,7 +477,7 @@ * CDesktopFolder::BindToStorage */ HRESULT WINAPI CDesktopFolder::BindToStorage( - LPCITEMIDLIST pidl, + PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -492,7 +492,7 @@ /************************************************************************** * CDesktopFolder::CompareIDs */ -HRESULT WINAPI CDesktopFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CDesktopFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -545,7 +545,7 @@ */ HRESULT WINAPI CDesktopFolder::GetAttributesOf( UINT cidl, - LPCITEMIDLIST *apidl, + PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { HRESULT hr = S_OK; @@ -609,7 +609,7 @@ HRESULT WINAPI CDesktopFolder::GetUIObjectOf( HWND hwndOwner, UINT cidl, - LPCITEMIDLIST *apidl, + PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *prgfInOut, LPVOID *ppvOut) @@ -679,7 +679,7 @@ * NOTES * special case: pidl = null gives desktop-name back */ -HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CDesktopFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { HRESULT hr = S_OK; LPWSTR pszPath; @@ -854,10 +854,10 @@ */ HRESULT WINAPI CDesktopFolder::SetNameOf( HWND hwndOwner, - LPCITEMIDLIST pidl, /* simple pidl */ + PCUITEMID_CHILD pidl, /* simple pidl */ LPCOLESTR lpName, DWORD dwFlags, - LPITEMIDLIST *pPidlOut) + PITEMID_CHILD *pPidlOut) { CComPtr<IShellFolder2> psf; HRESULT hr; @@ -963,7 +963,7 @@ } HRESULT WINAPI CDesktopFolder::GetDetailsEx( - LPCITEMIDLIST pidl, + PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { @@ -973,7 +973,7 @@ } HRESULT WINAPI CDesktopFolder::GetDetailsOf( - LPCITEMIDLIST pidl, + PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -48,24 +48,24 @@ HRESULT WINAPI FinalConstruct(); // *** IShellFolder methods *** - virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); // *** IShellFolder2 methods *** virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // *** IPersist methods *** Modified: trunk/reactos/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -198,7 +198,7 @@ LPBC pbcReserved, LPOLESTR lpszDisplayName, DWORD *pchEaten, - LPITEMIDLIST *ppidl, + PIDLIST_RELATIVE *ppidl, DWORD * pdwAttributes) { HRESULT hr = E_UNEXPECTED; @@ -252,7 +252,7 @@ /************************************************************************** * CFontsFolder::BindToObject */ -HRESULT WINAPI CFontsFolder::BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CFontsFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -263,7 +263,7 @@ /************************************************************************** * CFontsFolder::BindToStorage */ -HRESULT WINAPI CFontsFolder::BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CFontsFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -276,7 +276,7 @@ * CFontsFolder::CompareIDs */ -HRESULT WINAPI CFontsFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CFontsFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -325,7 +325,7 @@ /************************************************************************** * CFontsFolder::GetAttributesOf */ -HRESULT WINAPI CFontsFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut) +HRESULT WINAPI CFontsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { HRESULT hr = S_OK; @@ -381,7 +381,7 @@ */ HRESULT WINAPI CFontsFolder::GetUIObjectOf( HWND hwndOwner, - UINT cidl, LPCITEMIDLIST *apidl, + UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *prgfInOut, LPVOID *ppvOut) { LPITEMIDLIST pidl; @@ -439,7 +439,7 @@ * CFontsFolder::GetDisplayNameOf * */ -HRESULT WINAPI CFontsFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CFontsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { PIDLFontStruct *pFont; @@ -497,8 +497,8 @@ * dwFlags [in] SHGNO formatting flags * ppidlOut [out] simple pidl returned */ -HRESULT WINAPI CFontsFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +HRESULT WINAPI CFontsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /*simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); @@ -539,13 +539,13 @@ return S_OK; } -HRESULT WINAPI CFontsFolder::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CFontsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME ("(%p)\n", this); return E_NOTIMPL; } -HRESULT WINAPI CFontsFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CFontsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; Modified: trunk/reactos/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fonts.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fonts.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -39,24 +39,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -171,7 +171,7 @@ HRESULT WINAPI CFSFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, - DWORD *pchEaten, LPITEMIDLIST *ppidl, + DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { HRESULT hr = E_INVALIDARG; @@ -297,7 +297,7 @@ * LPVOID* ppvObject //[out] Interface* */ HRESULT WINAPI CFSFolder::BindToObject( - LPCITEMIDLIST pidl, + PCUIDLIST_RELATIVE pidl, LPBC pbc, REFIID riid, LPVOID * ppvOut) @@ -317,7 +317,7 @@ * LPVOID* ppvObject //[out] Interface* returned */ HRESULT WINAPI CFSFolder::BindToStorage( - LPCITEMIDLIST pidl, + PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -334,7 +334,8 @@ */ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam, - LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) + PCUIDLIST_RELATIVE pidl1, + PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -391,7 +392,7 @@ * */ HRESULT WINAPI CFSFolder::GetAttributesOf(UINT cidl, - LPCITEMIDLIST * apidl, DWORD * rgfInOut) + PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; @@ -460,8 +461,9 @@ * needs the positions. */ HRESULT WINAPI CFSFolder::GetUIObjectOf(HWND hwndOwner, - UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, - UINT * prgfInOut, LPVOID * ppvOut) + UINT cidl, PCUITEMID_CHILD_ARRAY apidl, + REFIID riid, UINT * prgfInOut, + LPVOID * ppvOut) { LPITEMIDLIST pidl; IUnknown *pObj = NULL; @@ -597,7 +599,7 @@ * if the name is in the pidl the ret value should be a STRRET_OFFSET */ -HRESULT WINAPI CFSFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, +HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { LPWSTR pszPath; @@ -677,10 +679,10 @@ */ HRESULT WINAPI CFSFolder::SetNameOf( HWND hwndOwner, - LPCITEMIDLIST pidl, + PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, - LPITEMIDLIST * pPidlOut) + PITEMID_CHILD *pPidlOut) { WCHAR szSrc[MAX_PATH + 1], szDest[MAX_PATH + 1]; LPWSTR ptr; @@ -778,7 +780,7 @@ return S_OK; } -HRESULT WINAPI CFSFolder::GetDetailsEx(LPCITEMIDLIST pidl, +HRESULT WINAPI CFSFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID * pscid, VARIANT * pv) { FIXME ("(%p)\n", this); @@ -786,7 +788,7 @@ return E_NOTIMPL; } -HRESULT WINAPI CFSFolder::GetDetailsOf(LPCITEMIDLIST pidl, +HRESULT WINAPI CFSFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS * psd) { HRESULT hr = E_FAIL; Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -59,24 +59,24 @@ // IShellFolder - virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -193,7 +193,7 @@ * CDrivesFolder::ParseDisplayName */ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, - DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) + DWORD * pchEaten, PIDLIST_RELATIVE * ppidl, DWORD * pdwAttributes) { HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; @@ -287,7 +287,7 @@ /************************************************************************** * CDrivesFolder::BindToObject */ -HRESULT WINAPI CDrivesFolder::BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CDrivesFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid(&riid), ppvOut); @@ -298,7 +298,7 @@ /************************************************************************** * CDrivesFolder::BindToStorage */ -HRESULT WINAPI CDrivesFolder::BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CDrivesFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -311,7 +311,7 @@ * CDrivesFolder::CompareIDs */ -HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -363,7 +363,7 @@ /************************************************************************** * CDrivesFolder::GetAttributesOf */ -HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { static const DWORD dwComputerAttributes = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | @@ -422,7 +422,7 @@ * */ HRESULT WINAPI CDrivesFolder::GetUIObjectOf(HWND hwndOwner, - UINT cidl, LPCITEMIDLIST *apidl, + UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *prgfInOut, LPVOID *ppvOut) { LPITEMIDLIST pidl; @@ -486,7 +486,7 @@ /************************************************************************** * CDrivesFolder::GetDisplayNameOf */ -HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { LPWSTR pszPath; HRESULT hr = S_OK; @@ -682,8 +682,8 @@ * dwFlags [in] SHGNO formatting flags * ppidlOut [out] simple pidl returned */ -HRESULT WINAPI CDrivesFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut) +HRESULT WINAPI CDrivesFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { LPWSTR sName; HKEY hKey; @@ -766,14 +766,14 @@ return S_OK; } -HRESULT WINAPI CDrivesFolder::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +HRESULT WINAPI CDrivesFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID * pscid, VARIANT * pv) { FIXME ("(%p)\n", this); return E_NOTIMPL; } /* FIXME: drive size >4GB is rolling over */ -HRESULT WINAPI CDrivesFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { HRESULT hr; Modified: trunk/reactos/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mycomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mycomp.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -39,24 +39,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -126,8 +126,8 @@ return S_OK; } -HRESULT WINAPI CMyDocsFolder::ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, - DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +HRESULT WINAPI CMyDocsFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, + DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; @@ -245,7 +245,7 @@ /************************************************************************** * CMyDocsFolder::BindToObject */ -HRESULT WINAPI CMyDocsFolder::BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CMyDocsFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { TRACE("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -256,7 +256,7 @@ /************************************************************************** * CMyDocsFolder::BindToStorage */ -HRESULT WINAPI CMyDocsFolder::BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CMyDocsFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -268,7 +268,7 @@ /************************************************************************** * CMyDocsFolder::CompareIDs */ -HRESULT WINAPI CMyDocsFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CMyDocsFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -319,7 +319,7 @@ /************************************************************************** * CMyDocsFolder::GetAttributesOf */ -HRESULT WINAPI CMyDocsFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut) +HRESULT WINAPI CMyDocsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { HRESULT hr = S_OK; static const DWORD dwMyDocumentsAttributes = @@ -371,7 +371,7 @@ * LPVOID* ppvObject) //[out] Resulting Interface * */ -HRESULT WINAPI CMyDocsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CMyDocsFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { LPITEMIDLIST pidl; @@ -431,7 +431,7 @@ return hr; } -HRESULT WINAPI CMyDocsFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CMyDocsFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { HRESULT hr = S_OK; LPWSTR pszPath; @@ -571,8 +571,8 @@ return hr; } -HRESULT WINAPI CMyDocsFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, /* simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +HRESULT WINAPI CMyDocsFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); @@ -616,14 +616,14 @@ return S_OK; } -HRESULT WINAPI CMyDocsFolder::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CMyDocsFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME ("(%p)\n", this); return E_NOTIMPL; } -HRESULT WINAPI CMyDocsFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CMyDocsFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { HRESULT hr = S_OK; Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mydocuments.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mydocuments.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -40,24 +40,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf (UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/netplaces.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/netplaces.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -66,7 +66,7 @@ * CNetFolder::ParseDisplayName */ HRESULT WINAPI CNetFolder::ParseDisplayName(HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, - DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes) + DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { HRESULT hr = E_UNEXPECTED; @@ -101,7 +101,7 @@ /************************************************************************** * CNetFolder::BindToObject */ -HRESULT WINAPI CNetFolder::BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CNetFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -112,7 +112,7 @@ /************************************************************************** * CNetFolder::BindToStorage */ -HRESULT WINAPI CNetFolder::BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +HRESULT WINAPI CNetFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) { FIXME("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -125,7 +125,7 @@ * CNetFolder::CompareIDs */ -HRESULT WINAPI CNetFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CNetFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -177,7 +177,7 @@ /************************************************************************** * CNetFolder::GetAttributesOf */ -HRESULT WINAPI CNetFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut) +HRESULT WINAPI CNetFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { static const DWORD dwNethoodAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | @@ -227,7 +227,7 @@ * ppvObject [out] Resulting Interface * */ -HRESULT WINAPI CNetFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, +HRESULT WINAPI CNetFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { LPITEMIDLIST pidl; @@ -283,7 +283,7 @@ * CNetFolder::GetDisplayNameOf * */ -HRESULT WINAPI CNetFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CNetFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { FIXME("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet); pdump(pidl); @@ -306,8 +306,8 @@ * dwFlags [in] SHGNO formatting flags * ppidlOut [out] simple pidl returned */ -HRESULT WINAPI CNetFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +HRESULT WINAPI CNetFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /*simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { FIXME("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); @@ -348,13 +348,13 @@ return S_OK; } -HRESULT WINAPI CNetFolder::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CNetFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME("(%p)\n", this); return E_NOTIMPL; } -HRESULT WINAPI CNetFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CNetFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; Modified: trunk/reactos/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/netplaces.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/netplaces.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -39,24 +39,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -351,7 +351,7 @@ * This is E_NOTIMPL in Windows too. */ HRESULT WINAPI CPrinterFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, - DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) + DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), @@ -410,7 +410,7 @@ /************************************************************************** * CPrinterFolder::BindToObject */ -HRESULT WINAPI CPrinterFolder::BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +HRESULT WINAPI CPrinterFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) { TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -421,7 +421,7 @@ /************************************************************************** * ISF_Printers_fnBindToStorage */ -HRESULT WINAPI CPrinterFolder::BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +HRESULT WINAPI CPrinterFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) { FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); @@ -433,7 +433,7 @@ /************************************************************************** * CPrinterFolder::CompareIDs */ -HRESULT WINAPI CPrinterFolder::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CPrinterFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { int nReturn; @@ -485,7 +485,7 @@ /************************************************************************** * CPrinterFolder::GetAttributesOf */ -HRESULT WINAPI CPrinterFolder::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut) +HRESULT WINAPI CPrinterFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) { static const DWORD dwPrintersAttributes = SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; @@ -514,7 +514,7 @@ * LPVOID* ppvObject) //[out] Resulting Interface * */ -HRESULT WINAPI CPrinterFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CPrinterFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { IUnknown *pObj = NULL; @@ -545,7 +545,7 @@ * CPrinterFolder::GetDisplayNameOf * */ -HRESULT WINAPI CPrinterFolder::GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +HRESULT WINAPI CPrinterFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { LPWSTR pszName; PIDLPrinterStruct * p; @@ -604,8 +604,8 @@ * DWORD dwFlags, //[in ] SHGNO formatting flags * LPITEMIDLIST* ppidlOut) //[out] simple pidl returned */ -HRESULT WINAPI CPrinterFolder::SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, /* simple pidl */ - LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +HRESULT WINAPI CPrinterFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { FIXME("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", this, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); @@ -644,14 +644,14 @@ } -HRESULT WINAPI CPrinterFolder::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CPrinterFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME("(%p): stub\n", this); return E_NOTIMPL; } -HRESULT WINAPI CPrinterFolder::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) +HRESULT WINAPI CPrinterFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { WCHAR buffer[MAX_PATH] = {0}; HRESULT hr = E_FAIL; Modified: trunk/reactos/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/printers.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/printers.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -42,24 +42,24 @@ HRESULT WINAPI FinalConstruct(); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); /* ShellFolder2 */ virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IPersist Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -493,7 +493,7 @@ */ HRESULT WINAPI CRecycleBin::ParseDisplayName(HWND hwnd, LPBC pbc, - LPOLESTR pszDisplayName, ULONG *pchEaten, LPITEMIDLIST *ppidl, + LPOLESTR pszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes) { FIXME("stub\n"); @@ -537,19 +537,19 @@ return S_OK; } -HRESULT WINAPI CRecycleBin::BindToObject(LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) +HRESULT WINAPI CRecycleBin::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbc, REFIID riid, void **ppv) { FIXME("(%p, %p, %p, %s, %p) - stub\n", this, pidl, pbc, debugstr_guid(&riid), ppv); return E_NOTIMPL; } -HRESULT WINAPI CRecycleBin::BindToStorage(LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) +HRESULT WINAPI CRecycleBin::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbc, REFIID riid, void **ppv) { FIXME("(%p, %p, %p, %s, %p) - stub\n", this, pidl, pbc, debugstr_guid(&riid), ppv); return E_NOTIMPL; } -HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { /* TODO */ TRACE("(%p, %p, %p, %p)\n", this, (void *)lParam, pidl1, pidl2); @@ -594,7 +594,7 @@ } -HRESULT WINAPI CRecycleBin::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CRecycleBin::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, SFGAOF *rgfInOut) { TRACE("(%p, %d, {%p, ...}, {%x})\n", this, cidl, apidl ? apidl[0] : NULL, (unsigned int)*rgfInOut); @@ -602,7 +602,7 @@ return S_OK; } -HRESULT WINAPI CRecycleBin::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CRecycleBin::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *prgfInOut, void **ppv) { IUnknown *pObj = NULL; @@ -635,7 +635,7 @@ return hr; } -HRESULT WINAPI CRecycleBin::GetDisplayNameOf(LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) +HRESULT WINAPI CRecycleBin::GetDisplayNameOf(PCUITEMID_CHILD pidl, SHGDNF uFlags, STRRET *pName) { PIDLRecycleStruct *pFileDetails; LPWSTR pFileName; @@ -679,8 +679,8 @@ return S_OK; } -HRESULT WINAPI CRecycleBin::SetNameOf(HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName, - SHGDNF uFlags, LPITEMIDLIST *ppidlOut) +HRESULT WINAPI CRecycleBin::SetNameOf(HWND hwnd, PCUITEMID_CHILD pidl, LPCOLESTR pszName, + SHGDNF uFlags, PITEMID_CHILD *ppidlOut) { TRACE("\n"); return E_FAIL; /* not supported */ @@ -716,7 +716,7 @@ return S_OK; } -HRESULT WINAPI CRecycleBin::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) +HRESULT WINAPI CRecycleBin::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME("stub\n"); return E_NOTIMPL; @@ -742,7 +742,7 @@ return (ret != 0 ? E_FAIL : S_OK); } -HRESULT WINAPI CRecycleBin::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) +HRESULT WINAPI CRecycleBin::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, LPSHELLDETAILS pDetails) { PIDLRecycleStruct * pFileDetails; WCHAR buffer[MAX_PATH]; Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.h [iso-8859-1] Fri Aug 15 10:38:11 2014 @@ -55,24 +55,24 @@ virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); // IShellFolder - virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes); virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); - virtual HRESULT WINAPI BindToObject(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI BindToStorage(LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); - virtual HRESULT WINAPI GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, DWORD *rgfInOut); - virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT *prgfInOut, LPVOID *ppvOut); - virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); - virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); // IShellFolder2 virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); - virtual HRESULT WINAPI GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv); - virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); // IContextMenu

10 years, 4 months

[tfaber] 63889: [SHELL32] - Fix ITEMIDLIST typing in IShellFolder/IShellFolder2 implementations CORE-8441

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Aug 15 10:33:54 2014 New Revision: 63889 URL: http://svn.reactos.org/svn/reactos?rev=63889&view=rev Log: [SHELL32] - Fix ITEMIDLIST typing in IShellFolder/IShellFolder2 implementations CORE-8441 Modified: trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Fri Aug 15 10:33:54 2014 @@ -215,7 +215,7 @@ [in] LPBC pbcReserved, [in, string] LPOLESTR lpszDisplayName, [out] ULONG *pchEaten, - [out] LPITEMIDLIST *ppidl, + [out] PIDLIST_RELATIVE *ppidl, [in, out, unique] ULONG *pdwAttributes); HRESULT EnumObjects( @@ -332,8 +332,8 @@ HRESULT EnumSearches( [out] IEnumExtraSearch **ppenum ); HRESULT GetDefaultColumn( [in] DWORD dwReserved, [out] ULONG *pSort, [out] ULONG *pDisplay ); HRESULT GetDefaultColumnState( [in] UINT iColumn, [out] SHCOLSTATEF *pcsFlags ); - HRESULT GetDetailsEx( [in] LPCITEMIDLIST pidl, [in] const SHCOLUMNID *pscid, [out] VARIANT *pv); - HRESULT GetDetailsOf( [in] LPCITEMIDLIST pidl, [in] UINT iColumn, [out] SHELLDETAILS *psd); + HRESULT GetDetailsEx( [in] PCUITEMID_CHILD pidl, [in] const SHCOLUMNID *pscid, [out] VARIANT *pv); + HRESULT GetDetailsOf( [in] PCUITEMID_CHILD pidl, [in] UINT iColumn, [out] SHELLDETAILS *psd); HRESULT MapColumnToSCID( [in] UINT iColumn, [in] SHCOLUMNID *pscid ); } Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Fri Aug 15 10:33:54 2014 @@ -38,6 +38,7 @@ typedef const PITEMID_CHILD PCITEMID_CHILD; typedef LPCITEMIDLIST PCUITEMID_CHILD; typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; +typedef LPITEMIDLIST PIDLIST_RELATIVE; typedef LPCITEMIDLIST PCUIDLIST_RELATIVE; typedef LPITEMIDLIST PIDLIST_ABSOLUTE; typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE;

10 years, 4 months

[dquintana] 63888: Sync with trunk r63887.

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Aug 14 23:55:08 2014 New Revision: 63888 URL: http://svn.reactos.org/svn/reactos?rev=63888&view=rev Log: Sync with trunk r63887. Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/dll/cpl/console/console.c branches/shell-experiments/dll/cpl/console/layout.c branches/shell-experiments/dll/win32/kernel32/client/console/console.c branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/drivers/filesystems/npfs/waitsup.c branches/shell-experiments/include/psdk/shobjidl.idl branches/shell-experiments/win32ss/user/ntuser/misc.c branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c branches/shell-experiments/win32ss/user/winsrv/consrv/alias.h branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.c branches/shell-experiments/win32ss/user/winsrv/consrv/console.c 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/conwnd.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/graphics.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/gui/text.c 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/include/conio.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio_winsrv.h 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/subsysreg.c [This mail would be too long, it was shortened to contain the URLs only.] 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/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/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… 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/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/win32ss/user/ntuser/misc.c 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/alias.h 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/… 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/conoutput.c 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/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/conwnd.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/graphics.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/gui/text.c 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/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio_winsrv.h 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/subsysreg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

10 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
23
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 August 2014