Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 54520: [DiskPart] Remove unused file. Lee Schroeder, bug #6699.
by dgorbachev＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: dgorbachev Date: Mon Nov 28 07:35:58 2011 New Revision: 54520 URL: http://svn.reactos.org/svn/reactos?rev=54520&view=rev Log: [DiskPart] Remove unused file. Lee Schroeder, bug #6699. Removed: trunk/reactos/base/system/diskpart/remove.h Removed: trunk/reactos/base/system/diskpart/remove.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remov… ============================================================================== --- trunk/reactos/base/system/diskpart/remove.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/remove.h (removed) @@ -1,16 +1,0 @@ -/* - * PROJECT: ReactOS DiskPart - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/diskpart/remove.h - * PURPOSE: Manages all the partitions of the OS in - * an interactive way - * PROGRAMMERS: Lee Schroeder - */ -#ifndef REMOVE_H_INCLUDED -#define REMOVE_H_INCLUDED - -/* FUNCTIONS *****************************************************************/ -BOOL remove_main(INT argc, WCHAR **argv); -VOID help_remove(INT argc, WCHAR **argv); - -#endif // REMOVE_H_INCLUDED

1 0

[dgorbachev] 54519: [NTDLL] Do not map already mapped section.
by dgorbachev＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: dgorbachev Date: Mon Nov 28 07:35:51 2011 New Revision: 54519 URL: http://svn.reactos.org/svn/reactos?rev=54519&view=rev Log: [NTDLL] Do not map already mapped section. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Nov 28 07:35:51 2011 @@ -1251,7 +1251,7 @@ /* Stuff the image name in the TIB, for the debugger */ ArbitraryUserPointer = Teb->NtTib.ArbitraryUserPointer; Teb->NtTib.ArbitraryUserPointer = FullDllName.Buffer; - +#if 0 /* Map the DLL */ Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), @@ -1263,7 +1263,7 @@ ViewShare, 0, PAGE_READWRITE); - +#endif /* Restore */ Teb->NtTib.ArbitraryUserPointer = ArbitraryUserPointer; @@ -1301,7 +1301,7 @@ /* Stuff the image name in the TIB, for the debugger */ ArbitraryUserPointer = Teb->NtTib.ArbitraryUserPointer; Teb->NtTib.ArbitraryUserPointer = FullDllName.Buffer; - +#if 0 /* Map the DLL */ Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), @@ -1313,7 +1313,7 @@ ViewShare, 0, PAGE_READWRITE); - +#endif /* Restore */ Teb->NtTib.ArbitraryUserPointer = ArbitraryUserPointer;

1 0

[jimtabor] 54518: - fix GetNCHitEx, restore track mouse buttons in test system.
by jimtabor＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: jimtabor Date: Mon Nov 28 06:37:45 2011 New Revision: 54518 URL: http://svn.reactos.org/svn/reactos?rev=54518&view=rev Log: - fix GetNCHitEx, restore track mouse buttons in test system. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Mon Nov 28 06:37:45 2011 @@ -305,8 +305,7 @@ } else { - IntGetClientRect(pWnd, &rcClient); // This or - //rcClient = pWnd->rcClient; // this one? + rcClient = pWnd->rcClient; rcWindow = pWnd->rcWindow; }

1 0

[jimtabor] 54517: - Add padded boarder width to NONCLIENTMETRICS.
by jimtabor＠svn.reactos.org 28 Nov '11

28 Nov '11

Author: jimtabor Date: Mon Nov 28 04:16:54 2011 New Revision: 54517 URL: http://svn.reactos.org/svn/reactos?rev=54517&view=rev Log: - Add padded boarder width to NONCLIENTMETRICS. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Nov 28 04:16:54 2011 @@ -3315,6 +3315,9 @@ LOGFONTA lfMenuFont; LOGFONTA lfStatusFont; LOGFONTA lfMessageFont; +#if (WINVER >= 0x0600) + int iPaddedBorderWidth; +#endif } NONCLIENTMETRICSA, *PNONCLIENTMETRICSA,*LPNONCLIENTMETRICSA; typedef struct tagNONCLIENTMETRICSW { @@ -3333,6 +3336,9 @@ LOGFONTW lfMenuFont; LOGFONTW lfStatusFont; LOGFONTW lfMessageFont; +#if (WINVER >= 0x0600) + int iPaddedBorderWidth; +#endif } NONCLIENTMETRICSW, *PNONCLIENTMETRICSW,*LPNONCLIENTMETRICSW; #ifdef UNICODE

1 0

[rharabien] 54516: [MKSHELLLINK] - Don't use stricmp. It's not a standard function.
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 20:14:00 2011 New Revision: 54516 URL: http://svn.reactos.org/svn/reactos?rev=54516&view=rev Log: [MKSHELLLINK] - Don't use stricmp. It's not a standard function. Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… ============================================================================== --- trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] Sun Nov 27 20:14:00 2011 @@ -139,25 +139,25 @@ { if (argv[i][0] != '-' && argv[i][0] != '/') pszTarget = argv[i]; - else if (!stricmp(argv[i] + 1, "h")) + else if (!strcmp(argv[i] + 1, "h")) bHelp = 1; - else if (!stricmp(argv[i] + 1, "o") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "o") && i + 1 < argc) pszOutputPath = argv[++i]; - else if (!stricmp(argv[i] + 1, "d") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "d") && i + 1 < argc) pszDescription = argv[++i]; - else if (!stricmp(argv[i] + 1, "w") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "w") && i + 1 < argc) pszWorkingDir = argv[++i]; - else if (!stricmp(argv[i] + 1, "c") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "c") && i + 1 < argc) pszCmdLineArgs = argv[++i]; - else if (!stricmp(argv[i] + 1, "i") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "i") && i + 1 < argc) { pszIcon = argv[++i]; if (i + 1 < argc && isdigit(argv[i + 1][0])) IconNr = atoi(argv[++i]); } - else if (!stricmp(argv[i] + 1, "m")) + else if (!strcmp(argv[i] + 1, "m")) bMinimized = 1; - else if (!stricmp(argv[i] + 1, "g") && i + 1 < argc) + else if (!strcmp(argv[i] + 1, "g") && i + 1 < argc) { unsigned Data4Tmp[8], j;

1 0

[rharabien] 54515: [MKSHELLLINK] - Don't use windows.h in host tool
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 20:11:06 2011 New Revision: 54515 URL: http://svn.reactos.org/svn/reactos?rev=54515&view=rev Log: [MKSHELLLINK] - Don't use windows.h in host tool Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… ============================================================================== --- trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] Sun Nov 27 20:11:06 2011 @@ -6,9 +6,24 @@ */ #include <stdio.h> -#include <stdlib.h> +#include <string.h> #include <ctype.h> -#include <windows.h> +#include <stdint.h> + +#define SW_SHOWNORMAL 1 +#define SW_SHOWMINNOACTIVE 7 + +typedef struct _GUID { + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[8]; +} GUID; + +typedef struct _FILETIME { + uint32_t dwLowDateTime; + uint32_t dwHighDateTime; +} FILETIME, *PFILETIME; #define DEFINE_GUID2(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } } DEFINE_GUID2(CLSID_ShellLink,0x00021401L,0,0,0xC0,0,0,0,0,0,0,0x46); @@ -32,39 +47,39 @@ typedef struct _LNK_HEADER { - DWORD Signature; + uint32_t Signature; GUID Guid; - DWORD Flags; - DWORD Attributes; + uint32_t Flags; + uint32_t Attributes; FILETIME CreationTime; FILETIME ModificationTime; FILETIME LastAccessTime; - DWORD FileSize; - DWORD IconNr; - DWORD Show; - DWORD Hotkey; - DWORD Unknown; - DWORD Unknown2; + uint32_t FileSize; + uint32_t IconNr; + uint32_t Show; + uint32_t Hotkey; + uint32_t Unknown; + uint32_t Unknown2; } LNK_HEADER; typedef struct _LNK_LOCATOR_INFO { - DWORD Size; - DWORD DataOffset; - DWORD Flags; - DWORD LocalVolumeInfoOffset; - DWORD LocalBasePathnameOffset; - DWORD NetworkVolumeInfoOffset; - DWORD RemainingPathnameOffset; + uint32_t Size; + uint32_t DataOffset; + uint32_t Flags; + uint32_t LocalVolumeInfoOffset; + uint32_t LocalBasePathnameOffset; + uint32_t NetworkVolumeInfoOffset; + uint32_t RemainingPathnameOffset; char Data[0]; } LNK_LOCATOR_INFO; typedef struct _LNK_LOCAL_VOLUME_INFO { - DWORD Size; - DWORD VolumeType; /* See GetDriveType */ - DWORD SerialNumber; - DWORD VolumeNameOffset; + uint32_t Size; + uint32_t VolumeType; /* See GetDriveType */ + uint32_t SerialNumber; + uint32_t VolumeNameOffset; char VolumeLabel[0]; } LNK_LOCAL_VOLUME_INFO; @@ -75,30 +90,30 @@ typedef struct _ID_LIST_FILE { - WORD Size; - BYTE Type; - BYTE dummy; - DWORD dwFileSize; - WORD uFileDate; - WORD uFileTime; - WORD uFileAttribs; + uint16_t Size; + uint8_t Type; + uint8_t dummy; + uint32_t dwFileSize; + uint16_t uFileDate; + uint16_t uFileTime; + uint16_t uFileAttribs; char szName[0]; } ID_LIST_FILE; typedef struct _ID_LIST_GUID { - WORD Size; - BYTE Type; - BYTE dummy; + uint16_t Size; + uint8_t Type; + uint8_t dummy; GUID guid; } ID_LIST_GUID; typedef struct _ID_LIST_DRIVE { - WORD Size; - BYTE Type; - CHAR szDriveName[20]; - WORD unknown; + uint16_t Size; + uint8_t Type; + char szDriveName[20]; + uint16_t unknown; } ID_LIST_DRIVE; #pragma pack(pop) @@ -114,18 +129,18 @@ const char *pszIcon = NULL; int IconNr = 0; GUID Guid = CLSID_MyComputer; - BOOL bHelp = FALSE, bMinimized = FALSE; + int bHelp = 0, bMinimized = 0; FILE *pFile; LNK_HEADER Header; - USHORT uhTmp; - DWORD dwTmp; + uint16_t uhTmp; + uint32_t dwTmp; for (i = 1; i < argc; ++i) { if (argv[i][0] != '-' && argv[i][0] != '/') pszTarget = argv[i]; else if (!stricmp(argv[i] + 1, "h")) - bHelp = TRUE; + bHelp = 1; else if (!stricmp(argv[i] + 1, "o") && i + 1 < argc) pszOutputPath = argv[++i]; else if (!stricmp(argv[i] + 1, "d") && i + 1 < argc) @@ -141,7 +156,7 @@ IconNr = atoi(argv[++i]); } else if (!stricmp(argv[i] + 1, "m")) - bMinimized = TRUE; + bMinimized = 1; else if (!stricmp(argv[i] + 1, "g") && i + 1 < argc) { unsigned Data4Tmp[8], j; @@ -151,7 +166,7 @@ &Data4Tmp[0], &Data4Tmp[1], &Data4Tmp[2], &Data4Tmp[3], &Data4Tmp[4], &Data4Tmp[5], &Data4Tmp[6], &Data4Tmp[7]); for (j = 0; j < 8; ++j) - Guid.Data4[j] = (BYTE)Data4Tmp[j]; + Guid.Data4[j] = (uint8_t)Data4Tmp[j]; } else printf("Invalid option: %s\n", argv[i]); @@ -180,7 +195,7 @@ // Header memset(&Header, 0, sizeof(Header)); - Header.Signature = (DWORD)'L'; + Header.Signature = (uint32_t)'L'; Header.Guid = CLSID_ShellLink; Header.Flags = LINK_ID_LIST; if (pszDescription) @@ -200,7 +215,7 @@ ID_LIST_FILE IdListFile; ID_LIST_GUID IdListGuid; ID_LIST_DRIVE IdListDrive; - unsigned cbListSize = sizeof(IdListGuid) + sizeof(WORD), cchName; + unsigned cbListSize = sizeof(IdListGuid) + sizeof(uint16_t), cchName; const char *pszName = pszTarget; // ID list

1 0

[rharabien] 54514: [CMAKE] - Add shortcuts to CMake livecd. All .lnk files in Windows has structure called "id list". This is something like a path (we can't use environment variables there) and it...
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 19:59:14 2011 New Revision: 54514 URL: http://svn.reactos.org/svn/reactos?rev=54514&view=rev Log: [CMAKE] - Add shortcuts to CMake livecd. All .lnk files in Windows has structure called "id list". This is something like a path (we can't use environment variables there) and it is relative to Desktop. Usually first element is My Computer folder. In our shortcuts it points to livecd_start.cmd in My Documents folder, which is simple batch file. It's functionality is to start application given in argument. Because command line parameter of shell links can have environment variables, our shortcuts does not depend on patch to system directory (especially the drive number). It's a bit complicated but I have not found a better way. Now we have working shortcuts on Desktop and Start Menu. Control Panel will benefit in future because Admin Tools depend on Start Menu. Added: trunk/reactos/boot/bootdata/livecd_start.cmd (with props) Modified: trunk/reactos/boot/bootdata/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Nov 27 19:59:14 2011 @@ -9,12 +9,12 @@ # livecd hives list(APPEND CD_HIVES - ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf + ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) + ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sam @@ -52,4 +52,41 @@ #unattend add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) #uncomment this for unattend bootcd -#add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) +#add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) + +#LiveCD shortcuts +macro(add_livecd_shortcut name app dest) + add_link(NAME ${name} CMD_LINE_ARGS ${app} ICON ${app} PATH livecd_start.cmd GUID "{450D8FBA-AD25-11D0-98A8-0800361B1103}" MINIMIZE) + list(APPEND LIVECD_SHORTCUTS "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk") + add_cd_file(FILE "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk" + TARGET livecd_links + DESTINATION ${dest} + FOR livecd) +endmacro(add_livecd_shortcut) + +add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/livecd_start.cmd" DESTINATION "Profiles/Default User/My Documents" FOR livecd) +add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/All Users/Desktop") +add_livecd_shortcut("Device Manager" devmgmt.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") +add_livecd_shortcut("Event Viewer" eventvwr.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") +add_livecd_shortcut("Service Manager" servman.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") +add_livecd_shortcut("System Configuration" msconfig.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") +add_livecd_shortcut("Magnify" magnify.exe "Profiles/All Users/Start Menu/Programs/Accessibility") +add_livecd_shortcut("Calculator" calc.exe "Profiles/All Users/Start Menu/Programs/Accessories") +add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/All Users/Start Menu/Programs/Accessories") +add_livecd_shortcut("Paint" mspaint.exe "Profiles/All Users/Start Menu/Programs/Accessories") +add_livecd_shortcut("Notepad" notepad.exe "Profiles/All Users/Start Menu/Programs/Accessories") +add_livecd_shortcut("Remote desktop" mstsc.exe "Profiles/All Users/Start Menu/Programs/Accessories") +add_livecd_shortcut("WordPad" wordpad.exe "Profiles/All Users/Start Menu/Programs/Accessories") +add_livecd_shortcut("Audiorecorder" sndrec32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") +add_livecd_shortcut("Multimedia Player" mplay32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") +add_livecd_shortcut("Volume Control" sndvol32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") +add_livecd_shortcut("Solitaire" sol.exe "Profiles/All Users/Start Menu/Programs/Games") +add_livecd_shortcut("Spider Solitaire" spider.exe "Profiles/All Users/Start Menu/Programs/Games") +add_livecd_shortcut("WineMine" winmine.exe "Profiles/All Users/Start Menu/Programs/Games") +add_livecd_shortcut("Character Map" charmap.exe "Profiles/All Users/Start Menu/Programs/System Tools") +add_livecd_shortcut("Keyboard Layout Switcher" kbswitch.exe "Profiles/All Users/Start Menu/Programs/System Tools") +add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe "Profiles/All Users/Start Menu/Programs/System Tools") +add_livecd_shortcut("Regedit" regedit.exe "Profiles/All Users/Start Menu/Programs/System Tools") +add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/All Users/Start Menu/Programs") + +add_custom_target(livecd_links DEPENDS ${LIVECD_SHORTCUTS}) Added: trunk/reactos/boot/bootdata/livecd_start.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd_start… ============================================================================== --- trunk/reactos/boot/bootdata/livecd_start.cmd (added) +++ trunk/reactos/boot/bootdata/livecd_start.cmd [iso-8859-1] Sun Nov 27 19:59:14 2011 @@ -1,0 +1,1 @@ +@start %1 Propchange: trunk/reactos/boot/bootdata/livecd_start.cmd ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[rharabien] 54513: [CMAKE] - Add support for creating lnk files
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 19:45:41 2011 New Revision: 54513 URL: http://svn.reactos.org/svn/reactos?rev=54513&view=rev Log: [CMAKE] - Add support for creating lnk files Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=54513&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Nov 27 19:45:41 2011 @@ -61,9 +61,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl wrc gendib cabman cdmake mkhive obj2bin spec2def geninc rsym FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS gendib cabman cdmake mkhive obj2bin spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS widl wrc gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Nov 27 19:45:41 2011 @@ -54,6 +54,35 @@ PROPERTIES GENERATED TRUE) add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc) endforeach() +endfunction() + +function(add_link) + cmake_parse_arguments(_LINK "MINIMIZE" "NAME;PATH;CMD_LINE_ARGS;ICON;GUID" "" ${ARGN}) + if(NOT _LINK_NAME OR NOT _LINK_PATH) + message(FATAL_ERROR "You must provide name and path") + endif() + + if(_LINK_CMD_LINE_ARGS) + set(_LINK_CMD_LINE_ARGS -c ${_LINK_CMD_LINE_ARGS}) + endif() + + if(_LINK_ICON) + set(_LINK_ICON -i ${_LINK_ICON}) + endif() + + if(_LINK_GUID) + set(_LINK_GUID -g ${_LINK_GUID}) + endif() + + if(_LINK_MINIMIZE) + set(_LINK_MINIMIZE "-m") + endif() + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk + COMMAND native-mkshelllink -o ${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk ${_LINK_CMD_LINE_ARGS} ${_LINK_ICON} ${_LINK_GUID} ${_LINK_MINIMIZE} ${_LINK_PATH} + DEPENDS native-mkshelllink) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk PROPERTIES GENERATED TRUE) endfunction() macro(dir_to_num dir var)

1 0

[rharabien] 54512: [MKSHELLLINK] - Add host tool for creating .lnk files
by rharabien＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: rharabien Date: Sun Nov 27 19:41:52 2011 New Revision: 54512 URL: http://svn.reactos.org/svn/reactos?rev=54512&view=rev Log: [MKSHELLLINK] - Add host tool for creating .lnk files Added: trunk/reactos/tools/mkshelllink/ (with props) trunk/reactos/tools/mkshelllink/CMakeLists.txt (with props) trunk/reactos/tools/mkshelllink/mkshelllink.c (with props) trunk/reactos/tools/mkshelllink/mkshelllink.rbuild (with props) Modified: trunk/reactos/tools/CMakeLists.txt trunk/reactos/tools/tools.rbuild Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Sun Nov 27 19:41:52 2011 @@ -13,6 +13,7 @@ add_subdirectory(obj2bin) add_subdirectory(spec2def) add_subdirectory(unicode) +add_subdirectory(mkshelllink) if(NOT MSVC) add_subdirectory(rsym) Propchange: trunk/reactos/tools/mkshelllink/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 27 19:41:52 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/tools/mkshelllink/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/tools/mkshelllink/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/tools/mkshelllink/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/tools/mkshelllink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/CMakeLis… ============================================================================== --- trunk/reactos/tools/mkshelllink/CMakeLists.txt (added) +++ trunk/reactos/tools/mkshelllink/CMakeLists.txt [iso-8859-1] Sun Nov 27 19:41:52 2011 @@ -1,0 +1,2 @@ + +add_executable(mkshelllink mkshelllink.c) Propchange: trunk/reactos/tools/mkshelllink/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/mkshelllink/CMakeLists.txt ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Added: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… ============================================================================== --- trunk/reactos/tools/mkshelllink/mkshelllink.c (added) +++ trunk/reactos/tools/mkshelllink/mkshelllink.c [iso-8859-1] Sun Nov 27 19:41:52 2011 @@ -1,0 +1,333 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shell Link maker + * FILE: tools/mkshelllink/mkshelllink.c + * PURPOSE: Shell Link maker + * PROGRAMMER: Rafal Harabien + */ + +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <windows.h> + +#define DEFINE_GUID2(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID name = { l,w1,w2,{ b1,b2,b3,b4,b5,b6,b7,b8 } } +DEFINE_GUID2(CLSID_ShellLink,0x00021401L,0,0,0xC0,0,0,0,0,0,0,0x46); +DEFINE_GUID2(CLSID_MyComputer,0x20D04FE0,0x3AEA,0x1069,0xA2,0xD8,0x08,0x00,0x2B,0x30,0x30,0x9D); + +#define LINK_ID_LIST 0x01 +#define LINK_FILE 0x02 +#define LINK_DESCRIPTION 0x04 +#define LINK_RELATIVE_PATH 0x08 +#define LINK_WORKING_DIR 0x10 +#define LINK_CMD_LINE_ARGS 0x20 +#define LINK_ICON 0x40 +#define LINK_UNICODE 0x80 + +#define LOCATOR_LOCAL 0x1 +#define LOCATOR_NETWORK 0x2 + +#pragma pack(push, 1) + +/* Specification: http://ithreats.files.wordpress.com/2009/05/lnk_the_windows_shortcut_file_f… */ + +typedef struct _LNK_HEADER +{ + DWORD Signature; + GUID Guid; + DWORD Flags; + DWORD Attributes; + FILETIME CreationTime; + FILETIME ModificationTime; + FILETIME LastAccessTime; + DWORD FileSize; + DWORD IconNr; + DWORD Show; + DWORD Hotkey; + DWORD Unknown; + DWORD Unknown2; +} LNK_HEADER; + +typedef struct _LNK_LOCATOR_INFO +{ + DWORD Size; + DWORD DataOffset; + DWORD Flags; + DWORD LocalVolumeInfoOffset; + DWORD LocalBasePathnameOffset; + DWORD NetworkVolumeInfoOffset; + DWORD RemainingPathnameOffset; + char Data[0]; +} LNK_LOCATOR_INFO; + +typedef struct _LNK_LOCAL_VOLUME_INFO +{ + DWORD Size; + DWORD VolumeType; /* See GetDriveType */ + DWORD SerialNumber; + DWORD VolumeNameOffset; + char VolumeLabel[0]; +} LNK_LOCAL_VOLUME_INFO; + +#define PT_GUID 0x1F +#define PT_DRIVE1 0x2F +#define PT_FOLDER 0x31 +#define PT_VALUE 0x32 + +typedef struct _ID_LIST_FILE +{ + WORD Size; + BYTE Type; + BYTE dummy; + DWORD dwFileSize; + WORD uFileDate; + WORD uFileTime; + WORD uFileAttribs; + char szName[0]; +} ID_LIST_FILE; + +typedef struct _ID_LIST_GUID +{ + WORD Size; + BYTE Type; + BYTE dummy; + GUID guid; +} ID_LIST_GUID; + +typedef struct _ID_LIST_DRIVE +{ + WORD Size; + BYTE Type; + CHAR szDriveName[20]; + WORD unknown; +} ID_LIST_DRIVE; + +#pragma pack(pop) + +int main(int argc, const char *argv[]) +{ + unsigned i; + const char *pszOutputPath = "shortcut.lnk"; + const char *pszTarget = NULL; + const char *pszDescription = "Description"; + const char *pszWorkingDir = NULL; + const char *pszCmdLineArgs = NULL; + const char *pszIcon = NULL; + int IconNr = 0; + GUID Guid = CLSID_MyComputer; + BOOL bHelp = FALSE, bMinimized = FALSE; + FILE *pFile; + LNK_HEADER Header; + USHORT uhTmp; + DWORD dwTmp; + + for (i = 1; i < argc; ++i) + { + if (argv[i][0] != '-' && argv[i][0] != '/') + pszTarget = argv[i]; + else if (!stricmp(argv[i] + 1, "h")) + bHelp = TRUE; + else if (!stricmp(argv[i] + 1, "o") && i + 1 < argc) + pszOutputPath = argv[++i]; + else if (!stricmp(argv[i] + 1, "d") && i + 1 < argc) + pszDescription = argv[++i]; + else if (!stricmp(argv[i] + 1, "w") && i + 1 < argc) + pszWorkingDir = argv[++i]; + else if (!stricmp(argv[i] + 1, "c") && i + 1 < argc) + pszCmdLineArgs = argv[++i]; + else if (!stricmp(argv[i] + 1, "i") && i + 1 < argc) + { + pszIcon = argv[++i]; + if (i + 1 < argc && isdigit(argv[i + 1][0])) + IconNr = atoi(argv[++i]); + } + else if (!stricmp(argv[i] + 1, "m")) + bMinimized = TRUE; + else if (!stricmp(argv[i] + 1, "g") && i + 1 < argc) + { + unsigned Data4Tmp[8], j; + + sscanf(argv[++i], "{%8lx-%4hx-%4hx-%2x%2x-%2x%2x%2x%2x%2x%2x}", + &Guid.Data1, &Guid.Data2, &Guid.Data3, + &Data4Tmp[0], &Data4Tmp[1], &Data4Tmp[2], &Data4Tmp[3], + &Data4Tmp[4], &Data4Tmp[5], &Data4Tmp[6], &Data4Tmp[7]); + for (j = 0; j < 8; ++j) + Guid.Data4[j] = (BYTE)Data4Tmp[j]; + } + else + printf("Invalid option: %s\n", argv[i]); + } + + if (!pszTarget || bHelp) + { + printf("Usage: %s [-o path][-d descr][-w path][-c cmd_line_args][-i icon_path [nr]][-h][-g guid] target\n" + "-o path\tSets output path\n" + "-d descr\tSets shortcut description\n" + "-w path\tSets working directory for executable\n" + "-c cmd_line_args\tSets command line arguments passed to program\n" + "-i icon_path [nr]\tSets icon file and optionally icon index\n" + "-m\tStart minimized\n" + "-g guid\tSets GUID to which target path is relative. Default value is MyComputer GUID.\n" + "target\tAbsolute or relative to guid specified with -g option path\n", argv[0]); + return 0; + } + + pFile = fopen(pszOutputPath, "wb"); + if (!pFile) + { + printf("Failed to open %s\n", pszOutputPath); + return -1; + } + + // Header + memset(&Header, 0, sizeof(Header)); + Header.Signature = (DWORD)'L'; + Header.Guid = CLSID_ShellLink; + Header.Flags = LINK_ID_LIST; + if (pszDescription) + Header.Flags |= LINK_DESCRIPTION; + if (pszWorkingDir) + Header.Flags |= LINK_WORKING_DIR; + if (pszCmdLineArgs) + Header.Flags |= LINK_CMD_LINE_ARGS; + if (pszIcon) + Header.Flags |= LINK_ICON; + Header.IconNr = IconNr; + Header.Show = bMinimized ? SW_SHOWMINNOACTIVE : SW_SHOWNORMAL; + fwrite(&Header, sizeof(Header), 1, pFile); + + if (Header.Flags & LINK_ID_LIST) + { + ID_LIST_FILE IdListFile; + ID_LIST_GUID IdListGuid; + ID_LIST_DRIVE IdListDrive; + unsigned cbListSize = sizeof(IdListGuid) + sizeof(WORD), cchName; + const char *pszName = pszTarget; + + // ID list + // It seems explorer does not accept links without id list. List is relative to desktop. + + pszName = pszTarget; + + if (pszName[0] && pszName[1] == ':') + { + cbListSize += sizeof(IdListDrive); + pszName += 2; + while (*pszName == '\\' || *pszName == '/') + ++pszName; + } + + while (*pszName) + { + cchName = 0; + while (pszName[cchName] && pszName[cchName] != '\\' && pszName[cchName] != '/') + ++cchName; + + if (cchName != 1 || pszName[0] != '.') + cbListSize += sizeof(IdListFile) + 2 * (cchName + 1); + + pszName += cchName; + while (*pszName == '\\' || *pszName == '/') + ++pszName; + } + + uhTmp = cbListSize; + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); // size + + IdListGuid.Size = sizeof(IdListGuid); + IdListGuid.Type = PT_GUID; + IdListGuid.dummy = 0x50; + IdListGuid.guid = Guid; + fwrite(&IdListGuid, sizeof(IdListGuid), 1, pFile); + + pszName = pszTarget; + + if (isalpha(pszName[0]) && pszName[1] == ':') + { + memset(&IdListDrive, 0, sizeof(IdListDrive)); + IdListDrive.Size = sizeof(IdListDrive); + IdListDrive.Type = PT_DRIVE1; + sprintf(IdListDrive.szDriveName, "%c:\\", pszName[0]); + fwrite(&IdListDrive, sizeof(IdListDrive), 1, pFile); + pszName += 2; + while(*pszName == '\\' || *pszName == '/') + ++pszName; + } + + while (*pszName) + { + cchName = 0; + while (pszName[cchName] && pszName[cchName] != '\\' && pszName[cchName] != '/') + ++cchName; + + if (cchName != 1 || pszName[0] != '.') + { + memset(&IdListFile, 0, sizeof(IdListFile)); + IdListFile.Size = sizeof(IdListFile) + 2 * (cchName + 1); + if (!pszName[cchName]) + IdListFile.Type = PT_VALUE; // File + else + IdListFile.Type = PT_FOLDER; + fwrite(&IdListFile, sizeof(IdListFile), 1, pFile); + fwrite(pszName, cchName, 1, pFile); + fputc(0, pFile); + fwrite(pszName, cchName, 1, pFile); + fputc(0, pFile); + } + + pszName += cchName; + while (*pszName == '\\' || *pszName == '/') + ++pszName; + } + + uhTmp = 0; // list end + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); + } + + if (Header.Flags & LINK_DESCRIPTION) + { + // Dscription + uhTmp = strlen(pszDescription); + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); + fputs(pszDescription, pFile); + } + + if (Header.Flags & LINK_RELATIVE_PATH) + { + // Relative Path + uhTmp = strlen(pszTarget); + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); + fputs(pszTarget, pFile); + } + + if (Header.Flags & LINK_WORKING_DIR) + { + // Working Dir + uhTmp = strlen(pszWorkingDir); + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); + fputs(pszWorkingDir, pFile); + } + + if (Header.Flags & LINK_CMD_LINE_ARGS) + { + // Command line arguments + uhTmp = strlen(pszCmdLineArgs); + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); + fputs(pszCmdLineArgs, pFile); + } + + if (Header.Flags & LINK_ICON) + { + // Command line arguments + uhTmp = strlen(pszIcon); + fwrite(&uhTmp, sizeof(uhTmp), 1, pFile); + fputs(pszIcon, pFile); + } + + // Extra stuff + dwTmp = 0; + fwrite(&dwTmp, sizeof(dwTmp), 1, pFile); + + fclose(pFile); + + return 0; +} Propchange: trunk/reactos/tools/mkshelllink/mkshelllink.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/mkshelllink/mkshelllink.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… ============================================================================== --- trunk/reactos/tools/mkshelllink/mkshelllink.rbuild (added) +++ trunk/reactos/tools/mkshelllink/mkshelllink.rbuild [iso-8859-1] Sun Nov 27 19:41:52 2011 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="mkshelllink" type="buildtool"> + <file>mkshelllink.c</file> +</module> Propchange: trunk/reactos/tools/mkshelllink/mkshelllink.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=545… ============================================================================== --- trunk/reactos/tools/tools.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/tools.rbuild [iso-8859-1] Sun Nov 27 19:41:52 2011 @@ -46,4 +46,7 @@ <directory name="rbuild_helper"> <xi:include href="rbuild_helper/rbuild_helper.rbuild" /> </directory> +<directory name="mkshelllink"> + <xi:include href="mkshelllink/mkshelllink.rbuild" /> +</directory> </group>

1 0

[ekohl] 54511: [CLASS2] Switch to the 'new' disk geometry (63 sectors per track and 255 tracks per cylinder). This geometry is compatible with Windows, Linux and other Operating Systems. ATTENTION:...
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 14:18:40 2011 New Revision: 54511 URL: http://svn.reactos.org/svn/reactos?rev=54511&view=rev Log: [CLASS2] Switch to the 'new' disk geometry (63 sectors per track and 255 tracks per cylinder). This geometry is compatible with Windows, Linux and other Operating Systems. ATTENTION: You must delete and re-create the partitions on your harddisk. Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Sun Nov 27 14:18:40 2011 @@ -29,12 +29,12 @@ #define START_UNIT_TIMEOUT 30 /* Disk layout used by Windows NT4 and earlier versions. */ -#define DEFAULT_SECTORS_PER_TRACK 32 -#define DEFAULT_TRACKS_PER_CYLINDER 64 +//#define DEFAULT_SECTORS_PER_TRACK 32 +//#define DEFAULT_TRACKS_PER_CYLINDER 64 /* Disk layout used by Windows 2000 and later versions. */ -//#define DEFAULT_SECTORS_PER_TRACK 63 -//#define DEFAULT_TRACKS_PER_CYLINDER 255 +#define DEFAULT_SECTORS_PER_TRACK 63 +#define DEFAULT_TRACKS_PER_CYLINDER 255 NTSTATUS NTAPI

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