Ros-dev July 2005

ros-dev@reactos.org

59 participants
100 discussions

by James Tabor

Hi All, I'm starting to get a headache. This is a port from wine to win32k/ntuser/winpos.c. It does compile. But it is so butt ugly! I'm in the process of fixing MDI. So far, testing with winefile.exe has come down to this one function. So this is open for peer review. I'm tired. 8^( Thanks, James BOOL FASTCALL IntIsIconic(HWND hWnd) { return (NtUserGetWindowLong( hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE) != 0; } BOOL FASTCALL IntIsWindowEnabled( HWND hWnd) { return (! (NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_DISABLED)); } #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) #define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772) static ATOM atomInternalPos; extern HWND FASTCALL IntSetOwner(HWND hWnd, HWND hWndNewOwner); extern HWND STDCALL IntCreateWindowEx(DWORD dwExStyle, PUNICODE_STRING ClassName, PUNICODE_STRING WindowName, DWORD dwStyle, LONG x, LONG y, LONG nWidth, LONG nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam, DWORD dwShowMode, BOOL bUnicodeWindow); HWND FASTCALL ICONTITLE_Create( HWND owner ) { HWND hWnd; UNICODE_STRING ClassName; HINSTANCE instance = (HINSTANCE)NtUserGetWindowLong( owner, GWL_HINSTANCE, FALSE ); LONG style = WS_CLIPSIBLINGS; RtlInitUnicodeString(&ClassName, NULL); ClassName.Buffer = (LPWSTR)ICONTITLE_CLASS_ATOM; if (!IntIsWindowEnabled(owner)) style |= WS_DISABLED; if( NtUserGetWindowLong( owner, GWL_STYLE,FALSE ) & WS_CHILD ) hWnd = IntCreateWindowEx( 0, &ClassName, NULL, style | WS_CHILD, 0, 0, 1, 1, NtUserGetParent(owner), 0, instance, NULL,SW_SHOW,TRUE ); else hWnd = IntCreateWindowEx( 0, &ClassName, NULL, style, 0, 0, 1, 1, owner, 0, instance, NULL,SW_SHOW,TRUE ); IntSetOwner( hWnd, owner ); /* MDI depends on this */ NtUserSetWindowLong( hWnd, GWL_STYLE, NtUserGetWindowLong( hWnd, GWL_STYLE,FALSE ) & ~(WS_CAPTION | WS_BORDER), FALSE ); return hWnd; } BOOL FASTCALL WinPosShowIconTitle(HWND hWnd, BOOL bShow) { PWINDOW_OBJECT WindowObject; PINTERNALPOS lpPos; /* This way or??? */ lpPos = (PINTERNALPOS)NtUserGetProp( hWnd, atomInternalPos ); if (!(WindowObject = IntGetWindowObject(hWnd))) { return FALSE; } /* This way? Dont know! */ lpPos = WindowObject->InternalPos; if (lpPos ) { HWND title = 0;//lpPos->hwndIconTitle; if( !title ) // lpPos->hwndIconTitle = title = ICONTITLE_Create( hWnd ); if( bShow ) { if (!IntIsWindowVisible(title)) { IntSendMessage( title, WM_SHOWWINDOW, TRUE, 0 ); WinPosSetWindowPos( title, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); } } else WinPosShowWindow( title, SW_HIDE ); } IntReleaseWindowObject(WindowObject); return TRUE; } UINT FASTCALL WinPosArrangeIconicWindows(PWINDOW_OBJECT parent) { RECT rectParent; HWND hwndChild; INT i, x, y, xspacing, yspacing; HWND *List = IntWinListChildren(parent); IntGetClientRect( parent, &rectParent ); x = rectParent.left; y = rectParent.bottom; xspacing = NtUserGetSystemMetrics(SM_CXICONSPACING); yspacing = NtUserGetSystemMetrics(SM_CYICONSPACING); for( i = 0; List[i]; i++) { hwndChild = List[i]; if( IntIsIconic( hwndChild ) ) { WinPosShowIconTitle( hwndChild, FALSE ); WinPosSetWindowPos( hwndChild, 0, x + (xspacing - NtUserGetSystemMetrics(SM_CXICON)) / 2, y - yspacing - NtUserGetSystemMetrics(SM_CYICON)/2, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); if( IntIsWindow(hwndChild) ) WinPosShowIconTitle(hwndChild , TRUE ); if (x <= rectParent.right - xspacing) x += xspacing; else { x = rectParent.left; y -= yspacing; } } } ExFreePool(List); return yspacing; }

19 years, 5 months

Patch: GetMenuString

by Jens Collin

Hello, my old cvs account is no longer working on the new svn server so I'm sending the patch here and hope that someone could take a moment to commit it for me. Thanks, Jens Collin Changelog: GetMenuStringA and GetMenuStringW inverted the MF_BYPOSITION parameter. Buffers were incorrectly copied in and wrong size returned in GetMenuItemInfoA ansi-structures. GetMenuString now works the same on both windows and ROS. Index: lib/user32/windows/menu.c =================================================================== --- lib/user32/windows/menu.c (revision 16591) +++ lib/user32/windows/menu.c (working copy) @@ -3772,7 +3772,7 @@ RtlCopyMemory(mii, &miiW, miiW.cbSize); mii->dwTypeData = AnsiBuffer; - + mii->cch = strlen(AnsiBuffer); return TRUE; } @@ -3864,11 +3864,11 @@ MENUITEMINFOA mii; mii.dwTypeData = lpString; mii.fMask = MIIM_STRING; + mii.fType = MF_STRING; mii.cbSize = sizeof(MENUITEMINFOA); mii.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii))) + if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&mii))) return 0; else return mii.cch; @@ -3893,10 +3893,9 @@ miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW))) + if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&miiW))) return 0; - else + else return miiW.cch; } @@ -4318,11 +4317,11 @@ mii.fState = MFS_ENABLED; UNIMPLEMENTED; - + if(!GetMenuItemInfoA( hMnu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), - &mii)) return FALSE; + &mii)) return FALSE; if(uFlags & MF_BITMAP) { @@ -4341,7 +4340,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } /* Item beginning with a backspace is a help item */ if (*lpNewItem == '\b') { @@ -4352,7 +4351,7 @@ mii.dwTypeData = (LPSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY; @@ -4439,7 +4438,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } if (*lpNewItem == '\b') { mii.fType |= MF_HELP; @@ -4449,7 +4448,7 @@ mii.dwTypeData = (LPWSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY;

19 years, 5 months

Explorer Crash

by James Tabor

Hi, C:\ReactOS>explorer <cr> no problem runs fine. [-]- My Computer | [+]- (C:) ^ Click here and,,,, (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (KERNEL32:lib/kernel32/file/file.c:859) Invalid path (lib/shell32/shell32_main.c:393:SHGetFileInfoW) pidl is null! (KERNEL32:lib/kernel32/file/file.c:859) Invalid path (KERNEL32:lib/kernel32/file/file.c:859) Invalid path (subsys/win32k/ntuser/misc.c:753) HWNDLOCK_ROUTINE_DRAWMENUBAR (lib/user32/windows/menu.c:4417)(ModifyMenuW) is unimplemented, please try again later. (lib/shell32/shell32_main.c:465:SHGetFileInfoW) set icon to link, stub (lib/shell32/shell32_main.c:465:SHGetFileInfoW) set icon to link, stub ne2000!NICIndicatePacket: Indicating (64) bytes. (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (ntoskrnl/io/file.c:125) Failed to mount logical volume (Status c000014f) (lib/shell32/shell32_main.c:465:SHGetFileInfoW) set icon to link, stub (lib/shell32/shell32_main.c:465:SHGetFileInfoW) set icon to link, stub (lib/shell32/shell32_main.c:465:SHGetFileInfoW) set icon to link, stub (lib/shell32/shell32_main.c:465:SHGetFileInfoW) set icon to link, stub (lib/shell32/shellole.c:237:SHELL32_DllGetClassObject) failed for CLSID= {645ff040-5081-101b-9f08-00aa002f954e} (unknown) (lib/shell32/shellole.c:167:SHCoCreateInstance) LoadFromShell failed for CLSID= {645ff040-5081-101b-9f08-00aa002f954e} (unknown) (lib/shell32/shellole.c:237:SHELL32_DllGetClassObject) failed for CLSID= {645ff040-5081-101b-9f08-00aa002f954e} (unknown) (lib/shell32/shellole.c:167:SHCoCreateInstance) LoadFromShell failed for CLSID= {645ff040-5081-101b-9f08-00aa002f954e} (unknown) (lib/shell32/shellole.c:237:SHELL32_DllGetClassObject) failed for CLSID= {645ff040-5081-101b-9f08-00aa002f954e} (unknown) (lib/shell32/shellole.c:167:SHCoCreateInstance) LoadFromShell failed for CLSID= {645ff040-5081-101b-9f08-00aa002f954e} (unknown) ???????????????? Context: ShellFolder::ShellFolder(IShellFolder*, LPCITEMIDLIST) Location: subsys/system/explorer/utility/shellclasses.cpp:280 Context Trace: - ShellFolder::ShellFolder(IShellFolder*, LPCITEMIDLIST) - ShellDirectory::read_directory() - Entry::read_directory_base() - Entry::smart_scan() - ShellBrowser::InsertSubitems() - ShellBrowser::OnTreeItemExpanding() - explorer_main - WinMain() - main (ntoskrnl/mm/mm.c:344) Address: ffffffff _SEHCallHandler: REG 007fe30c _SEHCallHandler: REG 007fe7d8 _SEHCallHandler: REG 007fe7d8 Unhandled exception Address: 46e0d6 C:\ReactOS\explorer.EXE CS:EIP 1b:46e0d6 DS 23 ES 23 FS 3b GS 23 EAX: 00000000 EBX: 00941e88 ECX: 007feb28 EDX: 00941e58 EBP: 007fecb8 ESI: 00000000 ESP: 007fecb0 EDI: 00000000 EFLAGS: 00010206 Frames: 400000+3aee5 C:\ReactOS\explorer.EXE 400000+81c36 C:\ReactOS\explorer.EXE 400000+106da C:\ReactOS\explorer.EXE 400000+8625 C:\ReactOS\explorer.EXE 400000+8bef C:\ReactOS\explorer.EXE 400000+1e897 C:\ReactOS\explorer.EXE 400000+1e799 C:\ReactOS\explorer.EXE 400000+85f61 C:\ReactOS\explorer.EXE 400000+3e4d9 C:\ReactOS\explorer.EXE 77e50000+5385e C:\ReactOS\system32\user32.dll 77e50000+5450c C:\ReactOS\system32\user32.dll 76160000+6f0ce C:\ReactOS\system32\comctl32.dll 76160000+6f388 C:\ReactOS\system32\comctl32.dll 76160000+735bb C:\ReactOS\system32\comctl32.dll 76160000+73a11 C:\ReactOS\system32\comctl32.dll 76160000+73cc8 C:\ReactOS\system32\comctl32.dll 76160000+7507e C:\ReactOS\system32\comctl32.dll 76160000+781b6 C:\ReactOS\system32\comctl32.dll 77e50000+5385e C:\ReactOS\system32\user32.dll 77e50000+53b83 C:\ReactOS\system32\user32.dll 400000+3f889 C:\ReactOS\explorer.EXE 400000+4a744 C:\ReactOS\explorer.EXE 400000+4af37 C:\ReactOS\explorer.EXE 400000+4a857 C:\ReactOS\explorer.EXE 400000+11e7 C:\ReactOS\explorer.EXE 400000+1258 C:\ReactOS\explorer.EXE 7c800000+2f105 C:\ReactOS\system32\KERNEL32.dll _SEHCallHandler: REG 007fe858 _SEHCallHandler: REG 007fffb8 _SEHCallHandler: REG 007fffb8 (lib/comctl32/toolbar.c:416:TOOLBAR_GetImageListForDrawing) bitmap for ID 0, ind ex 1 is not valid, number of bitmaps in imagelist: 0 (lib/comctl32/toolbar.c:416:TOOLBAR_GetImageListForDrawing) bitmap for ID 0, ind ex 1 is not valid, number of bitmaps in imagelist: 0 BTW, this is happening for a week or so. Thanks, James

19 years, 5 months

Errors with Building Reactos.

by James Tabor

Build ros on ros update. Make clean, (lib/rtl/error.c:903) RTL: RtlNtStatusToDosErrorNoTeb(0xc000002f): no valid W32 error mapping And this, (subsys/csrss/win32csr/conio.c:995) Console_Api Ctrl-C (lib/ntdll/ldr/startup.c:405) Failed to access the process parameter block (KERNEL32:lib/kernel32/misc/console.c:2954) GenerateConsoleCtrlEvent(0x0, 0x128) UNIMPLEMENTED! Assertion '*SpinLock < 2' failed at ntoskrnl/ke/spinlock.c line 181 (ntoskrnl/mm/mm.c:319) Page fault at high IRQL was 2, address cccccccc KeBugCheckWithTf at ntoskrnl/ke/catch.c:217 Spinning on spinlock 800ec340 current value 1 KeBugCheckEx at ntoskrnl/ke/spinlock.c:198 Spinning on spinlock 800ec340 current value 1 KeBugCheckEx at ntoskrnl/ke/spinlock.c:198 Spinning on spinlock 800ec340 current value 1 *Snip* Spinning on spinlock 800ec340 current value 1 KeBugCheckEx at ntoskrnl/ke/spinlock.c:198 Stack underflow (tf->esp 9d588fc0 Limit 9d5a9000) Stack Segment Fault Exception: 12(0) CS:EIP 8:80082203 <ntoskrnl.exe:82203 (ntoskrnl/rtl/sprintf.c:77 (number))> cr2 9d588fbc cr3 8b1c000 Proc: 81750210 Pid: 134 <make.exe> Thrd: 81940398 Tid: 158 DS 10 ES 10 FS 30 GS 10 EAX: 9d589105 EBX: 9d5895e8 ECX: 800ec340 EDX: 00000000 EBP: 9d589058 ESI: 0000000e ESP: 9d588fc0 EDI: 81940398 EFLAGS: 00010286 kESP 9d588fc0 kernel stack base 9 d5a9000 Frames: Major lockup! James

19 years, 5 months

Compilation problem

by Sebastian Gasiorek

Hi. I Have some problems with compiling ReactOS (for about 3-4 days) using MinGW-Special or current (gcc 3.4.4). here is the output of the compiler: [CC] lib\rtl\ppb.c lib\rtl\ppb.c: In function `RtlCreateProcessParameters': lib\rtl\ppb.c:89: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:90: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:91: error: structure has no member named `ConsoleHandle' lib\rtl\ppb.c:92: error: structure has no member named `ConsoleFlags' lib\rtl\ppb.c:148: error: structure has no member named `MaximumLength' lib\rtl\ppb.c:149: error: structure has no member named `Length' lib\rtl\ppb.c:152: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:153: error: structure has no member named `ConsoleHandle' lib\rtl\ppb.c:154: error: structure has no member named `ConsoleFlags' lib\rtl\ppb.c:160: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:165: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:169: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:170: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:172: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:173: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:174: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:216: error: structure has no member named `RuntimeData' lib\rtl\ppb.c: In function `RtlDeNormalizeProcessParams': lib\rtl\ppb.c:251: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:251: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:251: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:258: error: structure has no member named `RuntimeData' lib\rtl\ppb.c:258: error: structure has no member named `RuntimeData' lib\rtl\ppb.c:258: error: structure has no member named `RuntimeData' lib\rtl\ppb.c: In function `RtlNormalizeProcessParams': lib\rtl\ppb.c:276: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:276: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:276: error: structure has no member named `CurrentDirectory' lib\rtl\ppb.c:283: error: structure has no member named `RuntimeData' lib\rtl\ppb.c:283: error: structure has no member named `RuntimeData' lib\rtl\ppb.c:283: error: structure has no member named `RuntimeData' make: *** [obj-i386\lib\rtl\ppb.o] Error 1 what have I done wrong? thanks, Sebastian

19 years, 5 months

svn.reactos.com machine down for maintenance

by Casper Hornstrup

Hi. I'm taking the svn.reactos.com machine down for maintenance. It shouldn't take long. Sorry for the inconvenience. Casper

19 years, 5 months

Re: [ros-svn] [jimtabor] 16559: Implemented VkKeyScan, GetKeyboardTypeand, GetKeyboardLayout and some Wine ports.

by James Tabor

jimtabor(a)svn.reactos.com wrote: > Implemented VkKeyScan, GetKeyboardTypeand, GetKeyboardLayout and some Wine ports. > > > Updated files: > trunk/reactos/lib/user32/windows/input.c > FYI, Xp results, VkKeyScan 186, OemKey 39 VkKeyScan A: CapsMode 1 Scan 65 VkKeyScan B: CapsMode 1 Scan 66 VkKeyScan C: CapsMode 1 Scan 67 **snip** VkKeyScan 0: CapsMode 0 Scan 48 VkKeyScan 1: CapsMode 0 Scan 49 VkKeyScan 2: CapsMode 0 Scan 50 VkKeyScan 3: CapsMode 0 Scan 51 VkKeyScan 4: CapsMode 0 Scan 52 VkKeyScan 5: CapsMode 0 Scan 53 VkKeyScan 6: CapsMode 0 Scan 54 VkKeyScan 7: CapsMode 0 Scan 55 VkKeyScan 8: CapsMode 0 Scan 56 VkKeyScan 9: CapsMode 0 Scan 57 VkKeyScan :: CapsMode 1 Scan 186 Wine results, VkKeyScan 186, OemKey 59 VkKeyScan A: CapsMode 1 Scan 65 VkKeyScan B: CapsMode 1 Scan 66 VkKeyScan C: CapsMode 1 Scan 67 **snip** VkKeyScan 0: CapsMode 0 Scan 48 VkKeyScan 1: CapsMode 0 Scan 49 VkKeyScan 2: CapsMode 0 Scan 50 VkKeyScan 3: CapsMode 0 Scan 51 VkKeyScan 4: CapsMode 0 Scan 52 VkKeyScan 5: CapsMode 0 Scan 53 VkKeyScan 6: CapsMode 0 Scan 54 VkKeyScan 7: CapsMode 0 Scan 55 VkKeyScan 8: CapsMode 0 Scan 56 VkKeyScan 9: CapsMode 0 Scan 57 VkKeyScan :: CapsMode 1 Scan 186 ReactOS results, VkKeyScan 186, OemKey 39 VkKeyScan A: CapsMode 1 Scan 65 VkKeyScan B: CapsMode 1 Scan 66 VkKeyScan C: CapsMode 1 Scan 67 **snip** VkKeyScan 0: CapsMode 0 Scan 96 VkKeyScan 1: CapsMode 0 Scan 97 VkKeyScan 2: CapsMode 0 Scan 98 VkKeyScan 3: CapsMode 0 Scan 99 VkKeyScan 4: CapsMode 0 Scan 100 VkKeyScan 5: CapsMode 0 Scan 101 VkKeyScan 6: CapsMode 0 Scan 102 VkKeyScan 7: CapsMode 0 Scan 103 VkKeyScan 8: CapsMode 0 Scan 104 VkKeyScan 9: CapsMode 0 Scan 105 VkKeyScan :: CapsMode 1 Scan 186 Notice anything different? James

19 years, 5 months

ObjectHeader has invalid reference count Errors

by James Tabor

Hi all! When running AbiWord this is happening. Everything works, just more of these errors. I think the first clue is this next line, (subsys/win32k/m(subsys/win32k/objects/gdiobj.c:1289) Attempted to change owner isc/object.c:50) ObjectHeader 0x8D0E0140 has invalid reference count (-2) (subsys/win32k/misc/object.c:50) ObjectHeader 0x8D0E6808 has invalid reference c ount (-2) (subsys/win32k/misc/object.c:50) ObjectHeade ship of object 0x2304035f (pid: 0x12c) from pid 0x128!!! (subsys/win32k/objects/gdiobj.c:589) Attempted to free foreign handle: 0x2304035 f Owner: 0x12c from Caller: 0x128 r 0x8D0E65B8 has invalid reference count (-2) (subsys/win32k/misc/object.c:50) ObjectHeader 0x8D0E0140 has invalid reference c ount (-2) (subsys/win32k/misc/object.c:50) ObjectHeader 0x8D0E6808 has invalid reference c ount (-2) (subsys/win32k/misc/object.c:50) ObjectHeader 0x8D0E65B8 has invalid reference c ount (-2) (subsys/win32k/misc/object.c:50) ObjectHeader 0x8D0E0140 has invalid reference c ount (-2) (subsys/win32k/misc/object.c:50) ObjectHeader 0x8D0E6808 has invalid reference c ount (-2) on and on Thanks, James

19 years, 5 months

Re: [ros-diffs] [greatlrd] 16528: The return size calculation's of GetEnvironmentVariable string was wrong. Thx to <Bizzy_D> to find out cd %windir% did not work. Now it will

by Hartmut Birr

greatlrd(a)svn.reactos.com wrote: >The return size calculation's of GetEnvironmentVariable string was wrong. Thx to <Bizzy_D> to find out cd %windir% did not work. Now it will > >Modified: trunk/reactos/lib/kernel32/misc/env.c > > > ------------------------------------------------------------------------ > *Modified: trunk/reactos/lib/kernel32/misc/env.c* > >--- trunk/reactos/lib/kernel32/misc/env.c 2005-07-10 22:05:48 UTC (rev 16527) >+++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-10 22:12:07 UTC (rev 16528) >@@ -70,7 +70,7 @@ > >@@ -133,7 +133,7 @@ > > > } > } > > > >- return (VarValue.Length / sizeof(WCHAR)); > > >+ return (VarValue.Length / sizeof(WCHAR) + sizeof(WCHAR)); > > > } > > > > Hi, this change is wrong. The MSDN library says: If the function succeeds, the return value is the number of TCHARs stored into the buffer pointed to by /lpBuffer/, not including the terminating null character. Please revert your change. - Hartmut

19 years, 5 months

Re: [ros-diffs] [weiden] 16553: handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated

by Joseph Galbraith

> + VarValue.MaximumLength = (nSize != 0 ? (nSize - 1) * sizeof(WCHAR) : 0); > > VarValue.Buffer = lpBuffer; > > Status = RtlQueryEnvironmentVariable_U (NULL, > @@ -125,13 +150,17 @@ > > SetLastErrorByStatus (Status); > if (Status == STATUS_BUFFER_TOO_SMALL) > { > > - return (VarValue.Length / sizeof(WCHAR)) + 1; > > + return (VarValue.Length / sizeof(WCHAR)) + 1; > > } > else > { > return 0; > } > } > > + > + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U > + only terminates it if MaximumLength < Length */ > + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; Is it possible for an environment variable's value to be empty? If it is, RtlQueryEnvironmentVariable_U() could succeeded even if a zero length buffer is passed in. And then, would we crash appending the NUL termination? Since GetEnvironmentVariable has to have a buffer of at least one character to succeed, maybe we should add such a guard to the top of the function... Thanks, Joseph

19 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev July 2005