Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 63553: [CRYPT32] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 12:45:39 2014 New Revision: 63553 URL: http://svn.reactos.org/svn/reactos?rev=63553&view=rev Log: [CRYPT32] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/crypt32/regstore.c Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sun Jun 8 12:45:39 2014 @@ -3,9 +3,6 @@ -D__WINESRC__ -D_WINE -D_CRYPT32_) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB) @@ -45,7 +42,7 @@ set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) -add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(crypt32 user32 advapi32 shlwapi msvcrt kernel32 ntdll) add_delay_importlibs(crypt32 cryptnet) add_pch(crypt32 crypt32_private.h SOURCE) add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/crypt32/regstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/regstore… ============================================================================== --- trunk/reactos/dll/win32/crypt32/regstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/regstore.c [iso-8859-1] Sun Jun 8 12:45:39 2014 @@ -17,6 +17,8 @@ */ #include "crypt32_private.h" + +#include <shlwapi.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -507,12 +509,12 @@ if (dwFlags & CERT_STORE_DELETE_FLAG) { - DWORD rc = RegDeleteTreeW((HKEY)pvPara, CertsW); + DWORD rc = SHDeleteKeyW((HKEY)pvPara, CertsW); if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) - rc = RegDeleteTreeW((HKEY)pvPara, CRLsW); + rc = SHDeleteKeyW((HKEY)pvPara, CRLsW); if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) - rc = RegDeleteTreeW((HKEY)pvPara, CTLsW); + rc = SHDeleteKeyW((HKEY)pvPara, CTLsW); if (rc == ERROR_NO_MORE_ITEMS) rc = ERROR_SUCCESS; SetLastError(rc);

1 0

[akhaldi] 63552: [QUARTZ] * Do not rely on RegDeleteTree{A, W} which shouldn't be exported. * Move shlwapi.h inclusion to the PCH. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 12:14:06 2014 New Revision: 63552 URL: http://svn.reactos.org/svn/reactos?rev=63552&view=rev Log: [QUARTZ] * Do not rely on RegDeleteTree{A,W} which shouldn't be exported. * Move shlwapi.h inclusion to the PCH. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/quartz_private.h trunk/reactos/dll/directx/wine/quartz/regsvr.c Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] Sun Jun 8 12:14:06 2014 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Sun Jun 8 12:14:06 2014 @@ -19,8 +19,6 @@ */ #include "quartz_private.h" - -#include <shlwapi.h> static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Sun Jun 8 12:14:06 2014 @@ -1513,7 +1513,7 @@ if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); - lRet = RegDeleteTreeW(hKey, wszPins); + lRet = SHDeleteKeyW(hKey, wszPins); if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); @@ -1572,7 +1572,7 @@ strcatW(wszPinNameKey, wszSlash); strcatW(wszPinNameKey, Name); - lRet = RegDeleteTreeW(hKey, wszPinNameKey); + lRet = SHDeleteKeyW(hKey, wszPinNameKey); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinNameKey); } Modified: trunk/reactos/dll/directx/wine/quartz/quartz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/quartz_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/quartz_private.h [iso-8859-1] Sun Jun 8 12:14:06 2014 @@ -41,6 +41,7 @@ #include <dvdmedia.h> #include <vfw.h> #include <aviriff.h> +#include <shlwapi.h> #include <wine/strmbase.h> #include <wine/unicode.h> Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Sun Jun 8 12:14:06 2014 @@ -240,7 +240,7 @@ WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); + res = SHDeleteKeyW(interface_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -346,18 +346,18 @@ WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->progid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->viprogid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -500,7 +500,7 @@ if (res != ERROR_SUCCESS) break; StringFromGUID2(list->subtype, buf, 39); - res = RegDeleteTreeW(majortype_key, buf); + res = SHDeleteKeyW(majortype_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; /* Removed majortype key if there is no more subtype key */ @@ -535,7 +535,7 @@ res = ERROR_SUCCESS; else if (res == ERROR_SUCCESS) for (; res == ERROR_SUCCESS && list->majortype; ++list) { - res = RegDeleteTreeA(extensions_root_key, list->extension); + res = SHDeleteKeyA(extensions_root_key, list->extension); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; }

1 0

[akhaldi] 63551: * Use SHDeleteKeyW explicitly here.
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 12:08:16 2014 New Revision: 63551 URL: http://svn.reactos.org/svn/reactos?rev=63551&view=rev Log: * Use SHDeleteKeyW explicitly here. Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Jun 8 12:08:16 2014 @@ -294,7 +294,7 @@ /* Delete subtree only if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (SHDeleteKey(root, p) != ERROR_SUCCESS) + if (SHDeleteKeyW(root, p) != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return 1;

1 0

[akhaldi] 63550: [DEVENUM] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 12:02:59 2014 New Revision: 63550 URL: http://svn.reactos.org/svn/reactos?rev=63550&view=rev Log: [DEVENUM] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/createdevenum.c Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Sun Jun 8 12:02:59 2014 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -22,7 +19,7 @@ set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) -add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) +add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 shlwapi msvcrt kernel32 ntdll) add_delay_importlibs(devenum msvfw32) add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Sun Jun 8 12:02:59 2014 @@ -27,6 +27,7 @@ #include <vfw.h> #include <aviriff.h> +#include <shlwapi.h> #include "resource.h" @@ -675,15 +676,15 @@ * or switched from pulseaudio to alsa, delete all old devices first */ if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED;

1 0

[akhaldi] 63549: [REG] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 11:56:30 2014 New Revision: 63549 URL: http://svn.reactos.org/svn/reactos?rev=63549&view=rev Log: [REG] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt trunk/reactos/base/applications/cmdutils/reg/reg.c Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Sun Jun 8 11:56:30 2014 @@ -1,8 +1,5 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_executable(reg reg.c reg.rc) set_module_type(reg win32cui UNICODE) -add_importlibs(reg advapi32 user32 msvcrt kernel32) +add_importlibs(reg advapi32 user32 shlwapi msvcrt kernel32) add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Jun 8 11:56:30 2014 @@ -22,6 +22,7 @@ #include <winuser.h> #include <winreg.h> #include <wincon.h> +#include <shlwapi.h> #include <wine/unicode.h> #include "reg.h" @@ -293,7 +294,7 @@ /* Delete subtree only if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + if (SHDeleteKey(root, p) != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return 1;

1 0

[dquintana] 63548: [BROWSEUI] * Fix stack corruption in VS2010 builds. No idea why it doesn't crash with other compilers. [EXPLORER-NEW] * Fix a similar bug that does not appear to cause any issue, ...
by dquintana＠svn.reactos.org 07 Jun '14

07 Jun '14

Author: dquintana Date: Sat Jun 7 23:26:35 2014 New Revision: 63548 URL: http://svn.reactos.org/svn/reactos?rev=63548&view=rev Log: [BROWSEUI] * Fix stack corruption in VS2010 builds. No idea why it doesn't crash with other compilers. [EXPLORER-NEW] * Fix a similar bug that does not appear to cause any issue, but is a bug regardless. Modified: branches/shell-experiments/base/shell/explorer-new/rshell.c branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp Modified: branches/shell-experiments/base/shell/explorer-new/rshell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/rshell.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/rshell.c [iso-8859-1] Sat Jun 7 23:26:35 2014 @@ -22,7 +22,7 @@ static HINSTANCE hRShell = NULL; -typedef HRESULT(*PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); HRESULT CStartMenu_Constructor(REFIID riid, void **ppv) { @@ -47,7 +47,7 @@ ppv); } -typedef HANDLE(WINAPI *PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); +typedef HANDLE(WINAPI * PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) { Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Jun 7 23:26:35 2014 @@ -73,6 +73,8 @@ extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateAddressBand(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); + HRESULT IUnknown_HasFocusIO(IUnknown * punk) { CComPtr<IInputObject> pio; @@ -132,8 +134,6 @@ return hResult; return S_OK; } - -typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); class CInternetToolbar; @@ -594,9 +594,9 @@ VARIANT menuOut; HWND ownerWindow; HRESULT hResult; + if (!pMenuBar) return E_POINTER; - *pMenuBar = NULL;

1 0

[ekohl] 63547: [USETUP] Implement scolling through the list of logical partitions. Multiple disks are not supported yet.
by ekohl＠svn.reactos.org 07 Jun '14

07 Jun '14

Author: ekohl Date: Sat Jun 7 20:02:26 2014 New Revision: 63547 URL: http://svn.reactos.org/svn/reactos?rev=63547&view=rev Log: [USETUP] Implement scolling through the list of logical partitions. Multiple disks are not supported yet. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jun 7 20:02:26 2014 @@ -1581,12 +1581,14 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownPartitionList(PartitionList); + if (ScrollDownPartitionList(PartitionList)) + DrawPartitionList(PartitionList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpPartitionList(PartitionList); + if (ScrollUpPartitionList(PartitionList)) + DrawPartitionList(PartitionList); } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 7 20:02:26 2014 @@ -1174,6 +1174,29 @@ DumpPartitionTable(DiskEntry); #endif + if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart != 0 && + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionLength.QuadPart != 0 && + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != 0) + { + if ((DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector) % DiskEntry->SectorsPerTrack == 0) + { + DPRINT1("Use %lu Sector alignment!\n", DiskEntry->SectorsPerTrack); + } + else if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart % 1048756 == 0) + { + DPRINT1("Use megabyte (%lu Sectors) alignment!\n", 1048756 / DiskEntry->BytesPerSector); + } + else + { + DPRINT1("No matching aligment found! Partiton 1 starts at %I64u\n", DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart); + } + } + else + { + DPRINT1("No valid partiton table found! Use megabyte (%lu Sectors) alignment!\n", 1048756 / DiskEntry->BytesPerSector); + } + + if (DiskEntry->LayoutBuffer->PartitionCount == 0) { DiskEntry->NewDisk = TRUE; @@ -1986,32 +2009,79 @@ } -VOID +BOOL ScrollDownPartitionList( PPARTLIST List) { // PDISKENTRY DiskEntry; PPARTENTRY PartEntry; -// PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; + PLIST_ENTRY Entry; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) - return; + return FALSE; + /* Check for next usable entry on current disk */ if (List->CurrentPartition != NULL) { - Entry2 = List->CurrentPartition->ListEntry.Flink; - if (Entry2 != &List->CurrentDisk->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - - List->CurrentPartition = PartEntry; - DrawPartitionList(List); - return; - } - } + if (List->CurrentPartition->LogicalPartition) + { + /* Logical partition */ + + Entry = List->CurrentPartition->ListEntry.Flink; + if (Entry != &List->CurrentDisk->LogicalPartListHead) + { + /* Next logical partition */ + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + else + { + Entry = List->CurrentDisk->ExtendedPartition->ListEntry.Flink; + if (Entry != &List->CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + } + } + else + { + /* Primary or extended partition */ + + if (IsContainerPartition(List->CurrentPartition->PartitionType)) + { + /* First logical partition */ + Entry = List->CurrentDisk->LogicalPartListHead.Flink; + if (Entry != &List->CurrentDisk->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + } + else + { + /* Next primary partition */ + Entry = List->CurrentPartition->ListEntry.Flink; + if (Entry != &List->CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + } + } + } + + DPRINT1("TODO: Check the next drive!\n"); #if 0 /* Check for first usable entry on next disk */ @@ -2037,37 +2107,67 @@ } } #endif -} - - -VOID + + return FALSE; +} + + +BOOL ScrollUpPartitionList( PPARTLIST List) { // PDISKENTRY DiskEntry; PPARTENTRY PartEntry; -// PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; + PLIST_ENTRY Entry; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) - return; - - /* check for previous usable entry on current disk */ + return FALSE; + + /* Check for previous usable entry on current disk */ if (List->CurrentPartition != NULL) { - Entry2 = List->CurrentPartition->ListEntry.Blink; - if (Entry2 != &List->CurrentDisk->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (List->CurrentPartition->LogicalPartition) + { + /* Logical partition */ + Entry = List->CurrentPartition->ListEntry.Blink; + if (Entry != &List->CurrentDisk->LogicalPartListHead) + { + /* Previous logical partition */ + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + } + else + { + /* Extended partition*/ + PartEntry = List->CurrentDisk->ExtendedPartition; + } List->CurrentPartition = PartEntry; - - /* Draw partition list and return */ - DrawPartitionList(List); - return; - } - } + return TRUE; + } + else + { + /* Primary or extended partition */ + + Entry = List->CurrentPartition->ListEntry.Blink; + if (Entry != &List->CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (IsContainerPartition(PartEntry->PartitionType)) + { + Entry = List->CurrentDisk->LogicalPartListHead.Blink; + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + } + + List->CurrentPartition = PartEntry; + return TRUE; + } + + } + } + + DPRINT1("TODO: Check the previous drive!\n"); #if 0 /* check for last usable entry on previous disk */ @@ -2095,6 +2195,8 @@ } } #endif + + return FALSE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sat Jun 7 20:02:26 2014 @@ -211,11 +211,11 @@ SetMountedDeviceValues( PPARTLIST List); -VOID +BOOL ScrollDownPartitionList( PPARTLIST List); -VOID +BOOL ScrollUpPartitionList( PPARTLIST List);

