Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[navaraf] 13696: Fix a stupid cut & paste error.

by navaraf＠svn.reactos.com

Fix a stupid cut & paste error. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-02-20 20:35:59 UTC (rev 13695) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-02-20 20:41:11 UTC (rev 13696) @@ -7612,9 +7612,18 @@ VOID) { volatile LONG Barrier; - __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "a"); + __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); } +static __inline +VOID +KeMemoryBarrier( + VOID) +{ + volatile LONG Barrier; + __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "%eax"); +} + NTOSAPI LONG DDKAPI

19 years, 8 months

[navaraf] 13695: Add KeMemoryBarrier.

by navaraf＠svn.reactos.com

Add KeMemoryBarrier. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-02-20 19:51:38 UTC (rev 13694) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-02-20 20:35:59 UTC (rev 13695) @@ -7606,6 +7606,15 @@ KeLeaveCriticalRegion( VOID); +static __inline +VOID +KeMemoryBarrier( + VOID) +{ + volatile LONG Barrier; + __asm__ __volatile__ ("xchg %%eax, %0" : : "m" (Barrier) : "a"); +} + NTOSAPI LONG DDKAPI

19 years, 8 months

[sedwards] 13694: Added a Open dialog. Right now it still opens new windows

by sedwards＠svn.reactos.com

Added a Open dialog. Right now it still opens new windows rather than opening documents in a existing ibrowser window. Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.h Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.h Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-02-20 19:07:24 UTC (rev 13693) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-02-20 19:51:38 UTC (rev 13694) @@ -417,8 +417,38 @@ { Dialog::DoModal(IDD_ABOUT_IBROWSER, WINDOW_CREATOR(ExplorerAboutDlg), hwndParent); } +void ibrowser_open(HWND hwndParent) +{ + HMODULE hShell32; + RUNFILEDLG RunFileDlg; + OSVERSIONINFO versionInfo; + WCHAR wTitle[40]; + WCHAR wText[256]; + char szTitle[40] = "Open"; + char szText[256] = "Type the Internet Address of a document or folder and IBrowser will open it for you."; + hShell32 = LoadLibrary(_T("SHELL32.DLL")); + RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (char*)((long)0x3D)); + /* Show "Run..." dialog */ + if (RunFileDlg) + { + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&versionInfo); + + if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) + { + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTitle, -1, wTitle, 40); + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szText, -1, wText, 256); + RunFileDlg(hwndParent, 0, NULL, (LPCSTR)wTitle, (LPCSTR)wText, RFF_CALCDIRECTORY); + } + else + RunFileDlg(hwndParent, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); + } + + FreeLibrary(hShell32); +} + static void InitInstance(HINSTANCE hInstance) { CONTEXT("InitInstance"); _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.h --- trunk/reactos/subsys/system/ibrowser/ibrowser.h 2005-02-20 19:07:24 UTC (rev 13693) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.h 2005-02-20 19:51:38 UTC (rev 13694) @@ -214,3 +214,18 @@ // display explorer "About" dialog extern void ibrowser_about(HWND hwndParent); + // display explorer "open" dialog +extern void ibrowser_open(HWND hwndParent); + + // declare shell32's "Run..." dialog export function +typedef void (WINAPI* RUNFILEDLG)(HWND hwndOwner, HICON hIcon, LPCSTR lpstrDirectory, LPCSTR lpstrTitle, LPCSTR lpstrDescription, UINT uFlags); + + // + // Flags for RunFileDlg + // + +#define RFF_NOBROWSE 0x01 // Removes the browse button. +#define RFF_NODEFAULT 0x02 // No default item selected. +#define RFF_CALCDIRECTORY 0x04 // Calculates the working directory from the file name. +#define RFF_NOLABEL 0x08 // Removes the edit box label. +#define RFF_NOSEPARATEMEM 0x20 // Removes the Separate Memory Space check box (Windows NT only). _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.h --- trunk/reactos/subsys/system/ibrowser/ibrowser_intres.h 2005-02-20 19:07:24 UTC (rev 13693) +++ trunk/reactos/subsys/system/ibrowser/ibrowser_intres.h 2005-02-20 19:51:38 UTC (rev 13694) @@ -35,6 +35,7 @@ #define ID_GO_SEARCH 40008 #define ID_GO_UP 40009 #define ID_STOP 40010 +#define ID_FILE_OPEN 0xE140 #define ID_FILE_EXIT 0xE141 #define ID_HELP 0xE146 #define IDC_STATIC -1 _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc --- trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-02-20 19:07:24 UTC (rev 13693) +++ trunk/reactos/subsys/system/ibrowser/ibrowser_intres.rc 2005-02-20 19:51:38 UTC (rev 13694) @@ -252,6 +252,7 @@ BEGIN POPUP "&File" BEGIN + MENUITEM "&Open", ID_FILE_OPEN MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&View" _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-02-20 19:07:24 UTC (rev 13693) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-02-20 19:51:38 UTC (rev 13694) @@ -262,6 +262,10 @@ CONTEXT("MainFrameBase::Command()"); switch(id) { + case ID_FILE_OPEN: + ibrowser_open(_hwnd); + break; + case ID_FILE_EXIT: SendMessage(_hwnd, WM_CLOSE, 0, 0); break;

19 years, 8 months

[gvg] 13693: Forgotten file

by gvg＠svn.reactos.com

Forgotten file Modified: trunk/reactos/include/wine/mmsystem.h _____ Modified: trunk/reactos/include/wine/mmsystem.h --- trunk/reactos/include/wine/mmsystem.h 2005-02-20 18:46:57 UTC (rev 13692) +++ trunk/reactos/include/wine/mmsystem.h 2005-02-20 19:07:24 UTC (rev 13693) @@ -25,6 +25,7 @@ #define DRV_SUCCESS 0x0001 #define DRV_FAILURE 0x0000 +#define DRV_EXITAPPLICATION 0x000C #define MCI_OPEN_DRIVER 0x0801 #define MCI_CLOSE_DRIVER 0x0802 @@ -34,11 +35,22 @@ typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */ -typedef struct tagMCI_SOUND_PARMS { - DWORD_PTR dwCallback; - LPCSTR lpstrSoundName; -} MCI_SOUND_PARMS, *LPMCI_SOUND_PARMS; +typedef struct tagMCI_SOUND_PARMSA { + DWORD_PTR dwCallback; + LPCSTR lpstrSoundName; +} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA; +typedef struct tagMCI_SOUND_PARMSW { + DWORD_PTR dwCallback; + LPCWSTR lpstrSoundName; +} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; + +#ifdef UNICODE +typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; +#else +typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; +#endif + typedef struct midievent_tag *LPMIDIEVENT; DWORD WINAPI GetDriverFlags(HDRVR hDriver);

19 years, 8 months

[ion] 13692: People keep telling me to use a branch...here goes nothing

by ion＠svn.reactos.com

People keep telling me to use a branch...here goes nothing Added: branches/alex_devel_branch/

19 years, 8 months

[hpoussin] 13691: Handle NULL values in IntGdiPolygon and IntRectangle

by hpoussin＠svn.reactos.com

Handle NULL values in IntGdiPolygon and IntRectangle Modified: trunk/reactos/subsys/win32k/objects/fillshap.c _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-20 17:35:50 UTC (rev 13690) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-20 18:01:03 UTC (rev 13691) @@ -88,9 +88,7 @@ /* Now fill the polygon with the current brush. */ FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); - /* FIXME - FillBrushObj can be NULL!!!!!!!! Don't Assert! */ - ASSERT(FillBrushObj); - if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->w.ROPmode), UnsafePoints, Count, DestRect ); @@ -99,12 +97,10 @@ /* get BRUSHOBJ from current pen. */ PenBrushObj = PENOBJ_LockPen(dc->w.hPen); - /* FIXME - handle PenBrushObj == NULL !!!!! */ - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - // Draw the Polygon Edges with the current pen ( if not a NULL pen ) - if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); for ( CurrentPoint = 0; CurrentPoint < Count; ++CurrentPoint ) { POINT To, From; //, Next; @@ -260,7 +256,7 @@ } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (NULL = BitmapObj) + if (NULL == BitmapObj) { BRUSHOBJ_UnlockBrush(dc->w.hBrush); BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); @@ -968,14 +964,13 @@ DestRect.bottom = BottomRect; FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); - /* FIXME - Handle FillBrushObj == NULL !!!! */ - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); if ( FillBrushObj ) { if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { - ret = IntEngBitBlt(BitmapObj, + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + ret = IntEngBitBlt(BitmapObj, NULL, NULL, dc->CombinedClip,

