Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[sedwards] 13274: added winetests for version.dll

by sedwards＠svn.reactos.com

added winetests for version.dll Added: trunk/reactos/lib/version/winetests/ Added: trunk/reactos/lib/version/winetests/Makefile Added: trunk/reactos/lib/version/winetests/info.c Added: trunk/reactos/lib/version/winetests/testlist.c _____ Added: trunk/reactos/lib/version/winetests/Makefile --- trunk/reactos/lib/version/winetests/Makefile 2005-01-25 17:52:28 UTC (rev 13273) +++ trunk/reactos/lib/version/winetests/Makefile 2005-01-25 19:11:22 UTC (rev 13274) @@ -0,0 +1,27 @@ +# $Id: Makefile 12745 2005-01-03 02:37:10Z sedwards $ + +PATH_TO_TOP = ../../.. + +TARGET_NORC = yes + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API -D_WIN32_IE=0x0600 \ + -D_WIN32_WINNT=0x0501 -D__REACTOS__ + +TARGET_NAME = version_test + +TARGET_SDKLIBS = version.a ntdll.a wine.a + +TARGET_OBJECTS = \ + testlist.o \ + info.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +# EOF _____ Added: trunk/reactos/lib/version/winetests/info.c --- trunk/reactos/lib/version/winetests/info.c 2005-01-25 17:52:28 UTC (rev 13273) +++ trunk/reactos/lib/version/winetests/info.c 2005-01-25 19:11:22 UTC (rev 13274) @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2004 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winver.h" + +#define MY_LAST_ERROR -1L +#define EXPECT_BAD_PATH__NOT_FOUND \ + ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ + (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ + (ERROR_FILE_NOT_FOUND == GetLastError()) || \ + (ERROR_BAD_PATHNAME == GetLastError()), \ + "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME (98)/" \ + "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ + "expected, got 0x%08lx\n", GetLastError()); +#define EXPECT_INVALID__NOT_FOUND \ + ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ + (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ + (ERROR_FILE_NOT_FOUND == GetLastError()) || \ + (ERROR_INVALID_PARAMETER == GetLastError()), \ + "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER (98)/" \ + "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ + "expected, got 0x%08lx\n", GetLastError()); + +static void test_info_size(void) +{ DWORD hdl, retval; + + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( NULL, NULL); + ok( !retval, + "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", + retval); + EXPECT_INVALID__NOT_FOUND; + + hdl = 0x55555555; + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( NULL, &hdl); + ok( !retval, + "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", + retval); + EXPECT_INVALID__NOT_FOUND; + ok( hdl == 0L, + "Handle wrong! 0L expected, got 0x%08lx\n", hdl); + + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( "", NULL); + ok( !retval, + "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", + retval); + EXPECT_BAD_PATH__NOT_FOUND; + + hdl = 0x55555555; + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( "", &hdl); + ok( !retval, + "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", + retval); + EXPECT_BAD_PATH__NOT_FOUND; + ok( hdl == 0L, + "Handle wrong! 0L expected, got 0x%08lx\n", hdl); + + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( "kernel32.dll", NULL); + ok( retval, + "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08lx\n", + retval); + ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), + "Last error wrong! NO_ERROR/0x%08lx (NT4) expected, got 0x%08lx\n", + MY_LAST_ERROR, GetLastError()); + + hdl = 0x55555555; + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( "kernel32.dll", &hdl); + ok( retval, + "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08lx\n", + retval); + ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), + "Last error wrong! NO_ERROR/0x%08lx (NT4) expected, got 0x%08lx\n", + MY_LAST_ERROR, GetLastError()); + ok( hdl == 0L, + "Handle wrong! 0L expected, got 0x%08lx\n", hdl); + + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( "notexist.dll", NULL); + ok( !retval, + "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", + retval); + ok( (ERROR_FILE_NOT_FOUND == GetLastError()) || + (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || + (MY_LAST_ERROR == GetLastError()), + "Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND " + "(XP)/0x%08lx (NT4) expected, got 0x%08lx\n", MY_LAST_ERROR, GetLastError()); +} + +static void VersionDwordLong2String(DWORDLONG Version, LPSTR lpszVerString) +{ + WORD a, b, c, d; + + a = (WORD)(Version >> 48); + b = (WORD)((Version >> 32) & 0xffff); + c = (WORD)((Version >> 16) & 0xffff); + d = (WORD)(Version & 0xffff); + + sprintf(lpszVerString, "%d.%d.%d.%d", a, b, c, d); + + return; +} + +static void test_info(void) +{ + DWORD hdl, retval; + PVOID pVersionInfo = NULL; + BOOL boolret; + VS_FIXEDFILEINFO *pFixedVersionInfo; + UINT uiLength; + char VersionString[MAX_PATH]; + DWORDLONG dwlVersion; + + hdl = 0x55555555; + SetLastError(MY_LAST_ERROR); + retval = GetFileVersionInfoSizeA( "kernel32.dll", &hdl); + ok( retval, + "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08lx\n", + retval); + ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()), + "Last error wrong! NO_ERROR/0x%08lx (NT4) expected, got 0x%08lx\n", + MY_LAST_ERROR, GetLastError()); + ok( hdl == 0L, + "Handle wrong! 0L expected, got 0x%08lx\n", hdl); + + if ( retval == 0 || hdl != 0) + return; + + pVersionInfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retval ); + ok(pVersionInfo != 0, "HeapAlloc failed\n" ); + if (pVersionInfo == 0) + return; + + boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, 0); + ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = 0x%08lx\n", GetLastError()); + ok ((GetLastError() == ERROR_INVALID_DATA) || (GetLastError() == ERROR_BAD_PATHNAME), + "Last error wrong! ERROR_INVALID_DATA/ERROR_BAD_PATHNAME (ME) expected, got 0x%08lx\n", + GetLastError()); + + boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, pVersionInfo ); + ok (boolret, "GetFileVersionInfoA failed: GetLastError = 0x%08lx\n", GetLastError()); + if (!boolret) + return; + + boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret, "VerQueryValueA failed: GetLastError = 0x%08lx\n", GetLastError()); + if (!boolret) + return; + + dwlVersion = (((DWORDLONG)pFixedVersionInfo->dwFileVersionMS) << 32) + + pFixedVersionInfo->dwFileVersionLS; + + VersionDwordLong2String(dwlVersion, VersionString); + + trace("kernel32.dll version: %s\n", VersionString); + + boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, 0); + ok (boolret, "VerQueryValue failed: GetLastError = 0x%08lx\n", GetLastError()); +} + +START_TEST(info) +{ + test_info_size(); + test_info(); +} _____ Added: trunk/reactos/lib/version/winetests/testlist.c --- trunk/reactos/lib/version/winetests/testlist.c 2005-01-25 17:52:28 UTC (rev 13273) +++ trunk/reactos/lib/version/winetests/testlist.c 2005-01-25 19:11:22 UTC (rev 13274) @@ -0,0 +1,25 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +/* stdarg.h is needed for Winelib */ +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include "windef.h" +#include "winbase.h" + +extern void func_info(void); + +struct test +{ + const char *name; + void (*func)(void); +}; + +static const struct test winetest_testlist[] = +{ + { "info", func_info }, + { 0, 0 } +}; + +#define WINETEST_WANT_MAIN +#include "wine/test.h"

