Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[mf] 13334: move address bar into top rebar

by mf＠svn.reactos.com

move address bar into top rebar Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-27 00:49:24 UTC (rev 13333) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-27 01:03:37 UTC (rev 13334) @@ -124,7 +124,7 @@ CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/); - // create rebar window to manage toolbar and drivebar + // create rebar window to manage toolbar and address bar #ifndef _NO_REBAR _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| @@ -149,10 +149,17 @@ rbBand.cyMaxChild = 0; rbBand.cyIntegral = btn_hgt; - rbBand.lpText = NULL;//TEXT("Toolbar"); + rbBand.lpText = TEXT("Toolbar"); rbBand.hwndChild = _htoolbar; rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt + 4; + rbBand.cx = 182; + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + + rbBand.lpText = TEXT("Address"); + rbBand.hwndChild = _haddressedit; + rbBand.cxMinChild = 0; + rbBand.cyMinChild = btn_hgt - 2; rbBand.cx = 284; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif @@ -395,13 +402,6 @@ rect.bottom -= rt.bottom; } - if (IsWindowVisible(_haddressedit)) { - ClientRect rt(_haddressedit); - rect.bottom -= rt.bottom; - - SetWindowPos(_haddressedit, 0, 0, rect.bottom, rect.right-rect.left, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); - } - if (IsWindowVisible(_hsidebar)) { WindowRect rt(_hsidebar); rect.left += rt.right-rt.left; @@ -727,13 +727,6 @@ rect.bottom -= rt.bottom; } - if (IsWindowVisible(_haddressedit)) { - ClientRect rt(_haddressedit); - rect.bottom -= rt.bottom; - - SetWindowPos(_haddressedit, 0, 0, rect.bottom, rect.right-rect.left, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); - } - if (IsWindowVisible(_hsidebar)) { WindowRect rt(_hsidebar); rect.left += rt.right-rt.left;

19 years, 11 months

[weiden] 13333: This patch removes the cursor location from the window station object and always uses it in the GDIDEVICE. Patch by tinus. Fixes bug #484

by weiden＠svn.reactos.com

This patch removes the cursor location from the window station object and always uses it in the GDIDEVICE. Patch by tinus. Fixes bug #484 Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/include/cursoricon.h Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/include/win32k/dc.h 2005-01-27 00:49:24 UTC (rev 13333) @@ -124,9 +124,6 @@ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ PGD_MOVEPOINTER MovePointer; ULONG Status; - UINT SafetyRemoveLevel; /* at what level was the cursor removed? - 0 for not removed */ - UINT SafetyRemoveCount; } GDIPOINTER, *PGDIPOINTER; typedef struct @@ -141,6 +138,11 @@ PFILE_OBJECT VideoFileObject; GDIPOINTER Pointer; + + /* Stuff to keep track of software cursors; win32k gdi part */ + UINT SafetyRemoveLevel; /* at what level was the cursor removed? + 0 for not removed */ + UINT SafetyRemoveCount; } GDIDEVICE; /* Internal functions */ _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-01-27 00:49:24 UTC (rev 13333) @@ -68,9 +68,9 @@ tmp = HazardY2; HazardY2 = HazardY1; HazardY1 = tmp; } - pgp->SafetyRemoveCount++; + ppdev->SafetyRemoveCount++; - if (pgp->SafetyRemoveLevel) + if (ppdev->SafetyRemoveLevel) { /* already hidden */ return FALSE; @@ -81,7 +81,7 @@ && pgp->Exclude.bottom >= HazardY1 && pgp->Exclude.top <= HazardY2) { - pgp->SafetyRemoveLevel = pgp->SafetyRemoveCount; + ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; if (pgp->MovePointer) pgp->MovePointer(SurfObj, -1, -1, NULL); else @@ -100,6 +100,8 @@ GDIDEVICE *ppdev; GDIPOINTER *pgp; + ASSERT(WinSta); + ASSERT(SurfObj != NULL); ppdev = GDIDEV(SurfObj); @@ -117,22 +119,16 @@ return FALSE; } - if (--pgp->SafetyRemoveCount >= pgp->SafetyRemoveLevel) + if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) { return FALSE; } - /* FIXME - this is wrong!!!!!! we must NOT access pgp->Pos from here, it's - a private field for ENG/driver. This will paint the cursor to the - wrong screen coordinates when a driver overrides DrvMovePointer()! - We should store the coordinates before calling Drv/EngMovePointer() - and Drv/EngSetPointerShape() separately in the GDIDEVICE structure - or somewhere where ntuser can access it! */ if (pgp->MovePointer) pgp->MovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); else EngMovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); - pgp->SafetyRemoveLevel = 0; + ppdev->SafetyRemoveLevel = 0; return(TRUE); } @@ -368,6 +364,8 @@ pgp->HotSpot.x = xHot; pgp->HotSpot.y = yHot; + /* Actually this should be set by 'the other side', but it would be + * done right after this. It helps IntShowMousePointer. */ if (x != -1) { pgp->Pos.x = x; @@ -472,14 +470,13 @@ if (prcl != NULL) { - prcl->left = pgp->Pos.x - pgp->HotSpot.x; - prcl->top = pgp->Pos.y - pgp->HotSpot.x; + prcl->left = x - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.x; prcl->right = prcl->left + pgp->Size.cx; prcl->bottom = prcl->top + pgp->Size.cy; } - } - - /* FIXME - touch prcl when x == -1? */ + } else if (prcl != NULL) + prcl->left = prcl->top = prcl->right = prcl->bottom = -1; return SPS_ACCEPT_EXCLUDE; } @@ -509,19 +506,21 @@ IntHideMousePointer(ppdev, pso); if (x != -1) { + /* Actually this should be set by 'the other side', but it would be + * done right after this. It helps IntShowMousePointer. */ pgp->Pos.x = x; pgp->Pos.y = y; IntShowMousePointer(ppdev, pso); if (prcl != NULL) { - prcl->left = pgp->Pos.x - pgp->HotSpot.x; - prcl->top = pgp->Pos.y - pgp->HotSpot.x; + prcl->left = x - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.x; prcl->right = prcl->left + pgp->Size.cx; prcl->bottom = prcl->top + pgp->Size.cy; } - } + } else if (prcl != NULL) + prcl->left = prcl->top = prcl->right = prcl->bottom = -1; - /* FIXME - touch prcl when x == -1? */ } /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/cursoricon.h --- trunk/reactos/subsys/win32k/include/cursoricon.h 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/include/cursoricon.h 2005-01-27 00:49:24 UTC (rev 13333) @@ -37,7 +37,6 @@ BOOL Enabled; BOOL SwapButtons; UINT ButtonsDown; - LONG x, y; FAST_MUTEX CursorMutex; CURSORCLIP_INFO CursorClipInfo; PCURICON_OBJECT CurrentCursorObject; @@ -57,6 +56,8 @@ PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinStaObject); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process); +BOOL FASTCALL IntGetCursorLocation(PWINSTATION_OBJECT WinStaObject, POINT *loc); + #define IntGetSysCursorInfo(WinStaObj) \ (PSYSTEM_CURSORINFO)((WinStaObj)->SystemCursor) _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-27 00:49:24 UTC (rev 13333) @@ -42,6 +42,40 @@ static LIST_ENTRY CurIconList; static FAST_MUTEX CurIconListLock; +/* Look up the location of the cursor in the GDIDEVICE structure + * when all we know is the window station object + * Actually doesn't use the window station, but should... */ +BOOL FASTCALL +IntGetCursorLocation(PWINSTATION_OBJECT WinStaObject, POINT *loc) +{ + HDC hDC; + PDC dc; + HBITMAP hBitmap; + BITMAPOBJ *BitmapObj; + SURFOBJ *SurfObj; + +#if 1 + /* FIXME - get the screen dc from the window station or desktop */ + if (!(hDC = IntGetScreenDC())) + return FALSE; +#endif + + if (!(dc = DC_LockDc(hDC))) + return FALSE; + + hBitmap = dc->w.hBitmap; + DC_UnlockDc(hDC); + if (!(BitmapObj = BITMAPOBJ_LockBitmap(hBitmap))) + return FALSE; + + SurfObj = &BitmapObj->SurfObj; + loc->x = GDIDEV(SurfObj)->Pointer.Pos.x; + loc->y = GDIDEV(SurfObj)->Pointer.Pos.y; + + BITMAPOBJ_UnlockBitmap(hBitmap); + return TRUE; +} + PCURICON_OBJECT FASTCALL IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle) { @@ -116,10 +150,9 @@ { /* Remove the cursor if it was displayed */ if (GDIDEV(SurfObj)->Pointer.MovePointer) - GDIDEV(SurfObj)->Pointer.MovePointer(SurfObj, -1, -1, NULL); + GDIDEV(SurfObj)->Pointer.MovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointer.Exclude); else - EngMovePointer(SurfObj, -1, -1, NULL); - GDIDEV(SurfObj)->Pointer.Exclude.right = -1; + EngMovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointer.Exclude); } GDIDEV(SurfObj)->Pointer.Status = SPS_ACCEPT_NOEXCLUDE; @@ -218,8 +251,8 @@ SurfObj, soMask, soColor, XlateObj, NewCursor->IconInfo.xHotspot, NewCursor->IconInfo.yHotspot, - CurInfo->x, - CurInfo->y, + GDIDEV(SurfObj)->Pointer.Pos.x, + GDIDEV(SurfObj)->Pointer.Pos.y, &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); DPRINT("SetCursor: DrvSetPointerShape() returned %x\n", @@ -236,8 +269,8 @@ SurfObj, soMask, soColor, XlateObj, NewCursor->IconInfo.xHotspot, NewCursor->IconInfo.yHotspot, - CurInfo->x, - CurInfo->y, + GDIDEV(SurfObj)->Pointer.Pos.x, + GDIDEV(SurfObj)->Pointer.Pos.y, &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); GDIDEV(SurfObj)->Pointer.MovePointer = EngMovePointer; @@ -760,6 +793,16 @@ PWINSTATION_OBJECT WinStaObject; NTSTATUS Status; PCURICON_OBJECT CursorObject; + +#if 1 + HDC hDC; + + /* FIXME - get the screen dc from the window station or desktop */ + if (!(hDC = IntGetScreenDC())) + { + return FALSE; + } +#endif Status = MmCopyFromCaller(&SafeCi.cbSize, pci, sizeof(DWORD)); if(!NT_SUCCESS(Status)) @@ -785,9 +828,9 @@ SafeCi.flags = ((CurInfo->ShowingCursor && CursorObject) ? CURSOR_SHOWING : 0); SafeCi.hCursor = (CursorObject ? (HCURSOR)CursorObject->Self : (HCURSOR)0); - SafeCi.ptScreenPos.x = CurInfo->x; - SafeCi.ptScreenPos.y = CurInfo->y; - + + IntGetCursorLocation(WinStaObject, &SafeCi.ptScreenPos); + Status = MmCopyToCaller(pci, &SafeCi, sizeof(CURSORINFO)); if(!NT_SUCCESS(Status)) { @@ -815,6 +858,7 @@ PSYSTEM_CURSORINFO CurInfo; RECT Rect; PWINDOW_OBJECT DesktopWindow = NULL; + POINT MousePos; WinStaObject = IntGetWinStaObj(); if (WinStaObject == NULL) @@ -830,6 +874,8 @@ } CurInfo = IntGetSysCursorInfo(WinStaObject); + IntGetCursorLocation(WinStaObject, &MousePos); + if(WinStaObject->ActiveDesktop) DesktopWindow = IntGetWindowObject(WinStaObject->ActiveDesktop->DesktopWindow); @@ -845,8 +891,8 @@ CurInfo->CursorClipInfo.Bottom = min(Rect.bottom - 1, DesktopWindow->WindowRect.bottom - 1); IntReleaseWindowObject(DesktopWindow); - mi.dx = CurInfo->x; - mi.dy = CurInfo->y; + mi.dx = MousePos.x; + mi.dy = MousePos.y; mi.mouseData = 0; mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; mi.time = 0; _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-01-27 00:49:24 UTC (rev 13333) @@ -540,7 +540,7 @@ const UINT SwapBtnMsg[2][2] = {{WM_LBUTTONDOWN, WM_RBUTTONDOWN}, {WM_LBUTTONUP, WM_RBUTTONUP}}; const WPARAM SwapBtn[2] = {MK_LBUTTON, MK_RBUTTON}; - POINT MousePos; + POINT MousePos, OrgPos; PSYSTEM_CURSORINFO CurInfo; PWINSTATION_OBJECT WinSta; BOOL DoMove, SwapButtons; @@ -586,8 +586,10 @@ DoMove = FALSE; ExAcquireFastMutex(&CurInfo->CursorMutex); - MousePos.x = CurInfo->x; - MousePos.y = CurInfo->y; + IntGetCursorLocation(WinSta, &MousePos); + OrgPos.x = MousePos.x; + OrgPos.y = MousePos.y; + if(mi->dwFlags & MOUSEEVENTF_MOVE) { if(mi->dwFlags & MOUSEEVENTF_ABSOLUTE) @@ -631,12 +633,7 @@ MousePos.y = (LONG)CurInfo->CursorClipInfo.Top; } - DoMove = (MousePos.x != CurInfo->x || MousePos.y != CurInfo->y); - if(DoMove) - { - CurInfo->x = MousePos.x; - CurInfo->y = MousePos.y; - } + DoMove = (MousePos.x != OrgPos.x || MousePos.y != OrgPos.y); } ExReleaseFastMutex(&CurInfo->CursorMutex); @@ -657,12 +654,13 @@ if (GDIDEV(SurfObj)->Pointer.MovePointer) { GDIDEV(SurfObj)->Pointer.MovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); - } - /* FIXME - That's a bad thing! We should't access private gdi pointer fields - from here. However it is required so MouseSafetyOnDrawEnd() can - properly paint the mouse cursor to the screen again. See the - comment in MouseSafetyOnDrawEnd() to fix this problem! */ - GDIDEV(SurfObj)->Pointer.Pos = MousePos; + } else { + EngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); + } + /* Only now, update the info in the GDIDEVICE, so EngMovePointer can + * use the old values to move the pointer image */ + GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; + GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; BITMAPOBJ_UnlockBitmap(hBitmap); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-01-27 00:49:24 UTC (rev 13333) @@ -1123,7 +1123,6 @@ } else { - PSYSTEM_CURSORINFO CurInfo; Window = IntGetWindowObject(Wnd); if (NULL == Window) { @@ -1149,9 +1148,8 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } - CurInfo = IntGetSysCursorInfo(PsGetWin32Thread()->Desktop->WindowStation); - KernelModeMsg.pt.x = CurInfo->x; - KernelModeMsg.pt.y = CurInfo->y; + IntGetCursorLocation(PsGetWin32Thread()->Desktop->WindowStation, + &KernelModeMsg.pt); KeQueryTickCount(&LargeTickCount); KernelModeMsg.time = LargeTickCount.u.LowPart; MsqPostMessage(Window->MessageQueue, &KernelModeMsg, _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-01-27 00:49:24 UTC (rev 13333) @@ -263,7 +263,6 @@ case ONEPARAM_ROUTINE_GETCURSORPOSITION: { - PSYSTEM_CURSORINFO CurInfo; PWINSTATION_OBJECT WinStaObject; NTSTATUS Status; POINT Pos; @@ -277,10 +276,8 @@ if (!NT_SUCCESS(Status)) return (DWORD)FALSE; - CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME - check if process has WINSTA_READATTRIBUTES */ - Pos.x = CurInfo->x; - Pos.y = CurInfo->y; + IntGetCursorLocation(WinStaObject, &Pos); Status = MmCopyToCaller((PPOINT)Param, &Pos, sizeof(POINT)); if(!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-01-27 00:33:11 UTC (rev 13332) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-01-27 00:49:24 UTC (rev 13333) @@ -389,8 +389,6 @@ ExInitializeFastMutex(&CurInfo->CursorMutex); CurInfo->Enabled = FALSE; CurInfo->ButtonsDown = 0; - CurInfo->x = (LONG)0; - CurInfo->y = (LONG)0; CurInfo->CursorClipInfo.IsClipped = FALSE; CurInfo->LastBtnDown = 0; CurInfo->CurrentCursorObject = NULL;

19 years, 11 months

[mf] 13332: fix UNICODE command line handling for MinGW builds

by mf＠svn.reactos.com

fix UNICODE command line handling for MinGW builds Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-01-27 00:33:05 UTC (rev 13331) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-01-27 00:33:11 UTC (rev 13332) @@ -482,6 +482,9 @@ while(*cmdline && !_istspace(*cmdline)) ++cmdline; + while(_istspace(*cmdline)) + ++cmdline; + return wWinMain(GetModuleHandle(NULL), 0, cmdline, nShowCmd); }

19 years, 11 months

[mf] 13331: fix UNICODE command line handling for MinGW builds

by mf＠svn.reactos.com

fix UNICODE command line handling for MinGW builds Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-01-27 00:29:12 UTC (rev 13330) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-01-27 00:33:05 UTC (rev 13331) @@ -696,6 +696,9 @@ while(*cmdline && !_istspace(*cmdline)) ++cmdline; + while(_istspace(*cmdline)) + ++cmdline; + return wWinMain(GetModuleHandle(NULL), 0, cmdline, nShowCmd); }

19 years, 11 months

[weiden] 13330: don't optimize reading/writing from/to vga memory away in optimized builds. this fixes bug #490

by weiden＠svn.reactos.com

don't optimize reading/writing from/to vga memory away in optimized builds. this fixes bug #490 Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-01-27 00:21:34 UTC (rev 13329) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-01-27 00:29:12 UTC (rev 13330) @@ -18,8 +18,8 @@ static int byteCounter; static unsigned char rightMask; -#define READ_REGISTER_UCHAR(p) (*((PUCHAR)(p))) -#define WRITE_REGISTER_UCHAR(p,c) (*((PCHAR)(p))) = (c) +#define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p))) +#define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c) INT abs(INT nm) {

19 years, 11 months

[mf] 13329: fix typos

by mf＠svn.reactos.com

fix typos Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-01-27 00:20:40 UTC (rev 13328) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-01-27 00:21:34 UTC (rev 13329) @@ -635,10 +635,10 @@ // register frame window class g_Globals._hframeClass = IconWindowClass(CLASSNAME_FRAME,IDI_EXPLORER); - // register child windows class + // register child window class WindowClass(CLASSNAME_CHILDWND, CS_CLASSDC|CS_DBLCLKS|CS_VREDRAW).Register(); - // register tree windows class + // register tree window class WindowClass(CLASSNAME_WINEFILETREE, CS_CLASSDC|CS_DBLCLKS|CS_VREDRAW).Register(); g_Globals._cfStrFName = RegisterClipboardFormat(CFSTR_FILENAME);

19 years, 11 months

[mf] 13328: store startup path statically

by mf＠svn.reactos.com

store startup path statically Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-01-27 00:18:30 UTC (rev 13327) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-01-27 00:20:40 UTC (rev 13328) @@ -50,13 +50,12 @@ hMainFrame = SDIMainFrame::Create(); if (hMainFrame) { - String sPath; HWND hwndOld = g_Globals._hMainWnd; g_Globals._hMainWnd = hMainFrame; if (path) { - sPath = path; // copy path to avoid accessing freed memory + static String sPath = path; // copy path to avoid accessing freed memory path = sPath; }

19 years, 11 months

[mf] 13327: store start URL statically

by mf＠svn.reactos.com

store start URL statically Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-27 00:09:43 UTC (rev 13326) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-27 00:18:30 UTC (rev 13327) @@ -44,10 +44,8 @@ //@@hMainFrame = MainFrame::Create(url); if (hMainFrame) { - String sPath; - if (url) { - sPath = url; // copy url to avoid accessing freed memory + static String sPath = url; // copy url to avoid accessing freed memory url = sPath; }

19 years, 11 months

[mf] 13326: - rename some Explorer strings to IBrowser

by mf＠svn.reactos.com

- rename some Explorer strings to IBrowser - fix child window size Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp Modified: trunk/reactos/subsys/system/ibrowser/webchild.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-01-26 23:30:50 UTC (rev 13325) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-01-27 00:09:43 UTC (rev 13326) @@ -370,7 +370,7 @@ } - /// "About Explorer" Dialog + /// "About" Dialog struct ExplorerAboutDlg : public CtlColorParent< OwnerDrawParent<Dialog> _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc --- trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-01-26 23:30:50 UTC (rev 13325) +++ trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-01-27 00:09:43 UTC (rev 13326) @@ -43,8 +43,8 @@ END POPUP "&Ajutor" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&Despre Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Despre IBrowser...", ID_ABOUT_IBROWSER MENUITEM "Despre &OS...", ID_ABOUT_WINDOWS END END @@ -116,8 +116,8 @@ END POPUP "&Hilfe" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER MENUITEM "About &OS...", ID_ABOUT_WINDOWS END END @@ -188,9 +188,9 @@ "BEGIN\r\n" "IDS_VERSION_STR """"\r\n" "#ifdef UNICODE\r\n" - "IDS_IBROWSER_VERSION_STR ""ROS Explorer%0s""\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n" "#else\r\n" - "IDS_IBROWSER_VERSION_STR ""ROS Explorer Ansi%0s""\r\n" + "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n" "#endif\r\n" "END\r\n" "#endif\r\n" @@ -265,8 +265,8 @@ END POPUP "&Help" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&About IBrowser...", ID_ABOUT_IBROWSER MENUITEM "About &OS...", ID_ABOUT_WINDOWS END END @@ -323,8 +323,8 @@ END POPUP "&Ayuda" BEGIN - MENUITEM "Explorer &FAQ...", ID_IBROWSER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_IBROWSER + MENUITEM "IBrowser &FAQ...", ID_IBROWSER_FAQ + MENUITEM "&Acerca de IBrowser...", ID_ABOUT_IBROWSER MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS END END @@ -386,9 +386,9 @@ BEGIN IDS_VERSION_STR "" #ifdef UNICODE -IDS_IBROWSER_VERSION_STR "ROS Explorer%0s" +IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s" #else -IDS_IBROWSER_VERSION_STR "ROS Explorer Ansi%0s" +IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s" #endif END #endif _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-26 23:30:50 UTC (rev 13325) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-01-27 00:09:43 UTC (rev 13326) @@ -672,9 +672,9 @@ if (!url || !*url) #ifdef _DEBUG - url = _T("http://localhost"); + url = TEXT("http://localhost"); #else - url = _T("about:blank"); + url = TEXT("about:blank"); #endif if (!_right_hwnd) { @@ -764,7 +764,7 @@ } if (_right_hwnd) - hdwp = DeferWindowPos(hdwp, _right_hwnd, 0, _clnt_rect.left+cx+1, _clnt_rect.top, _clnt_rect.right-cx, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE); + hdwp = DeferWindowPos(hdwp, _right_hwnd, 0, _clnt_rect.left+cx, _clnt_rect.top, _clnt_rect.right-cx, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } _____ Modified: trunk/reactos/subsys/system/ibrowser/webchild.cpp --- trunk/reactos/subsys/system/ibrowser/webchild.cpp 2005-01-26 23:30:50 UTC (rev 13325) +++ trunk/reactos/subsys/system/ibrowser/webchild.cpp 2005-01-27 00:09:43 UTC (rev 13326) @@ -222,8 +222,8 @@ _connector = auto_ptr<EventConnector>(new EventConnector(_control, DIID_DWebBrowserEvents2, this)); + // We need to call Navigate() here to initialize the browser control (see _browser_initialized) _control->Navigate(BStr(info._url), &vtMissing, &vtMissing, &vtMissing, &vtMissing); - //browser->Navigate2(&Variant(info._url), &vtMissing, &vtMissing, &vtMissing, &vtMissing); } }

19 years, 11 months

[gvg] 13325: Avoid crash if import directory is messed up

by gvg＠svn.reactos.com

Avoid crash if import directory is messed up Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-26 22:34:39 UTC (rev 13324) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-26 23:30:50 UTC (rev 13325) @@ -1577,6 +1577,12 @@ DPRINT("Processeing import directory at %p\n", ImportModuleDirectory); while (ImportModuleDirectory->Name) { + if (Module->Length <= ImportModuleDirectory->Name) + { + DPRINT1("Invalid import directory in %wZ\n", &Module->FullName); + return STATUS_SECTION_NOT_IMAGE; + } + /* Check to make sure that import lib is kernel */ ImportedName = (PCHAR) Module->Base + ImportModuleDirectory->Name;

19 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
71
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 January 2005