Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 44417: sync kernel32/misc/profile.c to wine kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if GetPrivateProfileStringW returns 0. <robertshearman at gmail dot com>
by cwittich＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: cwittich Date: Sat Dec 5 20:35:03 2009 New Revision: 44417 URL: http://svn.reactos.org/svn/reactos?rev=44417&view=rev Log: sync kernel32/misc/profile.c to wine kernel32: Fix uninitialised memory read in GetPrivateProfileStringA if GetPrivateProfileStringW returns 0. <robertshearman at gmail dot com> Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Sat Dec 5 20:35:03 2009 @@ -333,9 +333,8 @@ return NULL; buffer_base = HeapAlloc(GetProcessHeap(), 0 , dwFileSize); - if (!buffer_base) - return NULL; - + if (!buffer_base) return NULL; + if (!ReadFile(hFile, buffer_base, dwFileSize, &dwFileSize, NULL)) { HeapFree(GetProcessHeap(), 0, buffer_base); @@ -363,7 +362,6 @@ MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; - case ENCODING_UTF8: DPRINT("UTF8 encoding\n"); @@ -377,20 +375,17 @@ MultiByteToWideChar(CP_UTF8, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; - case ENCODING_UTF16LE: DPRINT("UTF16 Little Endian encoding\n"); szFile = pBuffer; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); break; - case ENCODING_UTF16BE: DPRINT("UTF16 Big Endian encoding\n"); szFile = pBuffer; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); PROFILE_ByteSwapShortBuffer(szFile, dwFileSize / sizeof(WCHAR)); break; - default: DPRINT("encoding type %d not implemented\n", *pEncoding); HeapFree(GetProcessHeap(), 0, buffer_base); @@ -398,7 +393,7 @@ } first_section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) ); - if (first_section == NULL) + if(first_section == NULL) { if (szFile != pBuffer) HeapFree(GetProcessHeap(), 0, szFile); @@ -849,9 +844,7 @@ MRUProfile[i] = MRUProfile[i-1]; CurProfile=tempProfile; } - - if (CurProfile->filename) - PROFILE_ReleaseFile(); + if(CurProfile->filename) PROFILE_ReleaseFile(); /* OK, now that CurProfile is definitely free we assign it our new file */ CurProfile->filename = HeapAlloc( GetProcessHeap(), 0, (wcslen(buffer)+1) * sizeof(WCHAR) ); @@ -1209,14 +1202,13 @@ filenameW.Buffer); if (len) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL); - if (!ret) - { - ret = len - 1; - buffer[ret] = 0; - } - else - ret--; /* strip terminating 0 */ + if (retW) + { + ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, len - 1, NULL, NULL); + if (!ret) + ret = len - 1; + } + buffer[ret] = 0; } RtlFreeUnicodeString(&sectionW);

1 0

[cwittich] 44416: sync user32_winetest with wine 1.1.34
by cwittich＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: cwittich Date: Sat Dec 5 20:25:28 2009 New Revision: 44416 URL: http://svn.reactos.org/svn/reactos?rev=44416&view=rev Log: sync user32_winetest with wine 1.1.34 Modified: trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… ============================================================================== --- trunk/rostests/winetests/user32/class.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/class.c [iso-8859-1] Sat Dec 5 20:25:28 2009 @@ -572,6 +572,7 @@ SetClassLongPtrA( hwnd, GCLP_HMODULE, 0xdeadbeef ); check_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); check_thread_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); + DestroyWindow(hwnd); } static void test_builtinproc(void) @@ -707,6 +708,7 @@ oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IS_WNDPROC_HANDLE(oldproc) == FALSE, "Class %s shouldn't return a handle\n", NORMAL_CLASSES[i]); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); DestroyWindow(hwnd); } @@ -747,6 +749,8 @@ CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classW, sizeof(classW)) == 0, "WM_GETTEXT invalid return\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); + DestroyWindow(hwnd); hwnd = CreateWindowA(WC_EDITA, classA, WS_OVERLAPPEDWINDOW, @@ -768,7 +772,7 @@ CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classW, sizeof(classW)) == 0, "WM_GETTEXT invalid return\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); + oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); SetWindowTextW(hwnd, unistring); CallWindowProcW((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, unistring, sizeof(unistring)) == 0, "WM_GETTEXT invalid return\n"); @@ -780,6 +784,8 @@ SetWindowTextW(hwnd, classW); CallWindowProcA((WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), hwnd, WM_GETTEXT, 120, (LPARAM)buf); ok(memcmp(buf, classA, sizeof(classA)) == 0, "WM_GETTEXT invalid return\n"); + + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)oldproc); DestroyWindow(hwnd); } Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Sat Dec 5 20:25:28 2009 @@ -2013,7 +2013,7 @@ broken(hi == 0xbeef), /* win2k */ "Expected 0, got %08lx\n", hi); - hglobal = GlobalAlloc(GMEM_DDESHARE, 2); + hglobal = GlobalAlloc(GMEM_DDESHARE, 2 * sizeof(*ptr)); ptr = GlobalLock(hglobal); ptr[0] = 0xcafebabe; ptr[1] = 0xdeadbeef; @@ -2067,6 +2067,8 @@ ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0, "Expected 0, got %08lx\n", lo); ok(hi == 0xcafebabe, "Expected 0xcafebabe, got %08lx\n", hi); + + GlobalFree(hglobal); } static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV hconv, Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Sat Dec 5 20:25:28 2009 @@ -1236,6 +1236,45 @@ rc.left, rc.top, rc.right, rc.bottom); len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); +} + +/* Test WM_GETTEXT processing + * after destroy messages + */ +static void test_edit_control_6(void) +{ + static const char *str = "test\r\ntest"; + char buf[MAXLEN]; + LONG ret; + HWND hWnd; + + hWnd = CreateWindowEx(0, + "EDIT", + "Test", + 0, + 10, 10, 1, 1, + NULL, NULL, hinst, NULL); + assert(hWnd); + + ret = SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + ok(ret == TRUE, "Expected %d, got %d\n", TRUE, ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == lstrlen(str), "Expected %s, got len %d\n", str, ret); + ok(!lstrcmp(buf, str), "Expected %s, got %s\n", str, buf); + buf[0] = 0; + ret = SendMessageA(hWnd, WM_DESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == lstrlen(str), "Expected %s, got len %d\n", str, ret); + ok(!lstrcmp(buf, str), "Expected %s, got %s\n", str, buf); + buf[0] = 0; + ret = SendMessageA(hWnd, WM_NCDESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == 0, "Expected 0, got len %d\n", ret); + ok(!lstrcmp(buf, ""), "Expected empty string, got %s\n", buf); + DestroyWindow(hWnd); } @@ -2270,6 +2309,7 @@ test_edit_control_3(); test_edit_control_4(); test_edit_control_5(); + test_edit_control_6(); test_edit_control_limittext(); test_margins(); test_margins_font_change(); Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sat Dec 5 20:25:28 2009 @@ -2298,7 +2298,7 @@ static void test_SetFocus(HWND hwnd) { - HWND child; + HWND child, child2; WNDPROC old_wnd_proc; /* check if we can set focus to non-visible windows */ @@ -2325,6 +2325,14 @@ ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); ok( GetFocus() == hwnd, "Focus should be on parent %p, not %p\n", hwnd, GetFocus() ); ShowWindow(child, SW_SHOW); + child2 = CreateWindowExA(0, "static", NULL, WS_CHILD, 0, 0, 0, 0, child, 0, 0, NULL); + assert(child2); + ShowWindow(child2, SW_SHOW); + SetFocus(child2); + ShowWindow(child, SW_HIDE); + ok( !(GetWindowLong(child,GWL_STYLE) & WS_VISIBLE), "Child %p is visible\n", child ); + ok( GetFocus() == child2, "Focus should be on %p, not %p\n", child2, GetFocus() ); + ShowWindow(child, SW_SHOW); SetFocus(child); ok( GetFocus() == child, "Focus should be on child %p\n", child ); SetWindowPos(child,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_HIDEWINDOW); @@ -2368,6 +2376,7 @@ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc); + DestroyWindow( child2 ); DestroyWindow( child ); }

1 0

[tkreuzer] 44415: Move architecture specific inline functions in into the respective headers. Remove some unused definitions from amd64 header.
by tkreuzer＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: tkreuzer Date: Sat Dec 5 19:46:22 2009 New Revision: 44415 URL: http://svn.reactos.org/svn/reactos?rev=44415&view=rev Log: Move architecture specific inline functions in into the respective headers. Remove some unused definitions from amd64 header. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/powerpc/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Sat Dec 5 19:46:22 2009 @@ -68,13 +68,6 @@ PVOID ServiceRoutine; } KIDT_INIT, *PKIDT_INIT; -//#define KeArchFnInit() Ke386FnInit() -#define KeArchFnInit() DbgPrint("KeArchFnInit is unimplemented!\n"); -#define KeArchHaltProcessor() Ke386HaltProcessor() -#define KfLowerIrql KeLowerIrql -#define KfAcquireSpinLock KeAcquireSpinLock -#define KfReleaseSpinLock KeReleaseSpinLock - extern ULONG Ke386CacheAlignment; extern ULONG KeI386NpxPresent; extern ULONG KeI386XMMIPresent; @@ -125,6 +118,32 @@ { /* Invalidate the TLB entry for this address */ __invlpg(Address); +} + +FORCEINLINE +VOID +KeFlushProcessTb(VOID) +{ + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +FORCEINLINE +PRKTHREAD +KeGetCurrentThread(VOID) +{ + return (PRKTHREAD)__readgsqword(FIELD_OFFSET(KIPCR, Prcb.CurrentThread)); +} + +FORCEINLINE +VOID +KiRundownThread(IN PKTHREAD Thread) +{ +#ifndef CONFIG_SMP + DbgPrint("KiRundownThread is unimplemented\n"); +#else + /* Nothing to do */ +#endif } struct _KPCR; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Sat Dec 5 19:46:22 2009 @@ -51,6 +51,23 @@ KeArmInvalidateTlbEntry(Address); } +FORCEINLINE +VOID +KeFlushProcessTb(VOID) +{ + // + // We need to implement this! + // + ASSERTMSG("Need ARM flush routine\n", FALSE); +} + +FORCEINLINE +VOID +KiRundownThread(IN PKTHREAD Thread) +{ + /* FIXME */ +} + VOID KiPassiveRelease( VOID Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sat Dec 5 19:46:22 2009 @@ -57,6 +57,39 @@ { /* Invalidate the TLB entry for this address */ __invlpg(Address); +} + +FORCEINLINE +VOID +KeFlushProcessTb(VOID) +{ + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + +FORCEINLINE +PRKTHREAD +KeGetCurrentThread(VOID) +{ + /* Return the current thread */ + return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread; +} + +FORCEINLINE +VOID +KiRundownThread(IN PKTHREAD Thread) +{ +#ifndef CONFIG_SMP + /* Check if this is the NPX Thread */ + if (KeGetCurrentPrcb()->NpxThread == Thread) + { + /* Clear it */ + KeGetCurrentPrcb()->NpxThread = NULL; + Ke386FnInit(); + } +#else + /* Nothing to do */ +#endif } VOID Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Dec 5 19:46:22 2009 @@ -8,21 +8,6 @@ #ifndef _M_ARM FORCEINLINE -PRKTHREAD -KeGetCurrentThread(VOID) -{ -#ifdef _M_IX86 - /* Return the current thread */ - return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread; -#elif defined (_M_AMD64) - return (PRKTHREAD)__readgsqword(FIELD_OFFSET(KIPCR, Prcb.CurrentThread)); -#else - PKPRCB Prcb = KeGetCurrentPrcb(); - return Prcb->CurrentThread; -#endif -} - -FORCEINLINE UCHAR KeGetPreviousMode(VOID) { @@ -30,23 +15,6 @@ return KeGetCurrentThread()->PreviousMode; } #endif - -FORCEINLINE -VOID -KeFlushProcessTb(VOID) -{ - /* Flush the TLB by resetting CR3 */ -#ifdef _M_PPC - __asm__("sync\n\tisync\n\t"); -#elif _M_ARM - // - // We need to implement this! - // - ASSERTMSG("Need ARM flush routine\n", FALSE); -#else - __writecr3(__readcr3()); -#endif -} // // Enters a Guarded Region @@ -304,21 +272,6 @@ FORCEINLINE VOID -KiRundownThread(IN PKTHREAD Thread) -{ -#if defined(_M_IX86) - /* Check if this is the NPX Thread */ - if (KeGetCurrentPrcb()->NpxThread == Thread) - { - /* Clear it */ - KeGetCurrentPrcb()->NpxThread = NULL; - Ke386FnInit(); - } -#endif -} - -FORCEINLINE -VOID KiRequestApcInterrupt(IN BOOLEAN NeedApc, IN UCHAR Processor) { @@ -657,14 +610,6 @@ { /* Scan the deferred ready lists if required */ if (Prcb->DeferredReadyListHead.Next) KiProcessDeferredReadyList(Prcb); -} - -FORCEINLINE -VOID -KiRundownThread(IN PKTHREAD Thread) -{ - /* Nothing to do */ - return; } FORCEINLINE Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Sat Dec 5 19:46:22 2009 @@ -77,6 +77,29 @@ return (struct _KPCR *)__readfsdword(0x1c); } +FORCEINLINE +VOID +KeFlushProcessTb(VOID) +{ + /* Flush the TLB */ + __asm__("sync\n\tisync\n\t"); +} + +FORCEINLINE +PRKTHREAD +KeGetCurrentThread(VOID) +{ + /* Return the current thread */ + return KeGetCurrentPrcb()->CurrentThread; +} + +FORCEINLINE +VOID +KiRundownThread(IN PKTHREAD Thread) +{ + /* FIXME */ +} + #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ VOID NTAPI

1 0

[tkreuzer] 44414: [KE] Don't use fastcall functions
by tkreuzer＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: tkreuzer Date: Sat Dec 5 19:17:59 2009 New Revision: 44414 URL: http://svn.reactos.org/svn/reactos?rev=44414&view=rev Log: [KE] Don't use fastcall functions Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] Sat Dec 5 19:17:59 2009 @@ -24,8 +24,10 @@ KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) { #ifndef CONFIG_SMP + KIRQL OldIrql; /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + return OldIrql; #else UNIMPLEMENTED; #endif @@ -39,8 +41,10 @@ KeAcquireSpinLockRaiseToDpc(PKSPIN_LOCK SpinLock) { #ifndef CONFIG_SMP + KIRQL OldIrql; /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + return OldIrql; #else UNIMPLEMENTED; #endif @@ -56,7 +60,7 @@ { #ifndef CONFIG_SMP /* Simply lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); #else UNIMPLEMENTED; #endif @@ -69,8 +73,10 @@ KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) { #ifndef CONFIG_SMP + KIRQL OldIrql; /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + return OldIrql; #else UNIMPLEMENTED; #endif @@ -83,8 +89,10 @@ KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) { #ifndef CONFIG_SMP + KIRQL OldIrql; /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + return OldIrql; #else UNIMPLEMENTED; #endif @@ -99,7 +107,7 @@ { #ifndef CONFIG_SMP /* Simply raise to dispatch */ - LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &LockHandle->OldIrql); #else UNIMPLEMENTED; #endif @@ -114,7 +122,7 @@ { #ifndef CONFIG_SMP /* Simply raise to synch */ - LockHandle->OldIrql = KfRaiseIrql(SYNCH_LEVEL); + KeRaiseIrql(SYNCH_LEVEL, &LockHandle->OldIrql); #else UNIMPLEMENTED; #endif @@ -129,7 +137,7 @@ { #ifndef CONFIG_SMP /* Simply lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); #else UNIMPLEMENTED; #endif @@ -143,7 +151,7 @@ { #ifndef CONFIG_SMP /* Simply lower IRQL back */ - KfLowerIrql(LockHandle->OldIrql); + KeLowerIrql(LockHandle->OldIrql); #else UNIMPLEMENTED; #endif @@ -158,7 +166,7 @@ { #ifndef CONFIG_SMP /* Simply raise to dispatch */ - *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, OldIrql); /* Always return true on UP Machines */ return TRUE; @@ -176,7 +184,7 @@ { #ifndef CONFIG_SMP /* Simply raise to dispatch */ - *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, OldIrql); /* Always return true on UP Machines */ return TRUE;

1 0

[dgorbachev] 44413: Fix a potential buffer owerflow. Noticed by Martin Ettl with cppcheck. Bug #4987.
by dgorbachev＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: dgorbachev Date: Sat Dec 5 18:35:54 2009 New Revision: 44413 URL: http://svn.reactos.org/svn/reactos?rev=44413&view=rev Log: Fix a potential buffer owerflow. Noticed by Martin Ettl with cppcheck. Bug #4987. Modified: trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp Modified: trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1] Sat Dec 5 18:35:54 2009 @@ -1,6 +1,5 @@ #include <windows.h> -#include <stdlib.h> -#include <memory.h> +#include <stdio.h> #include "tnmisc.h" @@ -139,10 +138,9 @@ // (Paul Brannan 12/17/98) #ifndef __BORLANDC__ // Ioannou Dec. 8, 1998 if(!hIcon) { - char filename[128]; // load from telnet.ico - strncpy(filename, icondir, sizeof(filename)); - strncat(filename, "telnet.ico", sizeof(filename)); - filename[sizeof(filename) - 1] = 0; + char filename[MAX_PATH]; // load from telnet.ico + _snprintf(filename, MAX_PATH - 1, "%s%s", icondir, "telnet.ico"); + filename[MAX_PATH - 1] = '\0'; // Note: loading the icon from a file doesn't work on NT // There is no LoadImage in Borland headers - only LoadIcon

1 0

[cgutman] 44412: [TCPIP] - Implement TDI_QUERY_MAX_DATAGRAM_INFO [AFD] - Send TDI_QUERY_MAX_DATAGRAM_INFO to set our send/receive windows properly - Don't create a send window for a datagram socket because it is never used - Fixes dropping all packets with length > 16384
by cgutman＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: cgutman Date: Sat Dec 5 17:29:41 2009 New Revision: 44412 URL: http://svn.reactos.org/svn/reactos?rev=44412&view=rev Log: [TCPIP] - Implement TDI_QUERY_MAX_DATAGRAM_INFO [AFD] - Send TDI_QUERY_MAX_DATAGRAM_INFO to set our send/receive windows properly - Don't create a send window for a datagram socket because it is never used - Fixes dropping all packets with length > 16384 Modified: branches/aicom-network-branch/drivers/network/afd/afd/bind.c branches/aicom-network-branch/drivers/network/afd/afd/connect.c branches/aicom-network-branch/drivers/network/afd/afd/main.c branches/aicom-network-branch/drivers/network/afd/afd/tdi.c branches/aicom-network-branch/drivers/network/afd/include/afd.h branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-branch/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/bind.c [iso-8859-1] Sat Dec 5 17:29:41 2009 @@ -32,6 +32,20 @@ FCB->LocalAddress, &FCB->AddressFile.Handle, &FCB->AddressFile.Object ); + if (!NT_SUCCESS(Status)) + return Status; + + if (FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) + { + Status = TdiQueryMaxDatagramLength(FCB->AddressFile.Object, + &FCB->Recv.Size); + if (NT_SUCCESS(Status)) + { + FCB->Recv.Window = ExAllocatePool(PagedPool, FCB->Recv.Size); + if (!FCB->Recv.Window) + Status = STATUS_NO_MEMORY; + } + } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); @@ -69,10 +83,6 @@ if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { AFD_DbgPrint(MID_TRACE,("Calling TdiReceiveDatagram\n")); - FCB->Recv.Window = ExAllocatePool(PagedPool, FCB->Recv.Size); - if (!FCB->Recv.Window) - return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); - Status = TdiReceiveDatagram ( &FCB->ReceiveIrp.InFlightRequest, FCB->AddressFile.Object, Modified: branches/aicom-network-branch/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Dec 5 17:29:41 2009 @@ -211,6 +211,13 @@ ASSERT(!FCB->Recv.Window); ASSERT(!FCB->Send.Window); + Status = TdiQueryMaxDatagramLength(FCB->Connection.Object, + &FCB->Send.Size); + if (!NT_SUCCESS(Status)) + return Status; + + FCB->Recv.Size = FCB->Send.Size; + /* Allocate the receive area and start receiving */ FCB->Recv.Window = ExAllocatePool( PagedPool, FCB->Recv.Size ); Modified: branches/aicom-network-branch/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/main.c [iso-8859-1] Sat Dec 5 17:29:41 2009 @@ -268,8 +268,6 @@ FCB->State = SOCKET_STATE_CREATED; FCB->FileObject = FileObject; FCB->DeviceExt = DeviceExt; - FCB->Recv.Size = DEFAULT_RECEIVE_WINDOW_SIZE; - FCB->Send.Size = DEFAULT_SEND_WINDOW_SIZE; FCB->AddressFile.Handle = INVALID_HANDLE_VALUE; FCB->Connection.Handle = INVALID_HANDLE_VALUE; @@ -313,13 +311,10 @@ /* It seems that UDP sockets are writable from inception */ if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { AFD_DbgPrint(MID_TRACE,("Packet oriented socket\n")); - FCB->Send.Window = ExAllocatePool( PagedPool, FCB->Send.Size ); - if (FCB->Send.Window) - { - /* A datagram socket is always sendable */ - FCB->PollState |= AFD_EVENT_SEND; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } else Status = STATUS_NO_MEMORY; + + /* A datagram socket is always sendable */ + FCB->PollState |= AFD_EVENT_SEND; + PollReeval( FCB->DeviceExt, FCB->FileObject ); } if( !NT_SUCCESS(Status) ) { Modified: branches/aicom-network-branch/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Dec 5 17:29:41 2009 @@ -206,6 +206,56 @@ return Status; } +NTSTATUS TdiQueryMaxDatagramLength( + PFILE_OBJECT FileObject, + PUINT MaxDatagramLength) +{ + PMDL Mdl; + PTDI_MAX_DATAGRAM_INFO Buffer; + NTSTATUS Status = STATUS_SUCCESS; + + Buffer = ExAllocatePool(NonPagedPool, sizeof(TDI_MAX_DATAGRAM_INFO)); + if (!Buffer) return STATUS_NO_MEMORY; + + Mdl = IoAllocateMdl(Buffer, sizeof(TDI_MAX_DATAGRAM_INFO), FALSE, FALSE, NULL); + if (!Mdl) + { + ExFreePool(Buffer); + return STATUS_NO_MEMORY; + } + + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + IoFreeMdl(Mdl); + ExFreePool(Buffer); + return Status; + } + + Status = TdiQueryInformation(FileObject, + TDI_QUERY_MAX_DATAGRAM_INFO, + Mdl); + if (!NT_SUCCESS(Status)) + { + ExFreePool(Buffer); + return Status; + } + + *MaxDatagramLength = Buffer->MaxDatagramSize; + + ExFreePool(Buffer); + + return STATUS_SUCCESS; +} NTSTATUS TdiOpenConnectionEndpointFile( PUNICODE_STRING DeviceName, Modified: branches/aicom-network-branch/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/include/afd.h [iso-8859-1] Sat Dec 5 17:29:41 2009 @@ -107,9 +107,6 @@ #define EXTRA_LOCK_BUFFERS 2 /* Number of extra buffers needed * for ancillary data on packet * requests. */ - -#define DEFAULT_SEND_WINDOW_SIZE 16384 -#define DEFAULT_RECEIVE_WINDOW_SIZE 16384 /* XXX This is a hack we should clean up later * We do this in order to get some storage for the locked handle table @@ -412,6 +409,10 @@ PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); +NTSTATUS TdiQueryMaxDatagramLength( + PFILE_OBJECT FileObject, + PUINT MaxDatagramLength); + /* write.c */ NTSTATUS NTAPI Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Dec 5 17:29:41 2009 @@ -761,6 +761,15 @@ return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE ); } + + case TDI_QUERY_MAX_DATAGRAM_INFO: + { + PTDI_MAX_DATAGRAM_INFO MaxDatagramInfo = MmGetSystemAddressForMdl(Irp->MdlAddress); + + MaxDatagramInfo->MaxDatagramSize = 0xFFFF; + + return STATUS_SUCCESS; + } } return STATUS_NOT_IMPLEMENTED;

1 0

[tkreuzer] 44411: [DDK] Add MmAllocatePagesForMdlEx
by tkreuzer＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: tkreuzer Date: Sat Dec 5 14:48:50 2009 New Revision: 44411 URL: http://svn.reactos.org/svn/reactos?rev=44411&view=rev Log: [DDK] Add MmAllocatePagesForMdlEx Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Dec 5 14:48:50 2009 @@ -8968,6 +8968,19 @@ IN PHYSICAL_ADDRESS SkipBytes, IN SIZE_T TotalBytes); +#if (NTDDI_VERSION >= NTDDI_WS03SP1) +NTKERNELAPI +PMDL +NTAPI +MmAllocatePagesForMdlEx( + IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN PHYSICAL_ADDRESS SkipBytes, + IN SIZE_T TotalBytes, + IN MEMORY_CACHING_TYPE CacheType, + IN ULONG Flags); +#endif + NTKERNELAPI VOID NTAPI

1 0

[gschneider] 44410: [rtl] - Update status to error mapping tables and functions to current Wine sources - Needed to for ERROR_TIMEOUT, ERROR_SXS_CANT_GEN_ACTCTX, ERROR_MR_MID_NOT_FOUND and several others - Remove RtlNtStatusToPsxErrno - nobody will miss it - Fixes ~20 kernel32 actctx winetests
by gschneider＠svn.reactos.org 05 Dec '09

05 Dec '09

Author: gschneider Date: Sat Dec 5 14:07:02 2009 New Revision: 44410 URL: http://svn.reactos.org/svn/reactos?rev=44410&view=rev Log: [rtl] - Update status to error mapping tables and functions to current Wine sources - Needed to for ERROR_TIMEOUT, ERROR_SXS_CANT_GEN_ACTCTX, ERROR_MR_MID_NOT_FOUND and several others - Remove RtlNtStatusToPsxErrno - nobody will miss it - Fixes ~20 kernel32 actctx winetests Modified: trunk/reactos/lib/rtl/error.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=44410&…

1 0

[sserapion] 44409: wined3d.dll - Missing floating point math operations. ddraw.dll - depends on wined3d d3d8.dll - depends on wined3d d3d9.dll - depends on wined3d usbdriver.sys - numerous build errors ntvdm.exe - not built
by sserapion＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: sserapion Date: Fri Dec 4 23:32:35 2009 New Revision: 44409 URL: http://svn.reactos.org/svn/reactos?rev=44409&view=rev Log: wined3d.dll - Missing floating point math operations. ddraw.dll - depends on wined3d d3d8.dll - depends on wined3d d3d9.dll - depends on wined3d usbdriver.sys - numerous build errors ntvdm.exe - not built Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Dec 4 23:32:35 2009 @@ -157,7 +157,7 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\wine\ddraw\ddraw.dll 1 +dll\directx\wine\ddraw\ddraw.dll 1 optional dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 @@ -165,9 +165,9 @@ dll\directx\msdmo\msdmo.dll 1 dll\directx\quartz\quartz.dll 1 dll\directx\qedit\qedit.dll 1 -dll\directx\wine\d3d8\d3d8.dll 1 -dll\directx\wine\wined3d\wined3d.dll 1 -dll\directx\wine\d3d9\d3d9.dll 1 +dll\directx\wine\d3d8\d3d8.dll 1 optional +dll\directx\wine\wined3d\wined3d.dll 1 optional +dll\directx\wine\d3d9\d3d9.dll 1 optional dll\keyboard\kbda1\kbda1.dll 1 dll\keyboard\kbda2\kbda2.dll 1 @@ -513,7 +513,7 @@ ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 optional drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1 @@ -663,7 +663,7 @@ ; Subsystems subsystems\win32\csrss\csrss.exe 1 subsystems\win32\csrss\win32csr\win32csr.dll 1 -subsystems\ntvdm\ntvdm.exe 1 +subsystems\ntvdm\ntvdm.exe 1 optional subsystems\win32\win32k\win32k.sys 1 ; Optional/proprietary files

1 0

[tkreuzer] 44408: [MM] Don't create a memory area for the PCR on amd64, as we use our own from the kernel mapping instead of a hardcoded address mapped by the loader. Skip initializing the old page pool. It will probably not live on long enough to deserve any 64 bit fixing.
by tkreuzer＠svn.reactos.org 04 Dec '09

04 Dec '09

Author: tkreuzer Date: Fri Dec 4 22:42:40 2009 New Revision: 44408 URL: http://svn.reactos.org/svn/reactos?rev=44408&view=rev Log: [MM] Don't create a memory area for the PCR on amd64, as we use our own from the kernel mapping instead of a hardcoded address mapped by the loader. Skip initializing the old page pool. It will probably not live on long enough to deserve any 64 bit fixing. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Dec 4 22:42:40 2009 @@ -227,6 +227,7 @@ BoundaryAddressMultiple); ASSERT(Status == STATUS_SUCCESS); +#ifndef _M_AMD64 // // Next, the KPCR // @@ -241,6 +242,7 @@ 0, BoundaryAddressMultiple); ASSERT(Status == STATUS_SUCCESS); +#endif // // Now the KUSER_SHARED_DATA @@ -474,8 +476,10 @@ /* Dump the address space */ MiDbgDumpAddressSpace(); +#ifndef _M_AMD64 // skip old paged pool /* Initialize paged pool */ MmInitializePagedPool(); +#endif /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory);

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