Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 43402: [arwinss] - Sync up to Wine-1.1.31.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 16:23:25 2009 New Revision: 43402 URL: http://svn.reactos.org/svn/reactos?rev=43402&view=rev Log: [arwinss] - Sync up to Wine-1.1.31. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/bitblt.c branches/arwinss/reactos/dll/win32/gdi32/bitmap.c branches/arwinss/reactos/dll/win32/gdi32/brush.c branches/arwinss/reactos/dll/win32/gdi32/dc.c branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/objects.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h branches/arwinss/reactos/dll/win32/gdi32/metafile16.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/bitblt.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/init.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/metafiledrv.h branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 12 16:23:25 2009 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/gdi32:42000-43126 -/vendor/wine/dlls/gdi32/current:43136,43149 +/vendor/wine/dlls/gdi32/current:43136,43149,43398 Modified: branches/arwinss/reactos/dll/win32/gdi32/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bitblt.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -47,11 +47,17 @@ if (!dc) return FALSE; + TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); + if (dc->funcs->pPatBlt) { - TRACE("%p %d,%d %dx%d %06x\n", hdc, left, top, width, height, rop ); update_dc( dc ); bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop ); + } + else if (dc->funcs->pStretchBlt) + { + update_dc( dc ); + bRet = dc->funcs->pStretchBlt( dc->physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); } release_dc_ptr( dc ); return bRet; @@ -72,14 +78,19 @@ if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; - if (dcDst->funcs->pBitBlt) + if (dcDst->funcs->pBitBlt || dcDst->funcs->pStretchBlt) { update_dc( dcDst ); dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); - ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, - dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + if (dcDst->funcs->pBitBlt) + ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); + else + ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, width, height, + dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, + width, height, rop ); release_dc_ptr( dcDst ); if (dcSrc) release_dc_ptr( dcSrc ); Modified: branches/arwinss/reactos/dll/win32/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/bitmap.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -292,7 +292,6 @@ bmpobj->bitmap.bmBits = NULL; bmpobj->funcs = NULL; bmpobj->dib = NULL; - bmpobj->segptr_bits = 0; bmpobj->color_table = NULL; bmpobj->nb_colors = 0; @@ -657,17 +656,6 @@ VirtualFree(dib->dsBm.bmBits, 0L, MEM_RELEASE ); } HeapFree(GetProcessHeap(), 0, dib); - bmp->dib = NULL; -#ifndef __REACTOS__ - if (bmp->segptr_bits) - { /* free its selector array */ - WORD sel = SELECTOROF(bmp->segptr_bits); - WORD count = (GetSelectorLimit16(sel) / 0x10000) + 1; - int i; - - for (i = 0; i < count; i++) FreeSelector16(sel + (i << __AHSHIFT)); - } -#endif HeapFree(GetProcessHeap(), 0, bmp->color_table); } return HeapFree( GetProcessHeap(), 0, bmp ); Modified: branches/arwinss/reactos/dll/win32/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/brush.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/brush.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -53,11 +53,10 @@ BRUSH_DeleteObject /* pDeleteObject */ }; -#ifndef __REACTOS__ -static HGLOBAL16 dib_copy(const BITMAPINFO *info, UINT coloruse) +static HGLOBAL dib_copy(const BITMAPINFO *info, UINT coloruse) { BITMAPINFO *newInfo; - HGLOBAL16 hmem; + HGLOBAL hmem; INT size; if (info->bmiHeader.biCompression != BI_RGB && info->bmiHeader.biCompression != BI_BITFIELDS) @@ -68,16 +67,15 @@ info->bmiHeader.biBitCount); size += bitmap_info_size( info, coloruse ); - if (!(hmem = GlobalAlloc16( GMEM_MOVEABLE, size ))) + if (!(hmem = GlobalAlloc( GMEM_MOVEABLE, size ))) { return 0; } - newInfo = GlobalLock16( hmem ); + newInfo = GlobalLock( hmem ); memcpy( newInfo, info, size ); - GlobalUnlock16( hmem ); + GlobalUnlock( hmem ); return hmem; } -#endif /*********************************************************************** @@ -119,7 +117,6 @@ ptr->logbrush.lbHatch = (ULONG_PTR)BITMAP_CopyBitmap( (HBITMAP) ptr->logbrush.lbHatch ); if (!ptr->logbrush.lbHatch) goto error; break; -#ifndef __REACTOS__ case BS_DIBPATTERNPT: ptr->logbrush.lbStyle = BS_DIBPATTERN; ptr->logbrush.lbHatch = (ULONG_PTR)dib_copy( (BITMAPINFO *) ptr->logbrush.lbHatch, @@ -135,12 +132,11 @@ ptr->logbrush.lbStyle = BS_DIBPATTERN; if (!(bmi = GlobalLock( h ))) goto error; - ptr->logbrush.lbHatch = dib_copy( bmi, ptr->logbrush.lbColor); + ptr->logbrush.lbHatch = (ULONG_PTR)dib_copy( bmi, ptr->logbrush.lbColor); GlobalUnlock( h ); if (!ptr->logbrush.lbHatch) goto error; break; } -#endif default: if(ptr->logbrush.lbStyle > BS_MONOPATTERN) goto error; break; @@ -159,7 +155,7 @@ DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); #ifndef __REACTOS__ else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) - GlobalFree16( (HGLOBAL16)ptr->logbrush.lbHatch ); + GlobalFree( (HGLOBAL)ptr->logbrush.lbHatch ); #endif } HeapFree( GetProcessHeap(), 0, ptr ); @@ -427,9 +423,7 @@ DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch ); break; case BS_DIBPATTERN: -#ifndef __REACTOS__ - GlobalFree16( (HGLOBAL16)brush->logbrush.lbHatch ); -#endif + GlobalFree( (HGLOBAL)brush->logbrush.lbHatch ); break; } return HeapFree( GetProcessHeap(), 0, brush ); Modified: branches/arwinss/reactos/dll/win32/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/dc.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -87,7 +87,6 @@ dc->saved_dc = 0; dc->dwHookData = 0; dc->hookProc = NULL; - dc->hookThunk = NULL; dc->wndOrgX = 0; dc->wndOrgY = 0; dc->wndExtX = 1; @@ -224,8 +223,8 @@ */ void update_dc( DC *dc ) { - if (InterlockedExchange( &dc->dirty, 0 ) && dc->hookThunk) - dc->hookThunk( dc->hSelf, DCHC_INVALIDVISRGN, dc->dwHookData, 0 ); + if (InterlockedExchange( &dc->dirty, 0 ) && dc->hookProc) + dc->hookProc( dc->hSelf, DCHC_INVALIDVISRGN, dc->dwHookData, 0 ); } @@ -403,8 +402,7 @@ PATH_InitGdiPath( &newdc->path ); newdc->pAbortProc = NULL; - newdc->hookThunk = NULL; - newdc->hookProc = 0; + newdc->hookProc = NULL; newdc->saved_visrgn = NULL; if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) @@ -820,7 +818,7 @@ } /* Call hook procedure to check whether is it OK to delete this DC */ - if (dc->hookThunk && !dc->hookThunk( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) + if (dc->hookProc && !dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); return FALSE; @@ -1389,7 +1387,7 @@ if (!(dc->flags & DC_SAVED)) { dc->dwHookData = dwHookData; - dc->hookThunk = hookProc; + dc->hookProc = hookProc; } release_dc_ptr( dc ); return TRUE; @@ -1407,71 +1405,11 @@ DWORD_PTR ret; if (!dc) return 0; - if (proc) *proc = dc->hookThunk; + if (proc) *proc = dc->hookProc; ret = dc->dwHookData; release_dc_ptr( dc ); return ret; } - - -/* relay function to call the 16-bit DC hook proc */ -#ifndef __REACTOS__ -static BOOL WINAPI call_dc_hook16( HDC hdc, WORD code, DWORD_PTR data, LPARAM lParam ) -{ - WORD args[6]; - DWORD ret = 0; - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - if (dc->hookProc) - { - args[5] = HDC_16(hdc); - args[4] = code; - args[3] = HIWORD(data); - args[2] = LOWORD(data); - args[1] = HIWORD(lParam); - args[0] = LOWORD(lParam); - WOWCallback16Ex( (DWORD)dc->hookProc, WCB16_PASCAL, sizeof(args), args, &ret ); - } - release_dc_ptr( dc ); - return LOWORD(ret); -} - -/*********************************************************************** - * SetDCHook (GDI.190) - */ -BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData ) -{ - DC *dc = get_dc_ptr( HDC_32(hdc16) ); - - if (!dc) return FALSE; - if (!(dc->flags & DC_SAVED)) - { - dc->dwHookData = dwHookData; - dc->hookThunk = call_dc_hook16; - dc->hookProc = hookProc; - } - release_dc_ptr( dc ); - return TRUE; -} - - -/*********************************************************************** - * GetDCHook (GDI.191) - */ -DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) -{ - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - DWORD ret; - - if (!dc) return 0; - *phookProc = dc->hookProc; - ret = dc->dwHookData; - release_dc_ptr( dc ); - return ret; -} -#endif /*********************************************************************** Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/objects.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/objects.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -166,7 +166,7 @@ { EMRCREATEDIBPATTERNBRUSHPT *emr; DWORD bmSize, biSize, size; - BITMAPINFO *info = GlobalLock16(logbrush.lbHatch); + BITMAPINFO *info = GlobalLock( (HGLOBAL)logbrush.lbHatch ); if (info->bmiHeader.biCompression) bmSize = info->bmiHeader.biSizeImage; @@ -192,7 +192,7 @@ if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0; HeapFree( GetProcessHeap(), 0, emr ); - GlobalUnlock16(logbrush.lbHatch); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } break; Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -5507,12 +5507,18 @@ LeaveCriticalSection( &freetype_cs ); return FALSE; } - } - if(!font->potm) - { - LeaveCriticalSection( &freetype_cs ); - return FALSE; - } + + /* Make sure that the font has sane width/height ratio */ + if (font->aveWidth) + { + if ((font->aveWidth + font->potm->otmTextMetrics.tmHeight - 1) / font->potm->otmTextMetrics.tmHeight > 100) + { + WARN("Ignoring too large font->aveWidth %d\n", font->aveWidth); + font->aveWidth = 0; + } + } + } + *ptm = font->potm->otmTextMetrics; scale_font_metrics(font, ptm); LeaveCriticalSection( &freetype_cs ); Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -252,8 +252,7 @@ INT saveLevel; HDC saved_dc; DWORD_PTR dwHookData; - FARPROC16 hookProc; /* the original SEGPTR ... */ - DCHOOKPROC hookThunk; /* ... and the thunk to call it */ + DCHOOKPROC hookProc; /* DC hook */ INT wndOrgX; /* Window origin */ INT wndOrgY; @@ -346,7 +345,6 @@ const DC_FUNCTIONS *funcs; /* DC function table */ /* For device-independent bitmaps: */ DIBSECTION *dib; - SEGPTR segptr_bits; /* segptr to DIB bits */ RGBQUAD *color_table; /* DIB color table if <= 8bpp */ UINT nb_colors; /* number of colors in table */ } BITMAPOBJ; @@ -462,7 +460,6 @@ /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; -extern HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) DECLSPEC_HIDDEN; extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; extern METAHEADER *MF_ReadMetaFile(HANDLE hfile) DECLSPEC_HIDDEN; extern METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) DECLSPEC_HIDDEN; Modified: branches/arwinss/reactos/dll/win32/gdi32/metafile16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/metafile16.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/metafile16.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -55,6 +55,61 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 hmf ) { return GlobalUnlock16( hmf ); +} + +/****************************************************************** + * MF_Create_HMETATFILE16 + * + * Creates a HMETAFILE16 object from a METAHEADER + * + * HMETAFILE16s are Global memory handles. + */ +static HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) +{ + HMETAFILE16 hmf; + DWORD size = mh->mtSize * sizeof(WORD); + + hmf = GlobalAlloc16(GMEM_MOVEABLE, size); + if(hmf) + { + METAHEADER *mh_dest = GlobalLock16(hmf); + memcpy(mh_dest, mh, size); + GlobalUnlock16(hmf); + } + HeapFree(GetProcessHeap(), 0, mh); + return hmf; +} + +/********************************************************************** + * CreateMetaFile (GDI.125) + */ +HDC16 WINAPI CreateMetaFile16( LPCSTR filename ) +{ + return HDC_16( CreateMetaFileA( filename ) ); +} + +/****************************************************************** + * CloseMetaFile (GDI.126) + */ +HMETAFILE16 WINAPI CloseMetaFile16(HDC16 hdc) +{ + HMETAFILE16 hmf16 = 0; + HMETAFILE hmf = CloseMetaFile( HDC_32(hdc) ); + + if (hmf) + { + UINT size = GetMetaFileBitsEx( hmf, 0, NULL ); + + hmf16 = GlobalAlloc16( GMEM_MOVEABLE, size ); + if (hmf16) + { + void *buffer = GlobalLock16( hmf16 ); + GetMetaFileBitsEx( hmf, size, buffer ); + GlobalUnlock16( hmf16 ); + } + DeleteMetaFile( hmf ); + } + return hmf16; } /****************************************************************** Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/mfdrv/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/mfdrv/bitblt.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -33,18 +33,6 @@ MFDRV_MetaParam6( dev, META_PATBLT, left, top, width, height, HIWORD(rop), LOWORD(rop) ); return TRUE; } - - -/*********************************************************************** - * MFDRV_BitBlt - */ -BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, - PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) -{ - return MFDRV_StretchBlt(devDst, xDst, yDst, width, height, devSrc, - xSrc, ySrc, width, height, rop); -} - /*********************************************************************** Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/mfdrv/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/mfdrv/init.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -23,8 +23,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" -#include "wownt32.h" #include "gdi_private.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" @@ -40,7 +38,7 @@ MFDRV_Arc, /* pArc */ NULL, /* pArcTo */ MFDRV_BeginPath, /* pBeginPath */ - MFDRV_BitBlt, /* pBitBlt */ + NULL, /* pBitBlt */ NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ @@ -354,52 +352,6 @@ } /****************************************************************** - * MF_Create_HMETATFILE16 - * - * Creates a HMETAFILE16 object from a METAHEADER - * - * HMETAFILE16s are Global memory handles. - */ -HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) -{ - HMETAFILE16 hmf; - DWORD size = mh->mtSize * sizeof(WORD); - - hmf = GlobalAlloc16(GMEM_MOVEABLE, size); - if(hmf) - { - METAHEADER *mh_dest = GlobalLock16(hmf); - memcpy(mh_dest, mh, size); - GlobalUnlock16(hmf); - } - HeapFree(GetProcessHeap(), 0, mh); - return hmf; -} - -/****************************************************************** - * CloseMetaFile (GDI.126) - * - * PARAMS - * hdc [I] Metafile DC to close - */ -HMETAFILE16 WINAPI CloseMetaFile16(HDC16 hdc) -{ - HMETAFILE16 hmf; - METAFILEDRV_PDEVICE *physDev; - DC *dc = MFDRV_CloseMetaFile(HDC_32(hdc)); - if (!dc) return 0; - physDev = (METAFILEDRV_PDEVICE *)dc->physDev; - - /* Now allocate a global handle for the metafile */ - - hmf = MF_Create_HMETAFILE16( physDev->mh ); - - physDev->mh = NULL; /* So it won't be deleted */ - MFDRV_DeleteDC( dc ); - return hmf; -} - -/****************************************************************** * CloseMetaFile (GDI32.@) * * Stop recording graphics operations in metafile associated with Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/metafiledrv.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/mfdrv/metafiledrv.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/mfdrv/metafiledrv.h [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -64,9 +64,6 @@ extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, - INT height, PHYSDEV devSrc, INT xSrc, INT ySrc, - DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c [iso-8859-1] Mon Oct 12 16:23:25 2009 @@ -300,7 +300,7 @@ BITMAPINFO *info; DWORD bmSize, biSize; - info = GlobalLock16((HGLOBAL16)logbrush.lbHatch); + info = GlobalLock( (HGLOBAL)logbrush.lbHatch ); if (info->bmiHeader.biCompression) bmSize = info->bmiHeader.biSizeImage; else @@ -310,12 +310,17 @@ biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); size = sizeof(METARECORD) + biSize + bmSize + 2; mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(!mr) goto done; + if (!mr) + { + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); + goto done; + } mr->rdFunction = META_DIBCREATEPATTERNBRUSH; mr->rdSize = size / 2; *(mr->rdParm) = logbrush.lbStyle; *(mr->rdParm + 1) = LOWORD(logbrush.lbColor); memcpy(mr->rdParm + 2, info, biSize + bmSize); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); break; } default:

1 0

[fireball] 43401: [arwinss] - Merge Wine-1.1.31 server headers.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 16:22:23 2009 New Revision: 43401 URL: http://svn.reactos.org/svn/reactos?rev=43401&view=rev Log: [arwinss] - Merge Wine-1.1.31 server headers. Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (contents, props changed) Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/server_protocol.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/server_protocol.h [iso-8859-1] Mon Oct 12 16:22:23 2009 @@ -112,7 +112,6 @@ struct { int code; - int unicode; client_ptr_t string; data_size_t length; } output_string; @@ -2045,8 +2044,6 @@ struct request_header __header; data_size_t length; client_ptr_t string; - int unicode; - char __pad_28[4]; }; struct output_debug_string_reply { @@ -5344,6 +5341,6 @@ struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 390 +#define SERVER_PROTOCOL_VERSION 391 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] Mon Oct 12 16:22:23 2009 @@ -1064,8 +1064,7 @@ C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, unicode) == 24 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 32 ); +C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 12 16:22:23 2009 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43126 -/vendor/wine/server/current/request.h:43136 +/vendor/wine/server/current/request.h:43136,43398

1 0

[dreimer] 43400: - Updated DejaVu Fonts to Version 2.30 - Updated 3rd Party Files Document
by dreimer＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dreimer Date: Mon Oct 12 16:10:57 2009 New Revision: 43400 URL: http://svn.reactos.org/svn/reactos?rev=43400&view=rev Log: - Updated DejaVu Fonts to Version 2.30 - Updated 3rd Party Files Document Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Mon Oct 12 16:10:57 2009 @@ -8,8 +8,8 @@ Website: https://www.redhat.com/promo/fonts/ Title: DejaVu Fonts -Version: 2.26 -Actual Version: 2.27 +Version: 2.30 +Actual Version: 2.30 Website: http://dejavu.sourceforge.net Title: DXTN OpenGL Compression Libs @@ -19,12 +19,12 @@ Title: FreeType Version: 2.3.5 -Actual Version: 2.3.7 +Actual Version: 2.3.11 Website: http://www.freetype.org Title: Mesa3D -Version: 7.2 -Actual Version: 7.2 +Version: 7.4 +Actual Version: 7.6 Website: http://www.mesa3d.org Title: GNU adns @@ -44,7 +44,7 @@ Title: LibXML Version: 2.7.1 -Actual Version: 2.7.1 +Actual Version: 2.7.6 Website: http://xmlsoft.org Title: ZLib Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-It… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… ============================================================================== Binary files - no diff available.

1 0

[fireball] 43399: - Remove Wine-X_X_XX tags from user32/gdi32/winex11/server vendor imports: I don't see a need to maintain them. It's not CVS times anymore.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 15:58:42 2009 New Revision: 43399 URL: http://svn.reactos.org/svn/reactos?rev=43399&view=rev Log: - Remove Wine-X_X_XX tags from user32/gdi32/winex11/server vendor imports: I don't see a need to maintain them. It's not CVS times anymore. Removed: vendor/wine/dlls/gdi32/Wine-1_1_30/ vendor/wine/dlls/user32/Wine-1_1_30/ vendor/wine/dlls/winex11.drv/Wine-1_1_30/ vendor/wine/server/Wine-1_1_30/

1 0

[fireball] 43398: - Vendor import Wine-1.1.31 gdi32, user32, winex11.drv and wineserver.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 15:56:55 2009 New Revision: 43398 URL: http://svn.reactos.org/svn/reactos?rev=43398&view=rev Log: - Vendor import Wine-1.1.31 gdi32, user32, winex11.drv and wineserver. Removed: vendor/wine/dlls/gdi32/current/wing.c vendor/wine/dlls/gdi32/current/wing.spec Modified: vendor/wine/dlls/gdi32/current/Makefile.in vendor/wine/dlls/gdi32/current/bitblt.c vendor/wine/dlls/gdi32/current/bitmap.c vendor/wine/dlls/gdi32/current/brush.c vendor/wine/dlls/gdi32/current/dc.c vendor/wine/dlls/gdi32/current/enhmfdrv/objects.c vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/current/gdi16.c vendor/wine/dlls/gdi32/current/gdi_private.h vendor/wine/dlls/gdi32/current/metafile16.c vendor/wine/dlls/gdi32/current/mfdrv/bitblt.c vendor/wine/dlls/gdi32/current/mfdrv/init.c vendor/wine/dlls/gdi32/current/mfdrv/metafiledrv.h vendor/wine/dlls/gdi32/current/mfdrv/objects.c vendor/wine/dlls/gdi32/current/tests/bitmap.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/user32/current/clipboard.c vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/sysparams.c vendor/wine/dlls/user32/current/tests/class.c vendor/wine/dlls/user32/current/tests/cursoricon.c vendor/wine/dlls/user32/current/tests/dde.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/tests/sysparams.c vendor/wine/dlls/user32/current/tests/text.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/text.c vendor/wine/dlls/user32/current/uitools.c vendor/wine/dlls/winex11.drv/current/bitblt.c vendor/wine/dlls/winex11.drv/current/brush.c vendor/wine/dlls/winex11.drv/current/dib.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/winex11.drv.spec vendor/wine/dlls/winex11.drv/current/x11drv.h vendor/wine/dlls/winex11.drv/current/xfont.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/debugger.c vendor/wine/server/current/fd.c vendor/wine/server/current/process.c vendor/wine/server/current/protocol.def vendor/wine/server/current/request.h vendor/wine/server/current/thread.c vendor/wine/server/current/thread.h vendor/wine/server/current/trace.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/Makefile.… Modified: vendor/wine/dlls/gdi32/current/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/bitblt.c?… Modified: vendor/wine/dlls/gdi32/current/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/bitmap.c?… Modified: vendor/wine/dlls/gdi32/current/brush.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/brush.c?r… Modified: vendor/wine/dlls/gdi32/current/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dc.c?rev=… Modified: vendor/wine/dlls/gdi32/current/enhmfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/enhmfdrv/… Modified: vendor/wine/dlls/gdi32/current/freetype.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/freetype.… Modified: vendor/wine/dlls/gdi32/current/gdi16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi16.c?r… Modified: vendor/wine/dlls/gdi32/current/gdi_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi_priva… Modified: vendor/wine/dlls/gdi32/current/metafile16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/metafile1… Modified: vendor/wine/dlls/gdi32/current/mfdrv/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/bit… Modified: vendor/wine/dlls/gdi32/current/mfdrv/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/ini… Modified: vendor/wine/dlls/gdi32/current/mfdrv/metafiledrv.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/met… Modified: vendor/wine/dlls/gdi32/current/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/obj… Modified: vendor/wine/dlls/gdi32/current/tests/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/bit… Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… Removed: vendor/wine/dlls/gdi32/current/wing.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/wing.c?re… Removed: vendor/wine/dlls/gdi32/current/wing.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/wing.spec… Modified: vendor/wine/dlls/user32/current/clipboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/clipboar… Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… Modified: vendor/wine/dlls/user32/current/sysparams.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/sysparam… Modified: vendor/wine/dlls/user32/current/tests/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cl… Modified: vendor/wine/dlls/user32/current/tests/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cu… Modified: vendor/wine/dlls/user32/current/tests/dde.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/dd… Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… Modified: vendor/wine/dlls/user32/current/tests/sysparams.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/sy… Modified: vendor/wine/dlls/user32/current/tests/text.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/te… Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… Modified: vendor/wine/dlls/user32/current/text.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/text.c?r… Modified: vendor/wine/dlls/user32/current/uitools.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/uitools.… Modified: vendor/wine/dlls/winex11.drv/current/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/brush.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bru… Modified: vendor/wine/dlls/winex11.drv/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/dib… Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… Modified: vendor/wine/dlls/winex11.drv/current/winex11.drv.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/x11drv.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/xfont.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xfo… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… Modified: vendor/wine/server/current/debugger.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/debugger.c?re… Modified: vendor/wine/server/current/fd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/fd.c?rev=4339… Modified: vendor/wine/server/current/process.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/process.c?rev… Modified: vendor/wine/server/current/protocol.def URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/protocol.def?… Modified: vendor/wine/server/current/request.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/request.h?rev… Modified: vendor/wine/server/current/thread.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.c?rev=… Modified: vendor/wine/server/current/thread.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.h?rev=… Modified: vendor/wine/server/current/trace.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/trace.c?rev=4…

1 0

[fireball] 43397: [fastfat_new] - Start implementing volume open requests.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 15:17:56 2009 New Revision: 43397 URL: http://svn.reactos.org/svn/reactos?rev=43397&view=rev Log: [fastfat_new] - Start implementing volume open requests. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Oct 12 15:17:56 2009 @@ -113,6 +113,100 @@ return Iosb; } +IO_STATUS_BLOCK +NTAPI +FatiOpenVolume(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG CreateDisposition) +{ + PCCB Ccb; + IO_STATUS_BLOCK Iosb = {{0}}; + BOOLEAN VolumeFlushed = FALSE; + + /* Check parameters */ + if (CreateDisposition != FILE_OPEN && + CreateDisposition != FILE_OPEN_IF) + { + /* Deny access */ + Iosb.Status = STATUS_ACCESS_DENIED; + } + + /* Check if it's exclusive open */ + if (!FlagOn(ShareAccess, FILE_SHARE_WRITE) && + !FlagOn(ShareAccess, FILE_SHARE_DELETE)) + { + // TODO: Check if exclusive read access requested + // and opened handles count is not 0 + //if (!FlagOn(ShareAccess, FILE_SHARE_READ) + + DPRINT1("Exclusive voume open\n"); + + // TODO: Flush the volume + VolumeFlushed = TRUE; + } + else if (FlagOn(*DesiredAccess, FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA)) + { + DPRINT1("Shared open\n"); + + // TODO: Flush the volume + VolumeFlushed = TRUE; + } + + if (VolumeFlushed && + !FlagOn(Vcb->State, VCB_STATE_MOUNTED_DIRTY) && + FlagOn(Vcb->State, VCB_STATE_FLAG_DIRTY) && + CcIsThereDirtyData(Vcb->Vpb)) + { + UNIMPLEMENTED; + } + + /* Set share access */ + if (Vcb->DirectOpenCount > 0) + { + /* This volume has already been opened */ + Iosb.Status = IoCheckShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Vcb->ShareAccess, + TRUE); + + if (!NT_SUCCESS(Iosb.Status)) + { + ASSERT(FALSE); + } + } + else + { + /* This is the first time open */ + IoSetShareAccess(*DesiredAccess, + ShareAccess, + FileObject, + &Vcb->ShareAccess); + } + + /* Set file object pointers */ + Ccb = FatCreateCcb(IrpContext); + FatSetFileObject(FileObject, UserVolumeOpen, Vcb, Ccb); + FileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; + + /* Increase direct open count */ + Vcb->DirectOpenCount++; + Vcb->OpenFileCount++; + + /* Set no buffering flag */ + FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; + + // TODO: User's access check + + Iosb.Status = STATUS_SUCCESS; + Iosb.Information = FILE_OPENED; + + return Iosb; +} + NTSTATUS NTAPI FatiCreate(IN PFAT_IRP_CONTEXT IrpContext, @@ -297,17 +391,36 @@ if (!RelatedFO || FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen) { + /* Check parameters */ + if (DirectoryFile || OpenTargetDirectory) + { + Status = DirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request and return */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; + } + /* It is indeed a volume open request */ - DPRINT1("Volume open request, not implemented now!\n"); - UNIMPLEMENTED; + Iosb = FatiOpenVolume(IrpContext, + FileObject, + Vcb, + DesiredAccess, + ShareAccess, + CreateDisposition); + + /* Set resulting information */ + Irp->IoStatus.Information = Iosb.Information; /* Unlock VCB */ FatReleaseVcb(IrpContext, Vcb); - /* Complete the request */ - FatCompleteRequest(IrpContext, Irp, STATUS_NOT_IMPLEMENTED); - - return STATUS_NOT_IMPLEMENTED; + /* Complete the request and return */ + FatCompleteRequest(IrpContext, Irp, Iosb.Status); + return Iosb.Status; } } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Mon Oct 12 15:17:56 2009 @@ -133,7 +133,9 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define VCB_STATE_FLAG_LOCKED 0x01 +#define VCB_STATE_FLAG_LOCKED 0x01 +#define VCB_STATE_FLAG_DIRTY 0x02 +#define VCB_STATE_MOUNTED_DIRTY 0x04 typedef enum _VCB_CONDITION { @@ -156,6 +158,10 @@ ULONG State; VCB_CONDITION Condition; ERESOURCE Resource; + + /* Direct volume access */ + ULONG DirectOpenCount; + SHARE_ACCESS ShareAccess; /* Notifications support */ PNOTIFY_SYNC NotifySync; @@ -179,7 +185,9 @@ /* Root Directory Control block */ struct _FCB *RootDcb; + /* Counters */ ULONG MediaChangeCount; + ULONG OpenFileCount; /* FullFAT integration */ FF_IOMAN *Ioman;

1 0

[mjmartin] 43396: - Change DIALOG_CreateIndirect location in source to make DEFDLG_SaveFocus available for use. - DIALOG_CreateIndirect: The current window with focus could have been set in the dialog's procedure, so save the current focused window after sending WM_INITDIALOG and before any other message are sent that modify focus. - Fixes setting focus on Open and Close dialogs to the FileName edit control in OpenOffice.
by mjmartin＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: mjmartin Date: Mon Oct 12 14:47:54 2009 New Revision: 43396 URL: http://svn.reactos.org/svn/reactos?rev=43396&view=rev Log: - Change DIALOG_CreateIndirect location in source to make DEFDLG_SaveFocus available for use. - DIALOG_CreateIndirect: The current window with focus could have been set in the dialog's procedure, so save the current focused window after sending WM_INITDIALOG and before any other message are sent that modify focus. - Fixes setting focus on Open and Close dialogs to the FileName edit control in OpenOffice. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Mon Oct 12 14:47:54 2009 @@ -682,7 +682,59 @@ return (LPCSTR)((((UINT_PTR)p) + 3) & ~3); } - /*********************************************************************** +/*********************************************************************** + * DEFDLG_SetFocus + * + * Set the focus to a control of the dialog, selecting the text if + * the control is an edit dialog. + */ +static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) +{ + if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) + SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); + SetFocus( hwndCtrl ); +} + + +/*********************************************************************** + * DEFDLG_SaveFocus + */ +static void DEFDLG_SaveFocus( HWND hwnd ) +{ + DIALOGINFO *infoPtr; + HWND hwndFocus = GetFocus(); + + if (!hwndFocus || !IsChild( hwnd, hwndFocus )) return; + if (!(infoPtr = GETDLGINFO(hwnd))) return; + infoPtr->hwndFocus = hwndFocus; + /* Remove default button */ +} + + +/*********************************************************************** + * DEFDLG_RestoreFocus + */ +static void DEFDLG_RestoreFocus( HWND hwnd ) +{ + DIALOGINFO *infoPtr; + + if (IsIconic( hwnd )) return; + if (!(infoPtr = GETDLGINFO(hwnd))) return; + /* Don't set the focus back to controls if EndDialog is already called.*/ + if (infoPtr->flags & DF_END) return; + if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { + /* If no saved focus control exists, set focus to the first visible, + non-disabled, WS_TABSTOP control in the dialog */ + infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!IsWindow( infoPtr->hwndFocus )) return; + } + DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); + + /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, + sometimes losing focus when receiving WM_SETFOCUS messages. */ +} + +/*********************************************************************** * DIALOG_CreateIndirect * Creates a dialog box window * @@ -923,6 +975,9 @@ if( dlgInfo->hwndFocus ) SetFocus( dlgInfo->hwndFocus ); } +//// ReactOS + DEFDLG_SaveFocus( hwnd ); +//// } //// ReactOS Rev 30613 & 30644 if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_CHILD)) @@ -938,60 +993,6 @@ if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } - - -/*********************************************************************** - * DEFDLG_SetFocus - * - * Set the focus to a control of the dialog, selecting the text if - * the control is an edit dialog. - */ -static void DEFDLG_SetFocus( HWND hwndDlg, HWND hwndCtrl ) -{ - if (SendMessageW( hwndCtrl, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) - SendMessageW( hwndCtrl, EM_SETSEL, 0, -1 ); - SetFocus( hwndCtrl ); -} - - -/*********************************************************************** - * DEFDLG_SaveFocus - */ -static void DEFDLG_SaveFocus( HWND hwnd ) -{ - DIALOGINFO *infoPtr; - HWND hwndFocus = GetFocus(); - - if (!hwndFocus || !IsChild( hwnd, hwndFocus )) return; - if (!(infoPtr = GETDLGINFO(hwnd))) return; - infoPtr->hwndFocus = hwndFocus; - /* Remove default button */ -} - - -/*********************************************************************** - * DEFDLG_RestoreFocus - */ -static void DEFDLG_RestoreFocus( HWND hwnd ) -{ - DIALOGINFO *infoPtr; - - if (IsIconic( hwnd )) return; - if (!(infoPtr = GETDLGINFO(hwnd))) return; - /* Don't set the focus back to controls if EndDialog is already called.*/ - if (infoPtr->flags & DF_END) return; - if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { - /* If no saved focus control exists, set focus to the first visible, - non-disabled, WS_TABSTOP control in the dialog */ - infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (!IsWindow( infoPtr->hwndFocus )) return; - } - DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); - - /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, - sometimes losing focus when receiving WM_SETFOCUS messages. */ -} - /*********************************************************************** * DEFDLG_FindDefButton

1 0

[dchapyshev] 43395: - Add some structures
by dchapyshev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dchapyshev Date: Mon Oct 12 14:28:22 2009 New Revision: 43395 URL: http://svn.reactos.org/svn/reactos?rev=43395&view=rev Log: - Add some structures Modified: trunk/reactos/include/psdk/evntrace.h trunk/reactos/include/psdk/wmistr.h Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Mon Oct 12 14:28:22 2009 @@ -10,6 +10,28 @@ #endif #endif #endif + +typedef struct _EVENT_TRACE_PROPERTIES +{ + WNODE_HEADER Wnode; + ULONG BufferSize; + ULONG MinimumBuffers; + ULONG MaximumBuffers; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG FlushTimer; + ULONG EnableFlags; + LONG AgeLimit; + ULONG NumberOfBuffers; + ULONG FreeBuffers; + ULONG EventsLost; + ULONG BuffersWritten; + ULONG LogBuffersLost; + ULONG RealTimeBuffersLost; + HANDLE LoggerThreadId; + ULONG LogFileNameOffset; + ULONG LoggerNameOffset; +} EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; typedef struct _EVENT_TRACE_HEADER { Modified: trunk/reactos/include/psdk/wmistr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wmistr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wmistr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wmistr.h [iso-8859-1] Mon Oct 12 14:28:22 2009 @@ -1,6 +1,30 @@ #ifndef _WMISTR_ #define _WMISTR_ - + +typedef struct _WNODE_HEADER +{ + ULONG BufferSize; + ULONG ProviderId; + union + { + ULONG64 HistoricalContext; + struct + { + ULONG Version; + ULONG Linkage; + }; + }; + union + { + ULONG CountLost; + HANDLE KernelHandle; + LARGE_INTEGER TimeStamp; + }; + GUID Guid; + ULONG ClientContext; + ULONG Flags; +} WNODE_HEADER, *PWNODE_HEADER; + typedef enum { WMI_GET_ALL_DATA = 0,

1 0

[dchapyshev] 43394: - Stub implement SfcGetNextProtectedFile
by dchapyshev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dchapyshev Date: Mon Oct 12 14:25:02 2009 New Revision: 43394 URL: http://svn.reactos.org/svn/reactos?rev=43394&view=rev Log: - Stub implement SfcGetNextProtectedFile Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c trunk/reactos/dll/win32/sfc_os/sfc_os.spec Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Mon Oct 12 14:25:02 2009 @@ -22,6 +22,13 @@ #include "debug.h" HINSTANCE hLibModule; + +typedef struct _PROTECTED_FILE_DATA +{ + WCHAR FileName[MAX_PATH]; + DWORD FileNumber; +} PROTECTED_FILE_DATA, *PPROTECTED_FILE_DATA; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -119,3 +126,19 @@ return FALSE; } +/****************************************************************** + * SfcGetNextProtectedFile [sfc_os.@] + */ +BOOL WINAPI SfcGetNextProtectedFile(HANDLE RpcHandle, PPROTECTED_FILE_DATA ProtFileData) +{ + if (!ProtFileData) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + UNIMPLEMENTED; + SetLastError(ERROR_NO_MORE_FILES); + return FALSE; +} + Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Mon Oct 12 14:25:02 2009 @@ -5,7 +5,7 @@ @ stub sfc_os_5 @ stub sfc_os_6 @ stub sfc_os_7 -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(ptr ptr) @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long) @ stub SfcWLEventLogoff

1 0

[fireball] 43393: [fastfat_new] - Implement a stub version of basic information query. Fixes an "autochk.exe" not found problem.
by fireball＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: fireball Date: Mon Oct 12 12:22:32 2009 New Revision: 43393 URL: http://svn.reactos.org/svn/reactos?rev=43393&view=rev Log: [fastfat_new] - Implement a stub version of basic information query. Fixes an "autochk.exe" not found problem. Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Mon Oct 12 12:22:32 2009 @@ -12,6 +12,41 @@ #include "fastfat.h" /* FUNCTIONS ****************************************************************/ + +VOID +NTAPI +FatiQueryBasicInformation(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb, + IN PFILE_OBJECT FileObject, + IN OUT PFILE_BASIC_INFORMATION Buffer, + IN OUT PLONG Length) +{ + /* Zero the buffer */ + RtlZeroMemory(Buffer, sizeof(FILE_BASIC_INFORMATION)); + + /* Deduct the written length */ + *Length -= sizeof(FILE_BASIC_INFORMATION); + + /* Check if it's a dir or a file */ + if (FatNodeType(Fcb) == FAT_NTC_FCB) + { + // FIXME: Read dirent and get times from there + Buffer->LastAccessTime.QuadPart = 0; + Buffer->CreationTime.QuadPart = 0; + Buffer->LastWriteTime.QuadPart = 0; + } + else + { + // FIXME: May not be really correct + Buffer->FileAttributes = 0; + DPRINT1("Basic info of a directory '%wZ' is requested!\n", &Fcb->FullFileName); + } + + + /* If attribute is 0, set normal */ + if (Buffer->FileAttributes == 0) + Buffer->FileAttributes = FILE_ATTRIBUTE_NORMAL; +} VOID NTAPI @@ -172,6 +207,9 @@ switch (InfoClass) { + case FileBasicInformation: + FatiQueryBasicInformation(IrpContext, Fcb, FileObject, Buffer, &Length); + break; case FileStandardInformation: FatiQueryStandardInformation(IrpContext, Fcb, FileObject, Buffer, &Length); break;

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