19 years, 9 months

[sedwards] 13273: remove some duplicate definintions.

by sedwards＠svn.reactos.com

remove some duplicate definintions. Modified: trunk/reactos/include/wine/guiddef.h _____ Modified: trunk/reactos/include/wine/guiddef.h --- trunk/reactos/include/wine/guiddef.h 2005-01-25 16:38:18 UTC (rev 13272) +++ trunk/reactos/include/wine/guiddef.h 2005-01-25 17:52:28 UTC (rev 13273) @@ -38,9 +38,6 @@ extern const GUID name; #endif -#define DEFINE_OLEGUID(name, l, w1, w2) \ - DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46) - #ifndef _GUIDDEF_H_ #define _GUIDDEF_H_ @@ -68,8 +65,6 @@ #else /* defined(__cplusplus) && !defined(CINTERFACE) */ #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #endif /* defined(__cplusplus) && !defined(CINTERFACE) */ -#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2) -#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2) #if defined(__cplusplus) && !defined(CINTERFACE) #include <string.h>

19 years, 9 months

[tamlin] 13272: Fixe use of memory after it had been free'd.

by tamlin＠svn.reactos.com

Fixe use of memory after it had been free'd. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-25 16:26:01 UTC (rev 13271) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-25 16:38:18 UTC (rev 13272) @@ -119,8 +119,8 @@ if (End != NULL) { ObDereferenceObject(Object); + DPRINT1("NtCreateKey() can't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); RtlFreeUnicodeString(&RemainingPath); - DPRINT1("NtCreateKey() can't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); return STATUS_OBJECT_NAME_NOT_FOUND; }

19 years, 9 months

[tamlin] 13271: Kill compiler warning.

by tamlin＠svn.reactos.com

Kill compiler warning. Modified: trunk/reactos/lib/dbghelp/regex.c _____ Modified: trunk/reactos/lib/dbghelp/regex.c --- trunk/reactos/lib/dbghelp/regex.c 2005-01-25 14:22:50 UTC (rev 13270) +++ trunk/reactos/lib/dbghelp/regex.c 2005-01-25 16:26:01 UTC (rev 13271) @@ -121,7 +121,7 @@ even if config.h says that we can. */ # undef REL_ALLOC -# if defined STDC_HEADERS || defined _LIBC +# if defined STDC_HEADERS || defined _LIBC || defined _WIN32 # include <stdlib.h> # else char *malloc ();

19 years, 9 months

[tamlin] 13270: Fix declaration of WSAStartup

by tamlin＠svn.reactos.com

Fix declaration of WSAStartup Modified: trunk/reactos/include/sockets.h _____ Modified: trunk/reactos/include/sockets.h --- trunk/reactos/include/sockets.h 2005-01-25 08:32:47 UTC (rev 13269) +++ trunk/reactos/include/sockets.h 2005-01-25 14:22:50 UTC (rev 13270) @@ -828,10 +828,8 @@ /* Microsoft Windows Extension function prototypes */ -/* int PASCAL WSAStartup(WORD wVersionRequired, LPWSADATA lpWSAData); */ -int PASCAL WSAStartup(int wVersionRequired, LPWSADATA lpWSAData); +int PASCAL WSAStartup(WORD wVersionRequired, LPWSADATA lpWSAData); - int PASCAL WSACleanup(void); void PASCAL WSASetLastError(int iError);

19 years, 9 months

[gvg] 13269: tinus <o112w8r02@sneakemail.com>

by gvg＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com> Properly allow removing toolbar bitmaps by changing it into 0. Modified: trunk/reactos/lib/comctl32/toolbar.c _____ Modified: trunk/reactos/lib/comctl32/toolbar.c --- trunk/reactos/lib/comctl32/toolbar.c 2005-01-25 05:38:01 UTC (rev 13268) +++ trunk/reactos/lib/comctl32/toolbar.c 2005-01-25 08:32:47 UTC (rev 13269) @@ -4269,7 +4269,7 @@ LPTBREPLACEBITMAP lpReplace = (LPTBREPLACEBITMAP) lParam; HBITMAP hBitmap; int i = 0, nOldButtons = 0, pos = 0; - int nOldBitmaps, nNewBitmaps; + int nOldBitmaps, nNewBitmaps = 0; HIMAGELIST himlDef = 0; TRACE("hInstOld %p nIDOld %x hInstNew %p nIDNew %x nButtons %x\n", @@ -4322,6 +4322,7 @@ for (i = pos + nOldBitmaps - 1; i >= pos; i--) ImageList_Remove(himlDef, i); + if (hBitmap) { BITMAP bmp; HBITMAP hOldBitmapBitmap, hOldBitmapLoad, hbmLoad;

19 years, 9 months

[ion] 13268: Set up ACPI Interrupt data before creating the interrupt, to fix case where interrupt is being called as soon as it's being set up, before the data is set. Patch by tinus. Fixes bug 472

by ion＠svn.reactos.com

Set up ACPI Interrupt data before creating the interrupt, to fix case where interrupt is being called as soon as it's being set up, before the data is set. Patch by tinus. Fixes bug 472 Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c --- trunk/reactos/drivers/bus/acpi/ospm/osl.c 2005-01-25 05:11:17 UTC (rev 13267) +++ trunk/reactos/drivers/bus/acpi/ospm/osl.c 2005-01-25 05:38:01 UTC (rev 13268) @@ -219,6 +219,11 @@ &DIrql, &Affinity); + AcpiIrqNumber = irq; + AcpiIrqHandler = handler; + AcpiIrqContext = context; + AcpiInterruptHandlerRegistered = TRUE; + Status = IoConnectInterrupt( &AcpiInterrupt, OslIsrStub, @@ -236,11 +241,6 @@ return AE_ERROR; } - AcpiIrqNumber = irq; - AcpiIrqHandler = handler; - AcpiIrqContext = context; - AcpiInterruptHandlerRegistered = TRUE; - return AE_OK; }

19 years, 9 months

[ion] 13267: Fix compiler errors. Patch by Herve Poussineau. Fixes bug 478

by ion＠svn.reactos.com

Fix compiler errors. Patch by Herve Poussineau. Fixes bug 478 Modified: trunk/rosapps/cmdutils/touch/touch.c Modified: trunk/rosapps/cmdutils/touch/various.h Modified: trunk/rosapps/dflat32/editbox.c Modified: trunk/rosapps/dflat32/slidebox.c Modified: trunk/rosapps/games/winemine/main.c Modified: trunk/rosapps/mc/pc/chmod.c Modified: trunk/rosapps/mc/pc/util_nt.c Modified: trunk/rosapps/mc/slang/slvideo.c Modified: trunk/rosapps/mc/src/file.c Modified: trunk/rosapps/mc/src/panel.h Modified: trunk/rosapps/mc/src/screen.c Modified: trunk/rosapps/net/niclist/niclist.c Modified: trunk/rosapps/sysutils/format.c Modified: trunk/rosapps/sysutils/kill/kill.c Modified: trunk/rosapps/sysutils/pedump.c Modified: trunk/rosapps/sysutils/tcat/cat.c Modified: trunk/rosapps/sysutils/tlist/tlist.c Modified: trunk/rosapps/sysutils/win32err.c Modified: trunk/rosapps/winfile/dialogs.c Modified: trunk/rosapps/winfile/treeview.h _____ Modified: trunk/rosapps/cmdutils/touch/touch.c --- trunk/rosapps/cmdutils/touch/touch.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/cmdutils/touch/touch.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -78,7 +78,7 @@ void stime_file __P((char *, time_t *)); void usage __P((void)); -void +int main(int argc, char *argv[]) { struct stat sb; @@ -194,7 +194,7 @@ if (rw(*argv, &sb, fflag)) rval = 1; DbgPrint("[%s]", "[23]"); } - exit(rval); DbgPrint("[%s]", "[23]"); + return rval; DbgPrint("[%s]", "[23]"); } #define ATOI2(ar) ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2; _____ Modified: trunk/rosapps/cmdutils/touch/various.h --- trunk/rosapps/cmdutils/touch/various.h 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/cmdutils/touch/various.h 2005-01-25 05:11:17 UTC (rev 13267) @@ -23,7 +23,7 @@ typedef long uid_t; // SunOS 5.5 #define __P(x) x -#define __STDC__ 1 +//#define __STDC__ 1 /* utmp.h */ #define UT_LINESIZE 8 _____ Modified: trunk/rosapps/dflat32/editbox.c --- trunk/rosapps/dflat32/editbox.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/dflat32/editbox.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -515,7 +515,7 @@ currchar = DfCurrChar; } /* ---- test typing at end of text ---- */ - if (currchar == wnd->text+wnd->MaxTextLength) { + if (currchar == (char*)(wnd->text+wnd->MaxTextLength)) { /* ---- typing at the end of maximum buffer ---- */ DfBeep(); return; @@ -571,14 +571,14 @@ /* ---------- test end of window --------- */ if (DfWndCol == DfClientWidth(wnd)-1) { if (!DfIsMultiLine(wnd)) { - if (!(currchar == wnd->text+wnd->MaxTextLength-2)) + if (!(currchar == (char*)(wnd->text+wnd->MaxTextLength-2))) DfSendMessage(wnd, DFM_HORIZSCROLL, TRUE, 0); } else { char *cp = currchar; - while (*cp != ' ' && cp != DfTextLine(wnd, wnd->CurrLine)) + while (*cp != ' ' && cp != (char*)DfTextLine(wnd, wnd->CurrLine)) --cp; - if (cp == DfTextLine(wnd, wnd->CurrLine) || + if (cp == (char*)DfTextLine(wnd, wnd->CurrLine) || !wnd->WordWrapMode) DfSendMessage(wnd, DFM_HORIZSCROLL, TRUE, 0); else { @@ -807,7 +807,7 @@ if (*bel == '\n') --bel; /* --- change all newlines in block to spaces --- */ - while (DfCurrChar < bel) { + while ((char*)DfCurrChar < bel) { if (*DfCurrChar == '\n') { *DfCurrChar = ' '; wnd->CurrLine++; @@ -818,7 +818,7 @@ } /* ---- insert newlines at new margin boundaries ---- */ bb = bbl; - while (bbl < bel) { + while ((char*)bbl < (char*)bel) { bbl++; if ((int)(bbl - bb) == DfClientWidth(wnd)-1) { while (*bbl != ' ' && bbl > bb) _____ Modified: trunk/rosapps/dflat32/slidebox.c --- trunk/rosapps/dflat32/slidebox.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/dflat32/slidebox.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -42,7 +42,7 @@ case DFM_PAINT: Percent = (int)p2; InsertPercent(DfGetText(wnd) ? - DfGetText(wnd) : SliderBoxDB.ctl[1].itext); + (char*)DfGetText(wnd) : SliderBoxDB.ctl[1].itext); GenericProc(wnd, DFM_PAINT, 0, 0); if (Percent >= 100) DfSendMessage(DfGetParent(wnd),DFM_COMMAND,DF_ID_CANCEL,0); _____ Modified: trunk/rosapps/games/winemine/main.c --- trunk/rosapps/games/winemine/main.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/games/winemine/main.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -57,7 +57,7 @@ wc.cbWndExtra = 0; wc.hInstance = hInst; wc.hIcon = LoadIcon( hInst, appname ); - wc.hCursor = LoadCursor( NULL_HANDLE, IDI_APPLICATION ); + wc.hCursor = LoadCursor( NULL_HANDLE, (LPCTSTR)IDI_APPLICATION ); wc.hbrBackground = (HBRUSH) GetStockObject( BLACK_BRUSH ); wc.lpszMenuName = "MENU_WINEMINE"; wc.lpszClassName = appname; _____ Modified: trunk/rosapps/mc/pc/chmod.c --- trunk/rosapps/mc/pc/chmod.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/mc/pc/chmod.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -377,7 +377,7 @@ static void apply_mask (mode_t sf) { char *fname; - mode_t sf_stat; + int sf_stat; need_update = end_chmod = 1; do_chmod (sf); @@ -387,7 +387,7 @@ if ((sf_stat = pc_stat_file (fname)) < 0) break; - c_stat = sf_stat; + c_stat = (mode_t) sf_stat; do_chmod (c_stat); } while (cpanel->marked); } @@ -397,7 +397,7 @@ char buffer [10]; char *fname; int i; - mode_t sf_stat; + int sf_stat; do { /* do while any files remaining */ init_chmod (); @@ -409,7 +409,7 @@ if ((sf_stat = pc_stat_file (fname)) < 0) /* get status of file */ break; - c_stat = sf_stat; + c_stat = (mode_t) sf_stat; mode_change = 0; /* clear changes flag */ /* set check buttons */ _____ Modified: trunk/rosapps/mc/pc/util_nt.c --- trunk/rosapps/mc/pc/util_nt.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/mc/pc/util_nt.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -629,7 +629,7 @@ } va_end (ap); // Spawn process - pid = spawnvp(P_NOWAIT,command, args);// argv[1], (const char* const*)&argv[1]); + pid = spawnvp(P_NOWAIT,command, (const char* const*)args);// argv[1], (const char* const*)&argv[1]); if(!pid) exit (1); // Duplicate copy of original stdin back into stdin _____ Modified: trunk/rosapps/mc/slang/slvideo.c --- trunk/rosapps/mc/slang/slvideo.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/mc/slang/slvideo.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -248,7 +248,7 @@ void SLtt_write_string (char *str) { #ifdef WIN32 - int bytes; + unsigned long bytes; (void) WriteConsole(hStdout, str, strlen(str), &bytes, NULL); #else @@ -1017,7 +1017,7 @@ register unsigned char *p = Line_Buffer; register unsigned short pair; #ifdef WIN32 - register unsigned char * org_src = src; + register unsigned char * org_src = (unsigned char*)src; COORD coord; long bytes; #endif @@ -1062,7 +1062,7 @@ /* write color attributes */ p = Line_Buffer; n = count; - src = org_src; /* restart the src pointer */ + src = (unsigned short*)org_src; /* restart the src pointer */ /* write into attributes only */ while (n-- > 0) @@ -1073,7 +1073,7 @@ *(p++) = 0; /* what's this for? */ } - WriteConsoleOutputAttribute(hStdout, Line_Buffer, count, coord, &bytes); + WriteConsoleOutputAttribute(hStdout, (WORD*)Line_Buffer, count, coord, &bytes); # else /* __os2__ */ /* ScreenUpdateLine (void *virtual_screen_line, int row); */ p = Line_Buffer; _____ Modified: trunk/rosapps/mc/src/file.c --- trunk/rosapps/mc/src/file.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/mc/src/file.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -122,7 +122,7 @@ int do_reget; -/* rcsid [] = "$Id: file.c,v 1.2 2003/06/27 21:10:35 gvg Exp $" */ +/* rcsid [] = "$Id$" */ int verbose = 1; /* Recursive operation on subdirectories */ @@ -211,7 +211,7 @@ /* To symlinks the difference between `follow Links' checked and not checked is the stat call used (mc_stat resp. mc_lstat) */ -int (*xstat)(char *, struct stat *) = mc_lstat; +int (*xstat)(const char *, struct stat *) = mc_lstat; static int op_follow_links = 0; _____ Modified: trunk/rosapps/mc/src/panel.h --- trunk/rosapps/mc/src/panel.h 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/mc/src/panel.h 2005-01-25 05:11:17 UTC (rev 13267) @@ -248,7 +248,7 @@ int file_compute_color (int attr, file_entry *fe); int file_entry_color (file_entry *fe); void do_file_mark_range (WPanel *panel, int r1, int r2); -int do_enter (WPanel *panel); +void do_enter (WPanel *panel); /* NOTE: Have to be ifdefed for HAVE_X */ void x_panel_select_item (WPanel *panel, int index, int val); _____ Modified: trunk/rosapps/mc/src/screen.c --- trunk/rosapps/mc/src/screen.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/mc/src/screen.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -59,7 +59,7 @@ #include "x.h" -/* "$Id: screen.c,v 1.1 2001/12/30 09:55:21 sedwards Exp $" */ +/* "$Id$" */ #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) ) /* If true, show the mini-info on the panel */ @@ -2020,13 +2020,13 @@ } } -int +void do_enter (WPanel *panel) { if (S_ISDIR (selection (panel)->buf.st_mode) || link_isdir (selection (panel))){ do_cd (selection (panel)->fname, cd_exact); - return 1; + return; } else { if (is_exe (selection (panel)->buf.st_mode) && if_link_is_exe (selection (panel))) { @@ -2053,15 +2053,9 @@ free (tmp2); } #endif /* USE_VFS */ - return 1; + return; } else { - char *p; - - p = regex_command (selection (panel)->fname, "Open", NULL, 0); - if (p && (strcmp (p, "Success") == 0)) - return 1; - else - return 0; + regex_command (selection (panel)->fname, "Open", NULL, 0); } } } _____ Modified: trunk/rosapps/net/niclist/niclist.c --- trunk/rosapps/net/niclist/niclist.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/net/niclist/niclist.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -1,4 +1,4 @@ -/* $Id: niclist.c,v 1.3 2004/01/12 22:45:53 sedwards Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS packet driver interface list utility @@ -53,7 +53,7 @@ HINSTANCE hPacket = LoadLibrary("PACKET.DLL"); if (hPacket) { PacketGetAdapterNames = (BOOLEAN (*)(PTSTR, PULONG))GetProcAddress(hPacket, "PacketGetAdapterNames"); - PacketGetVersion = (BOOLEAN (*)(PTSTR, PULONG))GetProcAddress(hPacket, "PacketGetVersion"); + PacketGetVersion = (PCHAR (*)(VOID))GetProcAddress(hPacket, "PacketGetVersion"); } else { printf("Could not load WinPCap driver! for more information goto:\n"); printf ("http://netgroup-serv.polito.it/winpcap\n"); _____ Modified: trunk/rosapps/sysutils/format.c --- trunk/rosapps/sysutils/format.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/sysutils/format.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -1,6 +1,6 @@ //====================================================================== // -// $Id: format.c,v 1.3 2003/01/14 18:51:12 guido Exp $ +// $Id$ // // Formatx // @@ -334,7 +334,7 @@ { int badArg; - DWORD media; + DWORD media = 0; DWORD driveType; WCHAR fileSystem [1024]; _____ Modified: trunk/rosapps/sysutils/kill/kill.c --- trunk/rosapps/sysutils/kill/kill.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/sysutils/kill/kill.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -40,7 +40,7 @@ DWORD dwProcessId; dwProcessId = (DWORD) atol(lpPid); - fprintf( stderr, "Killing PID %d...\n",dwProcessId); + fprintf( stderr, "Killing PID %ld...\n",dwProcessId); hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, @@ -48,7 +48,7 @@ ); if (NULL == hProcess) { - fprintf( stderr, "Could not open the process with PID = %d\n", dwProcessId); + fprintf( stderr, "Could not open the process with PID = %ld\n", dwProcessId); return 0; } if (FALSE == TerminateProcess( @@ -56,7 +56,7 @@ 0 ) ) { - fprintf( stderr, "Could not terminate the process with PID = %d\n", dwProcessId); + fprintf( stderr, "Could not terminate the process with PID = %ld\n", dwProcessId); return 0; } CloseHandle(hProcess); _____ Modified: trunk/rosapps/sysutils/pedump.c --- trunk/rosapps/sysutils/pedump.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/sysutils/pedump.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -1,4 +1,4 @@ -// $Id: pedump.c,v 1.1 2001/01/13 18:19:23 ea Exp $ +// $Id$ // // This program was written by Sang Cho, assistant professor at // the department of @@ -48,6 +48,7 @@ #include <string.h> #include <setjmp.h> #include <malloc.h> +#include <ctype.h> #ifndef bcopy #define bcopy(s,d,z) memcpy((d),(s),(z)) @@ -1060,7 +1061,7 @@ int nSections = NumOfSections (lpFile); int i = 0; - if (dwRVA == NULL) + if (dwRVA == 0) return NULL; if (dwRVA & 0x80000000) { @@ -1954,7 +1955,7 @@ { - int i, j, n; + int i, /*j,*/ n; char c, cc; static char buff[512]; // result of translation @@ -2375,7 +2376,7 @@ char buff[256]; // enough for any string ?? - char *psz; //=============================== + char *psz = NULL; //=============================== DWORD *pdwAddress; DWORD *pdw1; @@ -2737,8 +2738,8 @@ int *len, WORD ** pMenu) { - int num = 0; - int ndetails; + //int num = 0; + //int ndetails; WORD *pwd; WORD flag, flag1; WORD id, ispopup; @@ -2805,12 +2806,12 @@ char **psz, WORD ** pMenu) { - int num = 0; - int ndetails; - char *ptr, *pTemp; + //int num = 0; + //int ndetails; + char *ptr/*, *pTemp*/; WORD *pwd; WORD flag, flag1; - WORD id, ispopup; + WORD id/*, ispopup*/; ptr = *psz; pwd = *pMenu; @@ -2927,19 +2928,20 @@ //PIMAGE_SECTION_HEADER psh = (PIMAGE_SECTION_HEADER) //ImageDirectorySection (lpFile, IMAGE_DIRECTORY_ENTRY_RESOURCE); PIMAGE_MENU_HEADER pMenuHeader; - PIMAGE_POPUP_MENU_ITEM pPopup; - PIMAGE_NORMAL_MENU_ITEM pNormal; + //PIMAGE_POPUP_MENU_ITEM pPopup; + WORD* pPopup; + //PIMAGE_NORMAL_MENU_ITEM pNormal; char buff[32]; - int nCnt = 0, i, j; - int num = 0; + int /*nCnt = 0,*/ i, j; + //int num = 0; int size; int sLength, nMenus; WORD flag; WORD *pwd; - DWORD prdeName; + //DWORD prdeName; //DWORD dwBase; obsolete - char *pMem, *pTemp; - BOOL isStrange = FALSE; + char *pMem/*, *pTemp*/; + //BOOL isStrange = FALSE; /* get root directory of resource tree */ @@ -3020,7 +3022,7 @@ // normal case else { - pPopup = (PIMAGE_POPUP_MENU_ITEM) + pPopup = (WORD*) ((DWORD) pMenuHeader + sizeof (IMAGE_MENU_HEADER)); while (1) { @@ -3063,7 +3065,7 @@ // normal case else { - pPopup = (PIMAGE_POPUP_MENU_ITEM) + pPopup = (WORD*) ((DWORD) pMenuHeader + sizeof (IMAGE_MENU_HEADER)); while (1) { @@ -3127,7 +3129,7 @@ // normal case else { - pPopup = (PIMAGE_POPUP_MENU_ITEM) + pPopup = (WORD*) ((DWORD) pMenuHeader + sizeof (IMAGE_MENU_HEADER)); while (1) { @@ -3174,7 +3176,7 @@ // normal case else { - pPopup = (PIMAGE_POPUP_MENU_ITEM) + pPopup = (WORD*) ((DWORD) pMenuHeader + sizeof (IMAGE_MENU_HEADER)); while (1) { @@ -3200,10 +3202,10 @@ char **psz) { - int i, j, k, l; + //int i, j, k, l; int num; - WORD flag1, flag2; - char buff[128]; + //WORD flag1, flag2; + //char buff[128]; char *ptr, *pmax; //return dumpMenu (psz, size); @@ -3395,17 +3397,17 @@ PIMAGE_RESOURCE_DIR_STRING_U pDialogName; PIMAGE_RESOURCE_DATA_ENTRY prData; PIMAGE_DIALOG_HEADER pDialogHeader; - PIMAGE_CONTROL_DATA pControlData; + //PIMAGE_CONTROL_DATA pControlData; char buff[32]; - int nCnt = 0, i, j; - int num = 0; + int /*nCnt = 0,*/ i, j; + //int num = 0; int size; int sLength, nDialogs; - WORD flag; + //WORD flag; WORD *pwd; - DWORD prdeName; - char *pMem, *pTemp; - BOOL isStrange = FALSE; + //DWORD prdeName; + char *pMem/*, *pTemp*/; + //BOOL isStrange = FALSE; /* get root directory of resource tree */ @@ -3580,7 +3582,7 @@ // October 14, 1997 // /* print contents of dialog */ -int WINAPI +void WINAPI PrintNameOrOrdinal ( char **psz) { @@ -3613,15 +3615,15 @@ // October 14, 1997 // /* print contents of dialog */ -int WINAPI +void WINAPI PrintDialog ( char **psz) { - int i, j, k, l, n, c; + int i/*, j, k, l, n, c*/; int num, size; DWORD flag; WORD class; - char buff[32]; + //char buff[32]; char *ptr, *pmax; BOOL isStrange = FALSE; @@ -3924,9 +3926,9 @@ PIMAGE_FILE_HEADER pfh; PIMAGE_OPTIONAL_HEADER poh; PIMAGE_SECTION_HEADER psh; - IMAGE_SECTION_HEADER idsh; + //IMAGE_SECTION_HEADER idsh; IMAGE_SECTION_HEADER shdr[MAXSECTIONNUMBER]; - PIMAGE_IMPORT_MODULE_DIRECTORY pid; + //PIMAGE_IMPORT_MODULE_DIRECTORY pid; int nSections; // number of sections @@ -3945,10 +3947,10 @@ int imageBase; int entryPoint; - int i, j, k, n; - int mnsize; - int nCnt; - int nSize; + int i, j, /*k,*/ n; + //int mnsize; + //int nCnt; + //int nSize; int fsize; char *pnstr; char *pst; _____ Modified: trunk/rosapps/sysutils/tcat/cat.c --- trunk/rosapps/sysutils/tcat/cat.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/sysutils/tcat/cat.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -18,7 +18,7 @@ puts("Usage: cat [file]"); } -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { FILE *srcf; char *keys[]={"--help","/help"}; _____ Modified: trunk/rosapps/sysutils/tlist/tlist.c --- trunk/rosapps/sysutils/tlist/tlist.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/sysutils/tlist/tlist.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -1,4 +1,4 @@ -/* $Id: tlist.c,v 1.6 2003/08/03 18:06:02 ea Exp $ +/* $Id$ * * ReactOS Project * TList @@ -123,7 +123,7 @@ ++ Count; } } - (PBYTE) pInfo += pInfo->NextEntryDelta; + pInfo = (PSYSTEM_PROCESSES)((PBYTE)pInfo + pInfo->NextEntryDelta); } while (0 != pInfo->NextEntryDelta); @@ -201,7 +201,7 @@ } } } - (PBYTE) pInfo += pInfo->NextEntryDelta; + pInfo = (PSYSTEM_PROCESSES)((PBYTE)pInfo + pInfo->NextEntryDelta); } while (0 != pInfo->NextEntryDelta); _____ Modified: trunk/rosapps/sysutils/win32err.c --- trunk/rosapps/sysutils/win32err.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/sysutils/win32err.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -1,4 +1,4 @@ -/* $Id: win32err.c,v 1.1 1999/05/16 07:27:35 ea Exp $ +/* $Id$ * * win32err.c * @@ -47,14 +47,14 @@ DWORD ErrorCode ) { - LPVOID lpMsgBuf; + PVOID lpMsgBuf; FormatMessageW( (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM), NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (PWCHAR) & lpMsgBuf, + (LPWSTR)& lpMsgBuf, 0, NULL ); _____ Modified: trunk/rosapps/winfile/dialogs.c --- trunk/rosapps/winfile/dialogs.c 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/winfile/dialogs.c 2005-01-25 05:11:17 UTC (rev 13267) @@ -320,7 +320,7 @@ wsprintf(SubBlock, TEXT("\\StringFileInfo\\%04x%04x\\%s"), lpTranslate.wLanguage, lpTranslate.wCodePage, info_str); // Retrieve file description for language and code page "i". - if (VerQueryValue(pVersionData, SubBlock, &pVal, &nValLen)) { + if (VerQueryValue(pVersionData, SubBlock, (PVOID)&pVal, &nValLen)) { ListBox_InsertItemData(GetDlgItem(hDlg, IDC_LIST_PROP_VERSION_TYPES), i, info_str); // ListBox_InsertItemData(pane->hwnd, idx, entry); SendMessage(GetDlgItem(hDlg, IDC_LIST_PROP_VERSION_VALUES), WM_SETTEXT, 0, (LPARAM)pVal); @@ -375,7 +375,7 @@ UINT nValLen; // LPTSTR SubBlock = _T("\\"); _tcscpy(SubBlock, TEXT("\\")); - if (VerQueryValue(pVersionData, SubBlock, &pVal, &nValLen)) { + if (VerQueryValue(pVersionData, SubBlock, (PVOID)&pVal, &nValLen)) { if (nValLen == sizeof(VS_FIXEDFILEINFO)) { ShowFixedFileInfo(hDlg, (VS_FIXEDFILEINFO*)pVal); } _____ Modified: trunk/rosapps/winfile/treeview.h --- trunk/rosapps/winfile/treeview.h 2005-01-25 05:00:57 UTC (rev 13266) +++ trunk/rosapps/winfile/treeview.h 2005-01-25 05:11:17 UTC (rev 13267) @@ -36,11 +36,6 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv); -#ifndef _MSC_VER -#define NMTVDISPINFO TV_DISPINFO -#define NMTVDISPINFO TV_DISPINFO -#endif - void OnGetDispInfo(NMTVDISPINFO* ptvdi);

19 years, 9 months

[ion] 13266: Fix bug 474. Patch by tinus

by ion＠svn.reactos.com

Fix bug 474. Patch by tinus Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-01-25 01:35:43 UTC (rev 13265) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-01-25 05:00:57 UTC (rev 13266) @@ -461,7 +461,7 @@ Vector = InterruptObject->Vector; - if (Vector < IRQ_BASE && Vector >= IRQ_BASE + NR_IRQS) + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) return FALSE; Vector -= IRQ_BASE;

19 years, 9 months

[sedwards] 13265: finished merging setupapi with Winehq CVS. Tommrow I will do a vendor drop of the latest Winehq CVS.

by sedwards＠svn.reactos.com

finished merging setupapi with Winehq CVS. Tommrow I will do a vendor drop of the latest Winehq CVS. Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/dirid.c Modified: trunk/reactos/lib/setupapi/queue.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-01-25 01:23:23 UTC (rev 13264) +++ trunk/reactos/lib/setupapi/devinst.c 2005-01-25 01:35:43 UTC (rev 13265) @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" +#include "winnt.h" #include "winreg.h" #include "winternl.h" #include "wingdi.h" @@ -41,13 +42,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ +static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; +static const WCHAR Class[] = {'C','l','a','s','s',0}; +static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; +static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C','l','a','s','s',0}; +static const WCHAR NoInstallClass[] = {'N','o','I','s','t','a','l','l','C','l','a','s','s',0}; +static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; +static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; -static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; -static const WCHAR Class[] = {'C','l','a','s','s',0}; +/* Registry key and value names */ +static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s',0}; +static const WCHAR DeviceClasses[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; + /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) */ @@ -57,7 +73,7 @@ DWORD ClassGuidListSize, PDWORD RequiredSize) { - TRACE("SetupDiBuildClassInfoList() called\n"); + TRACE("\n"); return SetupDiBuildClassInfoListExW(Flags, ClassGuidList, ClassGuidListSize, RequiredSize, NULL, NULL); @@ -97,7 +113,7 @@ LONG lError; DWORD dwGuidListIndex = 0; - TRACE("SetupDiBuildClassInfoListExW() called\n"); + TRACE("\n"); if (RequiredSize != NULL) *RequiredSize = 0; @@ -126,7 +142,7 @@ TRACE("RegEnumKeyExW() returns %ld\n", lError); if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) { - TRACE("Key name: %S\n", szKeyName); + TRACE("Key name: %p\n", szKeyName); if (RegOpenKeyExW(hClassesKey, szKeyName, @@ -139,7 +155,7 @@ } if (!RegQueryValueExW(hClassKey, - L"NoUseClass", + NoUseClass, NULL, NULL, NULL, @@ -152,7 +168,7 @@ if ((Flags & DIBCI_NOINSTALLCLASS) && (!RegQueryValueExW(hClassKey, - L"NoInstallClass", + NoInstallClass, NULL, NULL, NULL, @@ -165,7 +181,7 @@ if ((Flags & DIBCI_NODISPLAYCLASS) && (!RegQueryValueExW(hClassKey, - L"NoDisplayClass", + NoDisplayClass, NULL, NULL, NULL, @@ -178,14 +194,14 @@ RegCloseKey(hClassKey); - TRACE("Guid: %S\n", szKeyName); + TRACE("Guid: %p\n", szKeyName); if (dwGuidListIndex < ClassGuidListSize) { if (szKeyName[0] == L'{' && szKeyName[37] == L'}') { szKeyName[37] = 0; } - TRACE("Guid: %S\n", &szKeyName[1]); + TRACE("Guid: %p\n", &szKeyName[1]); UuidFromStringW(&szKeyName[1], &ClassGuidList[dwGuidListIndex]); @@ -302,7 +318,7 @@ TRACE("RegEnumKeyExW() returns %ld\n", lError); if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) { - TRACE("Key name: %S\n", szKeyName); + TRACE("Key name: %p\n", szKeyName); if (RegOpenKeyExW(hClassesKey, szKeyName, @@ -322,20 +338,20 @@ (LPBYTE)szClassName, &dwLength)) { - TRACE("Class name: %S\n", szClassName); + TRACE("Class name: %p\n", szClassName); - if (_wcsicmp(szClassName, ClassName) == 0) + if (strcmpiW(szClassName, ClassName) == 0) { TRACE("Found matching class name\n"); - TRACE("Guid: %S\n", szKeyName); + TRACE("Guid: %p\n", szKeyName); if (dwGuidListIndex < ClassGuidListSize) { if (szKeyName[0] == L'{' && szKeyName[37] == L'}') { szKeyName[37] = 0; } - TRACE("Guid: %S\n", &szKeyName[1]); + TRACE("Guid: %p\n", &szKeyName[1]); UuidFromStringW(&szKeyName[1], &ClassGuidList[dwGuidListIndex]); @@ -508,7 +524,7 @@ */ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) { - FIXME("%04lx\n", (DWORD)devinfo); + FIXME("%p\n", devinfo); return FALSE; } @@ -571,13 +587,13 @@ PWSTR *Extension) { WCHAR szBuffer[MAX_PATH]; - OSVERSIONINFO OsVersionInfo; + OSVERSIONINFOW OsVersionInfo; DWORD dwLength; DWORD dwFullLength; LONG lLineCount = -1; - OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (!GetVersionEx(&OsVersionInfo)) + OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + if (!GetVersionExW(&OsVersionInfo)) { return FALSE; } @@ -707,7 +723,7 @@ Reserved); if (hKey == INVALID_HANDLE_VALUE) { - ERR("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError()); + WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError()); return FALSE; } @@ -855,8 +871,8 @@ if (!SetupGetLineTextW(NULL, hInf, - L"Version", - L"ClassGUID", + Version, + ClassGUID, Buffer, MAX_PATH, &RequiredSize)) @@ -864,7 +880,7 @@ return INVALID_HANDLE_VALUE; } - lstrcpyW(FullBuffer, L"System\\CurrentControlSet\\Control\\Class\\"); + lstrcpyW(FullBuffer, ControlClass); lstrcatW(FullBuffer, Buffer); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -875,8 +891,8 @@ { if (!SetupGetLineTextW(NULL, hInf, - L"Version", - L"Class", + Version, + Class, Buffer, MAX_PATH, &RequiredSize)) @@ -900,7 +916,7 @@ } if (RegSetValueExW(hClassKey, - L"Class", + Class, 0, REG_SZ, (LPBYTE)Buffer, @@ -931,7 +947,7 @@ HKEY hClassKey; - FIXME("Incomplete function.\n"); + FIXME("\n"); if ((Flags & DI_NOVCP) && (FileQueue == NULL || FileQueue == INVALID_HANDLE_VALUE)) { @@ -1001,7 +1017,6 @@ /* FIXME: More code! */ -ByeBye: if (bFileQueueCreated) SetupCloseFileQueue(FileQueue); @@ -1051,7 +1066,7 @@ LPWSTR lpGuidString; HKEY hClassesKey; HKEY hClassKey; - LPWSTR lpKeyName; + LPCWSTR lpKeyName; if (MachineName != NULL) { @@ -1061,11 +1076,11 @@ if (Flags == DIOCR_INSTALLER) { - lpKeyName = L"SYSTEM\\CurrentControlSet\\Control\\Class"; + lpKeyName = ControlClass; } else if (Flags == DIOCR_INTERFACE) { - lpKeyName = L"SYSTEM\\CurrentControlSet\\Control\\DeviceClasses"; + lpKeyName = DeviceClasses; } else { @@ -1109,7 +1124,6 @@ return hClassKey; } - /*********************************************************************** * SetupDiOpenDeviceInterfaceA (SETUPAPI.@) */ _____ Modified: trunk/reactos/lib/setupapi/dirid.c --- trunk/reactos/lib/setupapi/dirid.c 2005-01-25 01:23:23 UTC (rev 13264) +++ trunk/reactos/lib/setupapi/dirid.c 2005-01-25 01:35:43 UTC (rev 13265) @@ -29,6 +29,7 @@ #include "winuser.h" #include "winnls.h" #include "setupapi.h" +#include "shlobj.h" #include "wine/unicode.h" #include "setupapi_private.h" #include "wine/debug.h" @@ -36,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #define MAX_SYSTEM_DIRID DIRID_PRINTPROCESSOR +#define MIN_CSIDL_DIRID 0x4000 +#define MAX_CSIDL_DIRID 0x403f struct user_dirid { @@ -47,6 +50,7 @@ static int alloc_user_dirids; /* number of allocated user dirids */ static struct user_dirid *user_dirids; static const WCHAR *system_dirids[MAX_SYSTEM_DIRID+1]; +static const WCHAR *csidl_dirids[MAX_CSIDL_DIRID-MIN_CSIDL_DIRID+1]; /* retrieve the string for unknown dirids */ static const WCHAR *get_unknown_dirid(void) @@ -64,6 +68,8 @@ return unknown_dirid; } +static const WCHAR *get_csidl_dir(DWORD csidl); + /* create the string for a system dirid */ static const WCHAR *create_system_dirid( int dirid ) { @@ -76,8 +82,9 @@ static const WCHAR Viewers[] = {'\\','v','i','e','w','e','r','s',0}; static const WCHAR System[] = {'\\','s','y','s','t','e','m',0}; static const WCHAR Spool[] = {'\\','s','p','o','o','l',0}; + static const WCHAR UserProfile[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; - WCHAR buffer[MAX_PATH+16], *str; + WCHAR buffer[MAX_PATH+32], *str; int len; switch(dirid) @@ -126,9 +133,11 @@ GetWindowsDirectoryW( buffer, MAX_PATH ); strcatW( buffer, Spool ); break; + case DIRID_USERPROFILE: + if (GetEnvironmentVariableW( UserProfile, buffer, MAX_PATH )) break; + return get_csidl_dir(CSIDL_PROFILE); case DIRID_LOADER: return C_Root; /* FIXME */ - case DIRID_USERPROFILE: /* FIXME */ case DIRID_COLOR: /* FIXME */ case DIRID_PRINTPROCESSOR: /* FIXME */ default: @@ -140,6 +149,21 @@ return str; } +static const WCHAR *get_csidl_dir( DWORD csidl ) +{ + WCHAR buffer[MAX_PATH], *str; + int len; + + if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE )) + { + FIXME( "CSIDL %lx not found\n", csidl ); + return get_unknown_dirid(); + } + len = (strlenW(buffer) + 1) * sizeof(WCHAR); + if ((str = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( str, buffer, len ); + return str; +} + /* retrieve the string corresponding to a dirid, or NULL if none */ const WCHAR *DIRID_get_string( HINF hinf, int dirid ) { @@ -154,6 +178,13 @@ ERR("user id %d not found\n", dirid ); return NULL; } + else if (dirid >= MIN_CSIDL_DIRID) + { + if (dirid > MAX_CSIDL_DIRID) return get_unknown_dirid(); + dirid -= MIN_CSIDL_DIRID; + if (!csidl_dirids[dirid]) csidl_dirids[dirid] = get_csidl_dir( dirid ); + return csidl_dirids[dirid]; + } else { if (dirid > MAX_SYSTEM_DIRID) return get_unknown_dirid(); _____ Modified: trunk/reactos/lib/setupapi/queue.c --- trunk/reactos/lib/setupapi/queue.c 2005-01-25 01:23:23 UTC (rev 13264) +++ trunk/reactos/lib/setupapi/queue.c 2005-01-25 01:35:43 UTC (rev 13265) @@ -173,7 +173,7 @@ */ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) { - int src_len = 1, dst_len = 1; + unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; if (op->src_root) src_len += strlenW(op->src_root) + 1; @@ -991,7 +991,7 @@ LPVOID VersionTarget; VS_FIXEDFILEINFO *TargetInfo; VS_FIXEDFILEINFO *SourceInfo; - INT length; + UINT length; WCHAR SubBlock[2]={'\\',0}; DWORD ret; @@ -1370,6 +1370,57 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { - FIXME( "notification %d params %x,%x\n", notification, param1, param2 ); + FILEPATHS_W *paths = (FILEPATHS_W *)param1; + + switch(notification) + { + case SPFILENOTIFY_STARTQUEUE: + TRACE( "start queue\n" ); + return TRUE; + case SPFILENOTIFY_ENDQUEUE: + TRACE( "end queue\n" ); + return 0; + case SPFILENOTIFY_STARTSUBQUEUE: + TRACE( "start subqueue %d count %d\n", param1, param2 ); + return TRUE; + case SPFILENOTIFY_ENDSUBQUEUE: + TRACE( "end subqueue %d\n", param1 ); + return 0; + case SPFILENOTIFY_STARTDELETE: + TRACE( "start delete %s\n", debugstr_w(paths->Target) ); + return FILEOP_DOIT; + case SPFILENOTIFY_ENDDELETE: + TRACE( "end delete %s\n", debugstr_w(paths->Target) ); + return 0; + case SPFILENOTIFY_DELETEERROR: + ERR( "delete error %d %s\n", paths->Win32Error, debugstr_w(paths->Target) ); return FILEOP_SKIP; + case SPFILENOTIFY_STARTRENAME: + TRACE( "start rename %s -> %s\n", debugstr_w(paths->Source), debugstr_w(paths->Target) ); + return FILEOP_DOIT; + case SPFILENOTIFY_ENDRENAME: + TRACE( "end rename %s -> %s\n", debugstr_w(paths->Source), debugstr_w(paths->Target) ); + return 0; + case SPFILENOTIFY_RENAMEERROR: + ERR( "rename error %d %s -> %s\n", paths->Win32Error, + debugstr_w(paths->Source), debugstr_w(paths->Target) ); + return FILEOP_SKIP; + case SPFILENOTIFY_STARTCOPY: + TRACE( "start copy %s -> %s\n", debugstr_w(paths->Source), debugstr_w(paths->Target) ); + return FILEOP_DOIT; + case SPFILENOTIFY_ENDCOPY: + TRACE( "end copy %s -> %s\n", debugstr_w(paths->Source), debugstr_w(paths->Target) ); + return 0; + case SPFILENOTIFY_COPYERROR: + ERR( "copy error %d %s -> %s\n", paths->Win32Error, + debugstr_w(paths->Source), debugstr_w(paths->Target) ); + return FILEOP_SKIP; + case SPFILENOTIFY_NEEDMEDIA: + TRACE( "need media\n" ); + return FILEOP_SKIP; + default: + FIXME( "notification %d params %x,%x\n", notification, param1, param2 ); + break; + } + return 0; }

19 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005