19 years, 8 months

[hpoussin] 13690: Handle NULL values in IntRoundRect and NtGdiEllipse

by hpoussin＠svn.reactos.com

Handle NULL values in IntRoundRect and NtGdiEllipse Modified: trunk/reactos/subsys/win32k/objects/fillshap.c _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-20 16:46:10 UTC (rev 13689) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-20 17:35:50 UTC (rev 13690) @@ -260,8 +260,14 @@ } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - /* FIXME - BitmapObj can be NULL!!!! Don't assert but handle this case gracefully! */ - ASSERT(BitmapObj); + if (NULL = BitmapObj) + { + BRUSHOBJ_UnlockBrush(dc->w.hBrush); + BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); + DC_UnlockDc(hDC); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } IntGdiInitBrushInstance(&FillBrushInst, FillBrush, dc->XlateBrush); IntGdiInitBrushInstance(&PenBrushInst, PenBrush, dc->XlatePen); @@ -1113,30 +1119,44 @@ RectBounds.bottom = bottom; BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - /* FIXME - BitmapObj can be NULL!!!! Handle this case gracefully instead of ASSERT! */ - ASSERT(BitmapObj); + if (!BitmapObj) + { + /* Nothing to do, as we don't have a bitmap */ + BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); - /* FIXME - Don't assert if FillBrushObj == NULL, handle this case !!!! */ - ASSERT(FillBrushObj); - if (FillBrushObj->flAttrs & GDIBRUSH_IS_NULL) + if (FillBrushObj) { - BRUSHOBJ_UnlockBrush(dc->w.hBrush); - FillBrushObj = NULL; // make null brush check simpler... + if (FillBrushObj->flAttrs & GDIBRUSH_IS_NULL) + { + /* make null brush check simpler... */ + BRUSHOBJ_UnlockBrush(dc->w.hBrush); + FillBrushObj = NULL; + } + else + { + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + } } PenBrushObj = PENOBJ_LockPen(dc->w.hPen); - /* FIXME - PenBrushObject can be NULL!!! Don't assert!!!! */ - ASSERT(PenBrushObj); - if (PenBrushObj->flAttrs & GDIBRUSH_IS_NULL) + if (PenBrushObj) { - PENOBJ_UnlockPen(dc->w.hPen); - PenBrushObj = NULL; + if (PenBrushObj->flAttrs & GDIBRUSH_IS_NULL) + { + /* make null pen check simpler... */ + PENOBJ_UnlockPen(dc->w.hPen); + PenBrushObj = NULL; + } + else + { + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + } } - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - right--; bottom--; @@ -1317,7 +1337,8 @@ BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); if(PenBrushObj != NULL) PENOBJ_UnlockPen(dc->w.hPen); - BRUSHOBJ_UnlockBrush(dc->w.hBrush); + if(FillBrushObj != NULL) + BRUSHOBJ_UnlockBrush(dc->w.hBrush); return ret; }

19 years, 8 months

[ea] 13689: SM_ missing updated headers

by ea＠svn.reactos.com

SM_ missing updated headers Modified: trunk/reactos/include/sm/api.h Modified: trunk/reactos/include/sm/helper.h _____ Modified: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-02-20 16:37:58 UTC (rev 13688) +++ trunk/reactos/include/sm/api.h 2005-02-20 16:46:10 UTC (rev 13689) @@ -8,6 +8,29 @@ #pragma pack(push,4) +/*** DATA TYPES ******************************************************/ + +#define SM_SB_NAME_MAX_LENGTH 120 + +#pragma pack(push,4) + +/* SmConnectApiPort */ +typedef struct _SM_CONNECT_DATA +{ + ULONG Subsystem; + WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; + +} SM_CONNECT_DATA, *PSM_CONNECT_DATA; + +/* SmpConnectSbApiPort */ +typedef struct _SB_CONNECT_DATA +{ + ULONG SmApiMax; +} SB_CONNECT_DATA, *PSB_CONNECT_DATA; + + +/*** SM API ***/ + /*** 1 ****************************************************************/ #define SM_API_COMPLETE_SESSION 1 /* complete a session initialization */ @@ -65,8 +88,9 @@ /*** MACRO ***********************************************************/ -#define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) -#define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) +#define SM_CONNECT_DATA_SIZE(m) ((m).Header.DataSize-sizeof(ULONG)) +#define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) +#define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) #endif /* !def __SM_API_H */ _____ Modified: trunk/reactos/include/sm/helper.h --- trunk/reactos/include/sm/helper.h 2005-02-20 16:37:58 UTC (rev 13688) +++ trunk/reactos/include/sm/helper.h 2005-02-20 16:46:10 UTC (rev 13689) @@ -1,32 +1,8 @@ #ifndef INCLUDE_SM_HELPER_H #define INCLUDE_SM_HELPER_H +#define _SM_HELPER_H +/* $Id$ */ -/*** DATA TYPES ******************************************************/ - -#define SM_SB_NAME_MAX_LENGTH 120 - -#pragma pack(push,4) - -/* SmConnectApiPort */ -typedef struct _SM_CONNECT_DATA -{ - ULONG Subsystem; - WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; - -} SM_CONNECT_DATA, *PSM_CONNECT_DATA; - -/* SmpConnectSbApiPort */ -typedef struct _SB_CONNECT_DATA -{ - ULONG SmApiMax; -} SB_CONNECT_DATA, *PSB_CONNECT_DATA; - -#pragma pack(pop) - - -/*** PROTOTYPES ******************************************************/ - - /* smdll/connect.c */ NTSTATUS STDCALL SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL,

19 years, 8 months

[ea] 13688: FreeType: version information

by ea＠svn.reactos.com

FreeType: version information - original copyright added - year updated Modified: trunk/reactos/lib/freetype/freetype.rc _____ Modified: trunk/reactos/lib/freetype/freetype.rc --- trunk/reactos/lib/freetype/freetype.rc 2005-02-20 15:24:06 UTC (rev 13687) +++ trunk/reactos/lib/freetype/freetype.rc 2005-02-20 16:37:58 UTC (rev 13688) @@ -3,5 +3,6 @@ #define REACTOS_STR_INTERNAL_NAME "freetype\0" #define REACTOS_STR_ORIGINAL_FILENAME "freetype.dll\0" #define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/FreeType Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2004 ReactOS Team, 1996-2004 FreeType Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2005 ReactOS Team\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright 1996-2005 FreeType Team\0" #include <reactos/version.rc>

19 years, 8 months

[navaraf] 13687: Fix the compilation of expat.

by navaraf＠svn.reactos.com

Fix the compilation of expat. Modified: trunk/reactos/lib/expat/Makefile Modified: trunk/reactos/lib/expat/lib/internal.h _____ Modified: trunk/reactos/lib/expat/Makefile --- trunk/reactos/lib/expat/Makefile 2005-02-20 15:02:48 UTC (rev 13686) +++ trunk/reactos/lib/expat/Makefile 2005-02-20 15:24:06 UTC (rev 13687) @@ -8,7 +8,7 @@ TARGET_TYPE = library -TARGET_CFLAGS = -D__USE_W32API -DHAVE_EXPAT_CONFIG_H -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions +TARGET_CFLAGS = -D__USE_W32API -DHAVE_EXPAT_CONFIG_H -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -Ilib TARGET_LFLAGS = -nostartfiles LIB_OBJECTS = \ _____ Modified: trunk/reactos/lib/expat/lib/internal.h --- trunk/reactos/lib/expat/lib/internal.h 2005-02-20 15:02:48 UTC (rev 13686) +++ trunk/reactos/lib/expat/lib/internal.h 2005-02-20 15:24:06 UTC (rev 13687) @@ -20,7 +20,7 @@ and therefore subject to change. */ -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__) /* We'll use this version by default only where we know it helps. regparm() generates warnings on Solaris boxes. See SF bug #692878.

19 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
...
42
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 February 2005