Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hpoussin] 18071: USB root hub is not really a child of the USB Controller, so don't give it a device identifier
by hpoussin＠svn.reactos.com 25 Sep '05

25 Sep '05

USB root hub is not really a child of the USB Controller, so don't give it a device identifier Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-09-25 20:54:40 UTC (rev 18070) +++ trunk/reactos/bootdata/hivesys.inf 2005-09-25 20:56:58 UTC (rev 18071) @@ -606,6 +606,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","Count",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x0 0010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615A D&REV_00\0000","Service",0x0000000,"usbuhci" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615 AD&REV_00\0000","ParentIdPrefix",0x0000000,"0000" ;USB OHCI Driver (Cromwell), especially the same name as windows OHCI miniport HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x000 00001 _____ Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c --- trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-25 20:54:40 UTC (rev 18070) +++ trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-25 20:56:58 UTC (rev 18071) @@ -170,7 +170,7 @@ case BusQueryInstanceID: { DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - RtlInitUnicodeString(&SourceString, L"0000"); /* FIXME */ + RtlInitUnicodeString(&SourceString, L""); break; } default:

1 0

[navaraf] 18070: Revert r18064 and correctly set the cell size for hash cells.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Revert r18064 and correctly set the cell size for hash cells. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-25 20:46:28 UTC (rev 18069) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-25 20:54:40 UTC (rev 18070) @@ -3033,6 +3033,7 @@ else { ASSERT(SubKeyCount <= 0xffff); /* should really be USHORT_MAX or similar */ + NewHashBlock->CellSize = -NewHashSize; NewHashBlock->Id = REG_HASH_TABLE_CELL_ID; NewHashBlock->HashTableSize = (USHORT)SubKeyCount; *HashBlock = NewHashBlock; @@ -3456,20 +3457,14 @@ else { PCELL_HEADER pFree = Cell; - PHASH_TABLE_CELL pHash = Cell; - LONG CellSize; - if (pHash->Id == REG_HASH_TABLE_CELL_ID) - CellSize = sizeof(HASH_TABLE_CELL) + pHash->HashTableSize * sizeof(HASH_RECORD); - else - CellSize = abs(pFree->CellSize); + if (pFree->CellSize < 0) + pFree->CellSize = -pFree->CellSize; - /* Clear block */ - RtlZeroMemory(pFree, CellSize); - - /* restore CellSize */ - pFree->CellSize = CellSize; - + /* Clear block (except the block size) */ + RtlZeroMemory(((char*)pFree) + sizeof(ULONG), + pFree->CellSize - sizeof(ULONG)); + /* Add block to the list of free blocks */ CmiAddFree(RegistryHive, Cell, CellOffset, TRUE);

1 0

[gedmurphy] 18069: Simple implementation of the MS comp utility (remembered to add the files this time :) )
by gedmurphy＠svn.reactos.com 25 Sep '05

25 Sep '05

Simple implementation of the MS comp utility (remembered to add the files this time :) ) Added: trunk/rosapps/cmdutils/comp/ Added: trunk/rosapps/cmdutils/comp/comp.c Added: trunk/rosapps/cmdutils/comp/comp.rc Added: trunk/rosapps/cmdutils/comp/comp.xml _____ Added: trunk/rosapps/cmdutils/comp/comp.c --- trunk/rosapps/cmdutils/comp/comp.c 2005-09-25 20:39:55 UTC (rev 18068) +++ trunk/rosapps/cmdutils/comp/comp.c 2005-09-25 20:46:28 UTC (rev 18069) @@ -0,0 +1,181 @@ +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS comp utility + * FILE: comp.c + * PURPOSE: Compares the contents of two files + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 25/09/05 Created + * + */ + + +#include <windows.h> +#include <tchar.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define STRBUF 1024 + +/* getline: read a line, return length */ +INT GetLine(char *line, FILE *in) +{ + if (fgets(line, STRBUF, in) == NULL) + return 0; + else + return strlen(line); +} + +/* print program usage */ +VOID Usage(VOID) +{ + _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" + "COMP [data1] [data2]\n\n" + " data1 Specifies location and name of first file to compare.\n" + " data2 Specifies location and name of second file to compare.\n")); +} + + +int _tmain (int argc, TCHAR *argv[]) +{ + INT i; + INT LineLen1, LineLen2; + FILE *fp1, *fp2; // file pointers + PTCHAR Line1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + PTCHAR Line2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + TCHAR File1[_MAX_PATH], // file paths + File2[_MAX_PATH]; + BOOL bMatch = TRUE, // files match + bAscii = FALSE, // /A switch + bLineNos = FALSE; // /L switch + + /* parse command line for options */ + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + --argc; + switch (argv[i][1]) { + case 'A': bAscii = TRUE; + _tprintf(_T("/a not Supported\n")); /*FIXME: needs adding */ + break; + case 'L': bLineNos = TRUE; + _tprintf(_T("/l not supported\n")); /*FIXME: needs adding */ + break; + case '?': Usage(); + return EXIT_SUCCESS; + default: + _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); + Usage(); + return EXIT_FAILURE; + } + } + } + + switch (argc) + { + case 1 : + _tprintf(_T("Name of first file to compare: ")); + fgets(File1, _MAX_PATH, stdin); + for (i=0; i<_MAX_PATH; i++) + { + if (File1[i] == '\n') + { + File1[i] = '\0'; + break; + } + } + + _tprintf(_T("Name of second file to compare: ")); + fgets(File2, _MAX_PATH, stdin); + for (i=0; i<_MAX_PATH; i++) + { + if (File2[i] == '\n') + { + File2[i] = '\0'; + break; + } + } + break; + case 2 : + _tcsncpy(File1, argv[1], _MAX_PATH); + _tprintf(_T("Name of second file to compare: ")); + fgets(File2, _MAX_PATH, stdin); + for (i=0; i<_MAX_PATH; i++) + { + if (File2[i] == '\n') + { + File2[i] = '\0'; + break; + } + } + break; + case 3 : + _tcsncpy(File1, argv[1], _MAX_PATH); + _tcsncpy(File2, argv[2], _MAX_PATH); + break; + default : + _tprintf(_T("Bad command line syntax\n")); + return EXIT_FAILURE; + break; + } + + + + if ((fp1 = fopen(File1, "r")) == NULL) + { + _tprintf(_T("Can't find/open file: %s\n"), File1); + return EXIT_FAILURE; + } + if ((fp2 = fopen(File2, "r")) == NULL) + { + _tprintf(_T("Can't find/open file: %s\n"), File2); + return EXIT_FAILURE; + } + + + _tprintf(_T("Comparing %s and %s...\n"), File1, File2); + + while ((LineLen1 = GetLine(Line1, fp1) != 0) && + (LineLen2 = GetLine(Line2, fp2) != 0)) + { + // LineCount++; + while ((*Line1 != '\0') && (*Line2 != '\0')) + { + if (*Line1 != *Line2) + { + bMatch = FALSE; + break; + } + Line1++, Line2++; + } + } + + bMatch ? _tprintf(_T("Files compare OK\n")) : _tprintf(_T("Files are different sizes.\n")); + + fclose(fp1); + fclose(fp2); + + + return EXIT_SUCCESS; +} +/* EOF */ _____ Added: trunk/rosapps/cmdutils/comp/comp.rc --- trunk/rosapps/cmdutils/comp/comp.rc 2005-09-25 20:39:55 UTC (rev 18068) +++ trunk/rosapps/cmdutils/comp/comp.rc 2005-09-25 20:46:28 UTC (rev 18069) @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "File Compare Utility\0" +#define REACTOS_STR_INTERNAL_NAME "comp\0" +#define REACTOS_STR_ORIGINAL_FILENAME "comp.exe\0" +#include <reactos/version.rc> _____ Added: trunk/rosapps/cmdutils/comp/comp.xml --- trunk/rosapps/cmdutils/comp/comp.xml 2005-09-25 20:39:55 UTC (rev 18068) +++ trunk/rosapps/cmdutils/comp/comp.xml 2005-09-25 20:46:28 UTC (rev 18069) @@ -0,0 +1,7 @@ +<module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>comp.c</file> + <file>comp.rc</file> +</module> +