1 0

[dquintana] 63546: [RSHELL] * Use the debugging class to track COM refcounting of the CMenuBand. * CMenuSite: Remove an useless line. [BROWSEUI] * Refactor the CreateMenuBar method in an attempt to...
by dquintana＠svn.reactos.org 07 Jun '14

07 Jun '14

Author: dquintana Date: Sat Jun 7 13:54:11 2014 New Revision: 63546 URL: http://svn.reactos.org/svn/reactos?rev=63546&view=rev Log: [RSHELL] * Use the debugging class to track COM refcounting of the CMenuBand. * CMenuSite: Remove an useless line. [BROWSEUI] * Refactor the CreateMenuBar method in an attempt to figure out a seemingly magic crash with VS2010 (not yet solved). * Begin fixing some unused-but-set warnings. [SHELL32] * Fix some small bugs spotted by Victor. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/dialogs.cpp branches/shell-experiments/dll/win32/shell32/pidl.cpp branches/shell-experiments/dll/win32/shell32/shell32_main.cpp branches/shell-experiments/dll/win32/shell32/shlfolder.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -44,7 +44,7 @@ #else *ppv = NULL; - CMenuBand * site = new CComObject<CMenuBand>(); + CMenuBand * site = new CComDebugObject<CMenuBand>(); if (!site) return E_OUTOFMEMORY; Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -354,7 +354,6 @@ { RECT Rect = { 0 }; GetClientRect(&Rect); - Rect.right = Rect.right; pMenuPopup->OnPosRectChangeDB(&Rect); } } Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -113,3 +113,75 @@ #else #define FAILED_UNEXPECTEDLY(hr) FAILED(hr) #endif + + +template <class Base> +class CComDebugObject : public Base +{ +public: + CComDebugObject(void * = NULL) + { + _pAtlModule->Lock(); + } + + virtual ~CComDebugObject() + { + this->FinalRelease(); + _pAtlModule->Unlock(); + } + + STDMETHOD_(ULONG, AddRef)() + { + int rc = this->InternalAddRef(); + DbgPrint("RefCount is now %d(++)!\n", rc); + return rc; + } + + STDMETHOD_(ULONG, Release)() + { + ULONG newRefCount; + + newRefCount = this->InternalRelease(); + DbgPrint("RefCount is now %d(--)!\n", newRefCount); + if (newRefCount == 0) + delete this; + return newRefCount; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + return this->_InternalQueryInterface(iid, ppvObject); + } + + static HRESULT WINAPI CreateInstance(CComDebugObject<Base> **pp) + { + CComDebugObject<Base> *newInstance; + HRESULT hResult; + + ATLASSERT(pp != NULL); + if (pp == NULL) + return E_POINTER; + + hResult = E_OUTOFMEMORY; + newInstance = NULL; + ATLTRY(newInstance = new CComDebugObject<Base>()) + if (newInstance != NULL) + { + newInstance->SetVoid(NULL); + newInstance->InternalFinalConstructAddRef(); + hResult = newInstance->_AtlInitialConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->FinalConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->_AtlFinalConstruct(); + newInstance->InternalFinalConstructRelease(); + if (hResult != S_OK) + { + delete newInstance; + newInstance = NULL; + } + } + *pp = newInstance; + return hResult; + } +}; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -547,9 +547,11 @@ fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; - fMenuCallback.AddRef(); + fMenuCallback = new CComDebugObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; + + fMenuCallback->AddRef(); } CInternetToolbar::~CInternetToolbar() @@ -585,73 +587,77 @@ return ResizeBorderDW(&availableBorderSpace, fSite, FALSE); } -HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **menuBar) -{ - CComPtr<IOleCommandTarget> siteCommandTarget; - CComPtr<IOleWindow> oleWindow; - CComPtr<IOleCommandTarget> commandTarget; +HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar) +{ + CComPtr<IShellMenu> menubar; CComPtr<IShellMenuCallback> callback; VARIANT menuOut; HWND ownerWindow; HRESULT hResult; - + if (!pMenuBar) + return E_POINTER; + + + *pMenuBar = NULL; + + hResult = E_FAIL; #if USE_CUSTOM_MENUBAND - HMODULE hrs = LoadLibraryW(L"rshell.dll"); - - if (!hrs) - { - DbgPrint("Failed: %d\n", GetLastError()); - return E_FAIL; - } - - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); - if (func) - { - hResult = func(IID_PPV_ARG(IShellMenu, menuBar)); - } - else - { - DbgPrint("Failed: %d\n", GetLastError()); - hResult = E_FAIL; - } + HMODULE hrs = GetModuleHandleW(L"rshell.dll"); + if (!hrs) hrs = LoadLibraryW(L"rshell.dll"); + + if (hrs) + { + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); + if (func) + { + hResult = func(IID_PPV_ARG(IShellMenu, &menubar)); + } + } +#endif + + menubar->AddRef(); + if (FAILED_UNEXPECTEDLY(hResult)) { hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, menuBar)); - } -#else - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, menuBar)); -#endif - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = fMenuCallback.QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleWindow->GetWindow(&ownerWindow); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &siteCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = siteCommandTarget->Exec(&CGID_Explorer, 0x35, 0, NULL, &menuOut); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - if (V_VT(&menuOut) != VT_INT_PTR || V_INTREF(&menuOut) == NULL) - return E_FAIL; - hResult = (*menuBar)->SetMenu((HMENU)V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = IUnknown_Exec(*menuBar, CGID_MenuBand, 3, 1, NULL, NULL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + IID_PPV_ARG(IShellMenu, &menubar)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + + hResult = fMenuCallback->QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = menubar->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + // Set Menu + { + hResult = IUnknown_Exec(fSite, CGID_Explorer, 0x35, 0, NULL, &menuOut); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + if (V_VT(&menuOut) != VT_INT_PTR || V_INTREF(&menuOut) == NULL) + return E_FAIL; + + hResult = IUnknown_GetWindow(fSite, &ownerWindow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = menubar->SetMenu((HMENU) V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + + hResult = IUnknown_Exec(menubar, CGID_MenuBand, 3, 1, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + *pMenuBar = menubar.Detach(); + return S_OK; } @@ -1686,7 +1692,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_STATE; mii.fState = fLocked ? MFS_CHECKED : MFS_UNCHECKED; - command = SetMenuItemInfo(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, FALSE, &mii); + SetMenuItemInfo(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, FALSE, &mii); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -83,7 +83,7 @@ CComPtr<IUnknown> fLogoBar; // the reactos logo CComPtr<IUnknown> fControlsBar; // navigation controls CComPtr<IUnknown> fNavigationBar; // address bar - CComObject<CMenuCallback> fMenuCallback; + CComPtr<CMenuCallback> fMenuCallback; CComPtr<IOleCommandTarget> fCommandTarget; GUID fCommandCategory; HWND fToolbarWindow; Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -903,10 +903,21 @@ HRESULT hResult; hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_PPV_ARG(IShellFolder, &parentFolder), &childPIDL); + if (FAILED(hResult)) + return hResult; + hResult = parentFolder->GetDisplayNameOf(childPIDL, uFlags, &L108); + if (FAILED(hResult)) + return hResult; + StrRetToBufW(&L108, childPIDL, pszBuf, cchBuf); if (rgfInOut) + { hResult = parentFolder->GetAttributesOf(1, const_cast<LPCITEMIDLIST *>(&childPIDL), rgfInOut); + if (FAILED(hResult)) + return hResult; + } + ILFree(childPIDL); return S_OK; } Modified: branches/shell-experiments/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -62,7 +62,7 @@ PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u", lpszName); + swprintf(szName, L"%u", (DWORD)lpszName); else wcscpy(szName, (WCHAR*)lpszName); Modified: branches/shell-experiments/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -753,11 +753,13 @@ */ UINT WINAPI ILGetSize(LPCITEMIDLIST pidl) { - LPCSHITEMID si = &(pidl->mkid); + LPCSHITEMID si; UINT len = 0; if (pidl) { + si = &(pidl->mkid); + while (si->cb) { len += si->cb; Modified: branches/shell-experiments/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -752,7 +752,7 @@ temppsfi.dwAttributes=psfi->dwAttributes; if (psfi == NULL) - ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, sizeof(temppsfi), flags); + ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, 0, flags); else ret = SHGetFileInfoW(pathW, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags); Modified: branches/shell-experiments/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -126,35 +126,41 @@ LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes) { HRESULT hr = E_INVALIDARG; - LPITEMIDLIST pidlOut = NULL, - pidlTemp = NULL; - IShellFolder *psfChild; - - TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlInOut ? *pidlInOut : NULL, debugstr_w (szNext)); + LPITEMIDLIST pidlIn = pidlInOut ? *pidlInOut : NULL; + LPITEMIDLIST pidlOut = NULL; + LPITEMIDLIST pidlTemp = NULL; + CComPtr<IShellFolder> psfChild; + + TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlIn, debugstr_w (szNext)); /* get the shellfolder for the child pidl and let it analyse further */ - hr = psf->BindToObject(*pidlInOut, pbc, IID_PPV_ARG(IShellFolder, &psfChild)); - - if (SUCCEEDED(hr)) { + hr = psf->BindToObject(pidlIn, pbc, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED(hr)) + return hr; + hr = psfChild->ParseDisplayName(hwndOwner, pbc, szNext, pEaten, &pidlOut, pdwAttributes); - psfChild->Release(); - - if (SUCCEEDED(hr)) { - pidlTemp = ILCombine (*pidlInOut, pidlOut); - - if (!pidlTemp) + if (FAILED(hr)) + return hr; + + pidlTemp = ILCombine (pidlIn, pidlOut); + if (!pidlTemp) + { hr = E_OUTOFMEMORY; + if (pidlOut) + ILFree(pidlOut); + return hr; } if (pidlOut) ILFree (pidlOut); - } - - ILFree (*pidlInOut); + + if (pidlIn) + ILFree (pidlIn); + *pidlInOut = pidlTemp; TRACE ("-- pidl=%p ret=0x%08x\n", pidlInOut ? *pidlInOut : NULL, hr); - return hr; + return S_OK; } /***********************************************************************

