Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[gschneider] 47255: [WIN32CSR] - Fix a FIXME: convert ASCII char to Unicode char with input codepage - Rename define parameters to make sense (prefix s - source, d - destination)

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon May 17 20:43:21 2010 New Revision: 47255 URL: http://svn.reactos.org/svn/reactos?rev=47255&view=rev Log: [WIN32CSR] - Fix a FIXME: convert ASCII char to Unicode char with input codepage - Rename define parameters to make sense (prefix s - source, d - destination) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon May 17 20:43:21 2010 @@ -26,11 +26,14 @@ #define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ WideCharToMultiByte((Console)->CodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) +#define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + MultiByteToWideChar((Console)->CodePage, 0, (sChar), 1, (dWChar), 1) + #define ConsoleUnicodeCharToAnsiChar(Console, dChar, sWChar) \ WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) -#define ConsoleAnsiCharToUnicodeChar(Console, sWChar, dChar) \ - MultiByteToWideChar((Console)->OutputCodePage, 0, (dChar), 1, (sWChar), 1) +#define ConsoleAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) /* FUNCTIONS *****************************************************************/ @@ -616,7 +619,7 @@ else { if(Request->Data.ReadConsoleRequest.Unicode) - UnicodeBuffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; /* FIXME */ + ConsoleInputAnsiCharToUnicodeChar(Console, &UnicodeBuffer[i], &Input->InputEvent.Event.KeyEvent.uChar.AsciiChar); else Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; }

14 years, 4 months

[tkreuzer] 47254: [HAL] comment out some amd64 specific stuff from rbuild files.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 17 16:52:00 2010 New Revision: 47254 URL: http://svn.reactos.org/svn/reactos?rev=47254&view=rev Log: [HAL] comment out some amd64 specific stuff from rbuild files. Modified: trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halamd64.rbuild Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon May 17 16:52:00 2010 @@ -37,15 +37,15 @@ </if> <if property="ARCH" value="amd64"> <define name="_X86BIOS_" /> - <include base="x86emu">.</include> +  <directory name="amd64"> <file>x86bios.c</file> - <file>halinit.c</file> - <file>irq.S</file> - <file>misc.c</file> - <file>apic.c</file> +  +  +  +  <file>systimer.S</file> - <file>usage.c</file> +  </directory> </if> </directory> Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Mon May 17 16:52:00 2010 @@ -13,7 +13,7 @@ <library>hal_generic</library> <library>hal_generic_acpi</library> <library>ntoskrnl</library> - <library>x86emu</library> +  <directory name="generic"> <file>spinlock.c</file>

14 years, 4 months

[dreimer] 47253: fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. Found by Crocodile

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon May 17 15:55:04 2010 New Revision: 47253 URL: http://svn.reactos.org/svn/reactos?rev=47253&view=rev Log: fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. Found by Crocodile Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Mon May 17 15:55:04 2010 @@ -184,6 +184,8 @@ echo Unknown parameter specified. Try 'help ssvn'. ) +goto EOC + :UP for /f "usebackq tokens=2" %%i in (`"svn.exe info | find "Revision:""`) do set OFFSVN=%%i if "%ROS_ARCH%" == "amd64" (

14 years, 4 months

[mjmartin] 47252: [regedit] - Woops, forgot to change the messages to use resource files instead. Thanks Gregor Schneider.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon May 17 14:31:06 2010 New Revision: 47252 URL: http://svn.reactos.org/svn/reactos?rev=47252&view=rev Log: [regedit] - Woops, forgot to change the messages to use resource files instead. Thanks Gregor Schneider. Modified: trunk/reactos/base/applications/regedit/find.c Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Mon May 17 14:31:06 2010 @@ -808,8 +808,13 @@ hWnd, FindDialogProc, 0) != 0) { if (FindNext(hWnd) == FALSE) - MessageBoxW(NULL,L"Finished searching through the registry\n", - L"Registry Editor", MB_ICONINFORMATION); - } -} - + { + TCHAR msg[128], caption[128]; + + LoadString(hInst, IDS_FINISHEDFIND, msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_APP_TITLE, caption, sizeof(caption)/sizeof(TCHAR)); + MessageBox(0, msg, caption, MB_ICONINFORMATION); + } + } +} +

14 years, 4 months

[mjmartin] 47251: [regedit] - If a search was never done, show the find dialog when pressing F3. Patch by Radek Liska. See Bug #5391. - Return the result of the FindNext and if it is false inform the user that search is complete.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon May 17 04:15:50 2010 New Revision: 47251 URL: http://svn.reactos.org/svn/reactos?rev=47251&view=rev Log: [regedit] - If a search was never done, show the find dialog when pressing F3. Patch by Radek Liska. See Bug #5391. - Return the result of the FindNext and if it is false inform the user that search is complete. Modified: trunk/reactos/base/applications/regedit/find.c Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Mon May 17 04:15:50 2010 @@ -629,6 +629,12 @@ LPCTSTR pszValueName; LPTSTR pszFoundSubKey, pszFoundValueName; + if (_tcslen(s_szFindWhat) == 0) + { + FindDialog(hWnd); + return TRUE; + } + s_dwFlags = GetFindFlags(); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); @@ -678,7 +684,7 @@ free(pszFoundValueName); SetFocus(g_pChildWnd->hListWnd); } - return TRUE; + return fSuccess; } static INT_PTR CALLBACK FindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -801,7 +807,9 @@ if (DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_FIND), hWnd, FindDialogProc, 0) != 0) { - FindNext(hWnd); - } -} - + if (FindNext(hWnd) == FALSE) + MessageBoxW(NULL,L"Finished searching through the registry\n", + L"Registry Editor", MB_ICONINFORMATION); + } +} +

14 years, 4 months

[cgutman] 47250: [USB] - Fix device interface activation - Add usbehci to build

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon May 17 03:25:18 2010 New Revision: 47250 URL: http://svn.reactos.org/svn/reactos?rev=47250&view=rev Log: [USB] - Fix device interface activation - Add usbehci to build Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c Modified: branches/aicom-hardware-fun/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/directory.rbuild [iso-8859-1] Mon May 17 03:25:18 2010 @@ -6,6 +6,9 @@ </directory> <directory name="nt4compat"> <xi:include href="nt4compat/directory.rbuild" /> + </directory> + <directory name="usbehci"> + <xi:include href="usbehci/usbehci.rbuild" /> </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> Modified: branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/miniport/common/fdo.c [iso-8859-1] Mon May 17 03:25:18 2010 @@ -218,6 +218,13 @@ } DPRINT("Busnumber %d\n", DeviceExtension->SystemIoBusNumber); + + Status = IoSetDeviceInterfaceState(&DeviceExtension->HcdInterfaceName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoSetDeviceInterfaceState failed (0x%x)\n", Status); + return Status; + } /* Init wrapper with this object */ return InitLinuxWrapper(DeviceObject); Modified: branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/miniport/common/pdo.c [iso-8859-1] Mon May 17 03:25:18 2010 @@ -268,6 +268,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + return Status; + } + + Status = IoSetDeviceInterfaceState(&DeviceExtension->HcdInterfaceName, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); return Status; }

14 years, 4 months

[mjmartin] 47249: [win32k] - Check that the thread is not in cleanup before attempting to do anything related to it. Add a couple asserts for sanity.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon May 17 02:01:26 2010 New Revision: 47249 URL: http://svn.reactos.org/svn/reactos?rev=47249&view=rev Log: [win32k] - Check that the thread is not in cleanup before attempting to do anything related to it. Add a couple asserts for sanity. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Mon May 17 02:01:26 2010 @@ -368,7 +368,8 @@ { if (pTmr->cmsCountdown < 0) { - if (!(pTmr->flags & TMRF_READY)) + ASSERT(pTmr->pti); + if ((!(pTmr->flags & TMRF_READY)) && (!(pTmr->pti->TIF_flags & TIF_INCLEANUP))) { if (pTmr->flags & TMRF_ONESHOT) pTmr->flags |= TMRF_WAITING; @@ -384,8 +385,8 @@ // Set thread message queue for this timer. if (pTmr->pti->MessageQueue) { // Wakeup thread - if (pTmr->pti->MessageQueue->WakeMask & QS_POSTMESSAGE) - KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + ASSERT(pTmr->pti->MessageQueue->NewMessages != NULL); + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } } }

14 years, 4 months

[tkreuzer] 47248: [ReactOS-arm.rbuild] - add newinflib to arm builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 17 01:07:44 2010 New Revision: 47248 URL: http://svn.reactos.org/svn/reactos?rev=47248&view=rev Log: [ReactOS-arm.rbuild] - add newinflib to arm builds Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=472… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Mon May 17 01:07:44 2010 @@ -73,6 +73,9 @@ </directory> <directory name="inflib"> <xi:include href="lib/inflib/inflib.rbuild" /> + </directory> + <directory name="newinflib"> + <xi:include href="lib/newinflib/inflib.rbuild" /> </directory> <directory name="cmlib"> <xi:include href="lib/cmlib/cmlib.rbuild" />

14 years, 4 months

[akhaldi] 47247: [VERSION] - Update the referencing of IMAGE_RESOURCE_DIRECTORY_ENTRY fields (the structure was updated in the previous commit).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 17 00:39:59 2010 New Revision: 47247 URL: http://svn.reactos.org/svn/reactos?rev=47247&view=rev Log: [VERSION] - Update the referencing of IMAGE_RESOURCE_DIRECTORY_ENTRY fields (the structure was updated in the previous commit). Modified: branches/header-work/dll/win32/version/resource.c Modified: branches/header-work/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/version/r… ============================================================================== --- branches/header-work/dll/win32/version/resource.c [iso-8859-1] (original) +++ branches/header-work/dll/win32/version/resource.c [iso-8859-1] Mon May 17 00:39:59 2010 @@ -67,9 +67,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u1.s2.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - if (entry[pos].u1.s2.Id > id) max = pos - 1; + if (entry[pos].u.Id == id) + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s.OffsetToDirectory); + if (entry[pos].u.Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -88,7 +88,7 @@ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s3.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s.OffsetToDirectory); }

14 years, 4 months

[tkreuzer] 47246: [KERNEL32] Protect GlobalLock, GlobalUnlock and GlobalSize with SEH, use IsBadReadPtr in GlobalLock. Inspired by wine code. Fixes user32_winetest dde crash.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 17 00:24:26 2010 New Revision: 47246 URL: http://svn.reactos.org/svn/reactos?rev=47246&view=rev Log: [KERNEL32] Protect GlobalLock, GlobalUnlock and GlobalSize with SEH, use IsBadReadPtr in GlobalLock. Inspired by wine code. Fixes user32_winetest dde crash. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Mon May 17 00:24:26 2010 @@ -380,44 +380,53 @@ /* Check if this was a simple allocated heap entry */ if (!((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY)) { - /* Then simply return the pointer */ - return hMem; + /* Verify and return the pointer */ + return IsBadReadPtr(hMem, 1) ? NULL : hMem; } /* Otherwise, lock the heap */ RtlLockHeap(hProcessHeap); - /* Get the handle entry */ - HandleEntry = BaseHeapGetEntry(hMem); - BASE_TRACE_HANDLE(HandleEntry, hMem); - - /* Make sure it's valid */ - if (!BaseHeapValidateEntry(HandleEntry)) - { - /* It's not, fail */ - BASE_TRACE_FAILURE(); + _SEH2_TRY + { + /* Get the handle entry */ + HandleEntry = BaseHeapGetEntry(hMem); + BASE_TRACE_HANDLE(HandleEntry, hMem); + + /* Make sure it's valid */ + if (!BaseHeapValidateEntry(HandleEntry)) + { + /* It's not, fail */ + BASE_TRACE_FAILURE(); + SetLastError(ERROR_INVALID_HANDLE); + Ptr = NULL; + } + else + { + /* Otherwise, get the pointer */ + Ptr = HandleEntry->Object; + if (Ptr) + { + /* Increase the lock count, unless we've went too far */ + if (HandleEntry->LockCount++ == GMEM_LOCKCOUNT) + { + /* In which case we simply unlock once */ + HandleEntry->LockCount--; + } + } + else + { + /* The handle is still there but the memory was already freed */ + SetLastError(ERROR_DISCARDED); + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { SetLastError(ERROR_INVALID_HANDLE); Ptr = NULL; } - else - { - /* Otherwise, get the pointer */ - Ptr = HandleEntry->Object; - if (Ptr) - { - /* Increase the lock count, unless we've went too far */ - if (HandleEntry->LockCount++ == GMEM_LOCKCOUNT) - { - /* In which case we simply unlock once */ - HandleEntry->LockCount--; - } - } - else - { - /* The handle is still there but the memory was already freed */ - SetLastError(ERROR_DISCARDED); - } - } + _SEH2_END /* All done. Unlock the heap and return the pointer */ RtlUnlockHeap(hProcessHeap); @@ -702,65 +711,74 @@ /* Lock the heap */ RtlLockHeap(hProcessHeap); - /* Check if this is a simple RTL Heap Managed block */ - if (!((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY)) - { - /* Then we'll query RTL Heap */ - RtlGetUserInfoHeap(hProcessHeap, Flags, hMem, &Handle, &Flags); - BASE_TRACE_PTR(Handle, hMem); - - /* - * Check if RTL Heap didn't give us a handle or said that this heap - * isn't movable. - */ - if (!(Handle) || !(Flags & BASE_HEAP_FLAG_MOVABLE)) - { - /* This implies we're not a handle heap, so use the generic call */ - dwSize = RtlSizeHeap(hProcessHeap, HEAP_NO_SERIALIZE, hMem); - } - else - { - /* Otherwise we're a handle heap, so get the internal handle */ - hMem = Handle; - } - } - - /* Make sure that this is an entry in our handle database */ - if ((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY) - { - /* Get the entry */ - HandleEntry = BaseHeapGetEntry(hMem); - BASE_TRACE_HANDLE(HandleEntry, hMem); - - /* Make sure the handle is valid */ - if (!BaseHeapValidateEntry(HandleEntry)) + _SEH2_TRY + { + /* Check if this is a simple RTL Heap Managed block */ + if (!((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY)) + { + /* Then we'll query RTL Heap */ + RtlGetUserInfoHeap(hProcessHeap, Flags, hMem, &Handle, &Flags); + BASE_TRACE_PTR(Handle, hMem); + + /* + * Check if RTL Heap didn't give us a handle or said that this heap + * isn't movable. + */ + if (!(Handle) || !(Flags & BASE_HEAP_FLAG_MOVABLE)) + { + /* This implies we're not a handle heap, so use the generic call */ + dwSize = RtlSizeHeap(hProcessHeap, HEAP_NO_SERIALIZE, hMem); + } + else + { + /* Otherwise we're a handle heap, so get the internal handle */ + hMem = Handle; + } + } + + /* Make sure that this is an entry in our handle database */ + if ((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY) + { + /* Get the entry */ + HandleEntry = BaseHeapGetEntry(hMem); + BASE_TRACE_HANDLE(HandleEntry, hMem); + + /* Make sure the handle is valid */ + if (!BaseHeapValidateEntry(HandleEntry)) + { + /* Fail */ + BASE_TRACE_FAILURE(); + SetLastError(ERROR_INVALID_HANDLE); + } + else if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSE) + { + /* We've reused this block, but we've saved the size for you */ + dwSize = HandleEntry->OldSize; + } + else + { + /* Otherwise, query RTL about it */ + dwSize = RtlSizeHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + HandleEntry->Object); + } + } + + /* Check if by now, we still haven't gotten any useful size */ + if (dwSize == MAXULONG_PTR) { /* Fail */ BASE_TRACE_FAILURE(); SetLastError(ERROR_INVALID_HANDLE); - } - else if (HandleEntry->Flags & BASE_HEAP_ENTRY_FLAG_REUSE) - { - /* We've reused this block, but we've saved the size for you */ - dwSize = HandleEntry->OldSize; - } - else - { - /* Otherwise, query RTL about it */ - dwSize = RtlSizeHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - HandleEntry->Object); - } - } - - /* Check if by now, we still haven't gotten any useful size */ - if (dwSize == MAXULONG_PTR) - { - /* Fail */ - BASE_TRACE_FAILURE(); + dwSize = 0; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { SetLastError(ERROR_INVALID_HANDLE); dwSize = 0; } + _SEH2_END /* All done! Unlock heap and return the size */ RtlUnlockHeap(hProcessHeap); @@ -798,31 +816,40 @@ HandleEntry = BaseHeapGetEntry(hMem); BASE_TRACE_HANDLE(HandleEntry, hMem); - /* Make sure it's valid */ - if (!BaseHeapValidateEntry(HandleEntry)) - { - /* It's not, fail */ - BASE_TRACE_FAILURE(); - SetLastError(ERROR_INVALID_HANDLE); + _SEH2_TRY + { + /* Make sure it's valid */ + if (!BaseHeapValidateEntry(HandleEntry)) + { + /* It's not, fail */ + BASE_TRACE_FAILURE(); + SetLastError(ERROR_INVALID_HANDLE); + RetVal = FALSE; + } + else + { + /* Otherwise, decrement lock count, unless we're already at 0*/ + if (!HandleEntry->LockCount--) + { + /* In which case we simply lock it back and fail */ + HandleEntry->LockCount++; + SetLastError(ERROR_NOT_LOCKED); + RetVal = FALSE; + } + else if (!HandleEntry->LockCount) + { + /* Nothing to unlock */ + SetLastError(NO_ERROR); + RetVal = FALSE; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_PARAMETER); RetVal = FALSE; } - else - { - /* Otherwise, decrement lock count, unless we're already at 0*/ - if (!HandleEntry->LockCount--) - { - /* In which case we simply lock it back and fail */ - HandleEntry->LockCount++; - SetLastError(ERROR_NOT_LOCKED); - RetVal = FALSE; - } - else if (!HandleEntry->LockCount) - { - /* Nothing to unlock */ - SetLastError(NO_ERROR); - RetVal = FALSE; - } - } + _SEH2_END /* All done. Unlock the heap and return the pointer */ RtlUnlockHeap(hProcessHeap);

14 years, 4 months

← Newer
1
...
23
24
25
26
27
28
29
...
44
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 May 2010