1 0

[gedmurphy] 18068: Simple implementation of the MS comp utility
by gedmurphy＠svn.reactos.com 25 Sep '05

25 Sep '05

Simple implementation of the MS comp utility Modified: trunk/rosapps/cmdutils/cmdutils.xml _____ Modified: trunk/rosapps/cmdutils/cmdutils.xml --- trunk/rosapps/cmdutils/cmdutils.xml 2005-09-25 19:40:48 UTC (rev 18067) +++ trunk/rosapps/cmdutils/cmdutils.xml 2005-09-25 20:39:55 UTC (rev 18068) @@ -1,23 +1,26 @@ <group> +<directory name="comp"> + <xi:include href="comp/comp.xml" /> +</directory> <directory name="find"> - <xi:include href="find/find.xml" /> + <xi:include href="find/find.xml" /> </directory> <directory name="mode"> - <xi:include href="mode/mode.xml" /> + <xi:include href="mode/mode.xml" /> </directory> <directory name="more"> - <xi:include href="more/more.xml" /> + <xi:include href="more/more.xml" /> </directory> <directory name="sort"> - <xi:include href="sort/sort.xml" /> + <xi:include href="sort/sort.xml" /> </directory> <directory name="tee"> - <xi:include href="tee/tee.xml" /> + <xi:include href="tee/tee.xml" /> </directory> <directory name="touch"> - <xi:include href="touch/touch.xml" /> + <xi:include href="touch/touch.xml" /> </directory> <directory name="y"> - <xi:include href="y/y.xml" /> + <xi:include href="y/y.xml" /> </directory> </group>

1 0

[ea] 18067: cmdutils: a program a directory (bootcd, livecd, ...)
by ea＠svn.reactos.com 25 Sep '05

25 Sep '05

cmdutils: a program a directory (bootcd,livecd,...) Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-09-25 19:38:46 UTC (rev 18066) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-09-25 19:40:48 UTC (rev 18067) @@ -296,13 +296,13 @@ modules\rosky\lib\libskygi\libskygi.dll 1 optional modules\vms\server\vmssrv.dll 1 optional modules\vms\lib\vmsdll\vmsdll.dll 1 optional -modules\rosapps\cmdutils\find.exe 1 optional -modules\rosapps\cmdutils\more.exe 1 optional -modules\rosapps\cmdutils\sort.exe 1 optional -modules\rosapps\cmdutils\tee.exe 1 optional -modules\rosapps\cmdutils\y.exe 1 optional +modules\rosapps\cmdutils\find\find.exe 1 optional modules\rosapps\cmdutils\mode\mode.exe 1 optional +modules\rosapps\cmdutils\more\more.exe 1 optional +modules\rosapps\cmdutils\sort\sort.exe 1 optional +modules\rosapps\cmdutils\tee\tee.exe 1 optional modules\rosapps\cmdutils\touch\touch.exe 1 optional +modules\rosapps\cmdutils\y\y.exe 1 optional modules\rosapps\games\solitaire\sol.exe 1 optional modules\rosapps\games\winemine\winemine.exe 1 optional modules\rosapps\mc\mc.exe 1 optional

1 0

[ea] 18066: cmdutils: a program a directory.
by ea＠svn.reactos.com 25 Sep '05

25 Sep '05

cmdutils: a program a directory. Modified: trunk/rosapps/cmdutils/cmdutils.xml Added: trunk/rosapps/cmdutils/find/ Added: trunk/rosapps/cmdutils/find/find.c Added: trunk/rosapps/cmdutils/find/find.rc Added: trunk/rosapps/cmdutils/find/find.xml Deleted: trunk/rosapps/cmdutils/find.c Deleted: trunk/rosapps/cmdutils/find.rc Added: trunk/rosapps/cmdutils/more/ Added: trunk/rosapps/cmdutils/more/more.c Added: trunk/rosapps/cmdutils/more/more.rc Added: trunk/rosapps/cmdutils/more/more.xml Deleted: trunk/rosapps/cmdutils/more.c Deleted: trunk/rosapps/cmdutils/more.rc Added: trunk/rosapps/cmdutils/sort/ Added: trunk/rosapps/cmdutils/sort/sort.c Added: trunk/rosapps/cmdutils/sort/sort.rc Added: trunk/rosapps/cmdutils/sort/sort.xml Deleted: trunk/rosapps/cmdutils/sort.c Deleted: trunk/rosapps/cmdutils/sort.rc Added: trunk/rosapps/cmdutils/tee/ Added: trunk/rosapps/cmdutils/tee/tee.c Added: trunk/rosapps/cmdutils/tee/tee.rc Added: trunk/rosapps/cmdutils/tee/tee.xml Deleted: trunk/rosapps/cmdutils/tee.c Deleted: trunk/rosapps/cmdutils/tee.rc Added: trunk/rosapps/cmdutils/y/ Added: trunk/rosapps/cmdutils/y/y.c Added: trunk/rosapps/cmdutils/y/y.rc Added: trunk/rosapps/cmdutils/y/y.xml Deleted: trunk/rosapps/cmdutils/y.c Deleted: trunk/rosapps/cmdutils/y.rc _____ Modified: trunk/rosapps/cmdutils/cmdutils.xml --- trunk/rosapps/cmdutils/cmdutils.xml 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/cmdutils.xml 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,52 +1,23 @@ +<group> +<directory name="find"> + <xi:include href="find/find.xml" /> +</directory> <directory name="mode"> <xi:include href="mode/mode.xml" /> </directory> - +<directory name="more"> + <xi:include href="more/more.xml" /> +</directory> +<directory name="sort"> + <xi:include href="sort/sort.xml" /> +</directory> +<directory name="tee"> + <xi:include href="tee/tee.xml" /> +</directory> <directory name="touch"> <xi:include href="touch/touch.xml" /> </directory> - -<module name="find" type="win32cui" installbase="system32" installname="find.exe"> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> - <file>find.c</file> - <file>find.rc</file> -</module> - -<module name="more" type="win32cui" installbase="system32" installname="more.exe"> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> - <file>more.c</file> - <file>more.rc</file> -</module> - -<module name="sort" type="win32cui" installbase="system32" installname="sort.exe"> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> - <file>sort.c</file> - <file>sort.rc</file> -</module> - -<module name="tee" type="win32cui" installbase="system32" installname="tee.exe"> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> - <file>tee.c</file> - <file>tee.rc</file> -</module> - -<module name="y" type="win32cui" installbase="system32" installname="y.exe"> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> - <file>y.c</file> - <file>y.rc</file> -</module> +<directory name="y"> + <xi:include href="y/y.xml" /> +</directory> +</group> _____ Copied: trunk/rosapps/cmdutils/find/find.c (from rev 18049, trunk/rosapps/cmdutils/find.c) _____ Copied: trunk/rosapps/cmdutils/find/find.rc (from rev 18049, trunk/rosapps/cmdutils/find.rc) _____ Added: trunk/rosapps/cmdutils/find/find.xml --- trunk/rosapps/cmdutils/find/find.xml 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/find/find.xml 2005-09-25 19:38:46 UTC (rev 18066) @@ -0,0 +1,8 @@ +<module name="find" type="win32cui" installbase="system32" installname="find.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>find.c</file> + <file>find.rc</file> +</module> Property changes on: trunk/rosapps/cmdutils/find/find.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/cmdutils/find.c --- trunk/rosapps/cmdutils/find.c 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/find.c 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,248 +0,0 @@ -/* find.c */ - -/* Copyright (C) 1994-2002, Jim Hall <jhall(a)freedos.org> */ - -/* Adapted for ReactOS */ - -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - - -/* This program locates a string in a text file and prints those lines - * that contain the string. Multiple files are clearly separated. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> - -#include <dir.h> -#include <dos.h> - - -/* Symbol definition */ -#define MAX_STR 1024 - - -/* This function prints out all lines containing a substring. There are some - * conditions that may be passed to the function. - * - * RETURN: If the string was found at least once, returns 1. - * If the string was not found at all, returns 0. - */ -int -find_str (char *sz, FILE *p, int invert_search, - int count_lines, int number_output, int ignore_case) -{ - int i, length; - long line_number = 0, total_lines = 0; - char *c, temp_str[MAX_STR], this_line[MAX_STR]; - - /* Convert to upper if needed */ - if (ignore_case) - { - length = strlen (sz); - for (i = 0; i < length; i++) - sz[i] = toupper (sz[i]); - } - - /* Scan the file until EOF */ - while (fgets (temp_str, MAX_STR, p) != NULL) - { - /* Remove the trailing newline */ - length = strlen (temp_str); - if (temp_str[length-1] == '\n') - { - temp_str[length-1] = '\0'; - } - - /* Increment number of lines */ - line_number++; - strcpy (this_line, temp_str); - - /* Convert to upper if needed */ - if (ignore_case) - { - for (i = 0; i < length; i++) - { - temp_str[i] = toupper (temp_str[i]); - } - } - - /* Locate the substring */ - - /* strstr() returns a pointer to the first occurrence in the - string of the substring */ - c = strstr (temp_str, sz); - - if ( ((invert_search) ? (c == NULL) : (c != NULL)) ) - { - if (!count_lines) - { - if (number_output) - printf ("%ld:", line_number); - - /* Print the line of text */ - puts (this_line); - } - - total_lines++; - } /* long if */ - } /* while fgets */ - - if (count_lines) - { - /* Just show num. lines that contain the string */ - printf ("%ld\n", total_lines); - } - - - /* RETURN: If the string was found at least once, returns 1. - * If the string was not found at all, returns 0. - */ - return (total_lines > 0 ? 1 : 0); -} - - -/* Show usage */ -void -usage (void) -{ - fprintf (stderr, "FIND: Prints all lines of a file that contain a string\n"); - fprintf (stderr, "FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n"); - fprintf (stderr, " /C Count the number of lines that contain string\n"); - fprintf (stderr, " /I Ignore case\n"); - fprintf (stderr, " /N Number the displayed lines, starting at 1\n"); - fprintf (stderr, " /V Print lines that do not contain the string\n"); -} - - -/* Main program */ -int -main (int argc, char **argv) -{ - char *opt, *needle = NULL; - int ret = 0; - - int invert_search = 0; /* flag to invert the search */ - int count_lines = 0; /* flag to whether/not count lines */ - int number_output = 0; /* flag to print line numbers */ - int ignore_case = 0; /* flag to be case insensitive */ - - FILE *pfile; /* file pointer */ - int hfind; /* search handle */ - struct _finddata_t finddata; /* _findfirst, filenext block */ - - /* Scan the command line */ - while ((--argc) && (needle == NULL)) - { - if (*(opt = *++argv) == '/') - { - switch (opt[1]) - { - case 'c': - case 'C': /* Count */ - count_lines = 1; - break; - - case 'i': - case 'I': /* Ignore */ - ignore_case = 1; - break; - - case 'n': - case 'N': /* Number */ - number_output = 1; - break; - - case 'v': - case 'V': /* Not with */ - invert_search = 1; - break; - - default: - usage (); - exit (2); /* syntax error .. return error 2 */ - break; - } - } - else - { - /* Get the string */ - if (needle == NULL) - { - /* Assign the string to find */ - needle = *argv; - } - } - } - - /* Check for search string */ - if (needle == NULL) - { - /* No string? */ - usage (); - exit (1); - } - - /* Scan the files for the string */ - if (argc == 0) - { - ret = find_str (needle, stdin, invert_search, count_lines, - number_output, ignore_case); - } - - while (--argc >= 0) - { - hfind = _findfirst (*++argv, &finddata); - if (hfind < 0) - { - /* We were not able to find a file. Display a message and - set the exit status. */ - fprintf (stderr, "FIND: %s: No such file\n", *argv); - } - else - { - /* repeat find next file to match the filemask */ - do - { - /* We have found a file, so try to open it */ - if ((pfile = fopen (finddata.name, "r")) != NULL) - { - printf ("---------------- %s\n", finddata.name); - ret = find_str (needle, pfile, invert_search, count_lines, - number_output, ignore_case); - fclose (pfile); - } - else - { - fprintf (stderr, "FIND: %s: Cannot open file\n", - finddata.name); - } - } - while (_findnext(hfind, &finddata) > 0); - } - _findclose(hfind); - } /* for each argv */ - - /* RETURN: If the string was found at least once, returns 0. - * If the string was not found at all, returns 1. - * (Note that find_str.c returns the exact opposite values.) - */ - exit ( (ret ? 0 : 1) ); -} - _____ Deleted: trunk/rosapps/cmdutils/find.rc --- trunk/rosapps/cmdutils/find.rc 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/find.rc 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,6 +0,0 @@ -/* $Id$ */ - -#define REACTOS_STR_FILE_DESCRIPTION "W32 find command\0" -#define REACTOS_STR_INTERNAL_NAME "find\0" -#define REACTOS_STR_ORIGINAL_FILENAME "find.exe\0" -#include <reactos/version.rc> _____ Copied: trunk/rosapps/cmdutils/more/more.c (from rev 18049, trunk/rosapps/cmdutils/more.c) _____ Copied: trunk/rosapps/cmdutils/more/more.rc (from rev 18049, trunk/rosapps/cmdutils/more.rc) _____ Added: trunk/rosapps/cmdutils/more/more.xml --- trunk/rosapps/cmdutils/more/more.xml 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/more/more.xml 2005-09-25 19:38:46 UTC (rev 18066) @@ -0,0 +1,8 @@ +<module name="more" type="win32cui" installbase="system32" installname="more.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>more.c</file> + <file>more.rc</file> +</module> Property changes on: trunk/rosapps/cmdutils/more/more.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/cmdutils/more.c --- trunk/rosapps/cmdutils/more.c 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/more.c 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,151 +0,0 @@ -/* - * MORE.C - external command. - * - * clone from 4nt more command - * - * 26 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> - * started - * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm> - * use window size instead of buffer size. - */ - -#include <windows.h> -#include <malloc.h> -#include <tchar.h> - - -DWORD len; -LPTSTR msg = "--- continue ---"; - - -/*handle for file and console*/ -HANDLE hStdIn; -HANDLE hStdOut; -HANDLE hStdErr; -HANDLE hKeyboard; - - -static VOID -GetScreenSize (PSHORT maxx, PSHORT maxy) -{ - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (hStdOut, &csbi); - *maxx = csbi.srWindow.Right; - *maxy = csbi.srWindow.Bottom; - -} - - -static -VOID ConOutPuts (LPTSTR szText) -{ - DWORD dwWritten; - - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); -} - - -static VOID -ConInKey (VOID) -{ - INPUT_RECORD ir; - DWORD dwRead; - - do - { - ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); - if ((ir.EventType == KEY_EVENT) && - (ir.Event.KeyEvent.bKeyDown == TRUE)) - return; - } - while (TRUE); -} - - -static VOID -WaitForKey (VOID) -{ - DWORD dwWritten; - - WriteFile (hStdErr,msg , len, &dwWritten, NULL); - - ConInKey(); - - WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); - -// FlushConsoleInputBuffer (hConsoleIn); -} - - -//INT CommandMore (LPTSTR cmd, LPTSTR param) -int main (int argc, char **argv) -{ - SHORT maxx,maxy; - SHORT line_count=0,ch_count=0; - INT i, last; - - /*reading/writing buffer*/ - TCHAR *buff; - - /*bytes written by WriteFile and ReadFile*/ - DWORD dwRead,dwWritten; - - /*ReadFile() return value*/ - BOOL bRet; - - len = _tcslen (msg); - hStdIn = GetStdHandle(STD_INPUT_HANDLE); - hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - hStdErr = GetStdHandle(STD_ERROR_HANDLE); - - if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) - { - ConOutPuts(_T("Help text still missing!!")); - return 0; - } - - hKeyboard = CreateFile ("CONIN$", GENERIC_READ, - 0,NULL,OPEN_ALWAYS,0,0); - - GetScreenSize(&maxx,&maxy); - - buff=malloc(4096); - - FlushConsoleInputBuffer (hKeyboard); - - do - { - bRet = ReadFile(hStdIn,buff,4096,&dwRead,NULL); - - for(last=i=0;i<dwRead && bRet;i++) - { - ch_count++; - if(buff[i] == _T('\n') || ch_count == maxx) - { - ch_count=0; - line_count++; - if (line_count == maxy) - { - line_count = 0; - WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); - last=i+1; - FlushFileBuffers (hStdOut); - WaitForKey (); - } - } - } - if (last<dwRead && bRet) - WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); - - } - while(dwRead>0 && bRet); - - free (buff); - CloseHandle (hKeyboard); - - return 0; -} - -/* EOF */ _____ Deleted: trunk/rosapps/cmdutils/more.rc --- trunk/rosapps/cmdutils/more.rc 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/more.rc 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,6 +0,0 @@ -/* $Id$ */ - -#define REACTOS_STR_FILE_DESCRIPTION "W32 more command\0" -#define REACTOS_STR_INTERNAL_NAME "more\0" -#define REACTOS_STR_ORIGINAL_FILENAME "more.exe\0" -#include <reactos/version.rc> _____ Copied: trunk/rosapps/cmdutils/sort/sort.c (from rev 18049, trunk/rosapps/cmdutils/sort.c) _____ Copied: trunk/rosapps/cmdutils/sort/sort.rc (from rev 18049, trunk/rosapps/cmdutils/sort.rc) _____ Added: trunk/rosapps/cmdutils/sort/sort.xml --- trunk/rosapps/cmdutils/sort/sort.xml 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/sort/sort.xml 2005-09-25 19:38:46 UTC (rev 18066) @@ -0,0 +1,8 @@ +<module name="sort" type="win32cui" installbase="system32" installname="sort.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>sort.c</file> + <file>sort.rc</file> +</module> Property changes on: trunk/rosapps/cmdutils/sort/sort.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/cmdutils/sort.c --- trunk/rosapps/cmdutils/sort.c 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/sort.c 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,141 +0,0 @@ -/* -* SORT - reads line of a file and sorts them in order -* Copyright 1995 Jim Lynch -* -* Adapted for ReactOS -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <malloc.h> - -#define MAXRECORDS 65536 /* maximum number of records that can be - * sorted */ -#define MAXLEN 4095 /* maximum record length */ - -int rev; /* reverse flag */ -int help; /* help flag */ -int sortcol; /* sort column */ -int err = 0; /* error counter */ - -int -cmpr(const void *a, const void *b) -{ - char *A, *B; - - A = *(char **) a; - B = *(char **) b; - - if (sortcol > 0) { - if (strlen(A) > sortcol) - A += sortcol; - else - A = ""; - if (strlen(B) > sortcol) - B += sortcol; - else - B = ""; - } - if (!rev) - return strcmp(A, B); - else - return strcmp(B, A); -} - -void -usage(void) -{ - fputs("SORT\n", stderr); - fputs("Sorts input and writes output to a file, console or a device.\n", stderr); - if (err) - fputs("Invalid parameter\n", stderr); - fputs(" SORT [options] < [drive:1][path1]file1 > [drive2:][path2]file2\n", stderr); - fputs(" Command | SORT [options] > [drive:][path]file\n", stderr); - fputs(" Options:\n", stderr); - fputs(" /R Reverse order\n", stderr); - fputs(" /+n Start sorting with column n\n", stderr); - fputs(" /? Help\n", stderr); -} - -int main(int argc, char **argv) -{ - char temp[MAXLEN + 1]; - char **list; - char *cp; /* option character pointer */ - int nr; - int i; - - - sortcol = 0; - rev = 0; - while (--argc) { - if (*(cp = *++argv) == '/') { - switch (cp[1]) { - case 'R': - case 'r': - rev = 1; - break; - case '?': - case 'h': - case 'H': - help = 1; - break; - case '+': - sortcol = atoi(cp + 1); - if (sortcol) - sortcol--; - break; - default: - err++; - } - } - } - if (err || help) { - usage(); - exit(1); - } - list = (char **) malloc(MAXRECORDS * sizeof(char *)); - if (list == NULL) { - fputs("SORT: Insufficient memory\n", stderr); - exit(3); - } - for (nr = 0; nr < MAXRECORDS; nr++) { - if (fgets(temp, MAXLEN, stdin) == NULL) - break; - if(strlen(temp)) - temp[strlen(temp)-1]='\0'; - list[nr] = (char *) malloc(strlen(temp) + 1); - if (list[nr] == NULL) { - fputs("SORT: Insufficient memory\n", stderr); - exit(3); - } - strcpy(list[nr], temp); - } - if (nr == MAXRECORDS) { - fputs("SORT: number of records exceeds maximum\n", stderr); - exit(4); - } - qsort((void *) list, nr, sizeof(char *), cmpr); - for (i = 0; i < nr; i++) { - fputs(list[i], stdout); - fputs("\n",stdout); - } - return 0; -} - -/* EOF */ _____ Deleted: trunk/rosapps/cmdutils/sort.rc --- trunk/rosapps/cmdutils/sort.rc 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/sort.rc 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,6 +0,0 @@ -/* $Id$ */ - -#define REACTOS_STR_FILE_DESCRIPTION "W32 sort command\0" -#define REACTOS_STR_INTERNAL_NAME "sort\0" -#define REACTOS_STR_ORIGINAL_FILENAME "sort.exe\0" -#include <reactos/version.rc> _____ Copied: trunk/rosapps/cmdutils/tee/tee.c (from rev 18049, trunk/rosapps/cmdutils/tee.c) _____ Copied: trunk/rosapps/cmdutils/tee/tee.rc (from rev 18049, trunk/rosapps/cmdutils/tee.rc) _____ Added: trunk/rosapps/cmdutils/tee/tee.xml --- trunk/rosapps/cmdutils/tee/tee.xml 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/tee/tee.xml 2005-09-25 19:38:46 UTC (rev 18066) @@ -0,0 +1,8 @@ +<module name="tee" type="win32cui" installbase="system32" installname="tee.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>tee.c</file> + <file>tee.rc</file> +</module> Property changes on: trunk/rosapps/cmdutils/tee/tee.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/cmdutils/tee.c --- trunk/rosapps/cmdutils/tee.c 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/tee.c 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,220 +0,0 @@ -/* - * TEE.C - external command. - * - * clone from 4nt tee command - * - * 01 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> - * started - * - * - */ - - -#include <windows.h> -#include <tchar.h> -#include <stdio.h> -#include <malloc.h> - - - -#define TEE_BUFFER_SIZE 8192 - -/*these are function that emulate the ones used in cmd*/ - -/*many of them are just copied in this file from their -original location*/ - -VOID ConOutPuts (LPTSTR szText) -{ - DWORD dwWritten; - - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), _T("\n"), 1, &dwWritten, NULL); -} - - -VOID ConErrPrintf (LPTSTR szFormat, ...) -{ - DWORD dwWritten; - TCHAR szOut[4096]; - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - _vstprintf (szOut, szFormat, arg_ptr); - va_end (arg_ptr); - - WriteFile (GetStdHandle (STD_ERROR_HANDLE), szOut, _tcslen(szOut), &dwWritten, NULL); -} - - - -VOID error_sfile_not_found (LPTSTR f) -{ - ConErrPrintf (_T("Error opening file") _T(" - %s\n"), f); -} - - - - -VOID ConErrPuts (LPTSTR szText) -{ - ConErrPrintf(_T("%s\n"),szText ); -} - - -INT main (int argc,char **p) -{ - /*reading/writing buffer*/ - TCHAR buff[TEE_BUFFER_SIZE]; - - /*handle for file and console*/ - HANDLE hConsoleIn,hConsoleOut; - - /*bytes written by WriteFile and ReadFile*/ - DWORD dwRead,dwWritten; - - - BOOL bRet,bAppend=FALSE; - - - /*command line parsing stuff*/ - LPTSTR tmp; - INT i; - BOOL bQuote; - - /*file list implementation*/ - LPTSTR *files; - INT iFileCounter=0; - HANDLE *hFile; - - /*used to remove '"' (if any)*/ - INT add; - - DWORD dw; - - - if (argc < 2) - return 1; - - if (_tcsncmp (p[1], _T("/?"), 2) == 0) - { - ConOutPuts (_T("Copy standard input to both standard output and a file.\n" - "\n" - "TEE [/A] file...\n" - "\n" - " file One or more files that will receive output.\n" - " /A Append output to files.\n")); - return 0; - } - - files = malloc(sizeof(LPTSTR)*argc); - hFile = malloc(sizeof(HANDLE)*argc); - - hConsoleIn=GetStdHandle(STD_INPUT_HANDLE); - hConsoleOut=GetStdHandle(STD_OUTPUT_HANDLE); - - /*parse command line for /a and file name(s)*/ - for(i=1;i <argc;i++) - { - bQuote=FALSE; - add=0; - - if(_tcsnicmp(p[i],_T("/a"),2) == 0) - { - bAppend = TRUE; - continue; - } - - /*remove quote if any*/ - if (p[i][0] == _T('"')) - { - tmp = _tcschr (p[i]+1, _T('"')); - if (tmp != 0) - { - add = 1; - *tmp= _T('\0'); - } - } - - /*add filename to array of filename*/ -/* - if( iFileCounter >= sizeof(files) / sizeof(*files) ) - { - ConErrPrintf("too many files, maximum is %d\n",sizeof(files) / sizeof(*files)); - return 1; - } - */ - - files[iFileCounter++]= p[i]+add; - } - - /*open file(s)*/ - for(i=0;i<iFileCounter;i++) - { - //l=0; - hFile[i] = CreateFile(files[i],GENERIC_WRITE, - 0,NULL, - OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL,NULL); - - if (hFile[i] == INVALID_HANDLE_VALUE) - { - error_sfile_not_found (files[i]); - - for(i=0;i<iFileCounter;i++) - CloseHandle (hFile[i]); - - free (files); - free (hFile); - - return 1; - } - - /*set append mode*/ - if (bAppend) - { - if (GetFileType (hFile[i]) == FILE_TYPE_DISK) - { - dw = SetFilePointer (hFile[i],0,NULL,FILE_END); - if (dw == 0xFFFFFFFF) - { - ConErrPrintf(_T("error moving to end of file %s"),files[i]); - - for(i=0;i<iFileCounter;i++) - CloseHandle (hFile[i]); - - free (files); - free (hFile); - - return 1; - } - - ConErrPrintf(_T("SetFilePointer() = %d\n"),dw); - } - } - } - - /*read and write*/ - do - { - bRet = ReadFile(hConsoleIn,buff,sizeof(buff),&dwRead,NULL); - - if (dwRead>0 && bRet) - { - for(i=0;i<iFileCounter;i++) - WriteFile(hFile[i],buff,dwRead,&dwWritten,NULL); - - WriteFile(hConsoleOut,buff,dwRead,&dwWritten,NULL); - } - } while(dwRead>0 && bRet); - - for(i=0;i<iFileCounter;i++) - CloseHandle (hFile[i]); - - free (files); - free (hFile); - - return 0; -} - -/* EOF */ _____ Deleted: trunk/rosapps/cmdutils/tee.rc --- trunk/rosapps/cmdutils/tee.rc 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/tee.rc 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,6 +0,0 @@ -/* $Id$ */ - -#define REACTOS_STR_FILE_DESCRIPTION "W32 tee command\0" -#define REACTOS_STR_INTERNAL_NAME "tee\0" -#define REACTOS_STR_ORIGINAL_FILENAME "tee.exe\0" -#include <reactos/version.rc> _____ Copied: trunk/rosapps/cmdutils/y/y.c (from rev 18049, trunk/rosapps/cmdutils/y.c) _____ Copied: trunk/rosapps/cmdutils/y/y.rc (from rev 18049, trunk/rosapps/cmdutils/y.rc) _____ Added: trunk/rosapps/cmdutils/y/y.xml --- trunk/rosapps/cmdutils/y/y.xml 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/y/y.xml 2005-09-25 19:38:46 UTC (rev 18066) @@ -0,0 +1,8 @@ +<module name="y" type="win32cui" installbase="system32" installname="y.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>y.c</file> + <file>y.rc</file> +</module> Property changes on: trunk/rosapps/cmdutils/y/y.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/rosapps/cmdutils/y.c --- trunk/rosapps/cmdutils/y.c 2005-09-25 18:17:27 UTC (rev 18065) +++ trunk/rosapps/cmdutils/y.c 2005-09-25 19:38:46 UTC (rev 18066) @@ -1,122 +0,0 @@ -/* - * Y.C - Y external command. [truncated at 1000 lines; 131 more skipped]

1 0

[ion] 18065: - Fix mixed tab/space formatting issues.
by ion＠svn.reactos.com 25 Sep '05

25 Sep '05

- Fix mixed tab/space formatting issues. Modified: trunk/reactos/lib/ntdll/csr/api.c Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/ntdll/csr/api.c --- trunk/reactos/lib/ntdll/csr/api.c 2005-09-25 18:07:36 UTC (rev 18064) +++ trunk/reactos/lib/ntdll/csr/api.c 2005-09-25 18:17:27 UTC (rev 18065) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/api.c _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-09-25 18:07:36 UTC (rev 18064) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-09-25 18:17:27 UTC (rev 18065) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/capture.c @@ -119,8 +118,8 @@ ULONG NTAPI CsrAllocateMessagePointer(PCSR_CAPTURE_BUFFER CaptureBuffer, - ULONG MessageLength, - PVOID *CaptureData) + ULONG MessageLength, + PVOID *CaptureData) { /* If there's no data, our job is easy. */ if (MessageLength == 0) @@ -159,9 +158,9 @@ VOID NTAPI CsrCaptureMessageBuffer(PCSR_CAPTURE_BUFFER CaptureBuffer, - PVOID MessageString, - ULONG StringLength, - PVOID *CapturedData) + PVOID MessageString, + ULONG StringLength, + PVOID *CapturedData) { /* Simply allocate a message pointer in the buffer */ CsrAllocateMessagePointer(CaptureBuffer, StringLength, CapturedData); @@ -255,7 +254,7 @@ PLARGE_INTEGER NTAPI CsrCaptureTimeout(LONG Milliseconds, - PLARGE_INTEGER Timeout) + PLARGE_INTEGER Timeout) { /* Validate the time */ if (Milliseconds == -1) return NULL; _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 18:07:36 UTC (rev 18064) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-25 18:17:27 UTC (rev 18065) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/connect.c @@ -40,7 +39,7 @@ NTAPI CsrGetProcessId(VOID) { - return CsrProcessId; + return CsrProcessId; } /* @@ -187,7 +186,7 @@ /* Binary compatibility with MS KERNEL32 */ if (NULL == ObjectDirectory) { - ObjectDirectory = L"\\Windows"; + ObjectDirectory = L"\\Windows"; } /* Calculate the total port name size */ @@ -209,12 +208,12 @@ /* Create a section for the port memory */ CsrSectionViewSize.QuadPart = CSR_CSRSS_SECTION_SIZE; Status = NtCreateSection(&CsrSectionHandle, - SECTION_ALL_ACCESS, - NULL, - &CsrSectionViewSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL); + SECTION_ALL_ACCESS, + NULL, + &CsrSectionViewSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failure allocating CSR Section\n"); @@ -256,13 +255,13 @@ /* Connect to the port */ Status = NtSecureConnectPort(&CsrApiPort, &PortName, - &SecurityQos, - &LpcWrite, + &SecurityQos, + &LpcWrite, SystemSid, - &LpcRead, - NULL, - &ConnectionInfo, - &ConnectionInfoLength); + &LpcRead, + NULL, + &ConnectionInfo, + &ConnectionInfoLength); NtClose(CsrSectionHandle); if (!NT_SUCCESS(Status)) { @@ -419,9 +418,9 @@ sizeof(CSR_CLIENT_CONNECT)); #endif Status = CsrClientCallServer(&RosApiMessage, - NULL, - MAKE_CSR_API(CONNECT_PROCESS, CSR_NATIVE), - sizeof(CSR_API_MESSAGE)); + NULL, + MAKE_CSR_API(CONNECT_PROCESS, CSR_NATIVE), + sizeof(CSR_API_MESSAGE)); } else {

1 0

[navaraf] 18064: Correctly interpret the cell type in CmiDestroyCell. Patch by brbak <mpd000@yahoo.de>.
by navaraf＠svn.reactos.com 25 Sep '05

25 Sep '05

Correctly interpret the cell type in CmiDestroyCell. Patch by brbak <mpd000(a)yahoo.de>. Modified: trunk/reactos/ntoskrnl/cm/regfile.c _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-25 17:59:20 UTC (rev 18063) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-09-25 18:07:36 UTC (rev 18064) @@ -3456,14 +3456,20 @@ else { PCELL_HEADER pFree = Cell; + PHASH_TABLE_CELL pHash = Cell; + LONG CellSize; - if (pFree->CellSize < 0) - pFree->CellSize = -pFree->CellSize; + if (pHash->Id == REG_HASH_TABLE_CELL_ID) + CellSize = sizeof(HASH_TABLE_CELL) + pHash->HashTableSize * sizeof(HASH_RECORD); + else + CellSize = abs(pFree->CellSize); - /* Clear block (except the block size) */ - RtlZeroMemory(((char*)pFree) + sizeof(ULONG), - pFree->CellSize - sizeof(ULONG)); - + /* Clear block */ + RtlZeroMemory(pFree, CellSize); + + /* restore CellSize */ + pFree->CellSize = CellSize; + /* Add block to the list of free blocks */ CmiAddFree(RegistryHive, Cell, CellOffset, TRUE);

1 0

[mf] 18063: refeactor all IUnknown implementations using IComSrvBase
by mf＠svn.reactos.com 25 Sep '05

25 Sep '05

refeactor all IUnknown implementations using IComSrvBase Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.cpp Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-09-25 17:52:12 UTC (rev 18062) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-09-25 17:59:20 UTC (rev 18063) @@ -58,8 +58,7 @@ /// Implementation of IShellBrowserImpl interface in explorer child windows struct ShellBrowser : public IShellBrowserImpl #ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) - , public IComSrvBase<IShellFolderViewCB, ShellBrowser>, - public SimpleComObject + , public IComSrvBase<IShellFolderViewCB, ShellBrowser>, public SimpleComObject #endif { ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, _____ Modified: trunk/reactos/subsys/system/explorer/shell/webchild.h --- trunk/reactos/subsys/system/explorer/shell/webchild.h 2005-09-25 17:52:12 UTC (rev 18062) +++ trunk/reactos/subsys/system/explorer/shell/webchild.h 2005-09-25 17:59:20 UTC (rev 18063) @@ -530,9 +530,9 @@ #endif }; -struct ANSUNC DWebBrowserEvents2Impl : public SimpleComObject, - public IComSrvBase<FixedDWebBrowserEvents2, DWebBrowserEvents2Impl>, - public DWebBrowserEvents2IF +struct ANSUNC DWebBrowserEvents2Impl + : public IComSrvBase<FixedDWebBrowserEvents2, DWebBrowserEvents2Impl>, public SimpleComObject, + public DWebBrowserEvents2IF { typedef IComSrvBase<FixedDWebBrowserEvents2, DWebBrowserEvents2Impl> super; _____ Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.cpp --- trunk/reactos/subsys/system/explorer/utility/dragdropimpl.cpp 2005-09-25 17:52:12 UTC (rev 18062) +++ trunk/reactos/subsys/system/explorer/utility/dragdropimpl.cpp 2005-09-25 17:59:20 UTC (rev 18063) @@ -22,7 +22,8 @@ ////////////////////////////////////////////////////////////////////// IDataObjectImpl::IDataObjectImpl(IDropSourceImpl* pDropSource) - : m_pDropSource(pDropSource), + : super(IID_IDataObject), + m_pDropSource(pDropSource), m_cRefCount(0) { } @@ -33,37 +34,6 @@ ReleaseStgMedium(it->_medium); } -STDMETHODIMP IDataObjectImpl::QueryInterface(/* [in] */ REFIID riid, -/* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) -{ - *ppvObject = NULL; - if (IID_IUnknown==riid || IID_IDataObject==riid) - *ppvObject=this; - /*if (riid == IID_IAsyncOperation) - *ppvObject=(IAsyncOperation*)this;*/ - if (NULL!=*ppvObject) - { - ((LPUNKNOWN)*ppvObject)->AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -STDMETHODIMP_(ULONG) IDataObjectImpl::AddRef() -{ - return ++m_cRefCount; -} - -STDMETHODIMP_(ULONG) IDataObjectImpl::Release() -{ - long nTemp = --m_cRefCount; - - if (nTemp == 0) - delete this; - - return nTemp; -} - STDMETHODIMP IDataObjectImpl::GetData( /* [unique][in] */ FORMATETC __RPC_FAR *pformatetcIn, /* [out] */ STGMEDIUM __RPC_FAR *pmedium) @@ -255,38 +225,6 @@ // IDropSourceImpl Class ////////////////////////////////////////////////////////////////////// -STDMETHODIMP IDropSourceImpl::QueryInterface(/* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) -{ - *ppvObject = NULL; - if (IID_IUnknown==riid || IID_IDropSource==riid) - *ppvObject=this; - - if (*ppvObject != NULL) - { - ((LPUNKNOWN)*ppvObject)->AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -STDMETHODIMP_(ULONG) IDropSourceImpl::AddRef() -{ - return ++m_cRefCount; -} - -STDMETHODIMP_(ULONG) IDropSourceImpl::Release() -{ - long nTemp = --m_cRefCount; - - assert(nTemp >= 0); - - if (nTemp == 0) - delete this; - - return nTemp; -} - STDMETHODIMP IDropSourceImpl::QueryContinueDrag( /* [in] */ BOOL fEscapePressed, /* [in] */ DWORD grfKeyState) @@ -314,7 +252,8 @@ ////////////////////////////////////////////////////////////////////// EnumFormatEtcImpl::EnumFormatEtcImpl(const FormatArray& ArrFE) - : m_cRefCount(0), + : super(IID_IEnumFORMATETC), + m_cRefCount(0), m_iCur(0) { for(FormatArray::const_iterator it=ArrFE.begin(); it!=ArrFE.end(); ++it) @@ -322,46 +261,16 @@ } EnumFormatEtcImpl::EnumFormatEtcImpl(const StorageArray& ArrFE) - : m_cRefCount(0), + : super(IID_IEnumFORMATETC), + m_cRefCount(0), m_iCur(0) { for(StorageArray::const_iterator it=ArrFE.begin(); it!=ArrFE.end(); ++it) m_pFmtEtc.push_back(*it->_format); } -STDMETHODIMP EnumFormatEtcImpl::QueryInterface(REFIID refiid, void** ppv) +STDMETHODIMP EnumFormatEtcImpl::Next(ULONG celt,LPFORMATETC lpFormatEtc, ULONG* pceltFetched) { - *ppv = NULL; - if (IID_IUnknown==refiid || IID_IEnumFORMATETC==refiid) - *ppv=this; - - if (*ppv != NULL) - { - ((LPUNKNOWN)*ppv)->AddRef(); - return S_OK; - } - return E_NOINTERFACE; -} - -STDMETHODIMP_(ULONG) EnumFormatEtcImpl::AddRef(void) -{ - return ++m_cRefCount; -} - -STDMETHODIMP_(ULONG) EnumFormatEtcImpl::Release(void) -{ - long nTemp = --m_cRefCount; - - assert(nTemp >= 0); - - if (nTemp == 0) - delete this; - - return nTemp; -} - -STDMETHODIMP EnumFormatEtcImpl::Next( ULONG celt,LPFORMATETC lpFormatEtc, ULONG* pceltFetched) -{ if (pceltFetched != NULL) *pceltFetched=0; _____ Modified: trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h --- trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h 2005-09-25 17:52:12 UTC (rev 18062) +++ trunk/reactos/subsys/system/explorer/utility/dragdropimpl.h 2005-09-25 17:59:20 UTC (rev 18063) @@ -4,7 +4,7 @@ ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. - Author: Leon Finker 11/2000 + Author: Leon Finker 11/2000 Modifications: replaced ATL by STL, Martin Fuchs 7/2003 ************************************************************************ **/ @@ -24,60 +24,64 @@ /// implementation of IEnumFORMATETC interface -class EnumFormatEtcImpl : public IEnumFORMATETC +class EnumFormatEtcImpl + : public IComSrvBase<IEnumFORMATETC, EnumFormatEtcImpl>, public SimpleComObject { - private: - ULONG m_cRefCount; - FormatArray m_pFmtEtc; - size_t m_iCur; + typedef IComSrvBase<IEnumFORMATETC, EnumFormatEtcImpl> super; - public: - EnumFormatEtcImpl(const FormatArray& ArrFE); +private: + ULONG m_cRefCount; + FormatArray m_pFmtEtc; + size_t m_iCur; + +public: + EnumFormatEtcImpl(const FormatArray& ArrFE); EnumFormatEtcImpl(const StorageArray& ArrFE); virtual ~EnumFormatEtcImpl() {} - //IUnknown members - virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**); - virtual ULONG STDMETHODCALLTYPE AddRef(void); - virtual ULONG STDMETHODCALLTYPE Release(void); - - //IEnumFORMATETC members - virtual HRESULT STDMETHODCALLTYPE Next(ULONG, LPFORMATETC, ULONG*); - virtual HRESULT STDMETHODCALLTYPE Skip(ULONG); - virtual HRESULT STDMETHODCALLTYPE Reset(void); - virtual HRESULT STDMETHODCALLTYPE Clone(IEnumFORMATETC**); + //IEnumFORMATETC members + virtual HRESULT STDMETHODCALLTYPE Next(ULONG, LPFORMATETC, ULONG*); + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG); + virtual HRESULT STDMETHODCALLTYPE Reset(void); + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumFORMATETC**); }; /// implementation of IDropSource interface -class IDropSourceImpl : public IDropSource +class IDropSourceImpl + : public IComSrvBase<IDropSource, IDropSourceImpl>, public SimpleComObject { + typedef IComSrvBase<IDropSource, IDropSourceImpl> super; + long m_cRefCount; public: bool m_bDropped; - IDropSourceImpl::IDropSourceImpl() : m_cRefCount(0), m_bDropped(false) {} + IDropSourceImpl() + : super(IID_IDropSource), + m_cRefCount(0), + m_bDropped(false) + { + } + virtual ~IDropSourceImpl() {} - //IUnknown - virtual HRESULT STDMETHODCALLTYPE QueryInterface( - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release(); - //IDropSource - virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag( - /* [in] */ BOOL fEscapePressed, - /* [in] */ DWORD grfKeyState); + virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag( + /* [in] */ BOOL fEscapePressed, + /* [in] */ DWORD grfKeyState); - virtual HRESULT STDMETHODCALLTYPE GiveFeedback( - /* [in] */ DWORD dwEffect); + virtual HRESULT STDMETHODCALLTYPE GiveFeedback( + /* [in] */ DWORD dwEffect); }; /// implementation of IDataObject interface -class IDataObjectImpl : public IDataObject//,public IAsyncOperation +class IDataObjectImpl + : public IComSrvBase<IDataObject, IDataObjectImpl>, public SimpleComObject + //public IAsyncOperation { + typedef IComSrvBase<IDataObject, IDataObjectImpl> super; + IDropSourceImpl* m_pDropSource; long m_cRefCount; @@ -89,79 +93,72 @@ void CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC* pFmtSrc); - //IUnknown - virtual HRESULT STDMETHODCALLTYPE QueryInterface( - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release(); - //IDataObject virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetData( - /* [unique][in] */ FORMATETC __RPC_FAR *pformatetcIn, - /* [out] */ STGMEDIUM __RPC_FAR *pmedium); + /* [unique][in] */ FORMATETC __RPC_FAR *pformatetcIn, + /* [out] */ STGMEDIUM __RPC_FAR *pmedium); - virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetDataHere( - /* [unique][in] */ FORMATETC __RPC_FAR *pformatetc, - /* [out][in] */ STGMEDIUM __RPC_FAR *pmedium); + virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetDataHere( + /* [unique][in] */ FORMATETC __RPC_FAR *pformatetc, + /* [out][in] */ STGMEDIUM __RPC_FAR *pmedium); - virtual HRESULT STDMETHODCALLTYPE QueryGetData( - /* [unique][in] */ FORMATETC __RPC_FAR *pformatetc); + virtual HRESULT STDMETHODCALLTYPE QueryGetData( + /* [unique][in] */ FORMATETC __RPC_FAR *pformatetc); - virtual HRESULT STDMETHODCALLTYPE GetCanonicalFormatEtc( - /* [unique][in] */ FORMATETC __RPC_FAR *pformatectIn, - /* [out] */ FORMATETC __RPC_FAR *pformatetcOut); + virtual HRESULT STDMETHODCALLTYPE GetCanonicalFormatEtc( + /* [unique][in] */ FORMATETC __RPC_FAR *pformatectIn, + /* [out] */ FORMATETC __RPC_FAR *pformatetcOut); - virtual /* [local] */ HRESULT STDMETHODCALLTYPE SetData( - /* [unique][in] */ FORMATETC __RPC_FAR *pformatetc, - /* [unique][in] */ STGMEDIUM __RPC_FAR *pmedium, - /* [in] */ BOOL fRelease); + virtual /* [local] */ HRESULT STDMETHODCALLTYPE SetData( + /* [unique][in] */ FORMATETC __RPC_FAR *pformatetc, + /* [unique][in] */ STGMEDIUM __RPC_FAR *pmedium, + /* [in] */ BOOL fRelease); - virtual HRESULT STDMETHODCALLTYPE EnumFormatEtc( - /* [in] */ DWORD dwDirection, - /* [out] */ IEnumFORMATETC __RPC_FAR *__RPC_FAR *ppenumFormatEtc); + virtual HRESULT STDMETHODCALLTYPE EnumFormatEtc( + /* [in] */ DWORD dwDirection, + /* [out] */ IEnumFORMATETC __RPC_FAR *__RPC_FAR *ppenumFormatEtc); - virtual HRESULT STDMETHODCALLTYPE DAdvise( - /* [in] */ FORMATETC __RPC_FAR *pformatetc, - /* [in] */ DWORD advf, - /* [unique][in] */ IAdviseSink __RPC_FAR *pAdvSink, - /* [out] */ DWORD __RPC_FAR *pdwConnection); + virtual HRESULT STDMETHODCALLTYPE DAdvise( + /* [in] */ FORMATETC __RPC_FAR *pformatetc, + /* [in] */ DWORD advf, + /* [unique][in] */ IAdviseSink __RPC_FAR *pAdvSink, + /* [out] */ DWORD __RPC_FAR *pdwConnection); - virtual HRESULT STDMETHODCALLTYPE DUnadvise( - /* [in] */ DWORD dwConnection); + virtual HRESULT STDMETHODCALLTYPE DUnadvise( + /* [in] */ DWORD dwConnection); - virtual HRESULT STDMETHODCALLTYPE EnumDAdvise( - /* [out] */ IEnumSTATDATA __RPC_FAR *__RPC_FAR *ppenumAdvise); + virtual HRESULT STDMETHODCALLTYPE EnumDAdvise( + /* [out] */ IEnumSTATDATA __RPC_FAR *__RPC_FAR *ppenumAdvise); //IAsyncOperation - //virtual HRESULT STDMETHODCALLTYPE SetAsyncMode( - // /* [in] */ BOOL fDoOpAsync) + //virtual HRESULT STDMETHODCALLTYPE SetAsyncMode( + // /* [in] */ BOOL fDoOpAsync) //{ // return E_NOTIMPL; //} - // - //virtual HRESULT STDMETHODCALLTYPE GetAsyncMode( - // /* [out] */ BOOL __RPC_FAR *pfIsOpAsync) + // + //virtual HRESULT STDMETHODCALLTYPE GetAsyncMode( + // /* [out] */ BOOL __RPC_FAR *pfIsOpAsync) //{ // return E_NOTIMPL; //} - // - //virtual HRESULT STDMETHODCALLTYPE StartOperation( - // /* [optional][unique][in] */ IBindCtx __RPC_FAR *pbcReserved) + // + //virtual HRESULT STDMETHODCALLTYPE StartOperation( + // /* [optional][unique][in] */ IBindCtx __RPC_FAR *pbcReserved) //{ // return E_NOTIMPL; //} - // - //virtual HRESULT STDMETHODCALLTYPE InOperation( - // /* [out] */ BOOL __RPC_FAR *pfInAsyncOp) + // + //virtual HRESULT STDMETHODCALLTYPE InOperation( + // /* [out] */ BOOL __RPC_FAR *pfInAsyncOp) //{ // return E_NOTIMPL; //} - // - //virtual HRESULT STDMETHODCALLTYPE EndOperation( - // /* [in] */ HRESULT hResult, - // /* [unique][in] */ IBindCtx __RPC_FAR *pbcReserved, - // /* [in] */ DWORD dwEffects) + // + //virtual HRESULT STDMETHODCALLTYPE EndOperation( + // /* [in] */ HRESULT hResult, + // /* [unique][in] */ IBindCtx __RPC_FAR *pbcReserved, + // /* [in] */ DWORD dwEffects) //{ // return E_NOTIMPL; //}*/ @@ -195,22 +192,22 @@ virtual ULONG STDMETHODCALLTYPE AddRef() {return ++m_cRefCount;} virtual ULONG STDMETHODCALLTYPE Release(); - bool QueryDrop(DWORD grfKeyState, LPDWORD pdwEffect); + bool QueryDrop(DWORD grfKeyState, LPDWORD pdwEffect); virtual HRESULT STDMETHODCALLTYPE DragEnter( - /* [unique][in] */ IDataObject __RPC_FAR *pDataObj, - /* [in] */ DWORD grfKeyState, - /* [in] */ POINTL pt, - /* [out][in] */ DWORD __RPC_FAR *pdwEffect); - virtual HRESULT STDMETHODCALLTYPE DragOver( - /* [in] */ DWORD grfKeyState, - /* [in] */ POINTL pt, - /* [out][in] */ DWORD __RPC_FAR *pdwEffect); - virtual HRESULT STDMETHODCALLTYPE DragLeave(); - virtual HRESULT STDMETHODCALLTYPE Drop( - /* [unique][in] */ IDataObject __RPC_FAR *pDataObj, - /* [in] */ DWORD grfKeyState, - /* [in] */ POINTL pt, - /* [out][in] */ DWORD __RPC_FAR *pdwEffect); + /* [unique][in] */ IDataObject __RPC_FAR *pDataObj, + /* [in] */ DWORD grfKeyState, + /* [in] */ POINTL pt, + /* [out][in] */ DWORD __RPC_FAR *pdwEffect); + virtual HRESULT STDMETHODCALLTYPE DragOver( + /* [in] */ DWORD grfKeyState, + /* [in] */ POINTL pt, + /* [out][in] */ DWORD __RPC_FAR *pdwEffect); + virtual HRESULT STDMETHODCALLTYPE DragLeave(); + virtual HRESULT STDMETHODCALLTYPE Drop( + /* [unique][in] */ IDataObject __RPC_FAR *pDataObj, + /* [in] */ DWORD grfKeyState, + /* [in] */ POINTL pt, + /* [out][in] */ DWORD __RPC_FAR *pdwEffect); }; /// implementation of IDragSourceHelper interface @@ -222,10 +219,10 @@ DragSourceHelper() { if (FAILED(CoCreateInstance(CLSID_DragDropHelper, - NULL, - CLSCTX_INPROC_SERVER, - IID_IDragSourceHelper, - (void**)&pDragSourceHelper))) + NULL, + CLSCTX_INPROC_SERVER, + IID_IDragSourceHelper, + (void**)&pDragSourceHelper))) pDragSourceHelper = NULL; } @@ -239,7 +236,7 @@ } // IDragSourceHelper - HRESULT InitializeFromBitmap(HBITMAP hBitmap, + HRESULT InitializeFromBitmap(HBITMAP hBitmap, POINT& pt, // cursor position in client coords of the window RECT& rc, // selected item's bounding rect IDataObject* pDataObject, @@ -249,19 +246,19 @@ if (pDragSourceHelper == NULL) return E_FAIL; - SHDRAGIMAGE di; - BITMAP bm; - GetObject(hBitmap, sizeof(bm), &bm); - di.sizeDragImage.cx = bm.bmWidth; - di.sizeDragImage.cy = bm.bmHeight; - di.hbmpDragImage = hBitmap; - di.crColorKey = crColorKey; - di.ptOffset.x = pt.x - rc.left; - di.ptOffset.y = pt.y - rc.top; - return pDragSourceHelper->InitializeFromBitmap(&di, pDataObject); + SHDRAGIMAGE di; + BITMAP bm; + GetObject(hBitmap, sizeof(bm), &bm); + di.sizeDragImage.cx = bm.bmWidth; + di.sizeDragImage.cy = bm.bmHeight; + di.hbmpDragImage = hBitmap; + di.crColorKey = crColorKey; + di.ptOffset.x = pt.x - rc.left; + di.ptOffset.y = pt.y - rc.top; + return pDragSourceHelper->InitializeFromBitmap(&di, pDataObject); } - HRESULT InitializeFromWindow(HWND hwnd, POINT& pt,IDataObject* pDataObject) + HRESULT InitializeFromWindow(HWND hwnd, POINT& pt,IDataObject* pDataObject) { if (pDragSourceHelper == NULL) return E_FAIL;

1 0

[weiden] 18062: fixed gcc4 warnings
by weiden＠svn.reactos.com 25 Sep '05

25 Sep '05

fixed gcc4 warnings Modified: trunk/reactos/subsys/system/notepad/text.c _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2005-09-25 17:49:14 UTC (rev 18061) +++ trunk/reactos/subsys/system/notepad/text.c 2005-09-25 17:52:12 UTC (rev 18062) @@ -130,7 +130,7 @@ else goto done; - dwCharCount = MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, NULL, 0); + dwCharCount = MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, NULL, 0); if (dwCharCount == 0) goto done; @@ -138,7 +138,7 @@ if (!pszAllocText) goto done; - if (!MultiByteToWideChar(iCodePage, 0, &pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) + if (!MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) goto done; pszAllocText[dwCharCount] = '\0';

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
59
Older →

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 September 2005