Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 31293: First restructure and reorder the code. Identify bugs and make corrections. Found DCX_CACHE sets to owned DCEs, we do not hold dcattr after ReleaseDC as we should and did not handle ClassDCs correctly. Will continue.
by jimtabor＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: jimtabor Date: Mon Dec 17 23:23:31 2007 New Revision: 31293 URL: http://svn.reactos.org/svn/reactos?rev=31293&view=rev Log: First restructure and reorder the code. Identify bugs and make corrections. Found DCX_CACHE sets to owned DCEs, we do not hold dcattr after ReleaseDC as we should and did not handle ClassDCs correctly. Will continue. Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h Mon Dec 17 23:23:31 2007 @@ -25,14 +25,15 @@ typedef struct tagDCE { - struct tagDCE *next; + LIST_ENTRY List; HDC hDC; HWND hwndCurrent; HWND hwndDC; HRGN hClipRgn; - DCE_TYPE type; + PVOID Class; DWORD DCXFlags; PEPROCESS pProcess; + DWORD Count; HANDLE Self; } DCE; /* PDCE already declared at top of file */ @@ -40,7 +41,7 @@ #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000 -#define DCX_DCOWNED 0x00008000 +#define DCX_DCPOWNED 0x00008000 #define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 #define DCX_NOCLIPCHILDREN 0x00080000 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Mon Dec 17 23:23:31 2007 @@ -1,30 +1,10 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntuser/windc.c + * PURPOSE: Keyboard layout management + * COPYRIGHT: Copyright 2007 ReactOS * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Window classes - * FILE: subsys/win32k/ntuser/class.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISION HISTORY: - * 06-06-2001 CSH Created */ /* INCLUDES ******************************************************************/ @@ -40,187 +20,162 @@ static PDCE FirstDce = NULL; static PDC defaultDCstate = NULL; -//static INT DCECount = 0; +//static INT DCECount = 0; // Count of DCE in system. #define DCX_CACHECOMPAREMASK (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | \ DCX_CACHE | DCX_WINDOW | DCX_PARENTCLIP) /* FUNCTIONS *****************************************************************/ +// +// This should be moved to dc.c or dcutil.c. +// HDC FASTCALL DceCreateDisplayDC(VOID) { - HDC hDC; - UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); - return hDC; -} - -VOID FASTCALL -DceInit(VOID) -{ - + HDC hDC; + UNICODE_STRING DriverName; + RtlInitUnicodeString(&DriverName, L"DISPLAY"); + hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); +// +// If NULL, first time through! Build the default window dc! +// + if (hDC && !defaultDCstate) // Ultra HAX! Dedicated to GvG! + { // This is a cheesy way to do this. + PDC dc = DC_LockDc ( hDC ); + defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + RtlZeroMemory(defaultDCstate, sizeof(DC)); + IntGdiCopyToSaveState(dc, defaultDCstate); + DC_UnlockDc( dc ); + } + return hDC; } static HRGN FASTCALL DceGetVisRgn(PWINDOW_OBJECT Window, ULONG Flags, HWND hWndChild, ULONG CFlags) { - HRGN VisRgn; - - VisRgn = VIS_ComputeVisibleRegion(Window, - 0 == (Flags & DCX_WINDOW), - 0 != (Flags & DCX_CLIPCHILDREN), - 0 != (Flags & DCX_CLIPSIBLINGS)); - - if (VisRgn == NULL) + HRGN VisRgn; + + VisRgn = VIS_ComputeVisibleRegion( Window, + 0 == (Flags & DCX_WINDOW), + 0 != (Flags & DCX_CLIPCHILDREN), + 0 != (Flags & DCX_CLIPSIBLINGS)); + + if (VisRgn == NULL) VisRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - return VisRgn; -} - -/* - * NtUserGetWindowDC - * - * The NtUserGetWindowDC function retrieves the device context (DC) for the - * entire window, including title bar, menus, and scroll bars. A window device - * context permits painting anywhere in a window, because the origin of the - * device context is the upper-left corner of the window instead of the client - * area. - * - * Status - * @implemented - */ - -DWORD STDCALL -NtUserGetWindowDC(HWND hWnd) -{ - return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); -} - -DWORD FASTCALL -UserGetWindowDC(PWINDOW_OBJECT Wnd) -{ - return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); -} - -HDC STDCALL -NtUserGetDC(HWND hWnd) -{ -#if 0 - if (!hWnd) - { // MSDN: - //"hWnd [in] Handle to the window whose DC is to be retrieved. - // If this value is NULL, GetDC retrieves the DC for the entire screen." - hWnd = IntGetDesktopWindow(); - if (hWnd) - return NtUserGetDCEx(hWnd, NULL, DCX_CACHE | DCX_WINDOW); - else - return NULL; - } - return NtUserGetDCEx(hWnd, NULL, DCX_USESTYLE); -#endif -// We have a problem here! - return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); -} + return VisRgn; +} + PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type) { - PDCE pDce; - PWINDOW Wnd = NULL; - - if (Window) - Wnd = Window->Wnd; - - pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), TAG_PDCE); - if(!pDce) + PDCE pDce; + PWINDOW Wnd = NULL; + PVOID Class = NULL; + + if (Window) Wnd = Window->Wnd; + + if (Wnd) Class = Wnd->Class; + + if (Type == DCE_CLASS_DC) + { + PDCE pdce; + KeEnterCriticalRegion(); + pdce = FirstDce; + do + { + if (pdce->Class == Class) + { + pdce->Count++; + KeLeaveCriticalRegion(); + return pdce; + } + pdce = (PDCE)pdce->List.Flink; + } while (pdce != FirstDce); + KeLeaveCriticalRegion(); + } + + pDce = ExAllocatePoolWithTag(PagedPool, sizeof(DCE), TAG_PDCE); + if(!pDce) return NULL; - pDce->hDC = DceCreateDisplayDC(); - if(!pDce->hDC) - { + pDce->hDC = DceCreateDisplayDC(); + if (!pDce->hDC) + { ExFreePoolWithTag(pDce, TAG_PDCE); return NULL; - } -// -// If NULL, first time through! Build the default window dc! -// - if (NULL == defaultDCstate) // Ultra HAX! Dedicated to GvG! - { // This is a cheesy way to do this. - PDC dc = DC_LockDc ( pDce->hDC ); - defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); - RtlZeroMemory(defaultDCstate, sizeof(DC)); - IntGdiCopyToSaveState(dc, defaultDCstate); - DC_UnlockDc( dc ); - } - - pDce->hwndCurrent = (Window ? Window->hSelf : NULL); - pDce->hClipRgn = NULL; - pDce->pProcess = NULL; - - KeEnterCriticalRegion(); - pDce->next = FirstDce; - FirstDce = pDce; - KeLeaveCriticalRegion(); - - DCU_SetDcUndeletable(pDce->hDC); - - if (Type == DCE_WINDOW_DC) //Window DCE have ownership. - { // Process should already own it. - pDce->pProcess = PsGetCurrentProcess(); - } - else - { - PDC dc = DC_LockDc ( pDce->hDC ); - DPRINT("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); - MmCopyFromCaller(&dc->Dc_Attr, dc->pDc_Attr, sizeof(DC_ATTR)); - DC_UnlockDc( dc ); - DC_FreeDcAttr(pDce->hDC); // Free the dcattr! - DC_SetOwnership(pDce->hDC, NULL); // This hDC is inaccessible! - } - - if (Type != DCE_CACHE_DC) + } + + pDce->hwndCurrent = (Window ? Window->hSelf : NULL); + pDce->hClipRgn = NULL; + pDce->pProcess = NULL; + pDce->Class = Class; + pDce->Count = 1; + + KeEnterCriticalRegion(); + if (FirstDce == NULL) + { + FirstDce = pDce; + InitializeListHead(&FirstDce->List); + } + else + InsertTailList(&FirstDce->List, &pDce->List); + KeLeaveCriticalRegion(); + + DCU_SetDcUndeletable(pDce->hDC); + + if (Type == DCE_WINDOW_DC || Type == DCE_CLASS_DC) //Window DCE have ownership. + { // Process should already own it. + pDce->pProcess = PsGetCurrentProcess(); + } + else + { + PDC dc = DC_LockDc ( pDce->hDC ); + DPRINT("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); + MmCopyFromCaller(&dc->Dc_Attr, dc->pDc_Attr, sizeof(DC_ATTR)); + DC_UnlockDc( dc ); + DC_FreeDcAttr(pDce->hDC); // Free the dcattr! + DC_SetOwnership(pDce->hDC, NULL); // This hDC is inaccessible! + } + + if (Type == DCE_CACHE_DC) + { + pDce->DCXFlags = DCX_CACHE | DCX_DCEEMPTY; + } + else + { + pDce->DCXFlags = DCX_DCEBUSY; + if (Wnd) { - pDce->DCXFlags = DCX_DCEBUSY; - - if (Wnd) + if (Type == DCE_WINDOW_DC) { - if (Wnd->Style & WS_CLIPCHILDREN) - { - pDce->DCXFlags |= DCX_CLIPCHILDREN; - } - if (Wnd->Style & WS_CLIPSIBLINGS) - { - pDce->DCXFlags |= DCX_CLIPSIBLINGS; - } + if (Wnd->Style & WS_CLIPCHILDREN) pDce->DCXFlags |= DCX_CLIPCHILDREN; + if (Wnd->Style & WS_CLIPSIBLINGS) pDce->DCXFlags |= DCX_CLIPSIBLINGS; } } - else - { - pDce->DCXFlags = DCX_CACHE | DCX_DCEEMPTY; - } - - return(pDce); + } + return(pDce); } VOID static STDCALL DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, BOOL SetClipOrigin) { - PWINDOW Wnd; - DC *dc = DC_LockDc(hDC); - if(!dc) + PWINDOW Wnd; + DC *dc = DC_LockDc(hDC); + if(!dc) return; - if (Window == NULL) - { + if (Window == NULL) + { dc->w.DCOrgX = 0; dc->w.DCOrgY = 0; - } - else - { + } + else + { Wnd = Window->Wnd; if (Flags & DCX_WINDOW) { @@ -232,8 +187,8 @@ dc->w.DCOrgX = Wnd->ClientRect.left; dc->w.DCOrgY = Wnd->ClientRect.top; } - } - DC_UnlockDc(dc); + } + DC_UnlockDc(dc); } @@ -282,6 +237,7 @@ IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); dc = DC_LockDc ( dce->hDC ); + // Clean the DC IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. dce->DCXFlags &= ~DCX_DCEBUSY; @@ -489,8 +445,14 @@ DCE* DceEmpty = NULL; DCE* DceUnused = NULL; KeEnterCriticalRegion(); - for (Dce = FirstDce; Dce != NULL; Dce = Dce->next) - { + Dce = FirstDce; + do + { +// The reason for this you may ask? +// Well, it seems ReactOS calls GetDC with out first creating a desktop DC window! +// Need to test for null here. Not sure if this is a bug or a feature. + if (!Dce) break; + if ((Dce->DCXFlags & (DCX_CACHE | DCX_DCEBUSY)) == DCX_CACHE) { DceUnused = Dce; @@ -509,13 +471,11 @@ break; } } - } + Dce = (PDCE)Dce->List.Flink; + } while (Dce != FirstDce); KeLeaveCriticalRegion(); - if (Dce == NULL) - { - Dce = (DceEmpty == NULL) ? DceUnused : DceEmpty; - } + Dce = (DceEmpty == NULL) ? DceUnused : DceEmpty; if (Dce == NULL) { @@ -597,6 +557,11 @@ if (Dce->DCXFlags & DCX_CACHE) { DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); + if (Dce->pProcess) + { + DPRINT1("POWNED!\n"); + return NULL; // should assert here. + } // Need to set ownership so Sync dcattr will work. DC_SetOwnership( Dce->hDC, PsGetCurrentProcess()); DC_AllocateDcAttr( Dce->hDC ); // Allocate new dcattr @@ -606,148 +571,47 @@ return(Dce->hDC); } - - -HDC STDCALL -NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) -{ - PWINDOW_OBJECT Wnd=NULL; - DECLARE_RETURN(HDC); - - DPRINT("Enter NtUserGetDCEx\n"); - UserEnterExclusive(); - - if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) - { - RETURN(NULL); - } - - RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); - -CLEANUP: - DPRINT("Leave NtUserGetDCEx, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -BOOL FASTCALL -DCE_Cleanup(PDCE pDce) -{ - PDCE PrevInList; - KeEnterCriticalRegion(); - if (pDce == FirstDce) - { - FirstDce = pDce->next; - PrevInList = pDce; - } - else - { - for (PrevInList = FirstDce; NULL != PrevInList; PrevInList = PrevInList->next) - { - if (pDce == PrevInList->next) - { - PrevInList->next = pDce->next; - break; - } - } - assert(NULL != PrevInList); - } - KeLeaveCriticalRegion(); - return NULL != PrevInList; -} - -HWND FASTCALL -IntWindowFromDC(HDC hDc) -{ - DCE *Dce; - HWND Ret = NULL; - KeEnterCriticalRegion(); - for (Dce = FirstDce; Dce != NULL; Dce = Dce->next) - { - if(Dce->hDC == hDc) - { - Ret = Dce->hwndCurrent; - break; - } - } - KeLeaveCriticalRegion(); - return Ret; -} - - -INT FASTCALL -UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) -{ - DCE *dce; - INT nRet = 0; - - dce = FirstDce; - - DPRINT("%p %p\n", Window, hDc); - KeEnterCriticalRegion(); - while (dce && (dce->hDC != hDc)) - { - dce = dce->next; - } - KeLeaveCriticalRegion(); - if (dce && (dce->DCXFlags & DCX_DCEBUSY)) - { - nRet = DceReleaseDC(dce, EndPaint); - } - - return nRet; -} - - /*********************************************************************** * DceFreeDCE */ PDCE FASTCALL DceFreeDCE(PDCE pdce, BOOLEAN Force) - { - DCE *ret; - - if (NULL == pdce) +{ + DCE *ret; + BOOL Hit = FALSE; + + if (NULL == pdce) return NULL; + + ret = (PDCE) pdce->List.Flink; + +#if 0 /* FIXME */ + SetDCHook(pdce->hDC, NULL, 0L); +#endif + + if (Force && !GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, pdce->hDC)) + { + DPRINT1("Change ownership for DCE!\n"); + + if (!IsObjectDead((HGDIOBJ) pdce->hDC)) + DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); + else { - return NULL; + DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); + Hit = TRUE; } - - ret = pdce->next; - - #if 0 /* FIXME */ - - SetDCHook(pdce->hDC, NULL, 0L); - #endif - - if(Force && !GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, pdce->hDC)) - { - DPRINT1("Change ownership for DCE!\n"); - - if(!IsObjectDead((HGDIOBJ) pdce->hDC)) - DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); - else - { - DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); - } - } - - IntGdiDeleteDC(pdce->hDC, TRUE); + } + + if (!Hit) IntGdiDeleteDC(pdce->hDC, TRUE); - if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) - { + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) + { NtGdiDeleteObject(pdce->hClipRgn); - } - - DCE_Cleanup(pdce); - ExFreePoolWithTag(pdce, TAG_PDCE); - - if (FirstDce == NULL) - { - ExFreePoolWithTag(defaultDCstate, TAG_DC); - defaultDCstate = NULL; - } - return ret; + } + + RemoveEntryList(&pdce->List); + ExFreePoolWithTag(pdce, TAG_PDCE); + + return ret; } /*********************************************************************** @@ -758,26 +622,33 @@ void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT Window) { - DCE *pDCE; - - pDCE = FirstDce; - KeEnterCriticalRegion(); - while (pDCE) - { + PDCE pDCE; + + pDCE = FirstDce; + KeEnterCriticalRegion(); + do + { if (pDCE->hwndCurrent == Window->hSelf) { - if (pDCE == Window->Dce) /* owned or Class DCE*/ + if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/ { - if (Window->Wnd->Class->Style & CS_OWNDC) /* owned DCE*/ + if (Window->Wnd->Class->Style & CS_CLASSDC || + Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ + { + if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ + DceDeleteClipRgn(pDCE); + pDCE->hwndCurrent = 0; + } + else if (Window->Wnd->Class->Style & CS_OWNDC || + Window->Wnd->Style & CS_OWNDC) /* owned DCE*/ { pDCE = DceFreeDCE(pDCE, FALSE); Window->Dce = NULL; continue; } - else if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ - { - DceDeleteClipRgn(pDCE); - pDCE->hwndCurrent = 0; + else + { + ASSERT(FALSE); } } else @@ -795,14 +666,13 @@ DceReleaseDC(pDCE, FALSE); } - pDCE->DCXFlags &= DCX_CACHE; pDCE->DCXFlags |= DCX_DCEEMPTY; pDCE->hwndCurrent = 0; } } - pDCE = pDCE->next; - } - KeLeaveCriticalRegion(); + pDCE = (PDCE) pDCE->List.Flink; + } while (pDCE != FirstDce); + KeLeaveCriticalRegion(); } VOID FASTCALL @@ -828,7 +698,8 @@ return; } pDCE = FirstDce; - while (pDCE) + if(!pDCE) return; // Another null test! + do { if (0 == (pDCE->DCXFlags & DCX_DCEEMPTY)) { @@ -841,7 +712,7 @@ CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); if (NULL == CurrentWindow) { - pDCE = pDCE->next; + pDCE = (PDCE) pDCE->List.Flink; continue; } } @@ -849,11 +720,7 @@ dc = DC_LockDc(pDCE->hDC); if (dc == NULL) { -// if (Window->hSelf != pDCE->hwndCurrent) -// { -// UserDerefObject(CurrentWindow); -// } - pDCE = pDCE->next; + pDCE = (PDCE) pDCE->List.Flink; continue; } if (Window == CurrentWindow || IntIsChildWindow(Window, CurrentWindow)) @@ -889,14 +756,134 @@ if (Window->hSelf != pDCE->hwndCurrent) { - // IntEngWindowChanged(CurrentWindow, WOC_RGN_CLIENT); +// IntEngWindowChanged(CurrentWindow, WOC_RGN_CLIENT); // UserDerefObject(CurrentWindow); } } - pDCE = pDCE->next; - } -} - + pDCE =(PDCE) pDCE->List.Flink; + } while (pDCE != FirstDce); +} + +HDC +FASTCALL +IntGetDC(PWINDOW_OBJECT Window) +{ + if (!Window) + { // MSDN: + //"hWnd [in] Handle to the window whose DC is to be retrieved. + // If this value is NULL, GetDC retrieves the DC for the entire screen." + Window = UserGetWindowObject(IntGetDesktopWindow()); + if (Window) + return UserGetDCEx(Window, NULL, DCX_CACHE | DCX_WINDOW); + else + return NULL; + } + return UserGetDCEx(Window, NULL, DCX_USESTYLE); +} + +HWND FASTCALL +IntWindowFromDC(HDC hDc) +{ + DCE *Dce; + HWND Ret = NULL; + KeEnterCriticalRegion(); + Dce = FirstDce; + do + { + if(Dce->hDC == hDc) + { + Ret = Dce->hwndCurrent; + break; + } + Dce = (PDCE)Dce->List.Flink; + } while (Dce != FirstDce); + KeLeaveCriticalRegion(); + return Ret; +} + +INT FASTCALL +UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) +{ + PDCE dce; + INT nRet = 0; + BOOL Hit = FALSE; + + DPRINT("%p %p\n", Window, hDc); + dce = FirstDce; + KeEnterCriticalRegion(); + do + { + if (dce->hDC == hDc) + { + Hit = TRUE; + break; + } + + dce = (PDCE) dce->List.Flink; + } + while (dce != FirstDce ); + KeLeaveCriticalRegion(); + + if ( Hit && (dce->DCXFlags & DCX_DCEBUSY)) + { + nRet = DceReleaseDC(dce, EndPaint); + } + + return nRet; +} + +DWORD FASTCALL +UserGetWindowDC(PWINDOW_OBJECT Wnd) +{ + return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW); +} + +HDC STDCALL +NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) +{ + PWINDOW_OBJECT Wnd=NULL; + DECLARE_RETURN(HDC); + + DPRINT("Enter NtUserGetDCEx\n"); + UserEnterExclusive(); + + if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + { + RETURN(NULL); + } + + RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); + +CLEANUP: + DPRINT("Leave NtUserGetDCEx, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +/* + * NtUserGetWindowDC + * + * The NtUserGetWindowDC function retrieves the device context (DC) for the + * entire window, including title bar, menus, and scroll bars. A window device + * context permits painting anywhere in a window, because the origin of the + * device context is the upper-left corner of the window instead of the client + * area. + * + * Status + * @implemented + */ +DWORD STDCALL +NtUserGetWindowDC(HWND hWnd) +{ + return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW); +} + +HDC STDCALL +NtUserGetDC(HWND hWnd) +{ +// We have a problem here! Should call IntGetDC. + return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); +} #define COPY_DEVMODE_VALUE_TO_CALLER(dst, src, member) \ Status = MmCopyToCaller(&(dst)->member, &(src)->member, sizeof ((src)->member)); \ @@ -991,7 +978,6 @@ } #undef COPY_DEVMODE_VALUE_TO_CALLER - LONG STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Dec 17 23:23:31 2007 @@ -1785,12 +1785,10 @@ /* Insert the window into the thread's window list. */ InsertTailList (&PsGetCurrentThreadWin32Thread()->WindowListHead, &Window->ThreadListEntry); + /* Handle "CS_CLASSDC", it is tested first. */ + if (dwStyle & CS_CLASSDC) Window->Dce = DceAllocDCE(Window, DCE_CLASS_DC); /* Allocate a DCE for this window. */ - if (dwStyle & CS_OWNDC) - { - Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); - } - /* FIXME: Handle "CS_CLASSDC" */ + else if (dwStyle & CS_OWNDC) Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); Pos.x = x; Pos.y = y;

1 0

[fireball] 31292: Sync winebuild (keeping ReactOS-specific changes). 3 days ago Michael Stefaniuc winebuild: Remove duplicate declaration of variable ... 6 days ago Alexandre Julliard winebuild: Don't set the IMAGE_FILE_DLL flag on native ... 10 days ago Alexandre Julliard winebuild: Also optimize out imports that are only ... 10 days ago Alexandre Julliard winebuild: Improved checks for missing forward entry ... 10 days ago Alexandre Julliard winebuild: Print a warning when failing to import a
by fireball＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: fireball Date: Mon Dec 17 23:17:36 2007 New Revision: 31292 URL: http://svn.reactos.org/svn/reactos?rev=31292&view=rev Log: Sync winebuild (keeping ReactOS-specific changes). 3 days ago Michael Stefaniuc winebuild: Remove duplicate declaration of variable ... 6 days ago Alexandre Julliard winebuild: Don't set the IMAGE_FILE_DLL flag on native ... 10 days ago Alexandre Julliard winebuild: Also optimize out imports that are only ... 10 days ago Alexandre Julliard winebuild: Improved checks for missing forward entry ... 10 days ago Alexandre Julliard winebuild: Print a warning when failing to import a ... 2007-11-07 Alexandre Julliard winebuild: Add a few nops to stub entry points to make ... 2007-10-26 Alexandre Julliard winebuild: Add a -ordinal flag for entry points that ... 2007-09-10 Dmitry Timoshkov winebuild: Add IMAGE_FILE_32BIT_MACHINE flag for a ... 2007-07-19 Alexandre Julliard ntdll: Move private data to make room in the TEB for ... 2007-05-29 Dmitry Timoshkov winebuild: Mark builtin DLLs as IMAGE_FILE_LARGE_ADDRES ... 2007-05-24 Alexandre Julliard winebuild: Set the IMAGE_FILE_EXECUTABLE_IMAGE flag ... 2007-05-21 Dmitry Timoshkov winebuild: Fix compilation warnings in 64-bit mode. 2007-04-25 Rob Shearman winebuild: Refer to strings used in generated stubs ... 2007-04-09 Dmitry Timoshkov winebuild: Check if a given forward does exist in one ... 2007-03-17 Andrew Talbot winebuild: Replace inline static with static inline. 2007-03-05 Joris Huizer winebuild: sign-compare fixes. 2006-12-27 Alexandre Julliard make_makefiles: Generate the top-level .gitignore file. 2006-12-07 Alexandre Julliard winebuild: Added --nxcompat option, and mark all module ... 2006-12-04 Alexandre Julliard winebuild: Check for illegal characters in entry point ... 2006-10-12 Andrew Talbot winebuild: Cast-qual warning fix. 2006-09-14 Alexandre Julliard makefiles: Generate the dependencies line to avoid ... 2006-08-23 Andrew Talbot winebuild: Cast-qual warnings fix. 2006-08-11 Alexandre Julliard winebuild: Added output() function to properly deal ... 2006-08-07 Alexandre Julliard makefiles: Use make dependencies to create installation ... 2006-07-11 Ge van Geldorp winebuild: Save registers which might contain parameter ... 2006-07-11 Ge van Geldorp winebuild: Reserve enough space for null function pointer. 2006-07-10 Alexandre Julliard Take advantage of the recursive nature of .gitignore ... 2006-06-19 Alexandre Julliard winebuild: Get rid of the data16 prefix, it shouldn't ... 2006-06-13 Alexandre Julliard winebuild: Fix a few printf format warnings by casting ... 2006-05-23 Jonathan Ernst Update the address of the Free Software Foundation. 2006-04-18 Alexandre Julliard winebuild: Disable linking to external symbols by default. 2006-04-18 Alexandre Julliard winebuild: Fixed index in module table for delayed ... 2006-04-05 Alexandre Julliard winebuild: Remove a no longer necessary movzwl instruction. 2006-02-16 Robert Shearman winebuild: Correction for manpage. 2006-02-14 Mike Frysinger Add support for 'make install DESTDIR'. 2006-01-24 Alexandre Julliard winebuild: Get rid of the default ignored symbols list. 2006-01-23 Alexandre Julliard winebuild: Always import atof, the MS version is different. 2006-01-21 Marcus Meissner winebuild: Output a .note.GNU-stack section to allow ... 2006-01-20 Alexandre Julliard winebuild: Moved offset definitions to relay.c since ... 2006-01-20 Alexandre Julliard ntdll: Move the %gs register to the ntdll_thread_regs ... Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

1 0

[gedmurphy] 31291: - Don't leak bitmaps in the CopyIcon call. - Pass the call on, don't call straight into win32k
by gedmurphy＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: gedmurphy Date: Mon Dec 17 19:31:10 2007 New Revision: 31291 URL: http://svn.reactos.org/svn/reactos?rev=31291&view=rev Log: - Don't leak bitmaps in the CopyIcon call. - Pass the call on, don't call straight into win32k Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Mon Dec 17 19:31:10 2007 @@ -35,6 +35,7 @@ /* FUNCTIONS *****************************************************************/ + HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot) { @@ -147,16 +148,19 @@ */ HICON STDCALL -CopyIcon( - HICON hIcon) -{ - ICONINFO IconInfo; - - if(GetIconInfo((HANDLE)hIcon, &IconInfo)) - { - return NtUserCreateCursorIconHandle(&IconInfo, FALSE); - } - return (HICON)0; +CopyIcon(HICON hIcon) +{ + HICON hRetIcon = NULL; + ICONINFO IconInfo; + + if(GetIconInfo(hIcon, &IconInfo)) + { + hRetIcon = CreateIconIndirect(&IconInfo); + DeleteObject(IconInfo.hbmColor); + DeleteObject(IconInfo.hbmMask); + } + + return hRetIcon; }

1 0

[gedmurphy] 31290: update header
by gedmurphy＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: gedmurphy Date: Mon Dec 17 12:41:33 2007 New Revision: 31290 URL: http://svn.reactos.org/svn/reactos?rev=31290&view=rev Log: update header Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Mon Dec 17 12:41:33 2007 @@ -638,6 +638,7 @@ #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x0d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0x0e #define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0x10 +#define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0x25 #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 #define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 @@ -1222,7 +1223,7 @@ NTAPI NtUserGetIconSize( HANDLE Handle, - DWORD Unknown, + UINT istepIfAniCur, LONG *plcx, LONG *plcy);

1 0

[gedmurphy] 31289: - Add a new routine to NtUSerCallOneParam which returns newly created handles for icons and cursors - Fix the NtUserGetIconSize prototype
by gedmurphy＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: gedmurphy Date: Mon Dec 17 12:40:48 2007 New Revision: 31289 URL: http://svn.reactos.org/svn/reactos?rev=31289&view=rev Log: - Add a new routine to NtUSerCallOneParam which returns newly created handles for icons and cursors - Fix the NtUserGetIconSize prototype Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Mon Dec 17 12:40:48 2007 @@ -676,9 +676,6 @@ } -/* for hints how the prototype might be, see - http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 - http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ /* * @implemented */ @@ -686,7 +683,7 @@ NTAPI NtUserGetIconSize( HANDLE hCurIcon, - DWORD dwUnknown2, // Most of the time Zero. + UINT istepIfAniCur, PLONG plcx, // &size.cx PLONG plcy) // &size.cy { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Dec 17 12:40:48 2007 @@ -352,6 +352,28 @@ case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO: RETURN( (DWORD)MsqSetMessageExtraInfo((LPARAM)Param)); + + case ONEPARAM_ROUTINE_CREATECURICONHANDLE: + { + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + + WinSta = IntGetWinStaObj(); + if(WinSta == NULL) + { + RETURN(0); + } + + if (!(CurIcon = IntCreateCurIconHandle(WinSta))) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + ObDereferenceObject(WinSta); + RETURN(0); + } + + ObDereferenceObject(WinSta); + RETURN((DWORD)CurIcon->Self); + } case ONEPARAM_ROUTINE_GETCURSORPOSITION: {

1 0

[dreimer] 31288: Updated German Input.cpl Resource.
by dreimer＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: dreimer Date: Mon Dec 17 12:06:07 2007 New Revision: 31288 URL: http://svn.reactos.org/svn/reactos?rev=31288&view=rev Log: Updated German Input.cpl Resource. Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Mon Dec 17 12:06:07 2007 @@ -233,15 +233,15 @@ BEGIN IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." - IDS_KEYBOARD "Keyboard" - IDS_ADV_TEXT_SRV "Advanced Text Services" - IDS_NONE "(None)" - IDS_UNKNOWN "(Unknown)" - IDS_RESTART "Do you want to restart your computer now?" - IDS_SPEECH "Speech" - IDS_HRD_REC "Handwriting Recognition" - IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" - IDS_WHATS_THIS "What's This?" + IDS_KEYBOARD "Tastatur" + IDS_ADV_TEXT_SRV "Erweiterte Textdienste" + IDS_NONE "(Keine)" + IDS_UNKNOWN "(Unbekannt)" + IDS_RESTART "Wollen Sie Ihren Computer nun neustarten?" + IDS_SPEECH "Sprache" + IDS_HRD_REC "Handschrifterkennung" + IDS_OFF_ADV_TXT_SRV "Wollen Sie die erweiterten Textdienste ausschalten?" + IDS_WHATS_THIS "Was ist das?" END STRINGTABLE

1 0

[hpoussin] 31287: Use kernel facilities to change debug level at runtime
by hpoussin＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: hpoussin Date: Mon Dec 17 00:12:54 2007 New Revision: 31287 URL: http://svn.reactos.org/svn/reactos?rev=31287&view=rev Log: Use kernel facilities to change debug level at runtime Modified: trunk/reactos/drivers/input/i8042prt/createclose.c trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/i8042prt/misc.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/input/i8042prt/ps2pp.c trunk/reactos/drivers/input/i8042prt/readwrite.c trunk/reactos/drivers/input/i8042prt/registry.c trunk/reactos/drivers/input/i8042prt/setup.c Modified: trunk/reactos/drivers/input/i8042prt/createclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/cre… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/createclose.c (original) +++ trunk/reactos/drivers/input/i8042prt/createclose.c Mon Dec 17 00:12:54 2007 @@ -17,7 +17,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CREATE\n"); + TRACE_(I8042PRT, "IRP_MJ_CREATE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -30,7 +30,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLEANUP\n"); + TRACE_(I8042PRT, "IRP_MJ_CLEANUP\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -43,7 +43,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLOSE\n"); + TRACE_(I8042PRT, "IRP_MJ_CLOSE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Mon Dec 17 00:12:54 2007 @@ -33,7 +33,7 @@ ULONG DeviceExtensionSize; NTSTATUS Status; - DPRINT("i8042AddDevice(%p %p)\n", DriverObject, Pdo); + TRACE_(I8042PRT, "i8042AddDevice(%p %p)\n", DriverObject, Pdo); DriverExtension = (PI8042_DRIVER_EXTENSION)IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -57,7 +57,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -70,7 +70,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -107,7 +107,7 @@ PIRP NewIrp; NTSTATUS Status; - DPRINT("i8042SendHookWorkItem(%p %p)\n", DeviceObject, Context); + TRACE_(I8042PRT, "i8042SendHookWorkItem(%p %p)\n", DeviceObject, Context); WorkItemData = (PI8042_HOOK_WORKITEM)Context; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -135,7 +135,7 @@ } default: { - DPRINT1("Unknown FDO type %u\n", FdoDeviceExtension->Type); + ERR_(I8042PRT, "Unknown FDO type %u\n", FdoDeviceExtension->Type); ASSERT(FALSE); WorkItemData->Irp->IoStatus.Status = STATUS_INTERNAL_ERROR; goto cleanup; @@ -158,7 +158,7 @@ if (!NewIrp) { - DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + WARN_(I8042PRT, "IoBuildDeviceIoControlRequest() failed\n"); WorkItemData->Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } @@ -176,7 +176,7 @@ } if (!NT_SUCCESS(Status)) { - DPRINT("IoCallDriver() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "IoCallDriver() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -196,7 +196,7 @@ FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("KeyboardHook.InitializationRoutine() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "KeyboardHook.InitializationRoutine() failed with status 0x%08lx\n", Status); WorkItemData->Irp->IoStatus.Status = Status; goto cleanup; } @@ -229,7 +229,7 @@ i8042KbdStartIo(DeviceObject, Irp); break; default: - DPRINT1("Unknown FDO type %u\n", DeviceExtension->Type); + ERR_(I8042PRT, "Unknown FDO type %u\n", DeviceExtension->Type); ASSERT(FALSE); break; } @@ -251,7 +251,7 @@ Port)) { /* something is really wrong! */ - DPRINT1("Failed to send packet byte!\n"); + WARN_(I8042PRT, "Failed to send packet byte!\n"); return FALSE; } } @@ -343,7 +343,7 @@ case Keyboard: DeviceExtension->PacketPort = 0; break; case Mouse: DeviceExtension->PacketPort = CTRL_WRITE_MOUSE; break; default: - DPRINT1("Unknown FDO type %u\n", FdoDeviceExtension->Type); + ERR_(I8042PRT, "Unknown FDO type %u\n", FdoDeviceExtension->Type); ASSERT(FALSE); Status = STATUS_INTERNAL_ERROR; goto done; @@ -401,7 +401,7 @@ PFDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("i8042DeviceControl(%p %p)\n", DeviceObject, Irp); + TRACE_(I8042PRT, "i8042DeviceControl(%p %p)\n", DeviceObject, Irp); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; switch (DeviceExtension->Type) @@ -425,7 +425,7 @@ ULONG ControlCode; NTSTATUS Status; - DPRINT("i8042InternalDeviceControl(%p %p)\n", DeviceObject, Irp); + TRACE_(I8042PRT, "i8042InternalDeviceControl(%p %p)\n", DeviceObject, Irp); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; switch (DeviceExtension->Type) @@ -442,7 +442,7 @@ Status = i8042MouInternalDeviceControl(DeviceObject, Irp); break; default: - DPRINT1("Unknown IO control code 0x%lx\n", ControlCode); + ERR_(I8042PRT, "Unknown IO control code 0x%lx\n", ControlCode); ASSERT(FALSE); Status = STATUS_INVALID_DEVICE_REQUEST; break; @@ -456,7 +456,7 @@ Status = i8042MouInternalDeviceControl(DeviceObject, Irp); break; default: - DPRINT1("Unknown FDO type %u\n", DeviceExtension->Type); + ERR_(I8042PRT, "Unknown FDO type %u\n", DeviceExtension->Type); ASSERT(FALSE); Status = STATUS_INTERNAL_ERROR; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -482,7 +482,7 @@ (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } RtlZeroMemory(DriverExtension, sizeof(I8042_DRIVER_EXTENSION)); @@ -496,14 +496,14 @@ &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } Status = ReadRegistryEntries(RegistryPath, &DriverExtension->Port.Settings); if (!NT_SUCCESS(Status)) { - DPRINT("ReadRegistryEntries() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "ReadRegistryEntries() failed with status 0x%08lx\n", Status); return Status; } @@ -523,5 +523,13 @@ if (IsFirstStageSetup()) return i8042AddLegacyKeyboard(DriverObject, RegistryPath); + /* ROS Hack: ideally, we shouldn't have to initialize debug level this way */ +#ifndef NDEBUG + DbgSetDebugFilterState( + DPFLTR_I8042PRT_ID, + DPFLTR_ERROR_LEVEL | DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL, + TRUE); +#endif + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Mon Dec 17 00:12:54 2007 @@ -39,7 +39,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PVOID Key) { - DPRINT("Debug key: %p\n", Key); + INFO_(I8042PRT, "Debug key: p\n", Key); if (!Key) return; @@ -85,11 +85,11 @@ DeviceExtension->KeysInBuffer++; if (DeviceExtension->KeysInBuffer > DeviceExtension->Common.PortDeviceExtension->Settings.KeyboardDataQueueSize) { - DPRINT1("Keyboard buffer overflow\n"); + WARN_(I8042PRT, "Keyboard buffer overflow\n"); DeviceExtension->KeysInBuffer--; } - DPRINT("Irq completes key\n"); + TRACE_(I8042PRT, "Irq completes key\n"); KeInsertQueueDpc(&DeviceExtension->DpcKeyboard, NULL, NULL); } @@ -130,7 +130,7 @@ { case IOCTL_KEYBOARD_SET_INDICATORS: { - DPRINT("IOCTL_KEYBOARD_SET_INDICATORS\n"); + TRACE_(I8042PRT, "IOCTL_KEYBOARD_SET_INDICATORS\n"); PortDeviceExtension->PacketBuffer[0] = KBD_CMD_SET_LEDS; PortDeviceExtension->PacketBuffer[1] = 0; @@ -153,7 +153,7 @@ } default: { - DPRINT("Unknown ioctl code 0x%lx\n", + ERR_(I8042PRT, "Unknown ioctl code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); } @@ -234,7 +234,7 @@ if (!NT_SUCCESS(Status)) { /* We can't do more yet, ignore the keypress... */ - DPRINT("IoRegisterDeviceInterface(GUID_DEVICE_SYS_BUTTON) failed with status 0x%08lx\n", + WARN_(I8042PRT, "IoRegisterDeviceInterface(GUID_DEVICE_SYS_BUTTON) failed with status 0x%08lx\n", Status); DeviceExtension->PowerInterfaceName.MaximumLength = 0; return; @@ -249,7 +249,7 @@ if (!NT_SUCCESS(Status)) { /* Ignore the key press... */ - DPRINT("Disabling interface %wZ failed with status 0x%08lx\n", + WARN_(I8042PRT, "Disabling interface %wZ failed with status 0x%08lx\n", &DeviceExtension->PowerInterfaceName, Status); return; } @@ -262,7 +262,7 @@ if (!NT_SUCCESS(Status)) { /* Ignore the key press... */ - DPRINT("Enabling interface %wZ failed with status 0x%08lx\n", + WARN_(I8042PRT, "Enabling interface %wZ failed with status 0x%08lx\n", &DeviceExtension->PowerInterfaceName, Status); return; } @@ -379,12 +379,12 @@ } } - DPRINT("Send a key\n"); + TRACE_(I8042PRT, "Send a key\n"); if (!DeviceExtension->KeyboardData.ClassService) return; - DPRINT("Sending %lu key(s)\n", KeysInBufferCopy); + INFO_(I8042PRT, "Sending %lu key(s)\n", KeysInBufferCopy); (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->KeyboardData.ClassService)( DeviceExtension->KeyboardData.ClassDeviceObject, DeviceExtension->KeyboardBuffer, @@ -418,7 +418,7 @@ { /* Part of GUID_DEVICE_SYS_BUTTON interface */ PULONG pCaps; - DPRINT("IOCTL_GET_SYS_BUTTON_CAPS\n"); + TRACE_(I8042PRT, "IOCTL_GET_SYS_BUTTON_CAPS\n"); if (Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(ULONG)) Status = STATUS_INVALID_PARAMETER; @@ -436,7 +436,7 @@ { /* Part of GUID_DEVICE_SYS_BUTTON interface */ PIRP WaitingIrp; - DPRINT("IOCTL_GET_SYS_BUTTON_EVENT\n"); + TRACE_(I8042PRT, "IOCTL_GET_SYS_BUTTON_EVENT\n"); if (Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(ULONG)) Status = STATUS_INVALID_PARAMETER; @@ -450,7 +450,7 @@ if (WaitingIrp) { /* Unable to have a 2nd pending IRP for this IOCTL */ - DPRINT1("Unable to pend a second IRP for IOCTL_GET_SYS_BUTTON_EVENT\n"); + WARN_(I8042PRT, "Unable to pend a second IRP for IOCTL_GET_SYS_BUTTON_EVENT\n"); Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -470,7 +470,7 @@ } else { - DPRINT("Pending IOCTL_GET_SYS_BUTTON_EVENT\n"); + TRACE_(I8042PRT, "Pending IOCTL_GET_SYS_BUTTON_EVENT\n"); Status = STATUS_PENDING; Irp->IoStatus.Status = Status; IoMarkIrpPending(Irp); @@ -482,7 +482,7 @@ } default: { - DPRINT("IRP_MJ_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", + ERR_(I8042PRT, "IRP_MJ_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); @@ -522,7 +522,7 @@ PIO_WORKITEM WorkItem = NULL; PI8042_HOOK_WORKITEM WorkItemData = NULL; - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_KEYBOARD_CONNECT\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_KEYBOARD_CONNECT\n"); if (Stack->Parameters.DeviceIoControl.InputBufferLength != sizeof(CONNECT_DATA)) { Status = STATUS_INVALID_PARAMETER; @@ -536,7 +536,7 @@ WorkItem = IoAllocateWorkItem(DeviceObject); if (!WorkItem) { - DPRINT("IoAllocateWorkItem() failed\n"); + WARN_(I8042PRT, "IoAllocateWorkItem() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } @@ -546,7 +546,7 @@ I8042PRT_TAG); if (!WorkItemData) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -562,7 +562,7 @@ I8042PRT_TAG); if (!DeviceExtension->KeyboardBuffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -574,14 +574,14 @@ DeviceExtension->PowerWorkItem = IoAllocateWorkItem(DeviceObject); if (!DeviceExtension->PowerWorkItem) { - DPRINT("IoAllocateWorkItem() failed\n"); + WARN_(I8042PRT, "IoAllocateWorkItem() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } DeviceExtension->DebugWorkItem = IoAllocateWorkItem(DeviceObject); if (!DeviceExtension->DebugWorkItem) { - DPRINT("IoAllocateWorkItem() failed\n"); + WARN_(I8042PRT, "IoAllocateWorkItem() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } @@ -614,7 +614,7 @@ } case IOCTL_INTERNAL_KEYBOARD_DISCONNECT: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_KEYBOARD_DISCONNECT\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_KEYBOARD_DISCONNECT\n"); /* MSDN says that operation is to implemented. * To implement it, we just have to do: * DeviceExtension->KeyboardData.ClassService = NULL; @@ -624,14 +624,14 @@ } case IOCTL_INTERNAL_I8042_HOOK_KEYBOARD: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_I8042_HOOK_KEYBOARD\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_I8042_HOOK_KEYBOARD\n"); /* Nothing to do here */ Status = STATUS_SUCCESS; break; } case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION\n"); /* We should check the UnitID, but it's kind of pointless as * all keyboards are supposed to have the same one @@ -653,7 +653,7 @@ } case IOCTL_KEYBOARD_QUERY_INDICATORS: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_INDICATORS\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_INDICATORS\n"); if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { @@ -672,7 +672,7 @@ } case IOCTL_KEYBOARD_SET_INDICATORS: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_SET_INDICATORS\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_SET_INDICATORS\n"); if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { @@ -692,7 +692,7 @@ } default: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", + ERR_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); @@ -765,7 +765,7 @@ Status = i8042ReadStatus(PortDeviceExtension, &PortStatus); if (!NT_SUCCESS(Status)) { - DPRINT("i8042ReadStatus() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "i8042ReadStatus() failed with status 0x%08lx\n", Status); return FALSE; } Status = i8042ReadKeyboardData(PortDeviceExtension, &Output); @@ -776,11 +776,11 @@ } if (Counter == 0) { - DPRINT("Spurious i8042 keyboard interrupt\n"); + WARN_(I8042PRT, "Spurious i8042 keyboard interrupt\n"); return FALSE; } - DPRINT("Got: 0x%02x\n", Output); + INFO_(I8042PRT, "Got: 0x%02x\n", Output); if (PortDeviceExtension->Settings.CrashOnCtrlScroll) { @@ -806,14 +806,14 @@ { if (PortDeviceExtension->PacketComplete) { - DPRINT("Packet complete\n"); + TRACE_(I8042PRT, "Packet complete\n"); KeInsertQueueDpc(&DeviceExtension->DpcKeyboard, NULL, NULL); } - DPRINT("Irq eaten by packet\n"); + TRACE_(I8042PRT, "Irq eaten by packet\n"); return TRUE; } - DPRINT("Irq is keyboard input\n"); + TRACE_(I8042PRT, "Irq is keyboard input\n"); if (DeviceExtension->KeyboardScanState == Normal) { Modified: trunk/reactos/drivers/input/i8042prt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mis… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/misc.c (original) +++ trunk/reactos/drivers/input/i8042prt/misc.c Mon Dec 17 00:12:54 2007 @@ -12,45 +12,19 @@ /* FUNCTIONS *****************************************************************/ -static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; - -static NTSTATUS NTAPI -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - NTSTATUS NTAPI ForwardIrpAndWait( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PDEVICE_OBJECT LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - KEVENT Event; - NTSTATUS Status; ASSERT(LowerDevice); - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); + if (!IoForwardIrpSynchronously(LowerDevice, Irp)) + return STATUS_UNSUCCESSFUL; - DPRINT("Calling lower device %p\n", LowerDevice); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; + return Irp->IoStatus.Status; } NTSTATUS NTAPI Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c Mon Dec 17 00:12:54 2007 @@ -50,11 +50,11 @@ DeviceExtension->MouseInBuffer++; if (DeviceExtension->MouseInBuffer > DeviceExtension->Common.PortDeviceExtension->Settings.MouseDataQueueSize) { - DPRINT1("Mouse buffer overflow\n"); + WARN_(I8042PRT, "Mouse buffer overflow\n"); DeviceExtension->MouseInBuffer--; } - DPRINT("Irq completes mouse packet\n"); + TRACE_(I8042PRT, "Irq completes mouse packet\n"); KeInsertQueueDpc(&DeviceExtension->DpcMouse, NULL, NULL); } @@ -75,7 +75,7 @@ * might be lucky and get in sync again */ if (!(Output & 8)) { - DPRINT1("Bad input, dropping..\n"); + WARN_(I8042PRT, "Bad input, dropping..\n"); return; } @@ -172,7 +172,7 @@ break; default: - DPRINT1("Unexpected state 0x%u!\n", DeviceExtension->MouseState); + ERR_(I8042PRT, "Unexpected state 0x%u!\n", DeviceExtension->MouseState); ASSERT(FALSE); } } @@ -202,7 +202,7 @@ (((~(NewButtonData)) << 1) & (ButtonDiff << 1)) | (MouseInput->RawButtons & 0xfc00); - DPRINT("Left raw/up/down: %u/%u/%u\n", + INFO_(I8042PRT, "Left raw/up/down: %u/%u/%u\n", MouseInput->RawButtons & MOUSE_LEFT_BUTTON_DOWN, MouseInput->ButtonFlags & MOUSE_LEFT_BUTTON_DOWN, MouseInput->ButtonFlags & MOUSE_LEFT_BUTTON_UP); @@ -291,12 +291,12 @@ KeReleaseInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt, Irql); - DPRINT("Send a mouse packet\n"); + TRACE_(I8042PRT, "Send a mouse packet\n"); if (!DeviceExtension->MouseData.ClassService) return; - DPRINT("Sending %lu mouse move(s)\n", MouseInBufferCopy); + INFO_(I8042PRT, "Sending %lu mouse move(s)\n", MouseInBufferCopy); (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->MouseData.ClassService)( DeviceExtension->MouseData.ClassDeviceObject, DeviceExtension->MouseBuffer, @@ -333,7 +333,7 @@ Irql = KeAcquireInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt); - DPRINT1("Mouse initialization timeout! (substate %x). Disabling mouse.\n", + WARN_(I8042PRT, "Mouse initialization timeout! (substate %x). Disabling mouse.\n", DeviceExtension->MouseResetState); i8042Flush(PortDeviceExtension); @@ -369,7 +369,7 @@ PIO_WORKITEM WorkItem = NULL; PI8042_HOOK_WORKITEM WorkItemData = NULL; - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_CONNECT\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_CONNECT\n"); if (Stack->Parameters.DeviceIoControl.InputBufferLength != sizeof(CONNECT_DATA)) { Status = STATUS_INVALID_PARAMETER; @@ -383,7 +383,7 @@ WorkItem = IoAllocateWorkItem(DeviceObject); if (!WorkItem) { - DPRINT("IoAllocateWorkItem() failed\n"); + WARN_(I8042PRT, "IoAllocateWorkItem() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } @@ -393,7 +393,7 @@ I8042PRT_TAG); if (!WorkItemData) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -409,7 +409,7 @@ I8042PRT_TAG); if (!DeviceExtension->MouseBuffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -452,7 +452,7 @@ } case IOCTL_INTERNAL_MOUSE_DISCONNECT: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_DISCONNECT\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_DISCONNECT\n"); /* MSDN says that operation is to implemented. * To implement it, we just have to do: * DeviceExtension->MouseData.ClassService = NULL; @@ -462,14 +462,14 @@ } case IOCTL_INTERNAL_I8042_HOOK_MOUSE: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_I8042_HOOK_MOUSE\n"); + TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_I8042_HOOK_MOUSE\n"); /* Nothing to do here */ Status = STATUS_SUCCESS; break; } default: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", + ERR_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); @@ -509,7 +509,7 @@ if (Now.QuadPart - DeviceExtension->MousePacketStartTime.QuadPart > DeviceExtension->Common.PortDeviceExtension->Settings.MouseSynchIn100ns) { - DPRINT("Mouse input packet timeout\n"); + WARN_(I8042PRT, "Mouse input packet timeout\n"); DeviceExtension->MouseState = MouseIdle; } } @@ -588,7 +588,7 @@ { PortDeviceExtension->Flags &= ~MOUSE_PRESENT; DeviceExtension->MouseState = MouseIdle; - DPRINT("Mouse returned bad reset reply: %x (expected aa)\n", Value); + WARN_(I8042PRT, "Mouse returned bad reset reply: %x (expected aa)\n", Value); } return TRUE; case ExpectingResetId: @@ -602,7 +602,7 @@ { PortDeviceExtension->Flags &= ~MOUSE_PRESENT; DeviceExtension->MouseState = MouseIdle; - DPRINT1("Mouse returned bad reset reply part two: %x (expected 0)\n", Value); + WARN_(I8042PRT, "Mouse returned bad reset reply part two: %x (expected 0)\n", Value); } return TRUE; case ExpectingGetDeviceIdACK: @@ -614,7 +614,7 @@ { DeviceExtension->MouseResetState++; /* Act as if 00 (normal mouse) was received */ - DPRINT("Mouse doesn't support 0xd2, (returns %x, expected %x), faking\n", Value, MOUSE_ACK); + WARN_(I8042PRT, "Mouse doesn't support 0xd2, (returns %x, expected %x), faking\n", Value, MOUSE_ACK); i8042MouResetIsr(DeviceExtension, Status, 0); } return TRUE; @@ -787,7 +787,7 @@ DeviceExtension->MouseHook.IsrWritePort( DeviceExtension->MouseHook.CallContext, (UCHAR)(PortDeviceExtension->Settings.MouseResolution & 0xff)); - DPRINT("Mouse resolution %lu\n", + INFO_(I8042PRT, "Mouse resolution %lu\n", PortDeviceExtension->Settings.MouseResolution); DeviceExtension->MouseResetState = ExpectingFinalResolutionValueACK; return TRUE; @@ -798,11 +798,11 @@ case ExpectingEnableACK: DeviceExtension->MouseState = MouseIdle; DeviceExtension->MouseTimeoutState = TimeoutCancel; - DPRINT("Mouse type = %u\n", DeviceExtension->MouseType); + INFO_(I8042PRT, "Mouse type = %u\n", DeviceExtension->MouseType); return TRUE; default: if (DeviceExtension->MouseResetState < 100 || DeviceExtension->MouseResetState > 999) - DPRINT1("MouseResetState went out of range: %lu\n", DeviceExtension->MouseResetState); + ERR_(I8042PRT, "MouseResetState went out of range: %lu\n", DeviceExtension->MouseResetState); return FALSE; } } @@ -827,7 +827,7 @@ Status = i8042ReadStatus(PortDeviceExtension, &PortStatus); if (!NT_SUCCESS(Status)) { - DPRINT("i8042ReadStatus() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "i8042ReadStatus() failed with status 0x%08lx\n", Status); return FALSE; } Status = i8042ReadMouseData(PortDeviceExtension, &Output); @@ -838,30 +838,30 @@ } if (Counter == 0) { - DPRINT("Spurious i8042 mouse interrupt\n"); + WARN_(I8042PRT, "Spurious i8042 mouse interrupt\n"); return FALSE; } - DPRINT("Got: 0x%02x\n", Output); + INFO_(I8042PRT, "Got: 0x%02x\n", Output); if (i8042PacketIsr(PortDeviceExtension, Output)) { if (PortDeviceExtension->PacketComplete) { - DPRINT("Packet complete\n"); + TRACE_(I8042PRT, "Packet complete\n"); KeInsertQueueDpc(&DeviceExtension->DpcMouse, NULL, NULL); } - DPRINT("Irq eaten by packet\n"); + TRACE_(I8042PRT, "Irq eaten by packet\n"); return TRUE; } - DPRINT("Irq is mouse input\n"); + TRACE_(I8042PRT, "Irq is mouse input\n"); i8042MouInputTestTimeout(DeviceExtension); if (i8042MouResetIsr(DeviceExtension, PortStatus, Output)) { - DPRINT("Handled by ResetIsr or hooked Isr\n"); + TRACE_(I8042PRT, "Handled by ResetIsr or hooked Isr\n"); if (NoChange != DeviceExtension->MouseTimeoutState) { KeInsertQueueDpc(&DeviceExtension->DpcMouse, NULL, NULL); } @@ -1035,10 +1035,10 @@ if (TestMouse(DeviceExtension)) { - DPRINT("Detected Mouse\n"); + TRACE_(I8042PRT, "Detected Mouse\n"); if (SendCommand(DeviceExtension, NULL, PSMOUSE_CMD_ENABLE)) - DPRINT1("Failed to enable mouse!\n"); + WARN_(I8042PRT, "Failed to enable mouse!\n"); } return TRUE; Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Mon Dec 17 00:12:54 2007 @@ -41,14 +41,14 @@ if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, KBD_READ_MODE)) { - DPRINT1("Can't read i8042 mode\n"); + WARN_(I8042PRT, "Can't read i8042 mode\n"); return FALSE; } Status = i8042ReadDataWait(DeviceExtension, &Value); if (!NT_SUCCESS(Status)) { - DPRINT1("No response after read i8042 mode\n"); + WARN_(I8042PRT, "No response after read i8042 mode\n"); return FALSE; } @@ -57,13 +57,13 @@ if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, KBD_WRITE_MODE)) { - DPRINT1("Can't set i8042 mode\n"); + WARN_(I8042PRT, "Can't set i8042 mode\n"); return FALSE; } if (!i8042Write(DeviceExtension, DeviceExtension->DataPort, Value)) { - DPRINT1("Can't send i8042 mode\n"); + WARN_(I8042PRT, "Can't send i8042 mode\n"); return FALSE; } @@ -85,20 +85,20 @@ if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_SELF_TEST)) { - DPRINT1("Writing CTRL_SELF_TEST command failed\n"); + WARN_(I8042PRT, "Writing CTRL_SELF_TEST command failed\n"); return STATUS_IO_TIMEOUT; } Status = i8042ReadDataWait(DeviceExtension, &Value); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to read CTRL_SELF_TEST response, status 0x%08lx\n", Status); + WARN_(I8042PRT, "Failed to read CTRL_SELF_TEST response, status 0x%08lx\n", Status); return Status; } if (Value != 0x55) { - DPRINT1("Got 0x%02x instead of 0x55\n", Value); + WARN_(I8042PRT, "Got 0x%02x instead of 0x55\n", Value); return STATUS_IO_DEVICE_ERROR; } @@ -136,13 +136,13 @@ Status = i8042SynchWritePort(DeviceExtension, 0, 0, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT("Can't finish SET_LEDS (0x%08lx)\n", Status); + WARN_(I8042PRT, "Can't finish SET_LEDS (0x%08lx)\n", Status); return FALSE; } } else { - DPRINT("Warning: can't write SET_LEDS (0x%08lx)\n", Status); + WARN_(I8042PRT, "Warning: can't write SET_LEDS (0x%08lx)\n", Status); } /* Turn on translation and SF (Some machines don't reboot if SF is not set) */ @@ -167,7 +167,7 @@ if (!i8042Write(DeviceExtension, DeviceExtension->ControlPort, CTRL_WRITE_MOUSE) ||!i8042Write(DeviceExtension, DeviceExtension->DataPort, MOU_CMD_RESET)) { - DPRINT1("Failed to write reset command to mouse\n"); + WARN_(I8042PRT, "Failed to write reset command to mouse\n"); goto cleanup; } @@ -184,12 +184,12 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("No ACK after mouse reset, status 0x%08lx\n", Status); + WARN_(I8042PRT, "No ACK after mouse reset, status 0x%08lx\n", Status); goto cleanup; } else if (Value != ExpectedReply[ReplyByte]) { - DPRINT1("Unexpected reply: 0x%02x (expected 0x%02x)\n", + WARN_(I8042PRT, "Unexpected reply: 0x%02x (expected 0x%02x)\n", Value, ExpectedReply[ReplyByte]); goto cleanup; } @@ -210,7 +210,7 @@ i8042Flush(DeviceExtension); } - DPRINT("Mouse %sdetected\n", Ok ? "" : "not "); + INFO_(I8042PRT, "Mouse %sdetected\n", Ok ? "" : "not "); return Ok; } @@ -223,24 +223,24 @@ KIRQL DirqlMax; NTSTATUS Status; - DPRINT("i8042ConnectKeyboardInterrupt()\n"); + TRACE_(I8042PRT, "i8042ConnectKeyboardInterrupt()\n"); PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension; DirqlMax = MAX( PortDeviceExtension->KeyboardInterrupt.Dirql, PortDeviceExtension->MouseInterrupt.Dirql); - DPRINT("KeyboardInterrupt.Vector %lu\n", + INFO_(I8042PRT, "KeyboardInterrupt.Vector %lu\n", PortDeviceExtension->KeyboardInterrupt.Vector); - DPRINT("KeyboardInterrupt.Dirql %lu\n", + INFO_(I8042PRT, "KeyboardInterrupt.Dirql %lu\n", PortDeviceExtension->KeyboardInterrupt.Dirql); - DPRINT("KeyboardInterrupt.DirqlMax %lu\n", + INFO_(I8042PRT, "KeyboardInterrupt.DirqlMax %lu\n", DirqlMax); - DPRINT("KeyboardInterrupt.InterruptMode %s\n", + INFO_(I8042PRT, "KeyboardInterrupt.InterruptMode %s\n", PortDeviceExtension->KeyboardInterrupt.InterruptMode == LevelSensitive ? "LevelSensitive" : "Latched"); - DPRINT("KeyboardInterrupt.ShareInterrupt %s\n", + INFO_(I8042PRT, "KeyboardInterrupt.ShareInterrupt %s\n", PortDeviceExtension->KeyboardInterrupt.ShareInterrupt ? "yes" : "no"); - DPRINT("KeyboardInterrupt.Affinity 0x%lx\n", + INFO_(I8042PRT, "KeyboardInterrupt.Affinity 0x%lx\n", PortDeviceExtension->KeyboardInterrupt.Affinity); Status = IoConnectInterrupt( &PortDeviceExtension->KeyboardInterrupt.Object, @@ -251,7 +251,7 @@ PortDeviceExtension->KeyboardInterrupt.Affinity, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("IoConnectInterrupt() failed with status 0x%08x\n", Status); + WARN_(I8042PRT, "IoConnectInterrupt() failed with status 0x%08x\n", Status); return Status; } @@ -269,7 +269,7 @@ KIRQL DirqlMax; NTSTATUS Status; - DPRINT("i8042ConnectMouseInterrupt()\n"); + TRACE_(I8042PRT, "i8042ConnectMouseInterrupt()\n"); Status = i8042MouInitialize(DeviceExtension); if (!NT_SUCCESS(Status)) @@ -280,17 +280,17 @@ PortDeviceExtension->KeyboardInterrupt.Dirql, PortDeviceExtension->MouseInterrupt.Dirql); - DPRINT("MouseInterrupt.Vector %lu\n", + INFO_(I8042PRT, "MouseInterrupt.Vector %lu\n", PortDeviceExtension->MouseInterrupt.Vector); - DPRINT("MouseInterrupt.Dirql %lu\n", + INFO_(I8042PRT, "MouseInterrupt.Dirql %lu\n", PortDeviceExtension->MouseInterrupt.Dirql); - DPRINT("MouseInterrupt.DirqlMax %lu\n", + INFO_(I8042PRT, "MouseInterrupt.DirqlMax %lu\n", DirqlMax); - DPRINT("MouseInterrupt.InterruptMode %s\n", + INFO_(I8042PRT, "MouseInterrupt.InterruptMode %s\n", PortDeviceExtension->MouseInterrupt.InterruptMode == LevelSensitive ? "LevelSensitive" : "Latched"); - DPRINT("MouseInterrupt.ShareInterrupt %s\n", + INFO_(I8042PRT, "MouseInterrupt.ShareInterrupt %s\n", PortDeviceExtension->MouseInterrupt.ShareInterrupt ? "yes" : "no"); - DPRINT("MouseInterrupt.Affinity 0x%lx\n", + INFO_(I8042PRT, "MouseInterrupt.Affinity 0x%lx\n", PortDeviceExtension->MouseInterrupt.Affinity); Status = IoConnectInterrupt( &PortDeviceExtension->MouseInterrupt.Object, @@ -301,7 +301,7 @@ PortDeviceExtension->MouseInterrupt.Affinity, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("IoConnectInterrupt() failed with status 0x%08x\n", Status); + WARN_(I8042PRT, "IoConnectInterrupt() failed with status 0x%08x\n", Status); goto cleanup; } @@ -378,21 +378,21 @@ if (!(DeviceExtension->Flags & (KEYBOARD_PRESENT | MOUSE_PRESENT))) { /* Try to detect them */ - DPRINT("Check if the controller is really a i8042\n"); + TRACE_(I8042PRT, "Check if the controller is really a i8042\n"); Status = i8042BasicDetect(DeviceExtension); if (!NT_SUCCESS(Status)) { - DPRINT("i8042BasicDetect() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "i8042BasicDetect() failed with status 0x%08lx\n", Status); return STATUS_UNSUCCESSFUL; } - DPRINT("Detecting keyboard\n"); + TRACE_(I8042PRT, "Detecting keyboard\n"); if (!i8042DetectKeyboard(DeviceExtension)) return STATUS_UNSUCCESSFUL; - DPRINT("Detecting mouse\n"); + TRACE_(I8042PRT, "Detecting mouse\n"); if (!i8042DetectMouse(DeviceExtension)) return STATUS_UNSUCCESSFUL; - DPRINT("Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); - DPRINT("Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO"); + INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); + INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO"); } /* Connect interrupts */ @@ -468,7 +468,7 @@ ULONG i; NTSTATUS Status; - DPRINT("i8042PnpStartDevice(%p)\n", DeviceObject); + TRACE_(I8042PRT, "i8042PnpStartDevice(%p)\n", DeviceObject); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; PortDeviceExtension = DeviceExtension->PortDeviceExtension; @@ -476,12 +476,12 @@ if (!AllocatedResources) { - DPRINT("No allocated resources sent to driver\n"); + WARN_(I8042PRT, "No allocated resources sent to driver\n"); return STATUS_INSUFFICIENT_RESOURCES; } if (AllocatedResources->Count != 1) { - DPRINT("Wrong number of allocated resources sent to driver\n"); + WARN_(I8042PRT, "Wrong number of allocated resources sent to driver\n"); return STATUS_INSUFFICIENT_RESOURCES; } if (AllocatedResources->List[0].PartialResourceList.Version != 1 @@ -489,7 +489,7 @@ || AllocatedResourcesTranslated->List[0].PartialResourceList.Version != 1 || AllocatedResourcesTranslated->List[0].PartialResourceList.Revision != 1) { - DPRINT("Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", + WARN_(I8042PRT, "Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", AllocatedResources->List[0].PartialResourceList.Version, AllocatedResources->List[0].PartialResourceList.Revision, AllocatedResourcesTranslated->List[0].PartialResourceList.Version, @@ -515,23 +515,23 @@ if (!FoundDataPort) { PortDeviceExtension->DataPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart); - DPRINT("Found data port: %p\n", PortDeviceExtension->DataPort); + INFO_(I8042PRT, "Found data port: %p\n", PortDeviceExtension->DataPort); FoundDataPort = TRUE; } else if (!FoundControlPort) { PortDeviceExtension->ControlPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart); - DPRINT("Found control port: %p\n", PortDeviceExtension->ControlPort); + INFO_(I8042PRT, "Found control port: %p\n", PortDeviceExtension->ControlPort); FoundControlPort = TRUE; } else { - DPRINT("Too much I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length); + WARN_(I8042PRT, "Too much I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length); return STATUS_INVALID_PARAMETER; } } else - DPRINT1("Invalid I/O range length: 0x%lx\n", ResourceDescriptor->u.Port.Length); + WARN_(I8042PRT, "Invalid I/O range length: 0x%lx\n", ResourceDescriptor->u.Port.Length); break; } case CmResourceTypeInterrupt: @@ -546,28 +546,28 @@ else InterruptData.InterruptMode = LevelSensitive; InterruptData.ShareInterrupt = (ResourceDescriptorTranslated->ShareDisposition == CmResourceShareShared); - DPRINT("Found irq resource: %lu\n", ResourceDescriptor->u.Interrupt.Level); + INFO_(I8042PRT, "Found irq resource: %lu\n", ResourceDescriptor->u.Interrupt.Level); FoundIrq = TRUE; break; } default: - DPRINT("Unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); + WARN_(I8042PRT, "Unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type); } } if (!FoundIrq) { - DPRINT("Interrupt resource was not found in allocated resources list\n"); + WARN_(I8042PRT, "Interrupt resource was not found in allocated resources list\n"); return STATUS_INSUFFICIENT_RESOURCES; } else if (DeviceExtension->Type == Keyboard && (!FoundDataPort || !FoundControlPort)) { - DPRINT("Some required resources were not found in allocated resources list\n"); + WARN_(I8042PRT, "Some required resources were not found in allocated resources list\n"); return STATUS_INSUFFICIENT_RESOURCES; } else if (DeviceExtension->Type == Mouse && (FoundDataPort || FoundControlPort)) { - DPRINT("Too much resources were provided in allocated resources list\n"); + WARN_(I8042PRT, "Too much resources were provided in allocated resources list\n"); return STATUS_INVALID_PARAMETER; } @@ -595,7 +595,7 @@ } default: { - DPRINT1("Unknown FDO type %u\n", DeviceExtension->Type); + ERR_(I8042PRT, "Unknown FDO type %u\n", DeviceExtension->Type); ASSERT(FALSE); Status = STATUS_INVALID_DEVICE_REQUEST; } @@ -626,7 +626,7 @@ { case IRP_MN_START_DEVICE: /* 0x00 */ { - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); /* Call lower driver (if any) */ if (DeviceType != PhysicalDeviceObject) @@ -650,7 +650,7 @@ { PDEVICE_RELATIONS DeviceRelations; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), I8042PRT_TAG); if (DeviceRelations) { @@ -664,11 +664,11 @@ } case RemovalRelations: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + ERR_(I8042PRT, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); @@ -677,14 +677,14 @@ } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* (optional) 0x0d */ { - DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); /* Nothing to do */ Status = Irp->IoStatus.Status; break; } default: { - DPRINT1("IRP_MJ_PNP / unknown minor function 0x%x\n", MinorFunction); + ERR_(I8042PRT, "IRP_MJ_PNP / unknown minor function 0x%x\n", MinorFunction); ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); } Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/ps2… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/ps2pp.c (original) +++ trunk/reactos/drivers/input/i8042prt/ps2pp.c Mon Dec 17 00:12:54 2007 @@ -88,7 +88,7 @@ (((DeviceExtension->MouseLogiBuffer[1] & 0x0C) >> 2) != (DeviceExtension->MouseLogiBuffer[2] & 0x03))) { - DPRINT1("Ps2pp packet fails sanity checks\n"); + WARN_(I8042PRT, "Ps2pp packet fails sanity checks\n"); return; } @@ -133,6 +133,6 @@ } default: - DPRINT1("Unexpected input state for ps2pp!\n"); + WARN_(I8042PRT, "Unexpected input state for ps2pp!\n"); } } Modified: trunk/reactos/drivers/input/i8042prt/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/rea… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/readwrite.c (original) +++ trunk/reactos/drivers/input/i8042prt/readwrite.c Mon Dec 17 00:12:54 2007 @@ -22,7 +22,7 @@ UCHAR Ignore; while (NT_SUCCESS(i8042ReadData(DeviceExtension, KBD_OBF | MOU_OBF, &Ignore))) { - DPRINT("Data flushed\n"); /* drop */ + INFO_(I8042PRT, "Data flushed\n"); /* drop */ } } @@ -59,7 +59,7 @@ if (PortStatus & StatusFlags) { *Data = READ_PORT_UCHAR(DeviceExtension->DataPort); - DPRINT("Read: 0x%02x (status: 0x%x)\n", Data[0], PortStatus); + INFO_(I8042PRT, "Read: 0x%02x (status: 0x%x)\n", Data[0], PortStatus); // If the data is valid (not timeout, not parity error) if ((PortStatus & KBD_PERR) == 0) @@ -146,13 +146,13 @@ if (Port) if (!i8042Write(DeviceExtension, DeviceExtension->DataPort, Port)) { - DPRINT1("Failed to write Port\n"); + WARN_(I8042PRT, "Failed to write Port\n"); return STATUS_IO_TIMEOUT; } if (!i8042Write(DeviceExtension, DeviceExtension->DataPort, Value)) { - DPRINT1("Failed to write Value\n"); + WARN_(I8042PRT, "Failed to write Value\n"); return STATUS_IO_TIMEOUT; } @@ -161,19 +161,19 @@ Status = i8042ReadDataWait(DeviceExtension, &Ack); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to read Ack\n"); + WARN_(I8042PRT, "Failed to read Ack\n"); return Status; } if (Ack == KBD_ACK) return STATUS_SUCCESS; else if (Ack == KBD_RESEND) - DPRINT("i8042 asks for a data resend\n"); + INFO_(I8042PRT, "i8042 asks for a data resend\n"); } else { return STATUS_SUCCESS; } - DPRINT("Reiterating\n"); + TRACE_(I8042PRT, "Reiterating\n"); ResendIterations--; } while (ResendIterations); @@ -205,7 +205,7 @@ if (ResendIterations) { WRITE_PORT_UCHAR(addr, data); - DPRINT("Sent 0x%x to port %p\n", data, addr); + INFO_(I8042PRT, "Sent 0x%x to port %p\n", data, addr); return TRUE; } return FALSE; Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c Mon Dec 17 00:12:54 2007 @@ -200,7 +200,7 @@ if (!RtlCreateUnicodeString(&Settings->KeyboardDeviceBaseName, DefaultKeyboardDeviceBaseName) || !RtlCreateUnicodeString(&Settings->PointerDeviceBaseName, DefaultPointerDeviceBaseName)) { - DPRINT("RtlCreateUnicodeString() failed\n"); + WARN_(I8042PRT, "RtlCreateUnicodeString() failed\n"); Status = STATUS_NO_MEMORY; } else @@ -211,20 +211,20 @@ if (NT_SUCCESS(Status)) { - DPRINT("KeyboardDataQueueSize : 0x%lx\n", Settings->KeyboardDataQueueSize); - DPRINT("KeyboardDeviceBaseName : %wZ\n", &Settings->KeyboardDeviceBaseName); - DPRINT("MouseDataQueueSize : 0x%lx\n", Settings->MouseDataQueueSize); - DPRINT("MouseResolution : 0x%lx\n", Settings->MouseResolution); - DPRINT("MouseSynchIn100ns : %lu\n", Settings->MouseSynchIn100ns); - DPRINT("NumberOfButtons : 0x%lx\n", Settings->NumberOfButtons); - DPRINT("PointerDeviceBaseName : %wZ\n", &Settings->PointerDeviceBaseName); - DPRINT("PollStatusIterations : 0x%lx\n", Settings->PollStatusIterations); - DPRINT("OverrideKeyboardType : 0x%lx\n", Settings->OverrideKeyboardType); - DPRINT("OverrideKeyboardSubtype : 0x%lx\n", Settings->OverrideKeyboardSubtype); - DPRINT("PollingIterations : 0x%lx\n", Settings->PollingIterations); - DPRINT("PollingIterationsMaximum : %lu\n", Settings->PollingIterationsMaximum); - DPRINT("ResendIterations : 0x%lx\n", Settings->ResendIterations); - DPRINT("SampleRate : %lu\n", Settings->SampleRate); + INFO_(I8042PRT, "KeyboardDataQueueSize : 0x%lx\n", Settings->KeyboardDataQueueSize); + INFO_(I8042PRT, "KeyboardDeviceBaseName : %wZ\n", &Settings->KeyboardDeviceBaseName); + INFO_(I8042PRT, "MouseDataQueueSize : 0x%lx\n", Settings->MouseDataQueueSize); + INFO_(I8042PRT, "MouseResolution : 0x%lx\n", Settings->MouseResolution); + INFO_(I8042PRT, "MouseSynchIn100ns : %lu\n", Settings->MouseSynchIn100ns); + INFO_(I8042PRT, "NumberOfButtons : 0x%lx\n", Settings->NumberOfButtons); + INFO_(I8042PRT, "PointerDeviceBaseName : %wZ\n", &Settings->PointerDeviceBaseName); + INFO_(I8042PRT, "PollStatusIterations : 0x%lx\n", Settings->PollStatusIterations); + INFO_(I8042PRT, "OverrideKeyboardType : 0x%lx\n", Settings->OverrideKeyboardType); + INFO_(I8042PRT, "OverrideKeyboardSubtype : 0x%lx\n", Settings->OverrideKeyboardSubtype); + INFO_(I8042PRT, "PollingIterations : 0x%lx\n", Settings->PollingIterations); + INFO_(I8042PRT, "PollingIterationsMaximum : %lu\n", Settings->PollingIterationsMaximum); + INFO_(I8042PRT, "ResendIterations : 0x%lx\n", Settings->ResendIterations); + INFO_(I8042PRT, "SampleRate : %lu\n", Settings->SampleRate); } return Status; Modified: trunk/reactos/drivers/input/i8042prt/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/set… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/setup.c (original) +++ trunk/reactos/drivers/input/i8042prt/setup.c Mon Dec 17 00:12:54 2007 @@ -42,7 +42,7 @@ if (hSetupKey != (HANDLE)NULL) ZwClose(hSetupKey); - DPRINT("IsFirstStageSetup() returns %s\n", ret ? "YES" : "NO"); + INFO_(I8042PRT, "IsFirstStageSetup() returns %s\n", ret ? "YES" : "NO"); return ret; } @@ -64,14 +64,14 @@ NTSTATUS Status; Pdo = (PDEVICE_OBJECT)Context; - DPRINT("SendStartDevice(%p)\n", Pdo); + TRACE_(I8042PRT, "SendStartDevice(%p)\n", Pdo); /* Create default resource list */ ResourceListSize = sizeof(CM_RESOURCE_LIST) + 3 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); AllocatedResources = ExAllocatePoolWithTag(PagedPool, ResourceListSize, I8042PRT_TAG); if (!AllocatedResources) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -105,7 +105,7 @@ AllocatedResourcesTranslated = ExAllocatePoolWithTag(PagedPool, ResourceListSize, I8042PRT_TAG); if (!AllocatedResourcesTranslated) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(I8042PRT, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -150,7 +150,7 @@ } if (!NT_SUCCESS(Status)) { - DPRINT("IoCallDriver() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "IoCallDriver() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -180,7 +180,7 @@ Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -189,14 +189,14 @@ Status = ZwCreateKey(&hPortKey, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); if (!NT_SUCCESS(Status)) { - DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "ZwCreateKey() failed with status 0x%08lx\n", Status); goto cleanup; } Status = ZwSetValueKey(hPortKey, DeviceName, 0, REG_SZ, (PVOID)RegistryPath, wcslen(RegistryPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!NT_SUCCESS(Status)) { - DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "ZwSetValueKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -220,7 +220,7 @@ PDEVICE_OBJECT Pdo = NULL; NTSTATUS Status; - DPRINT("i8042AddLegacyKeyboard()\n"); + TRACE_(I8042PRT, "i8042AddLegacyKeyboard()\n"); /* Create a named PDO */ Status = IoCreateDevice( @@ -233,7 +233,7 @@ &Pdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -247,7 +247,7 @@ Status = i8042AddDevice(DriverObject, Pdo); if (!NT_SUCCESS(Status)) { - DPRINT("i8042AddDevice() failed with status 0x%08lx\n", Status); + WARN_(I8042PRT, "i8042AddDevice() failed with status 0x%08lx\n", Status); goto cleanup; }

1 0

[hpoussin] 31286: Use kernel facilities to change debug level at runtime
by hpoussin＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: hpoussin Date: Mon Dec 17 00:00:44 2007 New Revision: 31286 URL: http://svn.reactos.org/svn/reactos?rev=31286&view=rev Log: Use kernel facilities to change debug level at runtime Modified: trunk/reactos/drivers/network/tcpip/include/debug.h trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/include/ddk/winddk.h trunk/reactos/lib/drivers/ip/network/routines.c Modified: trunk/reactos/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/debug.h (original) +++ trunk/reactos/drivers/network/tcpip/include/debug.h Mon Dec 17 00:00:44 2007 @@ -9,11 +9,9 @@ #ifndef __DEBUG_H #define __DEBUG_H -#define NORMAL_MASK 0x000000FF -#define SPECIAL_MASK 0xFFFFFF00 -#define MIN_TRACE 0x00000001 -#define MID_TRACE 0x00000002 -#define MAX_TRACE 0x00000003 +#define MIN_TRACE DPFLTR_WARNING_LEVEL +#define MID_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL +#define MAX_TRACE DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL #define DEBUG_CHECK 0x00000100 #define DEBUG_MEMORY 0x00000200 @@ -33,33 +31,14 @@ #define DEBUG_CPOINT 0x00800000 #define DEBUG_LOCK 0x01000000 #define DEBUG_INFO 0x02000000 -#define DEBUG_ULTRA 0xFFFFFFFF +#define DEBUG_ULTRA 0x7FFFFFFF #ifdef DBG -extern DWORD DebugTraceLevel; - -#ifdef _MSC_VER - +#define REMOVE_PARENS(...) __VA_ARGS__ #define TI_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ - DbgPrint _x_ ; \ - } - -#else /* _MSC_VER */ - -#define TI_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ - DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x_ ; \ - } - -#endif /* _MSC_VER */ - -#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) + DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, "(%s:%d) ", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_TCPIP_ID, (_t_) & DPFLTR_MASK, REMOVE_PARENS _x_) #else /* DBG */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Mon Dec 17 00:00:44 2007 @@ -419,10 +419,7 @@ } -NTSTATUS -#ifndef _MSC_VER -STDCALL -#endif +NTSTATUS NTAPI TiDispatchInternal( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -526,10 +523,7 @@ } -NTSTATUS -#ifndef _MSC_VER -STDCALL -#endif +NTSTATUS NTAPI TiDispatch( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -687,10 +681,7 @@ } } -NTSTATUS -#ifndef _MSC_VER -STDCALL -#endif +NTSTATUS NTAPI DriverEntry( PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) @@ -870,14 +861,14 @@ DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); + /* ROS Hack: ideally, DebugTraceLevel variable should be removed */ + DbgSetDebugFilterState(DPFLTR_TCPIP_ID, DebugTraceLevel, TRUE); + return STATUS_SUCCESS; } -VOID -#ifndef _MSC_VER -STDCALL -#endif +VOID NTAPI IPAddInterface( DWORD Unknown0, DWORD Unknown1, @@ -889,10 +880,7 @@ } -VOID -#ifndef _MSC_VER -STDCALL -#endif +VOID NTAPI IPDelInterface( DWORD Unknown0) { @@ -900,10 +888,7 @@ } -VOID -#ifndef _MSC_VER -STDCALL -#endif +VOID NTAPI LookupRoute( DWORD Unknown0, DWORD Unknown1) Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Dec 17 00:00:44 2007 @@ -240,7 +240,12 @@ #define DPFLTR_INFO_LEVEL 3 #define DPFLTR_MASK 0x80000000 -#define DPFLTR_PREFETCHER_ID 63 +typedef enum _DPFLTR_TYPE +{ + DPFLTR_I8042PRT_ID = 15, + DPFLTR_TCPIP_ID = 30, + DPFLTR_PREFETCHER_ID = 65, +} DPFLTR_TYPE; #define MAXIMUM_PROCESSORS 32 Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c Mon Dec 17 00:00:44 2007 @@ -94,7 +94,8 @@ UINT Length; PCHAR Buffer; - if ((DebugTraceLevel & (DEBUG_PBUFFER | DEBUG_TCP)) != (DEBUG_PBUFFER | DEBUG_TCP)) { + if (!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) || + !DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_TCP | DPFLTR_MASK)) { return; } @@ -137,7 +138,8 @@ PNDIS_BUFFER NextBuffer; PCHAR CharBuffer; - if ((DebugTraceLevel & (DEBUG_PBUFFER | DEBUG_IP)) != (DEBUG_PBUFFER | DEBUG_IP)) { + if (!DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK) || + !DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK)) { return; }

1 0

[fireball] 31285: - Properly allocate ArcDisk info, so it gets correctly mapped later. Fixes spontaneous INACCESSIBLE_BOOT_DEVICE errors.
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 23:28:29 2007 New Revision: 31285 URL: http://svn.reactos.org/svn/reactos?rev=31285&view=rev Log: - Properly allocate ArcDisk info, so it gets correctly mapped later. Fixes spontaneous INACCESSIBLE_BOOT_DEVICE errors. Modified: branches/winldr/windows/peloader.c branches/winldr/windows/winldr.c Modified: branches/winldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/peloader.c?rev=3… ============================================================================== --- branches/winldr/windows/peloader.c (original) +++ branches/winldr/windows/peloader.c Sun Dec 16 23:28:29 2007 @@ -106,8 +106,14 @@ ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); - DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %S ImportTable = 0x%X\n", - VaToPa(ScanDTE->BaseDllName.Buffer),ImportTable)); + { + UNICODE_STRING BaseName; + BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); + BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; + BaseName.Length = ScanDTE->BaseDllName.Length; + DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", + &BaseName, ImportTable)); + } /* If image doesn't have any import directory - just return success */ if (ImportTable == NULL) Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=312… ============================================================================== --- branches/winldr/windows/winldr.c (original) +++ branches/winldr/windows/winldr.c Sun Dec 16 23:28:29 2007 @@ -29,9 +29,6 @@ extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; extern char reactos_arc_strings[32][256]; -ARC_DISK_SIGNATURE BldrDiskInfo[32]; -CHAR BldrArcNames[32][256]; - BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -138,7 +135,7 @@ PARC_DISK_SIGNATURE ArcDiskInfo; /* Get the ARC structure */ - ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE));//&BldrDiskInfo[i]; + ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE)); RtlZeroMemory(ArcDiskInfo, sizeof(ARC_DISK_SIGNATURE)); /* Copy the data over */ @@ -146,9 +143,9 @@ ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum; /* Copy the ARC Name */ - //ArcDiskInfo->ArcName = (PCHAR)MmAllocateMemory(sizeof(CHAR)*256); - strcpy(BldrArcNames[i], reactos_arc_disk_info[i].ArcName); - ArcDiskInfo->ArcName = (PCHAR)PaToVa(BldrArcNames[i]); + ArcDiskInfo->ArcName = (PCHAR)MmHeapAlloc(sizeof(CHAR)*256); + strcpy(ArcDiskInfo->ArcName, reactos_arc_disk_info[i].ArcName); + ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName); /* Mark partition table as valid */ ArcDiskInfo->ValidPartitionTable = TRUE; @@ -534,7 +531,6 @@ { MemoryDescriptor = CONTAINING_RECORD(NextMd, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - DbgPrint((DPRINT_WINDOWS, "BP %08X PC %04X MT %d\n", MemoryDescriptor->BasePage, MemoryDescriptor->PageCount, MemoryDescriptor->MemoryType));

1 0

[dchapyshev] 31284: - Add some functionality - Small fixes and updates
by dchapyshev＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: dchapyshev Date: Sun Dec 16 23:02:17 2007 New Revision: 31284 URL: http://svn.reactos.org/svn/reactos?rev=31284&view=rev Log: - Add some functionality - Small fixes and updates Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/resources/information.ico trunk/reactos/dll/cpl/input/resources/keyboard.ico trunk/reactos/dll/cpl/input/resources/marker.ico trunk/reactos/dll/cpl/input/resources/microphone.ico trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=31… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Sun Dec 16 23:02:17 2007 @@ -95,36 +95,27 @@ VOID CreateLanguagesList(HWND hWnd) { - TCHAR LangSel[256]; + //TCHAR LangSel[256]; hLanguageList = hWnd; EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); - LoadString(hApplet, - IDS_SELECTED_LANGUAGE, - LangSel, - 256); - - SendMessage(hLanguageList, + /*SendMessage(hLanguageList, CB_SELECTSTRING, (WPARAM) -1, - (LPARAM)LangSel); + (LPARAM)LangSel);*/ } static VOID SelectCurrentLayout(HWND hWnd) { - TCHAR Layout[256]; + //TCHAR Layout[256]; - LoadString(hApplet, - IDS_SELECTED_LAYOUT, - Layout, - 256); - SendMessage(hWnd, + /*SendMessage(hWnd, CB_SELECTSTRING, (WPARAM) -1, - (LPARAM)Layout); + (LPARAM)Layout);*/ } INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc Sun Dec 16 23:02:17 2007 @@ -233,14 +233,19 @@ BEGIN IDS_CPLSYSTEMNAME "Ñëîâåñíè óñëóãè è åçèöè íà âúâåæäàíå" IDS_CPLSYSTEMDESCRIPTION "Íàãëàñÿâàíå íà íàñòðîéêèòå çà åçèöèòå íà âúâåæäàíå." + IDS_KEYBOARD "Keyboard" + IDS_ADV_TEXT_SRV "Advanced Text Services" + IDS_NONE "(None)" + IDS_UNKNOWN "(Unknown)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_SPEECH "Speech" + IDS_HRD_REC "Handwriting Recognition" + IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" + IDS_WHATS_THIS "What's This?" END STRINGTABLE BEGIN - //Selected language on "&Äîáàâÿíå åçèê íà âúâåæäàíå" - IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "&Äîáàâÿíå åçèê íà âúâåæäàíå" - IDS_SELECTED_LAYOUT, "ÑÀÙ- Äâîðàê" IDS_US_LAYOUT, "ÑÀÙ" IDS_BELGIAN_LAYOUT, "Áåëãèéñêà (òî÷êà)" IDS_BELGIAN_FRENCH_LAYOUT, "Áåëãèéñêà çà ôðåíñêè" Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sun Dec 16 23:02:17 2007 @@ -233,14 +233,19 @@ BEGIN IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." + IDS_KEYBOARD "Keyboard" + IDS_ADV_TEXT_SRV "Advanced Text Services" + IDS_NONE "(None)" + IDS_UNKNOWN "(Unknown)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_SPEECH "Speech" + IDS_HRD_REC "Handwriting Recognition" + IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" + IDS_WHATS_THIS "What's This?" END STRINGTABLE BEGIN - //Selected language on "Add Input language" - IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "Add Input language" - IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belgisch (Punkt)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgisch (Wallonisch)" Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sun Dec 16 23:02:17 2007 @@ -233,14 +233,19 @@ BEGIN IDS_CPLSYSTEMNAME "Text Services and Input Languages" IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." + IDS_KEYBOARD "Keyboard" + IDS_ADV_TEXT_SRV "Advanced Text Services" + IDS_NONE "(None)" + IDS_UNKNOWN "(Unknown)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_SPEECH "Speech" + IDS_HRD_REC "Handwriting Recognition" + IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" + IDS_WHATS_THIS "What's This?" END STRINGTABLE BEGIN - //Selected language on "Add Input language" - IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "Add Input language" - IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belgian (Period)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sun Dec 16 23:02:17 2007 @@ -233,16 +233,21 @@ BEGIN IDS_CPLSYSTEMNAME "Services texte et langue de saisie" IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." + IDS_KEYBOARD "Keyboard" + IDS_ADV_TEXT_SRV "Advanced Text Services" + IDS_NONE "(None)" + IDS_UNKNOWN "(Unknown)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_SPEECH "Speech" + IDS_HRD_REC "Handwriting Recognition" + IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" + IDS_WHATS_THIS "What's This?" END /* FIXME : To improve/complete */ /* FIXME : À améliorer/compléter */ STRINGTABLE BEGIN - //Selected language on "Add Input language" - IDS_SELECTED_LANGUAGE "Anglais (États-Unis)" - //Selected keyboard layout on "Add Input language" - IDS_SELECTED_LAYOUT, "États-Unis-Dvorak" IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belge (Period)" IDS_BELGIAN_FRENCH_LAYOUT, "Belge Français" Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc Sun Dec 16 23:02:17 2007 @@ -220,7 +220,7 @@ IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ñâîéñòâà ââîäà" +CAPTION "Ïàðàìåòðû ââîäà" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ßçûê ââîäà:", -1, 7, 7, 61, 8 @@ -234,15 +234,20 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Òåêñòîâûå ñåðâèñû è ââîä ÿçûêîâ" - IDS_CPLSYSTEMDESCRIPTION "Äîïîëíèòåëüíûå óñòàíîâêè òåêñòîâîãî ââîäà ÿçûêîâ." + IDS_CPLSYSTEMDESCRIPTION "Äîïîëíèòåëüíûå ïàðàìåòðû òåêñòîâîãî ââîäà ÿçûêîâ." + IDS_KEYBOARD "Êëàâèàòóðà" + IDS_ADV_TEXT_SRV "Advanced Text Services" + IDS_NONE "(None)" + IDS_UNKNOWN "(Unknown)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_SPEECH "Speech" + IDS_HRD_REC "Handwriting Recognition" + IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" + IDS_WHATS_THIS "What's This?" END STRINGTABLE BEGIN - //Selected language on "Add Input language" - IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "Add Input language" - IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_US_LAYOUT, "US" IDS_BELGIAN_LAYOUT, "Belgian (Period)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sun Dec 16 23:02:17 2007 @@ -242,14 +242,19 @@ BEGIN IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." + IDS_KEYBOARD "Keyboard" + IDS_ADV_TEXT_SRV "Advanced Text Services" + IDS_NONE "(None)" + IDS_UNKNOWN "(Unknown)" + IDS_RESTART "Do you want to restart your computer now?" + IDS_SPEECH "Speech" + IDS_HRD_REC "Handwriting Recognition" + IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?" + IDS_WHATS_THIS "What's This?" END STRINGTABLE BEGIN - //Selected language on "Add Input language" ("Äîäàâàííÿ ìîâè ââîäó") - IDS_SELECTED_LANGUAGE "English (United States)" - //Selected keyboard layout on "Add Input language" ("Äîäàâàííÿ ìîâè ââîäó") - IDS_SELECTED_LAYOUT, "United States-Dvorak" IDS_US_LAYOUT, "ÑØÀ" IDS_BELGIAN_LAYOUT, "Áåëüã³éñüêà (³ç êðàïêîþ)" IDS_BELGIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Áåëüã³ÿ)" Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h (original) +++ trunk/reactos/dll/cpl/input/resource.h Sun Dec 16 23:02:17 2007 @@ -79,7 +79,16 @@ /* IDS */ #define IDS_CPLSYSTEMNAME 1 #define IDS_CPLSYSTEMDESCRIPTION 2 - +#define IDS_KEYBOARD 3 +#define IDS_ADV_TEXT_SRV 4 +#define IDS_NONE 5 +#define IDS_UNKNOWN 6 +#define IDS_RESTART 7 +#define IDS_SPEECH 8 +#define IDS_HRD_REC 9 +#define IDS_OFF_ADV_TXT_SRV 10 +#define IDS_WHATS_THIS 11 +/* Layouts */ #define IDS_US_LAYOUT 5000 #define IDS_BELGIAN_LAYOUT 5001 #define IDS_BELGIAN_FRENCH_LAYOUT 5002 @@ -213,9 +222,6 @@ #define IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT 5134 #define IDS_BULGARIAN_PHONETIC_BDS_LAYOUT 5135 -#define IDS_SELECTED_LAYOUT 6000 -#define IDS_SELECTED_LANGUAGE 6001 - #endif /* __CPL_RESOURCE_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/input/resources/information.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/in… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/input/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/ke… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/input/resources/marker.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/ma… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/input/resources/microphone.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/mi… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Sun Dec 16 23:02:17 2007 @@ -39,27 +39,120 @@ #include "resource.h" #include "input.h" -#define BUFSIZE 80 - -static -BOOL -CreateDefaultLangList(HWND hWnd) +#define BUFSIZE 256 + +static BOOL +GetLayoutName(LPCTSTR lcid, LPCTSTR name) { HKEY hKey; - TCHAR szPreload[BUFSIZE]; - TCHAR szCount[BUFSIZE]; - TCHAR Lang[BUFSIZE]; DWORD dwBufLen; - DWORD dwBufCLen; - DWORD cValues; - LONG lRet; + TCHAR szBuf[BUFSIZE]; + + _stprintf(szBuf, L"SYSTEM\\ControlSet001\\Control\\Keyboard Layouts\\%s",lcid); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = BUFSIZE; + if (RegQueryValueEx(hKey,L"Layout Text",NULL,NULL,(LPBYTE)name,&dwBufLen) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + } + + return FALSE; +} + +static BOOL +TreeView_GetItemText(HWND hTree, HTREEITEM hItem, LPTSTR name, DWORD buf) +{ + TVITEM tv = {0}; + + tv.mask = TVIF_TEXT | TVIF_HANDLE; + tv.hItem = hItem; + tv.pszText = name; + tv.cchTextMax = (int)buf; + + return TreeView_GetItem(hTree, &tv); +} + +static HTREEITEM +GetRootHandle(HWND hWnd, TCHAR * Name) +{ + HTREEITEM hNext = 0, hRoot; + TCHAR Tmp[256]; + HWND hTree; + DWORD i, count; + HKEY hKey; + + hTree = GetDlgItem(hWnd, IDC_KEYLAYOUT_TREE); + hRoot = TreeView_GetRoot(hTree); + + RegOpenKeyEx(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_QUERY_VALUE, &hKey); + RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&count,NULL,NULL,NULL,NULL); + RegCloseKey(hKey); + + for (i = 0; i < count; i++) + { + if (i == 0) + { + (VOID) TreeView_GetItemText(hTree, hRoot, (LPTSTR)Tmp, 256); + } + else + { + if (i == 1) + { + hNext = TreeView_GetNextItem(hTree, hRoot, TVGN_NEXT); + } + else + { + hNext = TreeView_GetNextItem(hTree, hNext, TVGN_NEXT); + } + (VOID) TreeView_GetItemText(hTree, hNext, (LPTSTR)Tmp, 256); + } + + if (_tcscmp(Name,Tmp) == 0) + { + if (i == 0) return hRoot; + return hNext; + } + } + return 0; +} + +static BOOL +InitDefaultLangList(HWND hWnd) +{ + HKEY hKey, hSubKey; + TCHAR szPreload[BUFSIZE], szCount[BUFSIZE], szSub[BUFSIZE]; + TCHAR szName[BUFSIZE], Lang[BUFSIZE]; + DWORD dwBufLen, dwBufCLen, cValues; INT Count; LCID Lcid; - - if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - { + TV_INSERTSTRUCT inc; + HWND TWwnd; + int Index[3]; + HIMAGELIST hImgList; + HICON hIcon; + + ZeroMemory(&inc, sizeof(TV_INSERTSTRUCT)); + inc.hInsertAfter = TVI_LAST; + inc.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_STATE; + inc.hParent = TVI_ROOT; + + hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); + hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_KEYBOARD_ICO),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); + Index[0] = ImageList_AddIcon(hImgList,hIcon); + hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_MARKER_ICO),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); + Index[1] = ImageList_AddIcon(hImgList,hIcon); + hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_INFO_ICO),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); + Index[2] = ImageList_AddIcon(hImgList,hIcon); + DestroyIcon(hIcon); + + TWwnd = GetDlgItem(hWnd, IDC_KEYLAYOUT_TREE); + + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) return FALSE; - } RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,NULL,NULL,NULL,NULL); @@ -67,32 +160,98 @@ { for (Count = 0; Count < cValues; Count++) { - szCount[0] = TEXT('\0'); + szCount[0] = L'\0'; dwBufCLen = BUFSIZE; - lRet = RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL); - - _stprintf(szCount,TEXT("%d"),Count + 1); + RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL); + + _stprintf(szCount,L"%d",Count + 1); dwBufLen = BUFSIZE; RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen); Lcid = _tcstoul(szPreload, NULL, 16); + /* FIXME: If it is established more than one English layouts of the keyboard it is incorrectly determined Lang */ GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang)); - SendMessage(hWnd, - CB_ADDSTRING, - 0, - (LPARAM)Lang); + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", 0, KEY_QUERY_VALUE, &hSubKey) != ERROR_SUCCESS) + return FALSE; + + dwBufLen = BUFSIZE; + TCHAR szLOName[BUFSIZE], szBuf[BUFSIZE]; + LONG Ret; + HTREEITEM hRoot = 0, hKeyBrd = 0, hParent; + + Ret = RegQueryValueEx(hSubKey,(LPCTSTR)szPreload,NULL,NULL,(LPBYTE)szSub,&dwBufLen); + if (Ret == ERROR_SUCCESS) _tcscpy(szPreload, szSub); + + GetLayoutName(szPreload,szLOName); + + hParent = GetRootHandle(hWnd, Lang); + if (hParent == 0) + { + inc.hParent = NULL; + inc.item.pszText = Lang; + inc.item.iImage = Index[2]; + inc.item.iSelectedImage = Index[2]; + if (Count == 0) + { + inc.item.state = TVIS_BOLD; + inc.item.stateMask = TVIS_BOLD; + } + else + { + inc.item.state = !TVIS_BOLD; + inc.item.stateMask = !TVIS_BOLD; + } + hRoot = TreeView_InsertItem(TWwnd, &inc); + if (Count == 0) (VOID) TreeView_SelectItem(TWwnd, hRoot); + + LoadString(hApplet, IDS_KEYBOARD, (LPTSTR)szBuf, BUFSIZE); + inc.hParent = hRoot; + inc.item.pszText = szBuf; + inc.item.iImage = Index[0]; + inc.item.iSelectedImage = Index[0]; + inc.item.state = !TVIS_BOLD; + inc.item.stateMask = !TVIS_BOLD; + hKeyBrd = TreeView_InsertItem(TWwnd, &inc); + inc.hParent = hKeyBrd; + } + else + { + inc.hParent = TreeView_GetChild(TWwnd, hParent); + } + + inc.item.pszText = szLOName; + inc.item.iImage = Index[1]; + inc.item.iSelectedImage = Index[1]; if (Count == 0) { - SendMessage(hWnd, - CB_SELECTSTRING, - (WPARAM)-1, - (LPARAM)Lang); - } - } - + inc.item.state = TVIS_BOLD; + inc.item.stateMask = TVIS_BOLD; + } + else + { + inc.item.state = !TVIS_BOLD; + inc.item.stateMask = !TVIS_BOLD; + } + (VOID) TreeView_InsertItem(TWwnd, &inc); + + (VOID) TreeView_SetImageList(TWwnd, hImgList, TVSIL_NORMAL); + (VOID) TreeView_Expand(TWwnd, hRoot, TVM_EXPAND); + (VOID) TreeView_Expand(TWwnd, hKeyBrd, TVM_EXPAND); + + _stprintf(szName,L"%s - %s",Lang,szLOName); + + RegCloseKey(hSubKey); + + HWND CBwnd; + CBwnd = GetDlgItem(hWnd, IDC_DEFAULT_INPUT_LANG); + SendMessage(CBwnd,CB_ADDSTRING,0,(LPARAM)szName); + SendMessage(CBwnd,CB_SETITEMDATA,0,(LPARAM)Lcid); + if (Count == 0) + SendMessage(CBwnd,CB_SELECTSTRING,(WPARAM)-1,(LPARAM)szName); + } } RegCloseKey(hKey); @@ -109,7 +268,7 @@ switch (uMsg) { case WM_INITDIALOG: - CreateDefaultLangList(GetDlgItem(hwndDlg, IDC_DEFAULT_INPUT_LANG)); + InitDefaultLangList(hwndDlg); break; case WM_COMMAND:

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