Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[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

[jimtabor] 54510: - Fix GetNCHitEx rects.
by jimtabor＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: jimtabor Date: Sun Nov 27 13:29:15 2011 New Revision: 54510 URL: http://svn.reactos.org/svn/reactos?rev=54510&view=rev Log: - Fix GetNCHitEx rects. 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] Sun Nov 27 13:29:15 2011 @@ -295,11 +295,20 @@ if (!pWnd) return HTNOWHERE; - rcClient.left = rcClient.top = rcWindow.left = rcWindow.top = 0; - rcWindow.right = pWnd->rcWindow.right; - rcWindow.bottom = pWnd->rcWindow.bottom; - rcClient.right = pWnd->rcClient.right; - rcClient.bottom = pWnd->rcClient.bottom; + if (pWnd == UserGetDesktopWindow())//pWnd->fnid == FNID_DESKTOP) + { + rcClient.left = rcClient.top = rcWindow.left = rcWindow.top = 0; + rcWindow.right = UserGetSystemMetrics(SM_CXSCREEN); + rcWindow.bottom = UserGetSystemMetrics(SM_CYSCREEN); + rcClient.right = UserGetSystemMetrics(SM_CXSCREEN); + rcClient.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + else + { + IntGetClientRect(pWnd, &rcClient); // This or + //rcClient = pWnd->rcClient; // this one? + rcWindow = pWnd->rcWindow; + } if (!RECTL_bPointInRect(&rcWindow, pt.x, pt.y)) return HTNOWHERE;

1 0

[jimtabor] 54509: - Add window placement flag for async message mode. Yes we support this too now.
by jimtabor＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: jimtabor Date: Sun Nov 27 12:58:01 2011 New Revision: 54509 URL: http://svn.reactos.org/svn/reactos?rev=54509&view=rev Log: - Add window placement flag for async message mode. Yes we support this too now. 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] Sun Nov 27 12:58:01 2011 @@ -2451,6 +2451,9 @@ #define IDANI_CAPTION 3 #define WPF_RESTORETOMAXIMIZED 2 #define WPF_SETMINPOSITION 1 +#if(_WIN32_WINNT >= 0x0500) +#define WPF_ASYNCWINDOWPLACEMENT 4 +#endif #define ODT_MENU 1 #define ODT_LISTBOX 2 #define ODT_COMBOBOX 3

1 0

[jimtabor] 54508: [Win32k] - Create Monitor from rect. This will be used for window placement support.
by jimtabor＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: jimtabor Date: Sun Nov 27 12:47:43 2011 New Revision: 54508 URL: http://svn.reactos.org/svn/reactos?rev=54508&view=rev Log: [Win32k] - Create Monitor from rect. This will be used for window placement support. Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Sun Nov 27 12:47:43 2011 @@ -33,5 +33,6 @@ NTSTATUS IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice); PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR); PMONITOR FASTCALL IntGetPrimaryMonitor(VOID); +PMONITOR FASTCALL IntMonitorFromRect(PRECTL,DWORD); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sun Nov 27 12:47:43 2011 @@ -402,6 +402,83 @@ return cMonitors; } + +PMONITOR +FASTCALL +IntMonitorFromRect( + PRECTL pRect, + DWORD dwFlags) +{ + ULONG cMonitors, LargestArea = 0, i; + PRECTL prcMonitorList = NULL; + HMONITOR *phMonitorList = NULL; + HMONITOR hMonitor = NULL; + + /* Check if flags are valid */ + if (dwFlags != MONITOR_DEFAULTTONULL && + dwFlags != MONITOR_DEFAULTTOPRIMARY && + dwFlags != MONITOR_DEFAULTTONEAREST) + { + EngSetLastError(ERROR_INVALID_FLAGS); + return NULL; + } + + /* Find intersecting monitors */ + cMonitors = IntGetMonitorsFromRect(pRect, &hMonitor, NULL, 1, dwFlags); + if (cMonitors <= 1) + { + /* No or one monitor found. Just return handle. */ + goto cleanup; + } + + /* There is more than one monitor. Find monitor with largest intersection. + Temporary reset hMonitor */ + hMonitor = NULL; + + /* Allocate helper buffers */ + phMonitorList = ExAllocatePoolWithTag(PagedPool, + sizeof(HMONITOR) * cMonitors, + USERTAG_MONITORRECTS); + if (phMonitorList == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + prcMonitorList = ExAllocatePoolWithTag(PagedPool, + sizeof(RECT) * cMonitors, + USERTAG_MONITORRECTS); + if (prcMonitorList == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + /* Get intersecting monitors again but now with rectangle list */ + cMonitors = IntGetMonitorsFromRect(pRect, phMonitorList, prcMonitorList, + cMonitors, 0); + + /* Find largest intersection */ + for (i = 0; i < cMonitors; i++) + { + ULONG Area = (prcMonitorList[i].right - prcMonitorList[i].left) * + (prcMonitorList[i].bottom - prcMonitorList[i].top); + if (Area >= LargestArea) + { + hMonitor = phMonitorList[i]; + LargestArea = Area; + } + } + +cleanup: + if (phMonitorList) + ExFreePoolWithTag(phMonitorList, USERTAG_MONITORRECTS); + if (prcMonitorList) + ExFreePoolWithTag(prcMonitorList, USERTAG_MONITORRECTS); + + return UserGetMonitorObject(hMonitor); +} + /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[ekohl] 54507: [USETUP] Get rid of the ugly LIST_FOR_EACH macro.
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 12:00:34 2011 New Revision: 54507 URL: http://svn.reactos.org/svn/reactos?rev=54507&view=rev Log: [USETUP] Get rid of the ugly LIST_FOR_EACH macro. Modified: trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/usetup.h 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] Sun Nov 27 12:00:34 2011 @@ -1281,6 +1281,7 @@ PDISKENTRY DiskEntry) { PPARTENTRY PartEntry; + PLIST_ENTRY Entry; CHAR LineBuffer[128]; COORD coPos; DWORD Written; @@ -1365,8 +1366,11 @@ PrintEmptyLine (List); /* Print partition lines*/ - LIST_FOR_EACH(PartEntry, &DiskEntry->PartListHead, PARTENTRY, ListEntry) - { + Entry = DiskEntry->PartListHead.Flink; + while (Entry != &DiskEntry->PartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + /* Print disk entry */ for (i=0; i<4; i++) { @@ -1389,6 +1393,7 @@ 0); } + Entry = Entry->Flink; } /* Print separator line */ @@ -1596,11 +1601,16 @@ /* print list entries */ List->Line = - List->Offset; - LIST_FOR_EACH(DiskEntry, &List->DiskListHead, DISKENTRY, ListEntry) - { + Entry = List->DiskListHead.Flink; + while (Entry != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD (Entry, DISKENTRY, ListEntry); + /* Print disk entry */ PrintDiskData (List, DiskEntry); + + Entry = Entry->Flink; } } Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Nov 27 12:00:34 2011 @@ -167,11 +167,6 @@ #define POPUP_WAIT_ANY_KEY 1 #define POPUP_WAIT_ENTER 2 -#define LIST_FOR_EACH(elem, list, type, field) \ - for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list) || (elem == NULL); \ - (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) - #define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\ {\ PLIST_ENTRY current;\

1 0

[ekohl] 54506: [TCPVCS] - Report service status upon an interrogate request. - Set the wait hint to a non-zero value.
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 10:55:45 2011 New Revision: 54506 URL: http://svn.reactos.org/svn/reactos?rev=54506&view=rev Log: [TCPVCS] - Report service status upon an interrogate request. - Set the wait hint to a non-zero value. Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] Sun Nov 27 10:55:45 2011 @@ -135,7 +135,7 @@ LogEvent(L"\nSetting the service to SERVICE_STOP_PENDING", 0, 0, LOG_FILE); InterlockedExchange((LONG *)&bShutdown, TRUE); pServInfo->servStatus.dwWin32ExitCode = 0; - pServInfo->servStatus.dwWaitHint = 0; + pServInfo->servStatus.dwWaitHint = 5000; UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); break; @@ -152,6 +152,7 @@ break; case SERVICE_CONTROL_INTERROGATE: + SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus); break; default:

1 0

[ekohl] 54505: [FREELDR] PcDiskGetDriveGeometry: Try to retrieve the extended disk geometry first.
by ekohl＠svn.reactos.org 27 Nov '11

27 Nov '11

Author: ekohl Date: Sun Nov 27 10:00:24 2011 New Revision: 54505 URL: http://svn.reactos.org/svn/reactos?rev=54505&view=rev Log: [FREELDR] PcDiskGetDriveGeometry: Try to retrieve the extended disk geometry first. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun Nov 27 10:00:24 2011 @@ -302,11 +302,24 @@ BOOLEAN PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) { + EXTENDED_GEOMETRY ExtGeometry; REGS RegsIn; REGS RegsOut; ULONG Cylinders; TRACE("DiskGetDriveGeometry()\n"); + + /* Try to get the extended geometry first */ + ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); + if (DiskGetExtendedDriveParameters(DriveNumber, &ExtGeometry, ExtGeometry.Size)) + { + Geometry->Cylinders = ExtGeometry.Cylinders; + Geometry->Heads = ExtGeometry.Heads; + Geometry->Sectors = ExtGeometry.SectorsPerTrack; + Geometry->BytesPerSector = ExtGeometry.BytesPerSector; + + return TRUE; + } /* BIOS Int 13h, function 08h - Get drive parameters * AH = 08h

1 0

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011