1 0

[hbelusca] 63545: [CONSRV] - Rename a macro to something meaningful. - Localize selection type strings.
by hbelusca＠svn.reactos.org 06 Jun '14

06 Jun '14

Author: hbelusca Date: Fri Jun 6 21:05:59 2014 New Revision: 63545 URL: http://svn.reactos.org/svn/reactos?rev=63545&view=rev Log: [CONSRV] - Rename a macro to something meaningful. - Localize selection type strings. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -731,8 +731,8 @@ if ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) { - LPWSTR SelectionType, WindowTitle = NULL; - SIZE_T Length = 0; + LPWSTR SelTypeStr = NULL , WindowTitle = NULL; + SIZE_T SelTypeStrLength = 0, Length = 0; /* Clear the old selection */ if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) @@ -740,21 +740,34 @@ InvalidateRect(GuiData->hWindow, &oldRect, FALSE); } - if (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) - { - SelectionType = L"Selection - "; - } - else - { - SelectionType = L"Mark - "; - } - - Length = Console->Title.Length + wcslen(SelectionType) + 1; - WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); - wcscpy(WindowTitle, SelectionType); - wcscat(WindowTitle, Console->Title.Buffer); - SetWindowText(GuiData->hWindow, WindowTitle); - ConsoleFreeHeap(WindowTitle); + /* + * When passing a zero-length buffer size, LoadString(...) returns + * a read-only pointer buffer to the program's resource string. + */ + SelTypeStrLength = + LoadStringW(ConSrvDllInstance, + (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) + ? IDS_SELECT_TITLE : IDS_MARK_TITLE, + (LPWSTR)&SelTypeStr, 0); + + /* + * Prepend the selection type string to the current console title + * if we succeeded in retrieving a valid localized string. + */ + if (SelTypeStr) + { + // 3 for " - " and 1 for NULL + Length = Console->Title.Length + (SelTypeStrLength + 3 + 1) * sizeof(WCHAR); + WindowTitle = ConsoleAllocHeap(0, Length); + + wcsncpy(WindowTitle, SelTypeStr, SelTypeStrLength); + WindowTitle[SelTypeStrLength] = L'\0'; + wcscat(WindowTitle, L" - "); + wcscat(WindowTitle, Console->Title.Buffer); + + SetWindowText(GuiData->hWindow, WindowTitle); + ConsoleFreeHeap(WindowTitle); + } GuiData->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; ConioPause(Console, PAUSED_FROM_SELECTION); @@ -771,6 +784,7 @@ GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; ConioUnpause(Console, PAUSED_FROM_SELECTION); + /* Restore the console title */ SetWindowText(GuiData->hWindow, Console->Title.Buffer); } } @@ -1305,10 +1319,7 @@ if (GetType(Buffer) == TEXTMODE_BUFFER) { -#ifdef IS_WHITESPACE -#undef IS_WHITESPACE -#endif -#define IS_WHITESPACE(c) \ +#define IS_WORD_SEP(c) \ ((c) == L'\0' || (c) == L' ' || (c) == L'\t' || (c) == L'\r' || (c) == L'\n') PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; @@ -1320,15 +1331,15 @@ ptrL = ptrR = ConioCoordToPointer(TextBuffer, cL.X, cL.Y); /* Enlarge the selection by checking for whitespace */ - while ((0 < cL.X) && !IS_WHITESPACE(ptrL->Char.UnicodeChar) - && !IS_WHITESPACE((ptrL-1)->Char.UnicodeChar)) + while ((0 < cL.X) && !IS_WORD_SEP(ptrL->Char.UnicodeChar) + && !IS_WORD_SEP((ptrL-1)->Char.UnicodeChar)) { --cL.X; --ptrL; } while ((cR.X < TextBuffer->ScreenBufferSize.X - 1) && - !IS_WHITESPACE(ptrR->Char.UnicodeChar) && - !IS_WHITESPACE((ptrR+1)->Char.UnicodeChar)) + !IS_WORD_SEP(ptrR->Char.UnicodeChar) && + !IS_WORD_SEP((ptrR+1)->Char.UnicodeChar)) { ++cR.X; ++ptrR; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Eingabeaufforderung" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Marquage" + IDS_SELECT_TITLE "SÃ©lection" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -30,3 +30,9 @@ */ IDS_TERMINAL_TITLE "Konsola ReactOS" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "Consola ReactOS" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -27,3 +27,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -18,17 +18,18 @@ #define ID_SYSTEM_DEFAULTS 0xFFF6 #define ID_SYSTEM_PROPERTIES 0xFFF7 -#define NCPOPUP_MENU 103 +#define IDS_EDIT 204 +#define IDS_MARK 205 +#define IDS_COPY 206 +#define IDS_PASTE 207 +#define IDS_SELECTALL 208 +#define IDS_SCROLL 209 +#define IDS_FIND 210 +#define IDS_DEFAULTS 211 +#define IDS_PROPERTIES 212 -#define IDS_EDIT 204 -#define IDS_MARK 205 -#define IDS_COPY 206 -#define IDS_PASTE 207 -#define IDS_SELECTALL 208 -#define IDS_SCROLL 209 -#define IDS_FIND 210 -#define IDS_DEFAULTS 211 -#define IDS_PROPERTIES 212 +#define IDS_MARK_TITLE 220 +#define IDS_SELECT_TITLE 221 // Scrollbar resource ids. Unused. /* Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -59,9 +59,6 @@ GuiData->Selection.srSelection.Right, GuiData->Selection.srSelection.Bottom); -#ifdef IS_WHITESPACE -#undef IS_WHITESPACE -#endif #define IS_WHITESPACE(c) ((c) == L'\0' || (c) == L' ' || (c) == L'\t') /* Basic size for one line... */

1 0

[akhaldi] 63544: * Forgot this file.
by akhaldi＠svn.reactos.org 06 Jun '14

06 Jun '14

Author: akhaldi Date: Fri Jun 6 13:54:42 2014 New Revision: 63544 URL: http://svn.reactos.org/svn/reactos?rev=63544&view=rev Log: * Forgot this file. Modified: trunk/reactos/dll/win32/newdev/newdev.spec Modified: trunk/reactos/dll/win32/newdev/newdev.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.sp… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] Fri Jun 6 13:54:42 2014 @@ -1,4 +1,4 @@ -@ stdcall ClientSideInstallW(ptr long wstr) +@ stdcall ClientSideInstallW(ptr ptr wstr long) @ stdcall DevInstallW(ptr ptr wstr long) @ stub InstallDevInst @ stub InstallDevInstEx

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs