Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[tkreuzer] 36343: Map the APIC page.
by tkreuzer＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: tkreuzer Date: Sat Sep 20 04:33:53 2008 New Revision: 36343 URL: http://svn.reactos.org/svn/reactos?rev=36343&view=rev Log: Map the APIC page. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Sat Sep 20 04:33:53 2008 @@ -193,11 +193,6 @@ * * Returns: * None. - * - * Remarks: - * We are setting PDEs, but using the equvivalent (for our purpose) PTE structure. - * As such, please note that PageFrameNumber == PageEntryNumber. - * *--*/ VOID FASTCALL @@ -255,6 +250,12 @@ DbgPrint("Could not map KUSER_SHARED_DATA page.\n", KernelPages); } + /* Map APIC page */ + if (!FrLdrMapSinglePage(APIC_BASE, APIC_PHYS_BASE)) + { + DbgPrint("Could not map APIC page.\n", KernelPages); + } + } VOID Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Sat Sep 20 04:33:53 2008 @@ -41,7 +41,9 @@ #define HYPERSPACE_BASE 0xfffff70000000000ULL #define HAL_BASE 0xffffffff80000000ULL -#define APIC_BASE 0xffffffffff000000ULL // FIXME +#define APIC_BASE 0xfffffffffee00000ULL // FIXME + +#define APIC_PHYS_BASE 0xfee00000 #define NUM_PAGES_KERNEL

1 0

[cwittich] 36342: fix some resource leaks
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 04:28:55 2008 New Revision: 36342 URL: http://svn.reactos.org/svn/reactos?rev=36342&view=rev Log: fix some resource leaks Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sat Sep 20 04:28:55 2008 @@ -163,6 +163,7 @@ i++; } + RegCloseKey(hKey); } if (LoadStringW(hInst, @@ -851,10 +852,11 @@ if(lpDrawItem->CtlID == IDC_COLORIMAGE) { HDC hdcMem; + HBITMAP hSpecOld; hdcMem = CreateCompatibleDC(lpDrawItem->hDC); if (hdcMem != NULL) { - SelectObject(hdcMem, pInfo->hSpectrum); + hSpecOld = SelectObject(hdcMem, pInfo->hSpectrum); StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, @@ -866,6 +868,7 @@ pInfo->bitmap.bmWidth, pInfo->bitmap.bmHeight, SRCCOPY); + SelectObject(hdcMem, hSpecOld); DeleteDC(hdcMem); } } @@ -1020,6 +1023,31 @@ return bRet; } +static void Cleanup(PINFO pInfo) +{ + if (pInfo) + { + if (pInfo->hMstscSm) + DestroyIcon(pInfo->hMstscSm); + if (pInfo->hMstscLg) + DestroyIcon(pInfo->hMstscLg); + if (pInfo->hHeader) + DeleteObject(pInfo->hHeader); + if (pInfo->hSpectrum) + DeleteObject(pInfo->hSpectrum); + if (pInfo->hRemote) + DestroyIcon(pInfo->hRemote); + if (pInfo->hLogon) + DestroyIcon(pInfo->hLogon); + if (pInfo->hConn) + DestroyIcon(pInfo->hConn); + if (pInfo->hColor) + DestroyIcon(pInfo->hColor); + HeapFree(GetProcessHeap(), + 0, + pInfo); + } +} static BOOL CALLBACK DlgProc(HWND hDlg, @@ -1052,14 +1080,7 @@ SaveAllSettings(pInfo); SaveRdpSettingsToFile(NULL, pInfo->pRdpSettings); } - - if (pInfo) - { - HeapFree(GetProcessHeap(), - 0, - pInfo); - } - + Cleanup(pInfo); EndDialog(hDlg, LOWORD(wParam)); } @@ -1096,11 +1117,12 @@ WCHAR szBuffer[32]; RECT bmpRc, txtRc; LOGFONTW lf; - HFONT hFont; + HFONT hFont, hFontOld; + HBITMAP hBmpOld; GetClientRect(pInfo->hSelf, &bmpRc); - SelectObject(hdcMem, pInfo->hHeader); + hBmpOld = SelectObject(hdcMem, pInfo->hHeader); StretchBlt(hdc, 0, 0, @@ -1113,6 +1135,7 @@ pInfo->headerbitmap.bmHeight, SRCCOPY); + SelectObject(hdcMem, hBmpOld); txtRc.left = bmpRc.right * 0.25; txtRc.top = 10; txtRc.right = bmpRc.right * 0.75; @@ -1134,7 +1157,7 @@ hFont = CreateFontIndirectW(&lf); if (hFont) { - SelectObject(hdc, hFont); + hFontOld = SelectObject(hdc, hFont); DPtoLP(hdc, (PPOINT)&txtRc, 2); SetTextColor(hdc, RGB(255,255,255)); @@ -1144,6 +1167,7 @@ -1, &txtRc, DT_BOTTOM | DT_SINGLELINE | DT_NOCLIP); + SelectObject(hdc, hFontOld); DeleteObject(hFont); } } @@ -1167,7 +1191,7 @@ hFont = CreateFontIndirectW(&lf); if (hFont) { - SelectObject(hdc, hFont); + hFontOld = SelectObject(hdc, hFont); DPtoLP(hdc, (PPOINT)&txtRc, 2); SetTextColor(hdc, RGB(255,255,255)); @@ -1177,6 +1201,8 @@ -1, &txtRc, DT_TOP | DT_SINGLELINE); + SelectObject(hdc, hFontOld); + DeleteObject(hFont); } } @@ -1191,20 +1217,7 @@ case WM_CLOSE: { - if (pInfo) - { - if (pInfo->hMstscSm) - DestroyIcon(pInfo->hMstscSm); - if (pInfo->hMstscLg) - DestroyIcon(pInfo->hMstscLg); - if (pInfo->hHeader) - DeleteObject(pInfo->hHeader); - - HeapFree(GetProcessHeap(), - 0, - pInfo); - } - + Cleanup(pInfo); EndDialog(hDlg, 0); } break;

1 0

[cwittich] 36341: fix some resource leaks
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 04:05:24 2008 New Revision: 36341 URL: http://svn.reactos.org/svn/reactos?rev=36341&view=rev Log: fix some resource leaks Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sat Sep 20 04:05:24 2008 @@ -34,7 +34,7 @@ HBITMAP hBitmap, hBmpNew, hBmpOld; RECT rect; DWORD bkColor, bkText; - HFONT hFont = NULL; + HFONT hFontOld, hFont = NULL; ICONINFO IconInfo; HICON hIcon = NULL; @@ -72,11 +72,12 @@ OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); - SelectObject(hdc, hFont); + hFontOld = SelectObject(hdc, hFont); DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); SelectObject(hdc, hBmpNew); PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); SelectObject(hdc, hBmpOld); + SelectObject(hdc, hFontOld); IconInfo.hbmColor = hBitmap; IconInfo.hbmMask = hBmpNew; @@ -248,6 +249,7 @@ { _tcscpy(szName, szPath); RegCloseKey(hKey); + FreeLibrary(hLib); return TRUE; } FreeLibrary(hLib); @@ -285,7 +287,6 @@ _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); - CreateTrayIcon(szLCID); // Switch to the new keyboard layout GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR));

1 0

[cwittich] 36340: don't use \" in rc files, use double quotation marks instead
by cwittich＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cwittich Date: Sat Sep 20 03:36:06 2008 New Revision: 36340 URL: http://svn.reactos.org/svn/reactos?rev=36340&view=rev Log: don't use \" in rc files, use double quotation marks instead Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] Sat Sep 20 03:36:06 2008 @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Tento nástroj poskytuje detailní informace o komponentách ReactX a ovladaèích nainstalovaných na tomto systému.", -1, 10, 10, 443, 17 - LTEXT "Pokud víte, ve které oblasti se nachází problém, kliknìte na vhodnou záloku výe. V opaèném pøípadì lze pouít tlaèítko \"Dalí stránka\" níe a procházet stránky postupnì.", -1, 10, 30, 443, 25 + LTEXT "Pokud víte, ve které oblasti se nachází problém, kliknìte na vhodnou záloku výe. V opaèném pøípadì lze pouít tlaèítko ""Dalí stránka"" níe a procházet stránky postupnì.", -1, 10, 30, 443, 25 GROUPBOX "Systémové informace", -1, 10, 55, 443, 130, SS_RIGHT LTEXT "Souèasné datum a èas:", -1, 70, 70, 80, 10, SS_RIGHT LTEXT "Název poèítaèe:", -1, 70, 80, 80, 10, SS_RIGHT

1 0

[dchapyshev] 36339: - Fix formatting. No code change
by dchapyshev＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: dchapyshev Date: Sat Sep 20 03:11:32 2008 New Revision: 36339 URL: http://svn.reactos.org/svn/reactos?rev=36339&view=rev Log: - Fix formatting. No code change Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Sep 20 03:11:32 2008 @@ -26,17 +26,21 @@ NTSTATUS STDCALL User32CallSendAsyncProcForKernel(PVOID Arguments, ULONG ArgumentLength) { - PSENDASYNCPROC_CALLBACK_ARGUMENTS CallbackArgs; - - TRACE("User32CallSendAsyncProcKernel()\n"); - CallbackArgs = (PSENDASYNCPROC_CALLBACK_ARGUMENTS)Arguments; - if (ArgumentLength != sizeof(WINDOWPROC_CALLBACK_ARGUMENTS)) - { - return(STATUS_INFO_LENGTH_MISMATCH); - } - CallbackArgs->Callback(CallbackArgs->Wnd, CallbackArgs->Msg, - CallbackArgs->Context, CallbackArgs->Result); - return(STATUS_SUCCESS); + PSENDASYNCPROC_CALLBACK_ARGUMENTS CallbackArgs; + + TRACE("User32CallSendAsyncProcKernel()\n"); + CallbackArgs = (PSENDASYNCPROC_CALLBACK_ARGUMENTS)Arguments; + + if (ArgumentLength != sizeof(WINDOWPROC_CALLBACK_ARGUMENTS)) + { + return(STATUS_INFO_LENGTH_MISMATCH); + } + + CallbackArgs->Callback(CallbackArgs->Wnd, + CallbackArgs->Msg, + CallbackArgs->Context, + CallbackArgs->Result); + return(STATUS_SUCCESS); } @@ -46,13 +50,13 @@ BOOL STDCALL AllowSetForegroundWindow(DWORD dwProcessId) { - static BOOL show_message = TRUE; - if (show_message) - { - UNIMPLEMENTED; - show_message = FALSE; - } - return TRUE; + static BOOL show_message = TRUE; + if (show_message) + { + UNIMPLEMENTED; + show_message = FALSE; + } + return TRUE; } @@ -63,10 +67,10 @@ BeginDeferWindowPos(int nNumWindows) { #if 0 - UNIMPLEMENTED; - return (HDWP)0; + UNIMPLEMENTED; + return (HDWP)0; #else - return (HDWP)1; + return (HDWP)1; #endif } @@ -77,13 +81,13 @@ BOOL STDCALL BringWindowToTop(HWND hWnd) { - return NtUserSetWindowPos( hWnd, - HWND_TOP, - 0, - 0, - 0, - 0, - SWP_NOSIZE | SWP_NOMOVE ); + return NtUserSetWindowPos(hWnd, + HWND_TOP, + 0, + 0, + 0, + 0, + SWP_NOSIZE | SWP_NOMOVE); } @@ -93,21 +97,20 @@ /* WORD STDCALL CascadeWindows(HWND hwndParent, - UINT wHow, - CONST RECT *lpRect, - UINT cKids, - const HWND *lpKids) + UINT wHow, + CONST RECT *lpRect, + UINT cKids, + const HWND *lpKids) { UNIMPLEMENTED; return 0; } */ -VOID -STDCALL -SwitchToThisWindow ( HWND hwnd, BOOL fUnknown ) -{ - ShowWindow ( hwnd, SW_SHOW ); +VOID STDCALL +SwitchToThisWindow(HWND hwnd, BOOL fUnknown) +{ + ShowWindow(hwnd, SW_SHOW); } /* @@ -115,9 +118,9 @@ */ HWND STDCALL ChildWindowFromPoint(HWND hWndParent, - POINT Point) -{ - return (HWND) NtUserChildWindowFromPointEx(hWndParent, Point.x, Point.y, 0); + POINT Point) +{ + return (HWND) NtUserChildWindowFromPointEx(hWndParent, Point.x, Point.y, 0); } @@ -126,10 +129,10 @@ */ HWND STDCALL ChildWindowFromPointEx(HWND hwndParent, - POINT pt, - UINT uFlags) -{ - return (HWND) NtUserChildWindowFromPointEx(hwndParent, pt.x, pt.y, uFlags); + POINT pt, + UINT uFlags) +{ + return (HWND) NtUserChildWindowFromPointEx(hwndParent, pt.x, pt.y, uFlags); } @@ -147,113 +150,113 @@ HWND STDCALL User32CreateWindowEx(DWORD dwExStyle, - LPCSTR lpClassName, - LPCSTR lpWindowName, - DWORD dwStyle, - int x, - int y, - int nWidth, - int nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam, - BOOL Unicode) -{ - UNICODE_STRING WindowName; - UNICODE_STRING ClassName; - WNDCLASSEXA wceA; - WNDCLASSEXW wceW; - HWND Handle; + LPCSTR lpClassName, + LPCSTR lpWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam, + BOOL Unicode) +{ + UNICODE_STRING WindowName; + UNICODE_STRING ClassName; + WNDCLASSEXA wceA; + WNDCLASSEXW wceW; + HWND Handle; #if 0 - DbgPrint("[window] User32CreateWindowEx style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); + DbgPrint("[window] User32CreateWindowEx style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); #endif - if (IS_ATOM(lpClassName)) - { - RtlInitUnicodeString(&ClassName, NULL); - ClassName.Buffer = (LPWSTR)lpClassName; - } - else - { - if(Unicode) - RtlInitUnicodeString(&ClassName, (PCWSTR)lpClassName); - else - { - if (!RtlCreateUnicodeStringFromAsciiz(&(ClassName), (PCSZ)lpClassName)) - { - SetLastError(ERROR_OUTOFMEMORY); - return (HWND)0; - } - } - } - - if (Unicode) - RtlInitUnicodeString(&WindowName, (PCWSTR)lpWindowName); - else - { - if (!RtlCreateUnicodeStringFromAsciiz(&WindowName, (PCSZ)lpWindowName)) - { + if (IS_ATOM(lpClassName)) + { + RtlInitUnicodeString(&ClassName, NULL); + ClassName.Buffer = (LPWSTR)lpClassName; + } + else + { + if(Unicode) + RtlInitUnicodeString(&ClassName, (PCWSTR)lpClassName); + else + { + if (!RtlCreateUnicodeStringFromAsciiz(&(ClassName), (PCSZ)lpClassName)) + { + SetLastError(ERROR_OUTOFMEMORY); + return (HWND)0; + } + } + } + + if (Unicode) + RtlInitUnicodeString(&WindowName, (PCWSTR)lpWindowName); + else + { + if (!RtlCreateUnicodeStringFromAsciiz(&WindowName, (PCSZ)lpWindowName)) + { + if (!IS_ATOM(lpClassName)) + { + RtlFreeUnicodeString(&ClassName); + } + SetLastError(ERROR_OUTOFMEMORY); + return (HWND)0; + } + } + + if(!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP))) + { + if(Unicode) + { + wceW.cbSize = sizeof(WNDCLASSEXW); + if(GetClassInfoExW(hInstance, (LPCWSTR)lpClassName, &wceW) && wceW.lpszMenuName) + { + hMenu = LoadMenuW(hInstance, wceW.lpszMenuName); + } + } + else + { + wceA.cbSize = sizeof(WNDCLASSEXA); + if(GetClassInfoExA(hInstance, lpClassName, &wceA) && wceA.lpszMenuName) + { + hMenu = LoadMenuA(hInstance, wceA.lpszMenuName); + } + } + } + + Handle = NtUserCreateWindowEx(dwExStyle, + &ClassName, + &WindowName, + dwStyle, + x, + y, + nWidth, + nHeight, + hWndParent, + hMenu, + hInstance, + lpParam, + SW_SHOW, + FALSE, + 0); + +#if 0 + DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); +#endif + + if(!Unicode) + { + RtlFreeUnicodeString(&WindowName); + if (!IS_ATOM(lpClassName)) - { - RtlFreeUnicodeString(&ClassName); - } - SetLastError(ERROR_OUTOFMEMORY); - return (HWND)0; - } - } - - if(!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP))) - { - if(Unicode) - { - wceW.cbSize = sizeof(WNDCLASSEXW); - if(GetClassInfoExW(hInstance, (LPCWSTR)lpClassName, &wceW) && wceW.lpszMenuName) - { - hMenu = LoadMenuW(hInstance, wceW.lpszMenuName); - } - } - else - { - wceA.cbSize = sizeof(WNDCLASSEXA); - if(GetClassInfoExA(hInstance, lpClassName, &wceA) && wceA.lpszMenuName) - { - hMenu = LoadMenuA(hInstance, wceA.lpszMenuName); - } - } - } - - Handle = NtUserCreateWindowEx(dwExStyle, - &ClassName, - &WindowName, - dwStyle, - x, - y, - nWidth, - nHeight, - hWndParent, - hMenu, - hInstance, - lpParam, - SW_SHOW, - FALSE, - 0); - -#if 0 - DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); -#endif - - if(!Unicode) - { - RtlFreeUnicodeString(&WindowName); - - if (!IS_ATOM(lpClassName)) - { - RtlFreeUnicodeString(&ClassName); - } - } - return Handle; + { + RtlFreeUnicodeString(&ClassName); + } + } + return Handle; } @@ -262,17 +265,17 @@ */ HWND STDCALL CreateWindowExA(DWORD dwExStyle, - LPCSTR lpClassName, - LPCSTR lpWindowName, - DWORD dwStyle, - int x, - int y, - int nWidth, - int nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam) + LPCSTR lpClassName, + LPCSTR lpWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam) { MDICREATESTRUCTA mdi; HWND hwnd; @@ -368,17 +371,17 @@ */ HWND STDCALL CreateWindowExW(DWORD dwExStyle, - LPCWSTR lpClassName, - LPCWSTR lpWindowName, - DWORD dwStyle, - int x, - int y, - int nWidth, - int nHeight, - HWND hWndParent, - HMENU hMenu, - HINSTANCE hInstance, - LPVOID lpParam) + LPCWSTR lpClassName, + LPCWSTR lpWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam) { MDICREATESTRUCTW mdi; HWND hwnd; @@ -473,19 +476,19 @@ */ HDWP STDCALL DeferWindowPos(HDWP hWinPosInfo, - HWND hWnd, - HWND hWndInsertAfter, - int x, - int y, - int cx, - int cy, - UINT uFlags) + HWND hWnd, + HWND hWndInsertAfter, + int x, + int y, + int cx, + int cy, + UINT uFlags) { #if 0 - return NtUserDeferWindowPos(hWinPosInfo, hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); + return NtUserDeferWindowPos(hWinPosInfo, hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); #else - SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); - return hWinPosInfo; + SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); + return hWinPosInfo; #endif } @@ -496,7 +499,7 @@ BOOL STDCALL DestroyWindow(HWND hWnd) { - return NtUserDestroyWindow(hWnd); + return NtUserDestroyWindow(hWnd); } @@ -507,10 +510,10 @@ EndDeferWindowPos(HDWP hWinPosInfo) { #if 0 - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; #else - return TRUE; + return TRUE; #endif } @@ -546,300 +549,303 @@ HWND STDCALL GetForegroundWindow(VOID) { - return NtUserGetForegroundWindow(); -} - -static -BOOL -User32EnumWindows ( - HDESK hDesktop, - HWND hWndparent, - WNDENUMPROC lpfn, - LPARAM lParam, - DWORD dwThreadId, - BOOL bChildren ) -{ - DWORD i, dwCount = 0; - HWND* pHwnd = NULL; - HANDLE hHeap; - NTSTATUS Status; - - if ( !lpfn ) - { - SetLastError ( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - /* FIXME instead of always making two calls, should we use some - sort of persistent buffer and only grow it ( requiring a 2nd - call ) when the buffer wasn't already big enough? */ - /* first get how many window entries there are */ - Status = NtUserBuildHwndList ( - hDesktop, hWndparent, bChildren, dwThreadId, lParam, NULL, &dwCount ); - if ( !NT_SUCCESS( Status ) ) + return NtUserGetForegroundWindow(); +} + +static BOOL +User32EnumWindows(HDESK hDesktop, + HWND hWndparent, + WNDENUMPROC lpfn, + LPARAM lParam, + DWORD dwThreadId, + BOOL bChildren) +{ + DWORD i, dwCount = 0; + HWND* pHwnd = NULL; + HANDLE hHeap; + NTSTATUS Status; + + if (!lpfn) + { + SetLastError ( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + /* FIXME instead of always making two calls, should we use some + sort of persistent buffer and only grow it ( requiring a 2nd + call ) when the buffer wasn't already big enough? */ + /* first get how many window entries there are */ + Status = NtUserBuildHwndList(hDesktop, + hWndparent, + bChildren, + dwThreadId, + lParam, + NULL, + &dwCount); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* allocate buffer to receive HWND handles */ + hHeap = GetProcessHeap(); + pHwnd = HeapAlloc(hHeap, 0, sizeof(HWND)*(dwCount+1)); + if (!pHwnd) + { + SetLastError ( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + /* now call kernel again to fill the buffer this time */ + Status = NtUserBuildHwndList(hDesktop, + hWndparent, + bChildren, + dwThreadId, + lParam, + pHwnd, + &dwCount); + if (!NT_SUCCESS(Status)) + { + if (pHwnd) + HeapFree(hHeap, 0, pHwnd); + return FALSE; + } + + /* call the user's callback function until we're done or + they tell us to quit */ + for ( i = 0; i < dwCount; i++ ) + { + /* FIXME I'm only getting NULLs from Thread Enumeration, and it's + * probably because I'm not doing it right in NtUserBuildHwndList. + * Once that's fixed, we shouldn't have to check for a NULL HWND + * here + */ + if (!(ULONG)pHwnd[i]) /* don't enumerate a NULL HWND */ + continue; + if (!(*lpfn)(pHwnd[i], lParam)) + { + HeapFree ( hHeap, 0, pHwnd ); + return FALSE; + } + } + if (pHwnd) + HeapFree(hHeap, 0, pHwnd); + return TRUE; +} + + +/* + * @implemented + */ +BOOL STDCALL +EnumChildWindows(HWND hWndParent, + WNDENUMPROC lpEnumFunc, + LPARAM lParam) +{ + if (!hWndParent) + { + return EnumWindows(lpEnumFunc, lParam); + } + return User32EnumWindows(NULL, hWndParent, lpEnumFunc, lParam, 0, TRUE); +} + + +/* + * @implemented + */ +BOOL STDCALL +EnumThreadWindows(DWORD dwThreadId, + WNDENUMPROC lpfn, + LPARAM lParam) +{ + if (!dwThreadId) + dwThreadId = GetCurrentThreadId(); + return User32EnumWindows(NULL, NULL, lpfn, lParam, dwThreadId, FALSE); +} + + +/* + * @implemented + */ +BOOL STDCALL +EnumWindows(WNDENUMPROC lpEnumFunc, + LPARAM lParam) +{ + return User32EnumWindows(NULL, NULL, lpEnumFunc, lParam, 0, FALSE); +} + + +/* + * @implemented + */ +BOOL STDCALL +EnumDesktopWindows(HDESK hDesktop, + WNDENUMPROC lpfn, + LPARAM lParam) +{ + return User32EnumWindows(hDesktop, NULL, lpfn, lParam, 0, FALSE); +} + + +/* + * @implemented + */ +HWND STDCALL +FindWindowExA(HWND hwndParent, + HWND hwndChildAfter, + LPCSTR lpszClass, + LPCSTR lpszWindow) +{ + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; + HWND Result; + + if (IS_ATOM(lpszClass)) + { + ucClassName.Buffer = (LPWSTR)lpszClass; + ucClassName.Length = 0; + pucClassName = &ucClassName; + } + else if (lpszClass != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, + (LPSTR)lpszClass)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + pucClassName = &ucClassName; + } + + if (lpszWindow != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, + (LPSTR)lpszWindow)) + { + if (!IS_ATOM(lpszClass) && lpszClass != NULL) + RtlFreeUnicodeString(&ucWindowName); + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + pucWindowName = &ucWindowName; + } + + Result = NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName, + 0); + + if (!IS_ATOM(lpszClass) && lpszClass != NULL) + RtlFreeUnicodeString(&ucClassName); + if (lpszWindow != NULL) + RtlFreeUnicodeString(&ucWindowName); + + return Result; +} + + +/* + * @implemented + */ +HWND STDCALL +FindWindowExW(HWND hwndParent, + HWND hwndChildAfter, + LPCWSTR lpszClass, + LPCWSTR lpszWindow) +{ + UNICODE_STRING ucClassName, *pucClassName = NULL; + UNICODE_STRING ucWindowName, *pucWindowName = NULL; + + if (IS_ATOM(lpszClass)) + { + ucClassName.Length = 0; + ucClassName.Buffer = (LPWSTR)lpszClass; + pucClassName = &ucClassName; + } + else if (lpszClass != NULL) + { + RtlInitUnicodeString(&ucClassName, + lpszClass); + pucClassName = &ucClassName; + } + + if (lpszWindow != NULL) + { + RtlInitUnicodeString(&ucWindowName, + lpszWindow); + pucWindowName = &ucWindowName; + } + + return NtUserFindWindowEx(hwndParent, + hwndChildAfter, + pucClassName, + pucWindowName, + 0); +} + + +/* + * @implemented + */ +HWND STDCALL +FindWindowA(LPCSTR lpClassName, LPCSTR lpWindowName) +{ + //FIXME: FindWindow does not search children, but FindWindowEx does. + // what should we do about this? + return FindWindowExA (NULL, NULL, lpClassName, lpWindowName); +} + + +/* + * @implemented + */ +HWND STDCALL +FindWindowW(LPCWSTR lpClassName, LPCWSTR lpWindowName) +{ + /* + + There was a FIXME here earlier, but I think it is just a documentation unclarity. + + FindWindow only searches top level windows. What they mean is that child + windows of other windows than the desktop can be searched. + FindWindowExW never does a recursive search. + + / Joakim + */ + + return FindWindowExW(NULL, NULL, lpClassName, lpWindowName); +} + + + +/* + * @unimplemented + */ +BOOL STDCALL +GetAltTabInfoA(HWND hwnd, + int iItem, + PALTTABINFO pati, + LPSTR pszItemText, + UINT cchItemText) +{ + UNIMPLEMENTED; return FALSE; - - /* allocate buffer to receive HWND handles */ - hHeap = GetProcessHeap(); - pHwnd = HeapAlloc ( hHeap, 0, sizeof(HWND)*(dwCount+1) ); - if ( !pHwnd ) - { - SetLastError ( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - - /* now call kernel again to fill the buffer this time */ - Status = NtUserBuildHwndList ( - hDesktop, hWndparent, bChildren, dwThreadId, lParam, pHwnd, &dwCount ); - if ( !NT_SUCCESS( Status ) ) - { - if ( pHwnd ) - HeapFree ( hHeap, 0, pHwnd ); - return FALSE; - } - - /* call the user's callback function until we're done or - they tell us to quit */ - for ( i = 0; i < dwCount; i++ ) - { - /* FIXME I'm only getting NULLs from Thread Enumeration, and it's - * probably because I'm not doing it right in NtUserBuildHwndList. - * Once that's fixed, we shouldn't have to check for a NULL HWND - * here - */ - if ( !(ULONG)pHwnd[i] ) /* don't enumerate a NULL HWND */ - continue; - if ( !(*lpfn)( pHwnd[i], lParam ) ) - { - HeapFree ( hHeap, 0, pHwnd ); - return FALSE; - } - } - if ( pHwnd ) - HeapFree ( hHeap, 0, pHwnd ); - return TRUE; -} - - -/* - * @implemented - */ -BOOL -STDCALL -EnumChildWindows( - HWND hWndParent, - WNDENUMPROC lpEnumFunc, - LPARAM lParam) -{ - if ( !hWndParent ) - { - return EnumWindows(lpEnumFunc, lParam); - } - return User32EnumWindows ( NULL, hWndParent, lpEnumFunc, lParam, 0, TRUE ); -} - - -/* - * @implemented - */ -BOOL -STDCALL -EnumThreadWindows(DWORD dwThreadId, - WNDENUMPROC lpfn, - LPARAM lParam) -{ - if ( !dwThreadId ) - dwThreadId = GetCurrentThreadId(); - return User32EnumWindows ( NULL, NULL, lpfn, lParam, dwThreadId, FALSE ); -} - - -/* - * @implemented - */ -BOOL STDCALL -EnumWindows(WNDENUMPROC lpEnumFunc, - LPARAM lParam) -{ - return User32EnumWindows ( NULL, NULL, lpEnumFunc, lParam, 0, FALSE ); -} - - -/* - * @implemented - */ -BOOL -STDCALL -EnumDesktopWindows( - HDESK hDesktop, - WNDENUMPROC lpfn, - LPARAM lParam) -{ - return User32EnumWindows ( hDesktop, NULL, lpfn, lParam, 0, FALSE ); -} - - -/* - * @implemented - */ -HWND STDCALL -FindWindowExA(HWND hwndParent, - HWND hwndChildAfter, - LPCSTR lpszClass, - LPCSTR lpszWindow) -{ - UNICODE_STRING ucClassName, *pucClassName = NULL; - UNICODE_STRING ucWindowName, *pucWindowName = NULL; - HWND Result; - - if (IS_ATOM(lpszClass)) - { - ucClassName.Buffer = (LPWSTR)lpszClass; - ucClassName.Length = 0; - pucClassName = &ucClassName; - } - else if (lpszClass != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&ucClassName, - (LPSTR)lpszClass)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - pucClassName = &ucClassName; - } - - if (lpszWindow != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&ucWindowName, - (LPSTR)lpszWindow)) - { - if (!IS_ATOM(lpszClass) && lpszClass != NULL) - RtlFreeUnicodeString(&ucWindowName); - - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - pucWindowName = &ucWindowName; - } - - Result = NtUserFindWindowEx(hwndParent, - hwndChildAfter, - pucClassName, - pucWindowName, - 0); - - if (!IS_ATOM(lpszClass) && lpszClass != NULL) - RtlFreeUnicodeString(&ucClassName); - if (lpszWindow != NULL) - RtlFreeUnicodeString(&ucWindowName); - - return Result; -} - - -/* - * @implemented - */ -HWND STDCALL -FindWindowExW(HWND hwndParent, - HWND hwndChildAfter, - LPCWSTR lpszClass, - LPCWSTR lpszWindow) -{ - UNICODE_STRING ucClassName, *pucClassName = NULL; - UNICODE_STRING ucWindowName, *pucWindowName = NULL; - - if (IS_ATOM(lpszClass)) - { - ucClassName.Length = 0; - ucClassName.Buffer = (LPWSTR)lpszClass; - pucClassName = &ucClassName; - } - else if (lpszClass != NULL) - { - RtlInitUnicodeString(&ucClassName, - lpszClass); - pucClassName = &ucClassName; - } - - if (lpszWindow != NULL) - { - RtlInitUnicodeString(&ucWindowName, - lpszWindow); - pucWindowName = &ucWindowName; - } - - return NtUserFindWindowEx(hwndParent, - hwndChildAfter, - pucClassName, - pucWindowName, - 0); -} - - -/* - * @implemented - */ -HWND STDCALL -FindWindowA(LPCSTR lpClassName, LPCSTR lpWindowName) -{ - //FIXME: FindWindow does not search children, but FindWindowEx does. - // what should we do about this? - return FindWindowExA (NULL, NULL, lpClassName, lpWindowName); -} - - -/* - * @implemented - */ -HWND STDCALL -FindWindowW(LPCWSTR lpClassName, LPCWSTR lpWindowName) -{ - /* - - There was a FIXME here earlier, but I think it is just a documentation unclarity. - - FindWindow only searches top level windows. What they mean is that child - windows of other windows than the desktop can be searched. - FindWindowExW never does a recursive search. - - / Joakim - */ - - return FindWindowExW (NULL, NULL, lpClassName, lpWindowName); -} - +} /* * @unimplemented */ BOOL STDCALL -GetAltTabInfoA(HWND hwnd, - int iItem, - PALTTABINFO pati, - LPSTR pszItemText, - UINT cchItemText) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL STDCALL GetAltTabInfoW(HWND hwnd, - int iItem, - PALTTABINFO pati, - LPWSTR pszItemText, - UINT cchItemText) -{ - UNIMPLEMENTED; - return FALSE; + int iItem, + PALTTABINFO pati, + LPWSTR pszItemText, + UINT cchItemText) +{ + UNIMPLEMENTED; + return FALSE; } @@ -913,9 +919,9 @@ */ BOOL STDCALL GetGUIThreadInfo(DWORD idThread, - LPGUITHREADINFO lpgui) -{ - return (BOOL)NtUserGetGUIThreadInfo(idThread, lpgui); + LPGUITHREADINFO lpgui) +{ + return (BOOL)NtUserGetGUIThreadInfo(idThread, lpgui); } @@ -992,8 +998,8 @@ BOOL STDCALL GetProcessDefaultLayout(DWORD *pdwDefaultLayout) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -1002,9 +1008,9 @@ */ BOOL STDCALL GetTitleBarInfo(HWND hwnd, - PTITLEBARINFO pti) -{ - return NtUserGetTitleBarInfo(hwnd,pti); + PTITLEBARINFO pti) +{ + return NtUserGetTitleBarInfo(hwnd, pti); } @@ -1013,7 +1019,7 @@ */ HWND STDCALL GetWindow(HWND hWnd, - UINT uCmd) + UINT uCmd) { PWINDOW Wnd, FoundWnd; HWND Ret = NULL; @@ -1060,8 +1066,8 @@ HWND STDCALL GetTopWindow(HWND hWnd) { - if (!hWnd) hWnd = GetDesktopWindow(); - return GetWindow( hWnd, GW_CHILD ); + if (!hWnd) hWnd = GetDesktopWindow(); + return GetWindow(hWnd, GW_CHILD); } @@ -1070,9 +1076,9 @@ */ BOOL STDCALL GetWindowInfo(HWND hwnd, - PWINDOWINFO pwi) -{ - return NtUserGetWindowInfo(hwnd, pwi); + PWINDOWINFO pwi) +{ + return NtUserGetWindowInfo(hwnd, pwi); } @@ -1081,17 +1087,17 @@ */ UINT STDCALL GetWindowModuleFileNameA(HWND hwnd, - LPSTR lpszFileName, - UINT cchFileNameMax) -{ - HINSTANCE hWndInst; - - if(!(hWndInst = NtUserGetWindowInstance(hwnd))) - { - return 0; - } - - return GetModuleFileNameA(hWndInst, lpszFileName, cchFileNameMax); + LPSTR lpszFileName, + UINT cchFileNameMax) +{ + HINSTANCE hWndInst; + + if(!(hWndInst = NtUserGetWindowInstance(hwnd))) + { + return 0; + } + + return GetModuleFileNameA(hWndInst, lpszFileName, cchFileNameMax); } @@ -1100,17 +1106,17 @@ */ UINT STDCALL GetWindowModuleFileNameW(HWND hwnd, - LPWSTR lpszFileName, - UINT cchFileNameMax) -{ - HINSTANCE hWndInst; - - if(!(hWndInst = NtUserGetWindowInstance(hwnd))) - { - return 0; - } - - return GetModuleFileNameW(hWndInst, lpszFileName, cchFileNameMax); + LPWSTR lpszFileName, + UINT cchFileNameMax) +{ + HINSTANCE hWndInst; + + if(!(hWndInst = NtUserGetWindowInstance(hwnd))) + { + return 0; + } + + return GetModuleFileNameW(hWndInst, lpszFileName, cchFileNameMax); } @@ -1121,7 +1127,7 @@ GetWindowPlacement(HWND hWnd, WINDOWPLACEMENT *lpwndpl) { - return (BOOL)NtUserGetWindowPlacement(hWnd, lpwndpl); + return (BOOL)NtUserGetWindowPlacement(hWnd, lpwndpl); } @@ -1130,7 +1136,7 @@ */ BOOL STDCALL GetWindowRect(HWND hWnd, - LPRECT lpRect) + LPRECT lpRect) { PWINDOW Wnd = ValidateHwnd(hWnd); @@ -1297,34 +1303,34 @@ DWORD STDCALL GetWindowThreadProcessId(HWND hWnd, - LPDWORD lpdwProcessId) -{ - DWORD Ret = 0; - PW32THREADINFO ti; - PWINDOW pWnd = ValidateHwnd(hWnd); - - if (!pWnd) return Ret; - - ti = SharedPtrToUser(pWnd->ti); + LPDWORD lpdwProcessId) +{ + DWORD Ret = 0; + PW32THREADINFO ti; + PWINDOW pWnd = ValidateHwnd(hWnd); + + if (!pWnd) return Ret; + + ti = SharedPtrToUser(pWnd->ti); - if ( ti ) - { - if ( ti == GetW32ThreadInfo() ) - { // We are current. - //FIXME("Current!\n"); - if ( lpdwProcessId ) - *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; - Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; - } - else - { // Ask kernel for info. - //FIXME("Kernel call!\n"); - if ( lpdwProcessId ) - *lpdwProcessId = NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID); - Ret = NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_THREAD_ID); - } - } - return Ret; + if (ti) + { + if (ti == GetW32ThreadInfo()) + { // We are current. + //FIXME("Current!\n"); + if (lpdwProcessId) + *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; + Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; + } + else + { // Ask kernel for info. + //FIXME("Kernel call!\n"); + if (lpdwProcessId) + *lpdwProcessId = NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID); + Ret = NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_THREAD_ID); + } + } + return Ret; } @@ -1333,7 +1339,7 @@ */ BOOL STDCALL IsChild(HWND hWndParent, - HWND hWnd) + HWND hWnd) { PWINDOW WndParent, Wnd; BOOL Ret = FALSE; @@ -1463,10 +1469,8 @@ /* * @implemented */ -BOOL -STDCALL -IsWindowEnabled( - HWND hWnd) +BOOL STDCALL +IsWindowEnabled(HWND hWnd) { // AG: I don't know if child windows are affected if the parent is // disabled. I think they stop processing messages but stay appearing @@ -1492,8 +1496,8 @@ BOOL STDCALL LockSetForegroundWindow(UINT uLockCode) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -1502,13 +1506,13 @@ */ BOOL STDCALL MoveWindow(HWND hWnd, - int X, - int Y, - int nWidth, - int nHeight, - BOOL bRepaint) -{ - return NtUserMoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint); + int X, + int Y, + int nWidth, + int nHeight, + BOOL bRepaint) +{ + return NtUserMoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint); } @@ -1517,28 +1521,28 @@ */ BOOL STDCALL AnimateWindow(HWND hwnd, - DWORD dwTime, - DWORD dwFlags) -{ - /* FIXME Add animation code */ - - /* If trying to show/hide and it's already * - * shown/hidden or invalid window, fail with * - * invalid parameter */ - - BOOL visible; - visible = IsWindowVisible(hwnd); - if(!IsWindow(hwnd) || - (visible && !(dwFlags & AW_HIDE)) || - (!visible && (dwFlags & AW_HIDE))) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); - - return TRUE; + DWORD dwTime, + DWORD dwFlags) +{ + /* FIXME Add animation code */ + + /* If trying to show/hide and it's already * + * shown/hidden or invalid window, fail with * + * invalid parameter */ + + BOOL visible; + visible = IsWindowVisible(hwnd); + if(!IsWindow(hwnd) || + (visible && !(dwFlags & AW_HIDE)) || + (!visible && (dwFlags & AW_HIDE))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + ShowWindow(hwnd, (dwFlags & AW_HIDE) ? SW_HIDE : ((dwFlags & AW_ACTIVATE) ? SW_SHOW : SW_SHOWNA)); + + return TRUE; } @@ -1561,10 +1565,10 @@ */ HWND STDCALL RealChildWindowFromPoint(HWND hwndParent, - POINT ptParentClientCoords) -{ - UNIMPLEMENTED; - return (HWND)0; + POINT ptParentClientCoords) +{ + UNIMPLEMENTED; + return (HWND)0; } /* @@ -1573,7 +1577,7 @@ BOOL STDCALL SetForegroundWindow(HWND hWnd) { - return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW); + return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW); } @@ -1582,9 +1586,9 @@ */ HWND STDCALL SetParent(HWND hWndChild, - HWND hWndNewParent) -{ - return NtUserSetParent(hWndChild, hWndNewParent); + HWND hWndNewParent) +{ + return NtUserSetParent(hWndChild, hWndNewParent); } @@ -1594,8 +1598,8 @@ BOOL STDCALL SetProcessDefaultLayout(DWORD dwDefaultLayout) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } @@ -1604,9 +1608,9 @@ */ BOOL STDCALL SetWindowPlacement(HWND hWnd, - CONST WINDOWPLACEMENT *lpwndpl) -{ - return (BOOL)NtUserSetWindowPlacement(hWnd, (WINDOWPLACEMENT *)lpwndpl); + CONST WINDOWPLACEMENT *lpwndpl) +{ + return (BOOL)NtUserSetWindowPlacement(hWnd, (WINDOWPLACEMENT *)lpwndpl); } @@ -1615,14 +1619,14 @@ */ BOOL STDCALL SetWindowPos(HWND hWnd, - HWND hWndInsertAfter, - int X, - int Y, - int cx, - int cy, - UINT uFlags) -{ - return NtUserSetWindowPos(hWnd,hWndInsertAfter, X, Y, cx, cy, uFlags); + HWND hWndInsertAfter, + int X, + int Y, + int cx, + int cy, + UINT uFlags) +{ + return NtUserSetWindowPos(hWnd,hWndInsertAfter, X, Y, cx, cy, uFlags); } @@ -1631,38 +1635,38 @@ */ BOOL STDCALL SetWindowTextA(HWND hWnd, - LPCSTR lpString) -{ - DWORD ProcessId; - if(!GetWindowThreadProcessId(hWnd, &ProcessId)) - { - return FALSE; - } - - if(ProcessId != GetCurrentProcessId()) - { - /* do not send WM_GETTEXT messages to other processes */ - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; - - if(lpString) - { - RtlInitAnsiString(&AnsiString, (LPSTR)lpString); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - NtUserDefSetText(hWnd, &UnicodeString); - RtlFreeUnicodeString(&UnicodeString); - } - else - NtUserDefSetText(hWnd, NULL); - - if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - DefWndNCPaint(hWnd, (HRGN)1, -1); - } - return TRUE; - } - - return SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)lpString); + LPCSTR lpString) +{ + DWORD ProcessId; + if(!GetWindowThreadProcessId(hWnd, &ProcessId)) + { + return FALSE; + } + + if(ProcessId != GetCurrentProcessId()) + { + /* do not send WM_GETTEXT messages to other processes */ + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + + if(lpString) + { + RtlInitAnsiString(&AnsiString, (LPSTR)lpString); + RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); + NtUserDefSetText(hWnd, &UnicodeString); + RtlFreeUnicodeString(&UnicodeString); + } + else + NtUserDefSetText(hWnd, NULL); + + if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + { + DefWndNCPaint(hWnd, (HRGN)1, -1); + } + return TRUE; + } + + return SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)lpString); } @@ -1671,32 +1675,32 @@ */ BOOL STDCALL SetWindowTextW(HWND hWnd, - LPCWSTR lpString) -{ - DWORD ProcessId; - if(!GetWindowThreadProcessId(hWnd, &ProcessId)) - { - return FALSE; - } - - if(ProcessId != GetCurrentProcessId()) - { - /* do not send WM_GETTEXT messages to other processes */ - UNICODE_STRING UnicodeString; - - if(lpString) - RtlInitUnicodeString(&UnicodeString, (LPWSTR)lpString); - - NtUserDefSetText(hWnd, (lpString ? &UnicodeString : NULL)); - - if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - DefWndNCPaint(hWnd, (HRGN)1, -1); - } - return TRUE; - } - - return SendMessageW(hWnd, WM_SETTEXT, 0, (LPARAM)lpString); + LPCWSTR lpString) +{ + DWORD ProcessId; + if(!GetWindowThreadProcessId(hWnd, &ProcessId)) + { + return FALSE; + } + + if(ProcessId != GetCurrentProcessId()) + { + /* do not send WM_GETTEXT messages to other processes */ + UNICODE_STRING UnicodeString; + + if(lpString) + RtlInitUnicodeString(&UnicodeString, (LPWSTR)lpString); + + NtUserDefSetText(hWnd, (lpString ? &UnicodeString : NULL)); + + if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + { + DefWndNCPaint(hWnd, (HRGN)1, -1); + } + return TRUE; + } + + return SendMessageW(hWnd, WM_SETTEXT, 0, (LPARAM)lpString); } @@ -1705,9 +1709,9 @@ */ BOOL STDCALL ShowOwnedPopups(HWND hWnd, - BOOL fShow) -{ - return (BOOL)NtUserCallTwoParam((DWORD)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); + BOOL fShow) +{ + return (BOOL)NtUserCallTwoParam((DWORD)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); } @@ -1716,9 +1720,9 @@ */ BOOL STDCALL ShowWindow(HWND hWnd, - int nCmdShow) -{ - return NtUserShowWindow(hWnd, nCmdShow); + int nCmdShow) +{ + return NtUserShowWindow(hWnd, nCmdShow); } @@ -1727,9 +1731,9 @@ */ BOOL STDCALL ShowWindowAsync(HWND hWnd, - int nCmdShow) -{ - return NtUserShowWindowAsync(hWnd, nCmdShow); + int nCmdShow) +{ + return NtUserShowWindowAsync(hWnd, nCmdShow); } @@ -1739,10 +1743,10 @@ /* WORD STDCALL TileWindows(HWND hwndParent, - UINT wHow, - CONST RECT *lpRect, - UINT cKids, - const HWND *lpKids) + UINT wHow, + CONST RECT *lpRect, + UINT cKids, + const HWND *lpKids) { UNIMPLEMENTED; return 0; @@ -1755,17 +1759,17 @@ */ BOOL STDCALL UpdateLayeredWindow(HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags) -{ - UNIMPLEMENTED; - return FALSE; + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pblend, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; } @@ -1775,9 +1779,9 @@ HWND STDCALL WindowFromPoint(POINT Point) { - //TODO: Determine what the actual parameters to - // NtUserWindowFromPoint are. - return NtUserWindowFromPoint(Point.x, Point.y); + //TODO: Determine what the actual parameters to + // NtUserWindowFromPoint are. + return NtUserWindowFromPoint(Point.x, Point.y); } @@ -1857,20 +1861,18 @@ /* * @implemented */ -BOOL -STDCALL +BOOL STDCALL SetWindowContextHelpId(HWND hwnd, - DWORD dwContextHelpId) -{ - return NtUserSetWindowContextHelpId(hwnd, dwContextHelpId); -} - - -/* - * @implemented - */ -DWORD -STDCALL + DWORD dwContextHelpId) +{ + return NtUserSetWindowContextHelpId(hwnd, dwContextHelpId); +} + + +/* + * @implemented + */ +DWORD STDCALL GetWindowContextHelpId(HWND hwnd) { PWINDOW Wnd = ValidateHwnd(hwnd); @@ -1885,8 +1887,7 @@ /* * @implemented */ -int -STDCALL +int STDCALL InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) { INT Ret = NtUserInternalGetWindowText(hWnd, lpString, nMaxCount); @@ -1898,38 +1899,34 @@ /* * @implemented */ -BOOL -STDCALL +BOOL STDCALL IsHungAppWindow(HWND hwnd) { - return (NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG) != 0); -} - -/* - * @implemented - */ -VOID -STDCALL + return (NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG) != 0); +} + +/* + * @implemented + */ +VOID STDCALL SetLastErrorEx(DWORD dwErrCode, DWORD dwType) { - SetLastError(dwErrCode); -} - -/* - * @implemented - */ -HWND -STDCALL + SetLastError(dwErrCode); +} + +/* + * @implemented + */ +HWND STDCALL GetFocus(VOID) { - return (HWND)NtUserGetThreadState(THREADSTATE_FOCUSWINDOW); -} - -/* - * @implemented - */ -HWND -STDCALL + return (HWND)NtUserGetThreadState(THREADSTATE_FOCUSWINDOW); +} + +/* + * @implemented + */ +HWND STDCALL SetTaskmanWindow(HWND hWnd) { return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); @@ -1938,8 +1935,7 @@ /* * @implemented */ -HWND -STDCALL +HWND STDCALL SetProgmanWindow(HWND hWnd) { return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETPROGMANWINDOW); @@ -1948,32 +1944,39 @@ /* * @implemented */ -HWND -STDCALL +HWND STDCALL GetProgmanWindow(VOID) { - return (HWND)NtUserGetThreadState(THREADSTATE_PROGMANWINDOW); -} - -/* - * @implemented - */ -HWND -STDCALL + return (HWND)NtUserGetThreadState(THREADSTATE_PROGMANWINDOW); +} + +/* + * @implemented + */ +HWND STDCALL GetTaskmanWindow(VOID) { - return (HWND)NtUserGetThreadState(THREADSTATE_TASKMANWINDOW); -} - -/* - * @implemented - */ -BOOL STDCALL -ScrollWindow(HWND hWnd, int dx, int dy, CONST RECT *lpRect, - CONST RECT *prcClip) -{ - return NtUserScrollWindowEx(hWnd, dx, dy, lpRect, prcClip, 0, NULL, - (lpRect ? 0 : SW_SCROLLCHILDREN) | SW_INVALIDATE) != ERROR; + return (HWND)NtUserGetThreadState(THREADSTATE_TASKMANWINDOW); +} + +/* + * @implemented + */ +BOOL STDCALL +ScrollWindow(HWND hWnd, + int dx, + int dy, + CONST RECT *lpRect, + CONST RECT *prcClip) +{ + return NtUserScrollWindowEx(hWnd, + dx, + dy, + lpRect, + prcClip, + 0, + NULL, + (lpRect ? 0 : SW_SCROLLCHILDREN) | SW_INVALIDATE) != ERROR; } @@ -1981,45 +1984,51 @@ * @implemented */ INT STDCALL -ScrollWindowEx(HWND hWnd, int dx, int dy, CONST RECT *prcScroll, - CONST RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate, UINT flags) -{ - return NtUserScrollWindowEx(hWnd, dx, dy, prcScroll, prcClip, hrgnUpdate, - prcUpdate, flags); -} - -/* - * @implemented - */ -BOOL -STDCALL +ScrollWindowEx(HWND hWnd, + int dx, + int dy, + CONST RECT *prcScroll, + CONST RECT *prcClip, + HRGN hrgnUpdate, + LPRECT prcUpdate, + UINT flags) +{ + return NtUserScrollWindowEx(hWnd, + dx, + dy, + prcScroll, + prcClip, + hrgnUpdate, + prcUpdate, + flags); +} + +/* + * @implemented + */ +BOOL STDCALL AnyPopup(VOID) { - return NtUserAnyPopup(); -} - -/* - * @implemented - */ -BOOL -STDCALL + return NtUserAnyPopup(); +} + +/* + * @implemented + */ +BOOL STDCALL IsWindowInDestroy(HWND hWnd) { - return NtUserIsWindowInDestroy(hWnd); -} - -/* - * @implemented - */ -VOID -STDCALL + return NtUserIsWindowInDestroy(hWnd); +} + +/* + * @implemented + */ +VOID STDCALL DisableProcessWindowsGhosting(VOID) { - NtUserEnableProcessWindowGhosting(FALSE); + NtUserEnableProcessWindowGhosting(FALSE); } /* EOF */ - - -

1 0

[cgutman] 36338: - Merge aicom-network-fixes up to r36337
by cgutman＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cgutman Date: Fri Sep 19 19:39:55 2008 New Revision: 36338 URL: http://svn.reactos.org/svn/reactos?rev=36338&view=rev Log: - Merge aicom-network-fixes up to r36337 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/control.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/pool.c trunk/reactos/lib/drivers/ip/network/transmit.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -68,17 +68,6 @@ PVOID Data; WCHAR Buff[25]; - if(ParameterType != NdisParameterInteger && - ParameterType != NdisParameterHexInteger && - ParameterType != NdisParameterString && - ParameterType != NdisParameterMultiString && - ParameterType != NdisParameterBinary - ) - { - *Status = NDIS_STATUS_NOT_SUPPORTED; - return; - } - /* reset parameter type to standard reg types */ switch(ParameterType) { @@ -118,7 +107,7 @@ break; default: - *Status = NDIS_STATUS_FAILURE; + *Status = NDIS_STATUS_NOT_SUPPORTED; return; } @@ -342,6 +331,7 @@ ) { NDIS_DbgPrint(MID_TRACE,("unsupported parameter type\n")); + *Status = NDIS_STATUS_NOT_SUPPORTED; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -87,6 +87,7 @@ } } } + Lock->Context = PsGetCurrentThread(); LockState->LockState = 3; } } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -818,7 +818,10 @@ KeLowerIrql(RaiseOldIrql); } } - if( NdisStatus != NDIS_STATUS_PENDING ) { + + if( NdisStatus == NDIS_STATUS_RESOURCES ) + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); + else if( NdisStatus != NDIS_STATUS_PENDING ) { NdisMSendComplete ( Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus ); Adapter->MiniportBusy = FALSE; @@ -1143,7 +1146,6 @@ * ShutdownHandler: Function to call to handle the bugcheck * NOTES: * - I'm not sure about ShutdownContext - * - FIXME - memory leak below */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle; @@ -1164,8 +1166,9 @@ BugcheckContext->ShutdownHandler = ShutdownHandler; BugcheckContext->DriverContext = ShutdownContext; - /* not sure if this needs to be initialized or not... oh well, it's a leak. */ BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD)); + + KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -1207,17 +1207,17 @@ /* Convert returned link speed to bps (it is in 100bps increments) */ IF->Speed = Speed * 100L; - /* Add adapter to the adapter list */ - ExInterlockedInsertTailList(&AdapterListHead, - &IF->ListEntry, - &AdapterListLock); - /* Bind adapter to IP layer */ if( !BindAdapter(IF, RegistryPath) ) { TI_DbgPrint(DEBUG_DATALINK,("denying adapter %wZ (BindAdapter)\n", AdapterName)); exFreePool(IF); return NDIS_STATUS_NOT_ACCEPTED; } + + /* Add adapter to the adapter list */ + ExInterlockedInsertTailList(&AdapterListHead, + &IF->ListEntry, + &AdapterListLock); TI_DbgPrint(DEBUG_DATALINK, ("Leaving.\n")); Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -409,6 +409,11 @@ Status = TCPSocket( Connection, AF_INET, SOCK_STREAM, IPPROTO_TCP ); + if( !NT_SUCCESS(Status) ) { + TCPFreeConnectionEndpoint( Connection ); + return Status; + } + /* Return connection endpoint file object */ Request->Handle.ConnectionContext = Connection; Modified: trunk/reactos/drivers/network/tcpip/tcpip/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -25,6 +25,8 @@ /* FIXME: Get buffer from a free buffer pool with enough room */ Buffer = ExAllocatePool(NonPagedPool, Size); + + RtlZeroMemory(Buffer, Size); TI_DbgPrint(DEBUG_MEMORY, ("Allocated (%i) bytes at (0x%X).\n", Size, Buffer)); Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -34,10 +34,7 @@ ("Called. Context (0x%X) NdisPacket (0x%X) NdisStatus (0x%X)\n", Context, NdisPacket, NdisStatus)); - /* FIXME: Stop sending fragments and cleanup datagram buffers if - there was an error */ - - if (PrepareNextFragment(IFC)) { + if (NT_SUCCESS(NdisStatus) && PrepareNextFragment(IFC)) { /* A fragment was prepared for transmission, so send it */ IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); } else { Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -117,6 +117,7 @@ if( Bucket->AssociatedEndpoint == Connection ) { RemoveEntryList( ListEntry->Blink ); ExFreePool( Bucket ); + break; } } @@ -141,10 +142,14 @@ if( Status == STATUS_PENDING ) { Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); - Bucket->AssociatedEndpoint = Connection; - Bucket->Request.RequestNotifyObject = Complete; - Bucket->Request.RequestContext = Context; - InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + + if( Bucket ) { + Bucket->AssociatedEndpoint = Connection; + Bucket->Request.RequestNotifyObject = Complete; + Bucket->Request.RequestContext = Context; + InsertHeadList( &Listener->ListenRequest, &Bucket->Entry ); + } else + Status = STATUS_NO_MEMORY; } TcpipRecursiveMutexLeave( &TCPLock ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Fri Sep 19 19:39:55 2008 @@ -104,8 +104,7 @@ IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ); - if( !NT_SUCCESS(NdisStatus) ) return OSK_EINVAL; - else return 0; + return 0; } int TCPSleep( void *ClientData, void *token, int priority, char *msg, @@ -144,7 +143,9 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); PoolFreeBuffer( SleepingThread ); - } + } else + return OSK_ENOBUFS; + TI_DbgPrint(DEBUG_TCP,("Waiting finished: %x\n", token)); return 0; }

1 0

[cgutman] 36337: - Zero the memory after we allocate it
by cgutman＠svn.reactos.org 20 Sep '08

20 Sep '08

Author: cgutman Date: Fri Sep 19 19:31:02 2008 New Revision: 36337 URL: http://svn.reactos.org/svn/reactos?rev=36337&view=rev Log: - Zero the memory after we allocate it Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] Fri Sep 19 19:31:02 2008 @@ -25,6 +25,8 @@ /* FIXME: Get buffer from a free buffer pool with enough room */ Buffer = ExAllocatePool(NonPagedPool, Size); + + RtlZeroMemory(Buffer, Size); TI_DbgPrint(DEBUG_MEMORY, ("Allocated (%i) bytes at (0x%X).\n", Size, Buffer));

1 0

[cgutman] 36336: - Queue the packet again if we currently don't have enough resources to process it
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Fri Sep 19 18:51:26 2008 New Revision: 36336 URL: http://svn.reactos.org/svn/reactos?rev=36336&view=rev Log: - Queue the packet again if we currently don't have enough resources to process it Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 19 18:51:26 2008 @@ -818,7 +818,10 @@ KeLowerIrql(RaiseOldIrql); } } - if( NdisStatus != NDIS_STATUS_PENDING ) { + + if( NdisStatus == NDIS_STATUS_RESOURCES ) + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); + else if( NdisStatus != NDIS_STATUS_PENDING ) { NdisMSendComplete ( Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus ); Adapter->MiniportBusy = FALSE;

1 0

[cgutman] 36335: - Initialize the callback record before calling KeRegisterBugCheckCallback so NdisMRegisterAdapterShutdownHandler should work now
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Fri Sep 19 18:41:28 2008 New Revision: 36335 URL: http://svn.reactos.org/svn/reactos?rev=36335&view=rev Log: - Initialize the callback record before calling KeRegisterBugCheckCallback so NdisMRegisterAdapterShutdownHandler should work now Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 19 18:41:28 2008 @@ -1143,7 +1143,6 @@ * ShutdownHandler: Function to call to handle the bugcheck * NOTES: * - I'm not sure about ShutdownContext - * - FIXME - memory leak below */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle; @@ -1164,8 +1163,9 @@ BugcheckContext->ShutdownHandler = ShutdownHandler; BugcheckContext->DriverContext = ShutdownContext; - /* not sure if this needs to be initialized or not... oh well, it's a leak. */ BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD)); + + KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport");

1 0

[cgutman] 36334: - Code cleanup - Set Status to NDIS_STATUS_NOT_SUPPORTED if we don't support the parameter type
by cgutman＠svn.reactos.org 19 Sep '08

19 Sep '08

Author: cgutman Date: Fri Sep 19 18:18:12 2008 New Revision: 36334 URL: http://svn.reactos.org/svn/reactos?rev=36334&view=rev Log: - Code cleanup - Set Status to NDIS_STATUS_NOT_SUPPORTED if we don't support the parameter type Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Sep 19 18:18:12 2008 @@ -68,17 +68,6 @@ PVOID Data; WCHAR Buff[25]; - if(ParameterType != NdisParameterInteger && - ParameterType != NdisParameterHexInteger && - ParameterType != NdisParameterString && - ParameterType != NdisParameterMultiString && - ParameterType != NdisParameterBinary - ) - { - *Status = NDIS_STATUS_NOT_SUPPORTED; - return; - } - /* reset parameter type to standard reg types */ switch(ParameterType) { @@ -118,7 +107,7 @@ break; default: - *Status = NDIS_STATUS_FAILURE; + *Status = NDIS_STATUS_NOT_SUPPORTED; return; } @@ -342,6 +331,7 @@ ) { NDIS_DbgPrint(MID_TRACE,("unsupported parameter type\n")); + *Status = NDIS_STATUS_NOT_SUPPORTED; return; }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008