Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 19506: Get the cursor keys on the numpad working (patch by tinus).
by hbirr＠svn.reactos.com 23 Nov '05

23 Nov '05

Get the cursor keys on the numpad working (patch by tinus). Modified: trunk/reactos/subsys/system/usetup/keytrans.c _____ Modified: trunk/reactos/subsys/system/usetup/keytrans.c --- trunk/reactos/subsys/system/usetup/keytrans.c 2005-11-23 22:01:38 UTC (rev 19505) +++ trunk/reactos/subsys/system/usetup/keytrans.c 2005-11-23 22:10:30 UTC (rev 19506) @@ -53,11 +53,11 @@ VK_F2, VK_F3, VK_F4, VK_F5, /* 0x40 */ VK_F6, VK_F7, VK_F8, VK_F9, - VK_F10, VK_NUMLOCK, VK_SCROLL, VK_NUMPAD7, - VK_NUMPAD8, VK_NUMPAD9, VK_SUBTRACT, VK_NUMPAD4, - VK_NUMPAD5, VK_NUMPAD6, VK_ADD, VK_NUMPAD1, + VK_F10, VK_NUMLOCK, VK_SCROLL, VK_HOME, + VK_UP, VK_PRIOR, VK_SUBTRACT, VK_LEFT, + 0, VK_RIGHT, VK_ADD, VK_END, /* 0x50 */ - VK_NUMPAD2, VK_NUMPAD3, VK_NUMPAD0, VK_SEPARATOR, + VK_DOWN, VK_NEXT, VK_INSERT, VK_DELETE, 0, 0, 0, VK_F11, VK_F12, 0, 0, 0, 0, 0, 0, 0, @@ -116,6 +116,56 @@ 0, 0, 0, 0 }; +/* + * Note how the keyboard lights are not handled, so while NUMLOCK_ON can + * be on, the light will never be. If this starts to be a problem it can be + * fixed, but it's too much work for too little gain to do now. + * Look in win32k/ntuser/input.c for an example. + */ + +static WORD KeyTableNumlock[] = { +/* 0x00 */ + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, +/* 0x10 */ + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, +/* 0x20 */ + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, +/* 0x30 */ + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, +/* 0x40 */ + 0, 0, 0, 0, + 0, 0, 0, VK_NUMPAD7, + VK_NUMPAD8, VK_NUMPAD9, 0, VK_NUMPAD4, + VK_NUMPAD5, VK_NUMPAD6, 0, VK_NUMPAD1, +/* 0x50 */ + VK_NUMPAD2, VK_NUMPAD3, VK_NUMPAD0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, +/* 0x60 */ + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, +/* 0x70 */ + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0 +}; + typedef struct _SCANTOASCII { USHORT ScanCode; USHORT Enhanced; @@ -225,6 +275,11 @@ Value = LEFT_ALT_PRESSED; break; + case 0x45: + Value = NUMLOCK_ON; + if (!(InputData->Flags & KEY_BREAK)) + *State ^= Value; + return; default: return; } @@ -253,6 +308,12 @@ IntVKFromKbdInput(PKEYBOARD_INPUT_DATA InputData, DWORD KeyState) { if (!(KeyState & ENHANCED_KEY)) { + if ((KeyState & NUMLOCK_ON) && + KeyTableNumlock[InputData->MakeCode & 0x7f]) { + DPRINT("Numlock, using %x\n", + InputData->MakeCode & 0x7f); + return KeyTableNumlock[InputData->MakeCode & 0x7f]; + } DPRINT("Not enhanced, using %x\n", InputData->MakeCode & 0x7f); return KeyTable[InputData->MakeCode & 0x7f]; }

1 0

[hbirr] 19505: Use the correct read length in ConReadConsoleInput.
by hbirr＠svn.reactos.com 23 Nov '05

23 Nov '05

Use the correct read length in ConReadConsoleInput. Modified: trunk/reactos/subsys/system/usetup/console.c _____ Modified: trunk/reactos/subsys/system/usetup/console.c --- trunk/reactos/subsys/system/usetup/console.c 2005-11-23 21:59:34 UTC (rev 19504) +++ trunk/reactos/subsys/system/usetup/console.c 2005-11-23 22:01:38 UTC (rev 19505) @@ -199,8 +199,7 @@ NULL, &Iosb, &InputData, -// &Buffer->Event.KeyEvent, - sizeof(KEY_EVENT_RECORD), + sizeof(KEYBOARD_INPUT_DATA), NULL, 0);

1 0

[hbirr] 19504: Don't return from inside an exception handler.
by hbirr＠svn.reactos.com 23 Nov '05

23 Nov '05

Don't return from inside an exception handler. Modified: trunk/reactos/subsys/win32k/ntuser/message.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-11-23 21:19:00 UTC (rev 19503) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-11-23 21:59:34 UTC (rev 19504) @@ -113,24 +113,25 @@ CREATESTRUCTW *Cs; PUNICODE_STRING WindowName; PUNICODE_STRING ClassName; - UINT Size; + UINT Size = 0; - _SEH_TRY { + _SEH_TRY + { if (MMS_SIZE_WPARAM == MsgMemoryEntry->Size) - { - return (UINT) wParam; + { + Size = (UINT)wParam; } else if (MMS_SIZE_WPARAMWCHAR == MsgMemoryEntry->Size) - { - return (UINT) (wParam * sizeof(WCHAR)); + { + Size = (UINT) (wParam * sizeof(WCHAR)); } else if (MMS_SIZE_LPARAMSZ == MsgMemoryEntry->Size) - { - return (UINT) ((wcslen((PWSTR) lParam) + 1) * sizeof(WCHAR)); + { + Size = (UINT) ((wcslen((PWSTR) lParam) + 1) * sizeof(WCHAR)); } else if (MMS_SIZE_SPECIAL == MsgMemoryEntry->Size) - { - switch(MsgMemoryEntry->Message) + { + switch(MsgMemoryEntry->Message) { case WM_CREATE: case WM_NCCREATE: @@ -146,31 +147,34 @@ { Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR); } - return Size; break; case WM_NCCALCSIZE: - return wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) : sizeof(RECT); + Size = wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) : sizeof(RECT); break; case WM_COPYDATA: - return sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData; + Size = sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData; + break; default: assert(FALSE); - return 0; + Size = 0; break; } } else { - return MsgMemoryEntry->Size; + Size = MsgMemoryEntry->Size; } - } _SEH_HANDLE { - + } + _SEH_HANDLE + { DPRINT1("Exception caught in MsgMemorySize()! Status: 0x%x\n", _SEH_GetExceptionCode()); - } _SEH_END; - return 0; + Size = 0; + } + _SEH_END; + return Size; } static FASTCALL NTSTATUS

1 0

[hbirr] 19503: Fixed FormatMessageA/W.
by hbirr＠svn.reactos.com 23 Nov '05

23 Nov '05

Fixed FormatMessageA/W. Modified: trunk/reactos/lib/kernel32/misc/errormsg.c _____ Modified: trunk/reactos/lib/kernel32/misc/errormsg.c --- trunk/reactos/lib/kernel32/misc/errormsg.c 2005-11-23 21:17:11 UTC (rev 19502) +++ trunk/reactos/lib/kernel32/misc/errormsg.c 2005-11-23 21:19:00 UTC (rev 19503) @@ -267,18 +267,19 @@ else argliststart=(*(DWORD**)args)+insertnr-1; - /* FIXME: precision and width components are not handled correctly */ - if ( (strcmp(fmtstr, "%ls") == 0) || (strcmp(fmtstr,"%S") == 0) ) { - sz = WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, NULL, 0, NULL, NULL); + b = NULL; + sz = 0; + do { + if (b) { + HeapFree(GetProcessHeap(), 0, b); + } + sz += 256; b = HeapAlloc(GetProcessHeap(), 0, sz); - WideCharToMultiByte( CP_ACP, 0, *(WCHAR**)argliststart, -1, b, sz, NULL, NULL); - } else { - b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz = 1000); /* CMF - This makes a BIG assumption about va_list */ - TRACE("A BIG assumption\n"); - _vsnprintf(b, sz, fmtstr, (va_list) argliststart); - } - for (x=b; *x; x++) ADD_TO_T(*x); + } while (0 > _vsnprintf(b, sz, fmtstr, (va_list) argliststart)); + x=b; + while(*x) + ADD_TO_T(*x++); HeapFree(GetProcessHeap(),0,b); } else { @@ -378,7 +379,7 @@ #if defined(__i386__) || defined(__sparc__) /* This implementation is completely dependent on the format of the va_list on x86 CPUs */ LPWSTR target,t; - DWORD talloced; + DWORD talloced,len; LPWSTR from,f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; @@ -411,6 +412,7 @@ return 0; } } + target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); t = target; talloced= 100; @@ -434,10 +436,11 @@ while (*f && !eos) { if (*f=='%') { int insertnr; - WCHAR *fmtstr,*sprintfbuf,*x; + WCHAR *fmtstr,*sprintfbuf,*x,*lastf; DWORD *argliststart; fmtstr = NULL; + lastf = f; f++; if (!*f) { ADD_TO_T('%'); @@ -477,32 +480,38 @@ fmtstr = HeapAlloc( GetProcessHeap(),0,3*sizeof(WCHAR)); strcpyW( fmtstr, FMTWSTR ); } - if (dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) - argliststart=args+insertnr-1; - else - argliststart=(*(DWORD**)args)+insertnr-1; - if (fmtstr[strlenW(fmtstr)-1]=='s' && argliststart[0]) { - DWORD xarr[3]; + if (args) { + if (dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) + argliststart=args+insertnr-1; + else + argliststart=(*(DWORD**)args)+insertnr-1; - xarr[0]=*(argliststart+0); - /* possible invalid pointers */ - xarr[1]=*(argliststart+1); - xarr[2]=*(argliststart+2); - sprintfbuf=HeapAlloc(GetProcessHeap(),0,(strlenW((LPWSTR)argliststart[0] )*2+1)*sizeof(WCHAR)); - /* CMF - This makes a BIG assumption about va_list */ - _vsnwprintf(sprintfbuf,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCH AR), fmtstr, (va_list) xarr); + len = 0; + sprintfbuf = NULL; + do { + if (sprintfbuf) { + HeapFree(GetProcessHeap(),0,sprintfbuf); + } + len += 256; + sprintfbuf=HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + /* CMF - This makes a BIG assumption about va_list */ + } while (0 > _vsnwprintf(sprintfbuf, len, fmtstr, (va_list) argliststart)); + x=sprintfbuf; + while (*x) { + ADD_TO_T(*x++); + } + HeapFree(GetProcessHeap(),0,sprintfbuf); + } else { - sprintfbuf=HeapAlloc(GetProcessHeap(),0,100); + /* NULL args - copy formatstr + * (probably wrong) + */ + while ((lastf<f)&&(*lastf)) { + ADD_TO_T(*lastf++); + } + } - /* CMF - This makes a BIG assumption about va_list */ - _vsnwprintf(sprintfbuf,(strlenW((LPWSTR)argliststart[0])*2+1)*sizeof(WCH AR), fmtstr, (va_list) argliststart); - } - x=sprintfbuf; - while (*x) { - ADD_TO_T(*x++); - } - HeapFree(GetProcessHeap(),0,sprintfbuf); HeapFree(GetProcessHeap(),0,fmtstr); break; case 'n':

1 0

[hbirr] 19502: Removed some escape sequences from the command line in CreateProcessInternalW.
by hbirr＠svn.reactos.com 23 Nov '05

23 Nov '05

Removed some escape sequences from the command line in CreateProcessInternalW. Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-11-23 21:14:06 UTC (rev 19501) +++ trunk/reactos/lib/kernel32/process/create.c 2005-11-23 21:17:11 UTC (rev 19502) @@ -657,6 +657,7 @@ ULONG RetVal; UINT Error = 0; BOOLEAN SearchDone = FALSE; + BOOLEAN Escape = FALSE; CLIENT_ID ClientId; PPEB OurPeb = NtCurrentPeb(); PPEB RemotePeb; @@ -745,6 +746,21 @@ PriorityClass.Foreground = FALSE; PriorityClass.PriorityClass = BasepConvertPriorityClass(dwCreationFlags); + if (lpCommandLine) + { + /* Serach for escape sequences */ + ScanString = lpCommandLine; + while (NULL != (ScanString = wcschr(ScanString, L'^'))) + { + ScanString++; + if (*ScanString == L'\"' || *ScanString == L'^' || *ScanString == L'\"') + { + Escape = TRUE; + break; + } + } + } + /* Get the application name and do all the proper formating necessary */ GetAppName: /* See if we have an application name (oh please let us have one!) */ @@ -775,7 +791,7 @@ /* Find the closing quote */ while (*ScanString) { - if (*ScanString == L'\"') + if (*ScanString == L'\"' && *(ScanString - 1) != L'^') { /* Found it */ NullBuffer = ScanString; @@ -1178,6 +1194,27 @@ DPRINT("Quoted CmdLine: %S\n", QuotedCmdLine); } + + if (Escape) + { + if (QuotedCmdLine == NULL) + { + QuotedCmdLine = RtlAllocateHeap(GetProcessHeap(), + 0, + (wcslen(lpCommandLine) + 1) * sizeof(WCHAR)); + wcscpy(QuotedCmdLine, lpCommandLine); + } + + ScanString = QuotedCmdLine; + while (NULL != (ScanString = wcschr(ScanString, L'^'))) + { + ScanString++; + if (*ScanString == L'\"' || *ScanString == L'^' || *ScanString == L'\\') + { + memmove(ScanString-1, ScanString, wcslen(ScanString) * sizeof(WCHAR) + sizeof(WCHAR)); + } + } + } /* Get the Process Information */ Status = NtQueryInformationProcess(hProcess, @@ -1199,7 +1236,7 @@ RemotePeb, (LPWSTR)lpApplicationName, CurrentDirectory, - (QuotesNeeded || CmdLineIsAppName) ? + (QuotesNeeded || CmdLineIsAppName || Escape) ? QuotedCmdLine : lpCommandLine, lpEnvironment, EnvSize,

1 0

[hbirr] 19501: - Implemented wgetmainargs.
by hbirr＠svn.reactos.com 23 Nov '05

23 Nov '05

- Implemented wgetmainargs. - Fixed the allocating of argv if a empty cmd line is given. - Fixed the allocating of pgmptr. Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/misc/getargs.c Modified: trunk/reactos/lib/msvcrt/dllmain.c Modified: trunk/reactos/lib/msvcrt/msvcrt.def _____ Modified: trunk/reactos/lib/crt/misc/environ.c --- trunk/reactos/lib/crt/misc/environ.c 2005-11-23 20:47:38 UTC (rev 19500) +++ trunk/reactos/lib/crt/misc/environ.c 2005-11-23 21:14:06 UTC (rev 19501) @@ -31,6 +31,8 @@ wchar_t **__winitenv = NULL; /* pointer to initial environment block */ #undef _pgmptr char *_pgmptr = NULL; /* pointer to program name */ +#undef _wpgmptr +wchar_t *_wpgmptr = NULL; /* pointer to program name */ int __app_type = 0; //_UNKNOWN_APP; /* application type */ int __mb_cur_max = 1; @@ -271,8 +273,7 @@ * the environments are in sync and the option is at the * same position. */ free(_environ[index]); - for (; _environ[index] != NULL; index++) - _environ[index] = _environ[index + 1]; + memmove(&_environ[index], &_environ[index+1], (count - index) * sizeof(char*)); _environ = realloc(_environ, count * sizeof(char*)); result = SetEnvironmentVariableW(name, NULL) ? 0 : -1; @@ -375,6 +376,14 @@ /* * @implemented */ +wchar_t **__p__wcmdln(void) +{ + return &_wcmdln; +} + +/* + * @implemented + */ char ***__p__environ(void) { return &_environ; @@ -431,6 +440,14 @@ /* * @implemented */ +wchar_t **__p__wpgmptr(void) +{ + return &_wpgmptr; +} + +/* + * @implemented + */ unsigned int *__p__winmajor(void) { return &_winmajor; _____ Modified: trunk/reactos/lib/crt/misc/getargs.c --- trunk/reactos/lib/crt/misc/getargs.c 2005-11-23 20:47:38 UTC (rev 19500) +++ trunk/reactos/lib/crt/misc/getargs.c 2005-11-23 21:14:06 UTC (rev 19501) @@ -4,7 +4,11 @@ extern char*_acmdln; +extern wchar_t* _wcmdln; +#undef _pgmptr extern char*_pgmptr; +#undef _wpgmptr +extern wchar_t*_wpgmptr; #undef _environ extern char**_environ; @@ -31,11 +35,86 @@ return s; } +wchar_t* wcsndup(wchar_t* name, int len) +{ + wchar_t *s = malloc((len + 1) * sizeof(wchar_t)); + if (s != NULL) + { + memcpy(s, name, len*sizeof(wchar_t)); + s[len] = 0; + } + return s; +} + #define SIZE (4096 / sizeof(char*)) -int add - (char* name) +int wadd(wchar_t* name) { + wchar_t** _new; + if ((__argc % SIZE) == 0) + { + if (__wargv == NULL) + _new = malloc(sizeof(wchar_t*) * (1 + SIZE)); + else + _new = realloc(__wargv, sizeof(wchar_t*) * (__argc + 1 + SIZE)); + if (_new == NULL) + return -1; + __wargv = _new; + } + __wargv[__argc++] = name; + __wargv[__argc] = NULL; + return 0; +} + +int wexpand(wchar_t* name, int expand_wildcards) +{ + wchar_t* s; + WIN32_FIND_DATAW fd; + HANDLE hFile; + BOOLEAN first = TRUE; + wchar_t buffer[256]; + int pos; + + if (expand_wildcards && (s = wcspbrk(name, L"*?"))) + { + hFile = FindFirstFileW(name, &fd); + if (hFile != INVALID_HANDLE_VALUE) + { + while(s != name && *s != L'/' && *s != L'\\') + s--; + pos = s - name; + if (*s == L'/' || *s == L'\\') + pos++; + wcsncpy(buffer, name, pos); + do + { + if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + wcscpy(&buffer[pos], fd.cFileName); + if (wadd(_wcsdup(buffer)) < 0) + { + FindClose(hFile); + return -1; + } + first = FALSE; + } + } + while(FindNextFileW(hFile, &fd)); + FindClose(hFile); + } + } + if (first) + { + if (wadd(name) < 0) + return -1; + } + else + free(name); + return 0; +} + +int aadd(char* name) +{ char** _new; if ((__argc % SIZE) == 0) { @@ -52,7 +131,7 @@ return 0; } -int expand(char* name, int expand_wildcards) +int aexpand(char* name, int expand_wildcards) { char* s; WIN32_FIND_DATAA fd; @@ -77,8 +156,7 @@ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { strcpy(&buffer[pos], fd.cFileName); - if (add - (_strdup(buffer)) < 0) + if (aadd(_strdup(buffer)) < 0) { FindClose(hFile); return -1; @@ -92,8 +170,7 @@ } if (first) { - if (add - (name) < 0) + if (aadd(name) < 0) return -1; } else @@ -137,7 +214,7 @@ if (_acmdln[i] == ' ' && !ignorespace) { - expand(strndup(_acmdln + afterlastspace, i - afterlastspace), doexpand); + aexpand(strndup(_acmdln + afterlastspace, i - afterlastspace), doexpand); i++; while (_acmdln[i]==' ') i++; @@ -152,15 +229,20 @@ if (_acmdln[afterlastspace] != 0) { - expand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); + aexpand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); } HeapValidate(hHeap, 0, NULL); *argc = __argc; + if (__argv == NULL) + { + __argv = (char**)malloc(sizeof(char*)); + __argv[0] = 0; + } *argv = __argv; *env = _environ; - _pgmptr = _strdup((char*)argv[0]); + _pgmptr = _strdup(__argv[0]); // if (new_mode) _set_new_mode(*new_mode); } @@ -171,9 +253,66 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, int expand_wildcards, int* new_mode) { + int i, afterlastspace, ignorespace, len, doexpand; + + /* missing threading init */ + + i = 0; + afterlastspace = 0; + ignorespace = 0; + doexpand = expand_wildcards; + + len = wcslen(_wcmdln); + + while (_wcmdln[i]) + { + if (_wcmdln[i] == L'"') + { + if(ignorespace) + { + ignorespace = 0; + } + else + { + ignorespace = 1; + doexpand = 0; + } + memmove(_wcmdln + i, _wcmdln + i + 1, (len - i) * sizeof(wchar_t)); + len--; + continue; + } + + if (_wcmdln[i] == L' ' && !ignorespace) + { + wexpand(wcsndup(_wcmdln + afterlastspace, i - afterlastspace), doexpand); + i++; + while (_wcmdln[i]==L' ') + i++; + afterlastspace=i; + doexpand = expand_wildcards; + } + else + { + i++; + } + } + + if (_wcmdln[afterlastspace] != 0) + { + wexpand(wcsndup(_wcmdln+afterlastspace, i - afterlastspace), doexpand); + } + + HeapValidate(hHeap, 0, NULL); + *argc = __argc; + if (__wargv == NULL) + { + __wargv = (wchar_t**)malloc(sizeof(wchar_t*)); + __wargv[0] = 0; + } *wargv = __wargv; *wenv = __winitenv; + _wpgmptr = _wcsdup(__wargv[0]); // if (new_mode) _set_new_mode(*new_mode); } _____ Modified: trunk/reactos/lib/msvcrt/dllmain.c --- trunk/reactos/lib/msvcrt/dllmain.c 2005-11-23 20:47:38 UTC (rev 19500) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-11-23 21:14:06 UTC (rev 19501) @@ -90,7 +90,7 @@ if (BlockEnvToEnvironW() < 0) { - FreeEnvironment((char**)_wenviron); + FreeEnvironment(_environ); return FALSE; } _____ Modified: trunk/reactos/lib/msvcrt/msvcrt.def --- trunk/reactos/lib/msvcrt/msvcrt.def 2005-11-23 20:47:38 UTC (rev 19500) +++ trunk/reactos/lib/msvcrt/msvcrt.def 2005-11-23 21:14:06 UTC (rev 19501) @@ -147,12 +147,12 @@ __p__pwctype __p__timezone __p__tzname=stub -__p__wcmdln=stub +__p__wcmdln __p__wenviron __p__winmajor __p__winminor __p__winver -__p__wpgmptr=stub +__p__wpgmptr __pioinfo __pxcptinfoptrs __set_app_type @@ -561,7 +561,7 @@ _wasctime _wchdir _wchmod -_wcmdln +_wcmdln DATA _wcreat _wcsdup _wcserror=stub

1 0

[hpoussin] 19500: Use a common header file
by hpoussin＠svn.reactos.com 23 Nov '05

23 Nov '05

Use a common header file Small fix in CheckPciDevice Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pci.h Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/fdo.c --- trunk/reactos/drivers/bus/pci/fdo.c 2005-11-23 20:37:38 UTC (rev 19499) +++ trunk/reactos/drivers/bus/pci/fdo.c 2005-11-23 20:47:38 UTC (rev 19500) @@ -7,9 +7,6 @@ * 10-09-2001 CSH Created */ -#include <ddk/ntddk.h> - -#include "pcidef.h" #include "pci.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/bus/pci/pci.c --- trunk/reactos/drivers/bus/pci/pci.c 2005-11-23 20:37:38 UTC (rev 19499) +++ trunk/reactos/drivers/bus/pci/pci.c 2005-11-23 20:47:38 UTC (rev 19500) @@ -7,11 +7,7 @@ * 10-09-2001 CSH Created */ -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> -#include <stdio.h> - -#include "pcidef.h" +#define INITGUID #include "pci.h" #define NDEBUG _____ Modified: trunk/reactos/drivers/bus/pci/pci.h --- trunk/reactos/drivers/bus/pci/pci.h 2005-11-23 20:37:38 UTC (rev 19499) +++ trunk/reactos/drivers/bus/pci/pci.h 2005-11-23 20:47:38 UTC (rev 19500) @@ -1,6 +1,9 @@ #ifndef __PCI_H #define __PCI_H +#include <ddk/ntifs.h> +#include <ddk/wdmguid.h> +#include <stdio.h> typedef struct _PCI_DEVICE { _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-11-23 20:37:38 UTC (rev 19499) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-11-23 20:47:38 UTC (rev 19500) @@ -7,11 +7,6 @@ * 10-09-2001 CSH Created */ -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> -#include <initguid.h> -#include <ddk/wdmguid.h> -#include "pcidef.h" #include "pci.h" #define NDEBUG @@ -1020,9 +1015,9 @@ { return FALSE; } - if ((Parameters->Flags && PCI_USE_CLASS_SUBCLASS) && ( - PciConfig->u.type0.SubVendorID != Parameters->SubVendorID || - PciConfig->u.type0.SubSystemID != Parameters->SubSystemID)) + if ((Parameters->Flags & PCI_USE_CLASS_SUBCLASS) && ( + PciConfig->BaseClass != Parameters->BaseClass || + PciConfig->SubClass != Parameters->SubClass)) { return FALSE; } @@ -1032,8 +1027,8 @@ return FALSE; } if ((Parameters->Flags & PCI_USE_SUBSYSTEM_IDS) && ( - PciConfig->Command != Parameters->SubVendorID || - PciConfig->Status != Parameters->SubSystemID)) + PciConfig->u.type0.SubVendorID != Parameters->SubVendorID || + PciConfig->u.type0.SubSystemID != Parameters->SubSystemID)) { return FALSE; } @@ -1127,9 +1122,6 @@ BusInterface = (PBUS_INTERFACE_STANDARD)IrpSp->Parameters.QueryInterface.Interface; BusInterface->Size = sizeof(BUS_INTERFACE_STANDARD); BusInterface->Version = 1; - BusInterface->Context = DeviceObject; - BusInterface->InterfaceReference = InterfaceReference; - BusInterface->InterfaceDereference = InterfaceDereference; BusInterface->TranslateBusAddress = InterfaceBusTranslateBusAddress; BusInterface->GetDmaAdapter = InterfaceBusGetDmaAdapter; BusInterface->SetBusData = InterfaceBusSetBusData; @@ -1151,9 +1143,6 @@ PciDevicePresentInterface = (PPCI_DEVICE_PRESENT_INTERFACE)IrpSp->Parameters.QueryInterface.Interfac e; PciDevicePresentInterface->Size = sizeof(PCI_DEVICE_PRESENT_INTERFACE); PciDevicePresentInterface->Version = 1; - PciDevicePresentInterface->Context = DeviceObject; - PciDevicePresentInterface->InterfaceReference = InterfaceReference; - PciDevicePresentInterface->InterfaceDereference = InterfaceDereference; PciDevicePresentInterface->IsDevicePresent = InterfacePciDevicePresent; PciDevicePresentInterface->IsDevicePresentEx = InterfacePciDevicePresentEx; Status = STATUS_SUCCESS; @@ -1170,6 +1159,9 @@ /* Add a reference for the returned interface */ PINTERFACE Interface; Interface = (PINTERFACE)IrpSp->Parameters.QueryInterface.Interface; + Interface->Context = DeviceObject; + Interface->InterfaceReference = InterfaceReference; + Interface->InterfaceDereference = InterfaceDereference; Interface->InterfaceReference(Interface->Context); }

1 0

[greatlrd] 19499: Verify VBE is found and not anything else, is a safe check.
by greatlrd＠svn.reactos.com 23 Nov '05

23 Nov '05

Verify VBE is found and not anything else, is a safe check. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-11-23 20:23:41 UTC (rev 19498) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-11-23 20:37:38 UTC (rev 19499) @@ -241,6 +241,13 @@ &VBEDeviceExtension->VbeInfo, sizeof(VBEDeviceExtension->VbeInfo)); + /* Verify VBE is found and not an²thing else */ + if (strncmp(VBEDeviceExtension->VbeInfo.Signature,"VESA",4) != 0) + { + DPRINT("No VBE BIOS present\n"); + return FALSE; + } + /* Dectect Bad VBE BIOS some Graphice card report 0x200 when they are VBE 1.2 */ if (VBEDeviceExtension->VbeInfo.OemVendorNamePtr == 0 && VBEDeviceExtension->VbeInfo.Version == 0x200) {

1 0

[greatlrd] 19498: TotalMemory is in number of 64K block not 16K block see VBE 2.0 or 3.0 specification.
by greatlrd＠svn.reactos.com 23 Nov '05

23 Nov '05

TotalMemory is in number of 64K block not 16K block see VBE 2.0 or 3.0 specification. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-11-23 20:16:34 UTC (rev 19497) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-11-23 20:23:41 UTC (rev 19498) @@ -246,12 +246,11 @@ { VBEDeviceExtension->VbeInfo.Version = 0x102; } - - + DPRINT("VBE BIOS Present (%d.%d, %8ld Kb)\n", VBEDeviceExtension->VbeInfo.Version / 0x100, VBEDeviceExtension->VbeInfo.Version & 0xFF, - VBEDeviceExtension->VbeInfo.TotalMemory * 16); + VBEDeviceExtension->VbeInfo.TotalMemory * 64); #ifdef VBE12_SUPPORT if (VBEDeviceExtension->VbeInfo.Version < 0x102)

1 0

[hpoussin] 19497: Implement IRP_MN_QUERY_DEVICE_RELATIONS
by hpoussin＠svn.reactos.com 23 Nov '05

23 Nov '05

Implement IRP_MN_QUERY_DEVICE_RELATIONS Activate code in IRP_MN_STOP_DEVICE Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c _____ Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c --- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-23 19:35:44 UTC (rev 19496) +++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-23 20:16:34 UTC (rev 19497) @@ -1533,9 +1533,6 @@ break; case IRP_MN_STOP_DEVICE: - /* FIXME */ - Status = STATUS_UNSUCCESSFUL; - break; Status = NdisIForwardIrpAndWait(Adapter, Irp); if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) { @@ -1545,6 +1542,12 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + default: IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs