Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[tkreuzer] 30449: Release keyboard modifiers in KeybardThreadMain on KEY_BREAK. Fixes bug 2751. I think the whole handling of modifiers is still pretty hackish and could need some improvement. See issue #2751 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 15 02:28:18 2007 New Revision: 30449 URL: http://svn.reactos.org/svn/reactos?rev=30449&view=rev Log: Release keyboard modifiers in KeybardThreadMain on KEY_BREAK. Fixes bug 2751. I think the whole handling of modifiers is still pretty hackish and could need some improvement. See issue #2751 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Nov 15 02:28:18 2007 @@ -586,8 +586,8 @@ return; //(Status); } - /* Set LastInputTick */ - IntLastInputTick(TRUE); + /* Set LastInputTick */ + IntLastInputTick(TRUE); /* Update modifier state */ fsModifiers = IntKeyboardGetModifiers(&KeyInput); @@ -597,6 +597,22 @@ if (KeyInput.Flags & KEY_BREAK) { ModifierState &= ~fsModifiers; + if(fsModifiers == MOD_ALT) + { + if(KeyInput.Flags & KEY_E0) + { + gQueueKeyStateTable[VK_RMENU] = 0; + } + else + { + gQueueKeyStateTable[VK_LMENU] = 0; + } + if (gQueueKeyStateTable[VK_RMENU] == 0 && + gQueueKeyStateTable[VK_LMENU] == 0) + { + gQueueKeyStateTable[VK_MENU] = 0; + } + } } else { @@ -612,7 +628,7 @@ bLeftAlt = FALSE; if(fsModifiers == MOD_ALT) { - if(KeyInput.Flags & KEY_E1) + if(KeyInput.Flags & KEY_E0) { gQueueKeyStateTable[VK_RMENU] = 0x80; }

16 years, 10 months

[jimtabor] 30448: Removed code support for dcattr, it was over kill. Fix display locks, take resource from GdiDevice. If pDc_Attr zero, use internal. Fix mass exit error when freeing already freed handle.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Nov 15 01:53:19 2007 New Revision: 30448 URL: http://svn.reactos.org/svn/reactos?rev=30448&view=rev Log: Removed code support for dcattr, it was over kill. Fix display locks, take resource from GdiDevice. If pDc_Attr zero, use internal. Fix mass exit error when freeing already freed handle. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Nov 15 01:53:19 2007 @@ -86,19 +86,16 @@ HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); -VOID FASTCALL DC_LockDisplay(PERESOURCE); -VOID FASTCALL DC_UnlockDisplay(PERESOURCE); +VOID FASTCALL DC_LockDisplay(HDC); +VOID FASTCALL DC_UnlockDisplay(HDC); VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); VOID FASTCALL DC_UpdateXforms(PDC dc); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); -BOOL FASTCALL DCU_UpdateUserXForms(PDC, ULONG); BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC, FLONG); BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC, FLONG); -BOOL FASTCALL DCU_SyncDcAttrtoW32k(PDC, FLONG); -BOOL FASTCALL DCU_SynchDcAttrtoW32k(HDC, FLONG); VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Thu Nov 15 01:53:19 2007 @@ -589,6 +589,8 @@ NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) { PDC dc = DC_LockDc(hDC); + PDC_ATTR Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -599,8 +601,8 @@ { NTSTATUS Status = STATUS_SUCCESS; POINT SafePoint; - SafePoint.x = dc->Dc_Attr.ptlBrushOrigin.x; - SafePoint.y = dc->Dc_Attr.ptlBrushOrigin.y; + SafePoint.x = Dc_Attr->ptlBrushOrigin.x; + SafePoint.y = Dc_Attr->ptlBrushOrigin.y; _SEH_TRY { ProbeForWrite(Point, @@ -621,36 +623,9 @@ return FALSE; } } - - dc->Dc_Attr.ptlBrushOrigin.x = XOrg; - dc->Dc_Attr.ptlBrushOrigin.y = YOrg; - - if (dc->pDc_Attr) - { - PDC_ATTR Dc_Attr = dc->pDc_Attr; - NTSTATUS Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(Dc_Attr, - sizeof(DC_ATTR), - 1); - Dc_Attr->ptlBrushOrigin = dc->Dc_Attr.ptlBrushOrigin; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } + Dc_Attr->ptlBrushOrigin.x = XOrg; + Dc_Attr->ptlBrushOrigin.y = YOrg; DC_UnlockDc(dc); - return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Nov 15 01:53:19 2007 @@ -2528,7 +2528,6 @@ PDC pDC = DC_LockDc(DCToFree); if (pDC->pDc_Attr == &pDC->Dc_Attr) return; // Internal DC object! pDC->pDc_Attr = NULL; -// pDC->pDc_Attr = &pDC->Dc_Attr; // Correct behavior. DC_UnlockDc(pDC); KeEnterCriticalRegion(); @@ -2556,10 +2555,18 @@ DC_FreeDC(HDC DCToFree) { DC_FreeDcAttr(DCToFree); - - if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) - { - DPRINT("DC_FreeDC failed\n"); + INT Index = GDI_HANDLE_GET_INDEX(DCToFree); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + if ((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) + { + if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) + { + DPRINT1("DC_FreeDC failed\n"); + } + } + else + { + DPRINT1("Attempted to Delete 0x%x currently being destroyed!!!\n",DCToFree); } } @@ -2655,21 +2662,31 @@ // // Support multi display/device locks. -// Here, it is PrimarySurface.hsemDevLock -// or ((PGDIDEVICE)PDC->pPDev)->hsemDevLock // VOID FASTCALL -DC_LockDisplay(PERESOURCE Resource) -{ +DC_LockDisplay(HDC hDC) +{ + PERESOURCE Resource; + PDC dc = DC_LockDc(hDC); + if (!dc) return; + Resource = ((PGDIDEVICE)dc->pPDev)->hsemDevLock; + DC_UnlockDc(dc); + if (!Resource) return; KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite( Resource , TRUE); } VOID FASTCALL -DC_UnlockDisplay(PERESOURCE Resource) -{ +DC_UnlockDisplay(HDC hDC) +{ + PERESOURCE Resource; + PDC dc = DC_LockDc(hDC); + if (!dc) return; + Resource = ((PGDIDEVICE)dc->pPDev)->hsemDevLock; + DC_UnlockDc(dc); + if (!Resource) return; ExReleaseResourceLite( Resource ); KeLeaveCriticalRegion(); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Thu Nov 15 01:53:19 2007 @@ -52,160 +52,19 @@ XForm2MatrixS( &Dc_Attr->mxWorldToPage, &dc->w.xformWorld2Wnd); } -static -VOID -CopyFromUserDcAttr(PDC dc, PDC_ATTR Dc_Attr, FLONG Dirty) -{ - if ( (Dirty & DIRTY_FILL) || (Dc_Attr->ulDirty_ & DIRTY_FILL)) - { - dc->Dc_Attr.ulBrushClr = Dc_Attr->ulBrushClr; - dc->Dc_Attr.crBrushClr = Dc_Attr->crBrushClr; - Dc_Attr->ulDirty_ &= ~DIRTY_FILL; - } - if ( Dirty & DIRTY_LINE || (Dc_Attr->ulDirty_ & DIRTY_LINE)) - { - dc->Dc_Attr.crBackgroundClr = Dc_Attr->crBackgroundClr; - dc->Dc_Attr.ulBackgroundClr = Dc_Attr->ulBackgroundClr; - dc->Dc_Attr.ulPenClr = Dc_Attr->ulPenClr; - dc->Dc_Attr.crPenClr = Dc_Attr->crPenClr; - Dc_Attr->ulDirty_ &= ~DIRTY_LINE; - } - if ( Dirty & DIRTY_TEXT || (Dc_Attr->ulDirty_ & DIRTY_TEXT)) - { - dc->Dc_Attr.crForegroundClr = Dc_Attr->crForegroundClr; - dc->Dc_Attr.ulForegroundClr = Dc_Attr->ulForegroundClr; - Dc_Attr->ulDirty_ &= ~DIRTY_TEXT; - } - - if ( Dirty & (DC_MODE_DIRTY|DC_FONTTEXT_DIRTY) || - (Dc_Attr->ulDirty_ & (DC_MODE_DIRTY|DC_FONTTEXT_DIRTY))) - { - dc->Dc_Attr.jROP2 = Dc_Attr->jROP2; - dc->Dc_Attr.iGraphicsMode = Dc_Attr->iGraphicsMode; - dc->Dc_Attr.lFillMode = Dc_Attr->lFillMode; - dc->Dc_Attr.flFontMapper = Dc_Attr->flFontMapper; - dc->Dc_Attr.lBreakExtra = Dc_Attr->lBreakExtra; - dc->Dc_Attr.cBreak = Dc_Attr->cBreak; - } -} - -static -BOOL -ReadWriteVMDcAttr(PDC dc, FLONG Dirty, BOOL Write) -{ - BOOL Ret = FALSE; - KeEnterCriticalRegion(); - { - INT Index = GDI_HANDLE_GET_INDEX(dc->hHmgr); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - HANDLE ProcessId = (HANDLE)(((ULONG_PTR)(Entry->ProcessId)) & ~1); - DC_ATTR lDc_AttrData; - - if(Entry->UserData) - { - NTSTATUS Status = ZwReadVirtualMemory ( ProcessId, - &(Entry->UserData), - &lDc_AttrData, - sizeof(DC_ATTR), - NULL ); - if (Write) - { - if (NT_SUCCESS(Status)) CopytoUserDcAttr(dc, &lDc_AttrData, Dirty); - Ret = TRUE; - } - else - { - if (NT_SUCCESS(Status)) CopyFromUserDcAttr(dc, &lDc_AttrData, Dirty); - Ret = TRUE; - } - if (Write) - Status = ZwWriteVirtualMemory ( ProcessId, - &(Entry->UserData), - &lDc_AttrData, - sizeof(DC_ATTR), - NULL ); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - Ret = FALSE; - } - } - } - KeLeaveCriticalRegion(); - return Ret; -} - - -BOOL -FASTCALL -DCU_UpdateUserXForms(PDC pDC, ULONG uMask) -{ - PDC_ATTR DC_Attr = pDC->pDc_Attr; - - if (!uMask) return FALSE; - - if (!DC_Attr) return FALSE; - else - { - NTSTATUS Status = STATUS_SUCCESS; - KeEnterCriticalRegion(); - _SEH_TRY - { - ProbeForWrite(DC_Attr, - sizeof(DC_ATTR), - 1); - if (uMask & WORLD_XFORM_CHANGED) - XForm2MatrixS( &DC_Attr->mxWorldToDevice, &pDC->w.xformWorld2Vport); - - if (uMask & DEVICE_TO_WORLD_INVALID) - XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &pDC->w.xformVport2World); - - if (uMask & WORLD_TO_PAGE_IDENTITY) - XForm2MatrixS( &DC_Attr->mxWorldToPage, &pDC->w.xformWorld2Wnd); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - KeLeaveCriticalRegion(); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - } - return TRUE; -} BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC dc, FLONG Dirty) { - BOOL TryHarder = FALSE; PDC_ATTR Dc_Attr = dc->pDc_Attr; if (!Dirty) return FALSE; + + if (Dc_Attr == ((PDC_ATTR)&dc->Dc_Attr)) return TRUE; // No need to copy self. + if (!Dc_Attr) return FALSE; else - { - NTSTATUS Status = STATUS_SUCCESS; - KeEnterCriticalRegion(); - _SEH_TRY - { - ProbeForWrite(Dc_Attr, - sizeof(DC_ATTR), - 1); - CopytoUserDcAttr( dc, Dc_Attr, Dirty); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - KeLeaveCriticalRegion(); - if(!NT_SUCCESS(Status)) TryHarder = TRUE; - if (TryHarder) return ReadWriteVMDcAttr( dc, Dirty, TRUE); - } + CopytoUserDcAttr( dc, Dc_Attr, Dirty); return TRUE; } @@ -220,45 +79,4 @@ return Ret; } -BOOL -FASTCALL -DCU_SyncDcAttrtoW32k(PDC dc, FLONG Dirty) -{ - BOOL TryHarder = FALSE; - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if (!Dirty) return FALSE; - if (!Dc_Attr) return FALSE; - else - { - NTSTATUS Status = STATUS_SUCCESS; - KeEnterCriticalRegion(); - _SEH_TRY - { - ProbeForRead(Dc_Attr, - sizeof(DC_ATTR), - 1); - CopyFromUserDcAttr( dc, Dc_Attr, Dirty); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - KeLeaveCriticalRegion(); - if(!NT_SUCCESS(Status)) TryHarder = TRUE; - if (TryHarder) return ReadWriteVMDcAttr( dc, Dirty, FALSE); - } - return TRUE; -} -BOOL -FASTCALL -DCU_SynchDcAttrtoW32k(HDC hDC, FLONG Dirty) -{ - PDC pDC = DC_LockDc ( hDC ); - if (!pDC) return FALSE; - BOOL Ret = DCU_SyncDcAttrtoW32k(pDC, Dirty); - DC_UnlockDc( pDC ); - return Ret; -} - Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Thu Nov 15 01:53:19 2007 @@ -3348,34 +3348,15 @@ DWORD cscp = IntGdiGetCharSet(hDC); // If here, update everything! Dc = DC_LockDc(hDC); + PDC_ATTR Dc_Attr = Dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (!Dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - - Dc->Dc_Attr.iCS_CP = cscp; - Dc->Dc_Attr.ulDirty_ &= ~DIRTY_CHARSET; - - if (Dc->pDc_Attr) - { - PDC_ATTR Dc_Attr = Dc->pDc_Attr; - NTSTATUS Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(Dc_Attr, - sizeof(DC_ATTR), - 1); - Dc_Attr->iCS_CP = cscp; - Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) SetLastNtError(Status); - } + Dc_Attr->iCS_CP = cscp; + Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; DC_UnlockDc( Dc ); return cscp; }

16 years, 10 months

[hpoussin] 30447: Fix USE_API_SHCREATEDESKTOP = 0 case

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Nov 14 18:35:58 2007 New Revision: 30447 URL: http://svn.reactos.org/svn/reactos?rev=30447&view=rev Log: Fix USE_API_SHCREATEDESKTOP = 0 case Modified: trunk/reactos/base/shell/explorer-new/desktop.c trunk/reactos/base/shell/explorer-new/undoc.h Modified: trunk/reactos/base/shell/explorer-new/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/de… ============================================================================== --- trunk/reactos/base/shell/explorer-new/desktop.c (original) +++ trunk/reactos/base/shell/explorer-new/desktop.c Wed Nov 14 18:35:58 2007 @@ -136,10 +136,38 @@ /* ****************************************************************************** * NOTE: This could may be reused in a shell implementation of * + * SHCreateShellFolderView(). * + ****************************************************************************** + */ + +HRESULT WINAPI +SHCreateShellFolderView( + const SFV_CREATE *pcsfv, + IShellView **ppsv) +{ + CSFV csfv; + + ZeroMemory(&csfv, sizeof(CSFV)); + csfv.cbSize = sizeof(CSFV); + csfv.pshf = pcsfv->pshf; + csfv.psvOuter = pcsfv->psvOuter; + /* FIXME: handle pcsfv->psfvcb */ + return SHCreateShellFolderViewEx(&csfv, ppsv); +} + + +/* + ****************************************************************************** + * NOTE: This could may be reused in a shell implementation of * * SHCreateDesktop(). * ****************************************************************************** */ +#define IShellView2 IShellView +#define IShellView2_Release(This) IShellView_Release((This)) +#define IShellView2_CreateViewWindow2(This, Params) IShellView_CreateViewWindow((This), (Params)->psvPrev, (Params)->pfs, (Params)->psbOwner, (Params)->prcView, &(Params)->hwndView) + +#include "undoc.h" #define WM_SHELL_ADDDRIVENOTIFY (WM_USER + 0x100) static const IShellBrowserVtbl IDesktopShellBrowserImpl_Vtbl; @@ -590,7 +618,7 @@ &cne); /* Create the tray window */ - This->Tray = CreateTrayWindow(This->hWnd); + This->Tray = CreateTrayWindow(); return This; } @@ -1256,7 +1284,6 @@ volatile DESKCREATEINFO *DeskCreateInfo = (volatile DESKCREATEINFO *)lpParameter; HWND hwndDesktop; IDesktopShellBrowserImpl *pDesktop; - IShellDesktopTray *pSdt; MSG Msg; BOOL Ret; @@ -1274,7 +1301,7 @@ hExplorerInstance, NULL); - DeskCreateInfo->hWndDesktop = hWndDesktop; + DeskCreateInfo->hWndDesktop = hwndDesktop; if (hwndDesktop == NULL) return 1; Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… ============================================================================== --- trunk/reactos/base/shell/explorer-new/undoc.h (original) +++ trunk/reactos/base/shell/explorer-new/undoc.h Wed Nov 14 18:35:58 2007 @@ -96,7 +96,6 @@ #define IWindowEventHandler_ContainsWindow(T,a) (T)->lpVtbl->ContainsWindow(T,a) #endif -#if USE_API_SHCREATEDESKTOP != 0 #define INTERFACE IShellDesktopTray DECLARE_INTERFACE_(IShellDesktopTray,IUnknown) { @@ -122,6 +121,7 @@ #define IShellDesktopTray_Unknown(T,a,b) (T)->lpVtbl->Unknown(T,a,b) #endif +#if USE_API_SHCREATEDESKTOP != 0 #if 0 HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE);

16 years, 10 months

[cwittich] 30446: don't try to copy lpToken when it is NULL

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Nov 14 18:02:41 2007 New Revision: 30446 URL: http://svn.reactos.org/svn/reactos?rev=30446&view=rev Log: don't try to copy lpToken when it is NULL Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/settings.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 14 18:02:41 2007 @@ -36,7 +36,7 @@ static WCHAR szFilter[] = L"Remote Desktop Files (*rdp)\0*.rdp\0"; ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAME); + ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = pInfo->hGeneralPage; ofn.nMaxFile = MAX_PATH; ofn.nMaxFileTitle = MAX_PATH; @@ -62,7 +62,7 @@ static WCHAR szFilter[] = L"Remote Desktop Files (*rdp)\0*.rdp\0"; ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAME); + ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = pInfo->hGeneralPage; ofn.nMaxFile = MAX_PATH; ofn.nMaxFileTitle = MAX_PATH; @@ -1118,7 +1118,7 @@ txtRc.right = bmpRc.right * 0.75; txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.5; - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); if (LoadStringW(hInst, IDS_HEADERTEXT1, Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c (original) +++ trunk/reactos/base/applications/mstsc/settings.c Wed Nov 14 18:02:41 2007 @@ -252,13 +252,15 @@ { pRdpSettings->pSettings[i].Type = lpToken[0]; lpToken = wcstok(NULL, szSeps); - pRdpSettings->pSettings[i].Value.i = _wtoi(lpToken); + if (lpToken != NULL) + pRdpSettings->pSettings[i].Value.i = _wtoi(lpToken); } else if (lpToken[0] == L's') { pRdpSettings->pSettings[i].Type = lpToken[0]; lpToken = wcstok(NULL, szSeps); - wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); + if (lpToken != NULL) + wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); } bFound = TRUE; }

16 years, 10 months

[dreimer] 30445: Add a installation selection for GDB.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Nov 14 17:53:51 2007 New Revision: 30445 URL: http://svn.reactos.org/svn/reactos?rev=30445&view=rev Log: Add a installation selection for GDB. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Wed Nov 14 17:53:51 2007 @@ -186,7 +186,15 @@ File /r Root\Tools\cygwin1.dll SectionEnd -Section "relAddr2Line Tool" SEC07 +Section "GDB" SEC07 + SetShellVarContext current + SetOutPath "$INSTDIR\4.1.3\bin" + SetOverwrite try + File /r Root\Tools\gdb.exe + File /r Root\Tools\gdbserver.exe +SectionEnd + +Section "relAddr2Line Tool" SEC08 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -198,7 +206,7 @@ File /r Root\Tools\chkslash.exe SectionEnd -Section "Other Tools (chdefdir, chdefgcc and config)" SEC08 +Section "Other Tools (chdefdir, chdefgcc and config)" SEC09 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -207,7 +215,7 @@ File /r Root\Config.cmd SectionEnd -Section -StartMenuShortcuts SEC09 +Section -StartMenuShortcuts SEC10 SetShellVarContext current ;; @@ -225,7 +233,7 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC10 +Section /o "Desktop Shortcuts" SEC11 SetShellVarContext current ;; @@ -235,7 +243,7 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SectionEnd -Section /o "Quick Launch Shortcuts" SEC11 +Section /o "Quick Launch Shortcuts" SEC12 SetShellVarContext current ;; @@ -245,7 +253,7 @@ CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SectionEnd -Section -Post SEC12 +Section -Post SEC13 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

16 years, 10 months

[dreimer] 30444: Update the German Translation and reactivate it.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Nov 14 16:52:45 2007 New Revision: 30444 URL: http://svn.reactos.org/svn/reactos?rev=30444&view=rev Log: Update the German Translation and reactivate it. Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/mstsc/rsrc.rc Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc Wed Nov 14 16:52:45 2007 @@ -9,10 +9,10 @@ ICON "", IDC_LOGONICON, 15,19,20,20 LTEXT "Serveradresse eingeben",IDC_STATIC,47,24,81,8 LTEXT "Server:",IDC_STATIC,47,41,25,8 - LTEXT "Benutzername:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Benutzername:",IDC_STATIC,47,58,50,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Speichern",IDC_SAVE,67,139,50,14 - PUSHBUTTON "Speichern unter...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Speichern unter",IDC_SAVEAS,120,139,55,14 PUSHBUTTON "Öffnen...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 LTEXT "Die derzeitigen Verbindungseinstellungen speichern oder vohandene Einstellungen laden.",IDC_STATIC,50,115,172,20 @@ -22,27 +22,28 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "RemoteDesktop Größe",IDC_STATIC,7,7,228,68 + GROUPBOX "Remotedesktop Größe",IDC_STATIC,7,7,228,68 GROUPBOX "Farben",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Wählen Sie die Bildschirmgröße von Ihrem RemoteDesktop. Stellen Sie den Regler für Vollbild ganz nach rechts.",IDC_STATIC,53,22,175,21 - CONTROL "",IDC_GEOSLIDER,"msctls_trackbar32",WS_TABSTOP,56,49,124,15 - COMBOBOX IDC_BPPCOMBO,56,102,128,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,13 + LTEXT "Wählen Sie die Bildschirmgröße von Ihrem Remote- desktop. Stellen Sie den Regler für Vollbild nach rechts",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 LTEXT "Achtung: Die Einstellung auf dem Remotecomputer könnte diese Einstellung überschreiben.",IDC_STATIC,56,143,165,18 - LTEXT "Weniger",IDC_STATIC,35,52,15,8 - LTEXT "Mehr",IDC_STATIC,189,51,17,8 + LTEXT "Weniger",IDC_STATIC,28,42,27,8 + LTEXT "Mehr",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 277 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RemoteDesktop Verbindung" +CAPTION "Remotedesktop Verbindung" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Verbinden",IDOK,147,256,50,14 - PUSHBUTTON "Abbrechen",IDCANCEL,203,256,50,14 - CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,198 + DEFPUSHBUTTON "Verbinden",IDOK,147,245,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 END @@ -50,4 +51,13 @@ BEGIN IDS_TAB_GENERAL "Allgemein" IDS_TAB_DISPLAY "Display" + IDS_256COLORS "256 Farben" + IDS_HIGHCOLOR15 "High Color (15 bit)" + IDS_HIGHCOLOR16 "High Color (16 bit)" + IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_PIXEL "%lux%lu Pixel" + IDS_FULLSCREEN "Vollbild" + IDS_BROWSESERVER "<Nach mehr suchen...>" + IDS_HEADERTEXT1 "Remote Desktop" + IDS_HEADERTEXT2 "Verbindung" END Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Wed Nov 14 16:52:45 2007 @@ -14,7 +14,7 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_SPECT BITMAP "res/spectrum.bmp" -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" //#include "lang/fr-FR.rc" //#include "lang/ru-RU.rc"

16 years, 10 months

[hpoussin] 30443: Try to be more consistent in unimplemented messages

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Nov 14 16:14:46 2007 New Revision: 30443 URL: http://svn.reactos.org/svn/reactos?rev=30443&view=rev Log: Try to be more consistent in unimplemented messages Modified: trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/include/reactos/debug.h trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h (original) +++ trunk/reactos/dll/win32/hid/precomp.h Wed Nov 14 16:14:46 2007 @@ -1,5 +1,6 @@ #define WIN32_NO_STATUS #include <windows.h> +#include <debug.h> #define DDKAPI __stdcall #define _HIDPI_ @@ -18,9 +19,4 @@ extern HINSTANCE hDllInstance; extern const GUID HidClassGuid; -#ifndef UNIMPLEMENTED -#define UNIMPLEMENTED \ - DbgPrint("HID: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) -#endif - /* EOF */ Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Wed Nov 14 16:14:46 2007 @@ -117,21 +117,6 @@ #define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x)) #define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) -/* Macros expanding to the appropriate inline assembly to raise a breakpoint */ -#if defined(_M_IX86) -#define ASM_BREAKPOINT "\nint $3\n" -#elif defined(_M_ALPHA) -#define ASM_BREAKPOINT "\ncall_pal bpt\n" -#elif defined(_M_MIPS) -#define ASM_BREAKPOINT "\nbreak\n" -#elif defined(__x86_64__) -#define ASM_BREAKPOINT "\nint $3\n" -#elif defined(_M_PPC) -#define ASM_BREAKPOINT "\ntwi 1\n" -#else -#error Unsupported architecture. -#endif - #ifndef KEBUGCHECK #define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) #define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c Wed Nov 14 16:14:46 2007 @@ -212,7 +212,7 @@ IN BOOLEAN ScanDrive, IN PFMIFSCALLBACK Callback) { - DPRINT1("VfatChkdsk() unimplemented!\n"); + UNIMPLEMENTED; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/debug.h (original) +++ trunk/reactos/ntoskrnl/include/internal/debug.h Wed Nov 14 16:14:46 2007 @@ -15,72 +15,19 @@ * Define NASSERT before including this header to disable assertions */ -#ifdef CHECKPOINT -#undef CHECKPOINT -#endif +#include <reactos/debug.h> -#ifdef DPRINT -#undef DPRINT -#endif +#ifndef __NTOSKRNL_DEBUG +#define __NTOSKRNL_DEBUG -#ifndef NDEBUG -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#else /* NDEBUG */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#endif /* NDEBUG */ - -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG +#include <reactos/debug.h> #if defined(_MSC_VER) && (_MSC_VER < 1300) /* TODO: Verify which version the MS compiler learned the __FUNCTION__ macro */ #define __FUNCTION__ "<unknown>" #endif -#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); - -#ifdef assert -#undef assert -#endif - -#ifdef DBG - -/* Print if using a "checked" version */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define CPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define CPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif - -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT1(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif - -#else /* DBG */ - -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define CPRINT(args...) -#define DPRINT1(args...) -#else -#define CPRINT -#define DPRINT1 -#endif - -#endif /* DBG */ - -#define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) +#define CPRINT DPRINT1 /* * FUNCTION: Assert a maximum value for the current irql @@ -88,9 +35,7 @@ * x = Maximum irql */ #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x)) -#define ASSERT_IRQL(x) ASSERT_IRQL_LESS_OR_EQUAL(x) #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x)) #define ASSERT_IRQL_LESS(x) ASSERT(KeGetCurrentIrql()<(x)) -#define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) -#endif /* __INTERNAL_DEBUG */ +#endif /* __NTOSKRNL_DEBUG */

16 years, 10 months

[gedmurphy] 30442: add part of the patch from bug 2805 with some minor changes See issue #2805 for more details.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Nov 14 16:05:51 2007 New Revision: 30442 URL: http://svn.reactos.org/svn/reactos?rev=30442&view=rev Log: add part of the patch from bug 2805 with some minor changes See issue #2805 for more details. Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Wed Nov 14 16:05:51 2007 @@ -68,9 +68,8 @@ (WPARAM)hFont, 0); + ZeroMemory(&lf, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - lf.lfFaceName[0] = L'\0'; // all fonts - lf.lfPitchAndFamily = 0; hdc = GetDC(hwndCombo); @@ -123,6 +122,10 @@ 0, (LPARAM)lpFontName); } + + HeapFree(GetProcessHeap(), + 0, + lpFontName); } } @@ -250,12 +253,23 @@ } return TRUE; } - break; case WM_COMMAND: { switch(LOWORD(wParam)) { + case IDC_FONTMAP: + { + switch (HIWORD(wParam)) + { + case FM_SETCHAR: + AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), + LOWORD(lParam)); + break; + } + } + break; + case IDC_FONTCOMBO: { if (HIWORD(wParam) == CBN_SELCHANGE) @@ -303,29 +317,6 @@ } break; - case WM_NOTIFY: - { - LPMAPNOTIFY lpnm = (LPMAPNOTIFY)lParam; - - switch (lpnm->hdr.idFrom) - { - case IDC_FONTMAP: - { - switch (lpnm->hdr.code) - { - case FM_SETCHAR: - { - AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), - lpnm->ch); - } - break; - } - } - break; - } - } - break; - case WM_CLOSE: if (hSmIcon) DestroyIcon(hSmIcon); Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Wed Nov 14 16:05:51 2007 @@ -211,19 +211,16 @@ if (infoPtr->hParent != NULL) { - MAPNOTIFY mnmh; - - mnmh.hdr.hwndFrom = infoPtr->hMapWnd; - mnmh.hdr.idFrom = GetWindowLongPtr(infoPtr->hMapWnd, - GWLP_ID); - mnmh.hdr.code = code; - - mnmh.ch = ch; - - Ret = SendMessageW(infoPtr->hParent, - WM_NOTIFY, - (WPARAM)mnmh.hdr.idFrom, - (LPARAM)&mnmh); + DWORD dwIdc = GetWindowLongPtr(infoPtr->hMapWnd, GWLP_ID); + /* + * Push directly into the event queue instead of waiting + * the parent to be unlocked. + * High word of LPARAM is still available for future needs... + */ + Ret = PostMessage(infoPtr->hParent, + WM_COMMAND, + MAKELPARAM((WORD)dwIdc, (WORD)code), + (LPARAM)LOWORD(ch)); } return Ret; @@ -509,18 +506,8 @@ } case FM_SETFONT: - { - LPWSTR lpFontName = (LPWSTR)lParam; - - SetFont(infoPtr, - lpFontName); - - HeapFree(GetProcessHeap(), - 0, - lpFontName); - - break; - } + SetFont(infoPtr, (LPWSTR)lParam); + break; case FM_GETCHAR: {

16 years, 10 months

[hpoussin] 30441: Try to be more consistent in unimplemented messages

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Nov 14 15:50:12 2007 New Revision: 30441 URL: http://svn.reactos.org/svn/reactos?rev=30441&view=rev Log: Try to be more consistent in unimplemented messages Modified: trunk/reactos/dll/win32/authz/precomp.h trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/winscard/precomp.h trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/dll/win32/authz/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/authz/precomp.h (original) +++ trunk/reactos/dll/win32/authz/precomp.h Wed Nov 14 15:50:12 2007 @@ -4,15 +4,7 @@ #define _AUTHZ_ #include <windows.h> #include <authz.h> - -ULONG DbgPrint(PCH Format,...); -#ifndef DPRINT1 -#define DPRINT1 DbgPrint -#endif - -#ifndef UNIMPLEMENTED -#define UNIMPLEMENTED DbgPrint("AUTHZ.DLL: %s is UNIMPLEMENTED!\n", __FUNCTION__) -#endif +#include <debug.h> #if DBG @@ -20,17 +12,11 @@ #define CLIENTCTX_TAG 0x789ABCDE #define VALIDATE_RESMAN_HANDLE(handle) ASSERT(((PAUTHZ_RESMAN)handle)->Tag == RESMAN_TAG) #define VALIDATE_CLIENTCTX_HANDLE(handle) ASSERT(((PAUTHZ_CLIENT_CONTEXT)handle)->Tag == CLIENTCTX_TAG) -#ifndef ASSERT -#define ASSERT(cond) if (!(cond)) { DbgPrint("%s:%i: ASSERTION %s failed!\n", __FILE__, __LINE__, #cond ); } -#endif #else #define VALIDATE_RESMAN_HANDLE(handle) #define VALIDATE_CLIENTCTX_HANDLE(handle) -#ifndef ASSERT -#define ASSERT(cond) -#endif #endif Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c Wed Nov 14 15:50:12 2007 @@ -412,7 +412,7 @@ int WINAPI LogoffWindowsDialog(DWORD uFlags) { - ERR("LogoffWindowsDialog is UNIMPLEMENTED\n"); + UNIMPLEMENTED; ExitWindowsEx(EWX_LOGOFF, 0); return 0; } Modified: trunk/reactos/dll/win32/winscard/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/precomp… ============================================================================== --- trunk/reactos/dll/win32/winscard/precomp.h (original) +++ trunk/reactos/dll/win32/winscard/precomp.h Wed Nov 14 15:50:12 2007 @@ -1,10 +1,5 @@ #include <windows.h> #include <WinSCard.h> - -/* INTERNAL *******************************************************************/ - -ULONG DbgPrint(PCH Format,...); -#define UNIMPLEMENTED \ - DbgPrint("%s:%i: %s() UNIMPLEMENTED!\n", __FILE__, __LINE__, __FUNCTION__) +#include <debug.h> /* EOF */ Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h (original) +++ trunk/reactos/include/reactos/wine/debug.h Wed Nov 14 15:50:12 2007 @@ -62,7 +62,7 @@ char name[15]; }; -#define UNIMPLEMENTED WINE_FIXME(" is unimplemented") +#define UNIMPLEMENTED WINE_FIXME("%s is UNIMPLEMENTED!\n", __FUNCTION__) #ifndef WINE_NO_TRACE_MSGS # define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)->flags & (1 << __WINE_DBCL_TRACE))

16 years, 10 months

[hpoussin] 30440: No need to cast variables, as they already are of the right type

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Nov 14 15:26:39 2007 New Revision: 30440 URL: http://svn.reactos.org/svn/reactos?rev=30440&view=rev Log: No need to cast variables, as they already are of the right type Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Wed Nov 14 15:26:39 2007 @@ -547,7 +547,7 @@ VkKeyScanExW(WCHAR ch, HKL dwhkl) { - return (SHORT) NtUserVkKeyScanEx((DWORD) ch,(DWORD) dwhkl,(DWORD)NULL); + return (SHORT) NtUserVkKeyScanEx(ch, dwhkl, 0); }

16 years, 10 months

← Newer
1
...
45
46
47
48
49
50
51
...
89
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007