Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[gschneider] 43408: [spider] - Increase dialog width for German, increase "four card difficulty" label width for Spanish - Compile as Unicode, misc typos

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Oct 12 19:37:42 2009 New Revision: 43408 URL: http://svn.reactos.org/svn/reactos?rev=43408&view=rev Log: [spider] - Increase dialog width for German, increase "four card difficulty" label width for Spanish - Compile as Unicode, misc typos Modified: trunk/reactos/base/applications/games/spider/lang/de-DE.rc trunk/reactos/base/applications/games/spider/lang/es-ES.rc trunk/reactos/base/applications/games/spider/spider.rbuild trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/de-DE.rc [iso-8859-1] Mon Oct 12 19:37:42 2009 @@ -26,7 +26,7 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 162, 77, 54, 13 END -IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80 +IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 120, 80 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Schwierigkeitsgrad wählen" FONT 8, "MS Shell Dlg" Modified: trunk/reactos/base/applications/games/spider/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/es-ES.rc [iso-8859-1] Mon Oct 12 19:37:42 2009 @@ -33,7 +33,7 @@ BEGIN AUTORADIOBUTTON "FÃ¡cil: &Un Color", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Medio: &Dos Colores", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 - AUTORADIOBUTTON "DifÃcil: &Cuatro Colores", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + AUTORADIOBUTTON "DifÃcil: &Cuatro Colores", IDC_DIF_FOURCOLORS, 8, 36, 90, 10 DEFPUSHBUTTON "OK", IDOK, 8, 58, 40, 14 PUSHBUTTON "Cancelar", IDCANCEL, 58, 58, 40, 14 Modified: trunk/reactos/base/applications/games/spider/spider.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.rbuild [iso-8859-1] Mon Oct 12 19:37:42 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="spider" type="win32gui" installbase="system32" installname="spider.exe" unicode="no"> +<module name="spider" type="win32gui" installbase="system32" installname="spider.exe" unicode="yes"> <include base="spider">.</include> <include base="cardlib">.</include> <library>cardlib</library> Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Mon Oct 12 19:37:42 2009 @@ -1,7 +1,7 @@ /* * PROJECT: Spider Solitaire * LICENSE: See COPYING in top level directory - * FILE: base/applications/games/spider/lang/spigame.cpp + * FILE: base/applications/games/spider/spigame.cpp * PURPOSE: Spider Solitaire game functions * PROGRAMMER: Gregor Schneider */ @@ -121,7 +121,7 @@ SpiderWnd.Redraw(); } -/* Cards dragged friom a stack */ +/* Cards dragged from a stack */ bool CARDLIBPROC StackDragProc(CardRegion &stackobj, int numDragCards) { int numfacedown, numcards, i;

14 years, 11 months

[janderwald] 43407: [KS] - Activate handling of requests of type KSPROPERTY_TYPE_BASICSUPPORT - Return correct status code in the GUID_NULL handler

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Oct 12 19:04:15 2009 New Revision: 43407 URL: http://svn.reactos.org/svn/reactos?rev=43407&view=rev Log: [KS] - Activate handling of requests of type KSPROPERTY_TYPE_BASICSUPPORT - Return correct status code in the GUID_NULL handler Modified: trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Mon Oct 12 19:04:15 2009 @@ -8,6 +8,7 @@ #include "priv.h" +const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; NTSTATUS FindPropertyHandler( @@ -22,7 +23,6 @@ OUT PKSPROPERTY_SET * Set) { ULONG Index, ItemIndex; - //PULONG Flags; for(Index = 0; Index < PropertySetCount; Index++) { @@ -47,9 +47,11 @@ IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinData; return STATUS_MORE_ENTRIES; } -#if 0 if (Property->Flags & KSPROPERTY_TYPE_BASICSUPPORT) { + PULONG Flags; + PKSPROPERTY_DESCRIPTION Description; + if (sizeof(ULONG) > OutputBufferLength) { /* too small buffer */ @@ -60,7 +62,7 @@ Flags = (PULONG)OutputBuffer; /* clear flags */ - *Flags = KSPROPERTY_TYPE_BASICSUPPORT; + *Flags = 0; if (PropertySet[Index].PropertyItem[ItemIndex].GetSupported) *Flags |= KSPROPERTY_TYPE_GET; @@ -85,9 +87,8 @@ IoStatus->Information = sizeof(KSPROPERTY_DESCRIPTION); } + return STATUS_SUCCESS; } -#endif - if (Property->Flags & KSPROPERTY_TYPE_SET) *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; @@ -177,7 +178,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID) * PropertySetsCount) { // buffer too small - return STATUS_BUFFER_OVERFLOW; + return STATUS_MORE_ENTRIES; } // get output buffer

14 years, 11 months

[janderwald] 43406: [WDMAUD.DR>V] - Use default of 100 audio buffers if there are no prefered frame size available

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Oct 12 18:58:46 2009 New Revision: 43406 URL: http://svn.reactos.org/svn/reactos?rev=43406&view=rev Log: [WDMAUD.DR>V] - Use default of 100 audio buffers if there are no prefered frame size available Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Mon Oct 12 18:58:46 2009 @@ -412,6 +412,12 @@ SND_TRACE(L"FrameSize %u BufferCount %u\n", Instance->FrameSize, Instance->BufferCount); } } + else + { + // use a default of 100 buffers + Instance->BufferCount = 100; + } + /* Now start the stream */ DeviceInfo.u.State = KSSTATE_RUN;

14 years, 11 months

[fireball] 43405: - Remove BitBlt and PatBlt, they are going to be superseded by StretchBlt.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 12 17:10:01 2009 New Revision: 43405 URL: http://svn.reactos.org/svn/reactos?rev=43405&view=rev Log: - Remove BitBlt and PatBlt, they are going to be superseded by StretchBlt. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Mon Oct 12 17:10:01 2009 @@ -40,6 +40,7 @@ return FALSE; } +#if 0 BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) @@ -75,6 +76,7 @@ return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); } +#endif int CDECL RosDrv_ChoosePixelFormat(NTDRV_PDEVICE *physDev, const PIXELFORMATDESCRIPTOR *ppfd) @@ -396,6 +398,7 @@ return FALSE; } +#if 0 BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) { POINT pts[2], ptBrush; @@ -418,6 +421,7 @@ return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); } +#endif BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.drv.spec [iso-8859-1] Mon Oct 12 17:10:01 2009 @@ -2,7 +2,6 @@ @ cdecl AlphaBlend(ptr long long long long ptr long long long long long) RosDrv_AlphaBlend @ cdecl Arc(ptr long long long long long long long long) RosDrv_Arc -@ cdecl BitBlt(ptr long long long long ptr long long long) RosDrv_BitBlt @ cdecl ChoosePixelFormat(ptr ptr) RosDrv_ChoosePixelFormat @ cdecl Chord(ptr long long long long long long long long) RosDrv_Chord @ cdecl CreateBitmap(ptr long ptr) RosDrv_CreateBitmap @@ -31,7 +30,6 @@ @ cdecl GetTextMetrics(ptr ptr) RosDrv_GetTextMetrics @ cdecl LineTo(ptr long long) RosDrv_LineTo @ cdecl PaintRgn(ptr long) RosDrv_PaintRgn -@ cdecl PatBlt(ptr long long long long long) RosDrv_PatBlt @ cdecl Pie(ptr long long long long long long long long) RosDrv_Pie @ cdecl PolyPolygon(ptr ptr ptr long) RosDrv_PolyPolygon @ cdecl PolyPolyline(ptr ptr ptr long) RosDrv_PolyPolyline

14 years, 11 months

[fireball] 43404: [arwinss] - Sync up to Wine-1.1.31.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 12 17:03:17 2009 New Revision: 43404 URL: http://svn.reactos.org/svn/reactos?rev=43404&view=rev Log: [arwinss] - Sync up to Wine-1.1.31. Modified: branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/bitblt.c branches/arwinss/reactos/dll/win32/winex11.drv/brush.c branches/arwinss/reactos/dll/win32/winex11.drv/dib.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 12 17:03:17 2009 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/winex11.drv:42000-43126 -/vendor/wine/dlls/winex11.drv/current:43149 +/vendor/wine/dlls/winex11.drv/current:43149,43398 Modified: branches/arwinss/reactos/dll/win32/winex11.drv/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/bitblt.c [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -1231,19 +1231,137 @@ /*********************************************************************** - * BITBLT_InternalStretchBlt - * - * Implementation of PatBlt(), BitBlt() and StretchBlt(). + * client_side_dib_copy */ -static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, - DWORD rop ) +static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, + X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT width, INT height ) +{ + DIBSECTION srcDib, dstDib; + BYTE *srcPtr, *dstPtr; + INT srcRowOffset, dstRowOffset; + INT bytesPerPixel; + INT bytesToCopy; + INT y; + static RECT unusedRect; + + if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) + return FALSE; + if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) + return FALSE; + + /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ + if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) + return FALSE; + if (xSrc + width > srcDib.dsBm.bmWidth) + width = srcDib.dsBm.bmWidth - xSrc; + if (ySrc + height > srcDib.dsBm.bmHeight) + height = srcDib.dsBm.bmHeight - ySrc; + + if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) + { + /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ + FIXME("potential optimization: client-side complex region clipping\n"); + return FALSE; + } + if (dstDib.dsBm.bmBitsPixel <= 8) + { + FIXME("potential optimization: client-side color-index mode DIB copy\n"); + return FALSE; + } + if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && + dstDib.dsBmih.biCompression == BI_BITFIELDS && + !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) + && !(srcDib.dsBmih.biCompression == BI_RGB && + dstDib.dsBmih.biCompression == BI_RGB)) + { + FIXME("potential optimization: client-side compressed DIB copy\n"); + return FALSE; + } + if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) + { + FIXME("potential optimization: pixel format conversion\n"); + return FALSE; + } + if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) + { + FIXME("negative widths not yet implemented\n"); + return FALSE; + } + + switch (dstDib.dsBm.bmBitsPixel) + { + case 15: + case 16: + bytesPerPixel = 2; + break; + case 24: + bytesPerPixel = 3; + break; + case 32: + bytesPerPixel = 4; + break; + default: + FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); + return FALSE; + } + + bytesToCopy = width * bytesPerPixel; + + if (srcDib.dsBmih.biHeight < 0) + { + srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; + srcRowOffset = srcDib.dsBm.bmWidthBytes; + } + else + { + srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes + + xSrc*bytesPerPixel]; + srcRowOffset = -srcDib.dsBm.bmWidthBytes; + } + if (dstDib.dsBmih.biHeight < 0) + { + dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; + dstRowOffset = dstDib.dsBm.bmWidthBytes; + } + else + { + dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes + + xDst*bytesPerPixel]; + dstRowOffset = -dstDib.dsBm.bmWidthBytes; + } + + /* Handle overlapping regions on the same DIB */ + if (physDevSrc == physDevDst && ySrc < yDst) + { + srcPtr += srcRowOffset * (height - 1); + srcRowOffset = -srcRowOffset; + dstPtr += dstRowOffset * (height - 1); + dstRowOffset = -dstRowOffset; + } + + for (y = yDst; y < yDst + height; ++y) + { + memmove(dstPtr, srcPtr, bytesToCopy); + srcPtr += srcRowOffset; + dstPtr += dstRowOffset; + } + + return TRUE; +} + + +/*********************************************************************** + * X11DRV_StretchBlt + */ +BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, + DWORD rop ) { BOOL usePat, useSrc, useDst, destUsed, fStretch, fNullBrush; RECT visRectDst, visRectSrc; INT width, height; + INT sDst, sSrc = DIB_Status_None; const BYTE *opcode; Pixmap pixmaps[3] = { 0, 0, 0 }; /* pixmaps for DST, SRC, TMP */ GC tmpGC = 0; @@ -1305,6 +1423,8 @@ visRectSrc.right, visRectSrc.bottom, visRectDst.left, visRectDst.top, visRectDst.right, visRectDst.bottom ); + if (physDevDst != physDevSrc) + sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None ); } else { @@ -1319,6 +1439,21 @@ width = visRectDst.right - visRectDst.left; height = visRectDst.bottom - visRectDst.top; + + sDst = X11DRV_LockDIBSection( physDevDst, DIB_Status_None ); + if (physDevDst == physDevSrc) sSrc = sDst; + + /* try client-side DIB copy */ + if (!fStretch && rop == SRCCOPY && + sSrc == DIB_Status_AppMod && sDst == DIB_Status_AppMod && + physDevSrc->depth == physDevDst->depth) + { + if (client_side_dib_copy( physDevSrc, visRectSrc.left, visRectSrc.top, + physDevDst, visRectDst.left, visRectDst.top, width, height )) + goto done; + } + + X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod ); opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; @@ -1346,7 +1481,7 @@ physDevDst->dc_rect.top + visRectDst.top, width, height ); wine_tsx11_unlock(); - return TRUE; + goto done; } break; case DSTINVERT: /* 0x55 */ @@ -1366,7 +1501,7 @@ physDevDst->dc_rect.top + visRectDst.top, width, height ); wine_tsx11_unlock(); - return TRUE; + goto done; } break; } @@ -1380,7 +1515,7 @@ width, height ); wine_tsx11_unlock(); } - return TRUE; + goto done; } else if (OP_SRCDST(*opcode) == OP_ARGS(SRC,DST)) { @@ -1388,6 +1523,19 @@ { wine_tsx11_lock(); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); + wine_tsx11_unlock(); + + if (physDevSrc != physDevDst) + { + if (sSrc == DIB_Status_AppMod) + { + X11DRV_DIB_CopyDIBSection( physDevSrc, physDevDst, visRectSrc.left, visRectSrc.top, + visRectDst.left, visRectDst.top, width, height ); + goto done; + } + X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); + } + wine_tsx11_lock(); XCopyArea( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, physDevSrc->dc_rect.left + visRectSrc.left, @@ -1397,14 +1545,15 @@ physDevDst->dc_rect.top + visRectDst.top ); physDevDst->exposures++; wine_tsx11_unlock(); - return TRUE; + goto done; } if (physDevSrc->depth == 1) { int fg, bg; + + X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); get_colors(physDevDst, physDevSrc, &fg, &bg); wine_tsx11_lock(); - XSetBackground( gdi_display, physDevDst->gc, fg ); XSetForeground( gdi_display, physDevDst->gc, bg ); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); @@ -1417,7 +1566,7 @@ physDevDst->dc_rect.top + visRectDst.top, 1 ); physDevDst->exposures++; wine_tsx11_unlock(); - return TRUE; + goto done; } } } @@ -1436,6 +1585,8 @@ pixmaps[SRC] = XCreatePixmap( gdi_display, root_window, width, height, physDevDst->depth ); wine_tsx11_unlock(); + + if (physDevDst != physDevSrc) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); if(!X11DRV_XRender_GetSrcAreaStretch( physDevSrc, physDevDst, pixmaps[SRC], tmpGC, widthSrc, heightSrc, widthDst, heightDst, @@ -1501,263 +1652,9 @@ if (pixmaps[TMP]) XFreePixmap( gdi_display, pixmaps[TMP] ); XFreeGC( gdi_display, tmpGC ); wine_tsx11_unlock(); + +done: + if (useSrc && physDevDst != physDevSrc) X11DRV_UnlockDIBSection( physDevSrc, FALSE ); + X11DRV_UnlockDIBSection( physDevDst, TRUE ); return TRUE; } - - -/*********************************************************************** - * X11DRV_PatBlt - */ -BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) -{ - BOOL result; - - X11DRV_LockDIBSection( physDev, DIB_Status_GdiMod ); - result = BITBLT_InternalStretchBlt( physDev, left, top, width, height, NULL, 0, 0, 0, 0, rop ); - X11DRV_UnlockDIBSection( physDev, TRUE ); - return result; -} - - -/*********************************************************************** - * X11DRV_ClientSideDIBCopy - */ -static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height ) -{ - DIBSECTION srcDib, dstDib; - BYTE *srcPtr, *dstPtr; - INT srcRowOffset, dstRowOffset; - INT bytesPerPixel; - INT bytesToCopy; - INT y; - static RECT unusedRect; - - if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) - return FALSE; - if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) - return FALSE; - - /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ - if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) - return FALSE; - if (xSrc + width > srcDib.dsBm.bmWidth) - width = srcDib.dsBm.bmWidth - xSrc; - if (ySrc + height > srcDib.dsBm.bmHeight) - height = srcDib.dsBm.bmHeight - ySrc; - - if (GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) - { - /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ - FIXME("potential optimization: client-side complex region clipping\n"); - return FALSE; - } - if (dstDib.dsBm.bmBitsPixel <= 8) - { - FIXME("potential optimization: client-side color-index mode DIB copy\n"); - return FALSE; - } - if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && - dstDib.dsBmih.biCompression == BI_BITFIELDS && - !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) - && !(srcDib.dsBmih.biCompression == BI_RGB && - dstDib.dsBmih.biCompression == BI_RGB)) - { - FIXME("potential optimization: client-side compressed DIB copy\n"); - return FALSE; - } - if (srcDib.dsBm.bmBitsPixel != dstDib.dsBm.bmBitsPixel) - { - FIXME("potential optimization: pixel format conversion\n"); - return FALSE; - } - if (srcDib.dsBmih.biWidth < 0 || dstDib.dsBmih.biWidth < 0) - { - FIXME("negative widths not yet implemented\n"); - return FALSE; - } - - switch (dstDib.dsBm.bmBitsPixel) - { - case 15: - case 16: - bytesPerPixel = 2; - break; - case 24: - bytesPerPixel = 3; - break; - case 32: - bytesPerPixel = 4; - break; - default: - FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); - return FALSE; - } - - bytesToCopy = width * bytesPerPixel; - - if (srcDib.dsBmih.biHeight < 0) - { - srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; - srcRowOffset = srcDib.dsBm.bmWidthBytes; - } - else - { - srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes - + xSrc*bytesPerPixel]; - srcRowOffset = -srcDib.dsBm.bmWidthBytes; - } - if (dstDib.dsBmih.biHeight < 0) - { - dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; - dstRowOffset = dstDib.dsBm.bmWidthBytes; - } - else - { - dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes - + xDst*bytesPerPixel]; - dstRowOffset = -dstDib.dsBm.bmWidthBytes; - } - - /* Handle overlapping regions on the same DIB */ - if (physDevSrc == physDevDst && ySrc < yDst) - { - srcPtr += srcRowOffset * (height - 1); - srcRowOffset = -srcRowOffset; - dstPtr += dstRowOffset * (height - 1); - dstRowOffset = -dstRowOffset; - } - - for (y = yDst; y < yDst + height; ++y) - { - memmove(dstPtr, srcPtr, bytesToCopy); - srcPtr += srcRowOffset; - dstPtr += dstRowOffset; - } - - return TRUE; -} - - -/*********************************************************************** - * X11DRV_BitBlt - */ -BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height, X11DRV_PDEVICE *physDevSrc, - INT xSrc, INT ySrc, DWORD rop ) -{ - BOOL result = FALSE; - INT sSrc, sDst; - RECT visRectDst, visRectSrc; - - if (((rop >> 16) & 0x55) == ((rop >> 17) & 0x55)) { - /* FIXME: seems the ROP doesn't include destination; - * now if the destination area include the entire dcDst, - * we can pass TRUE instead of FALSE to CoerceDIBSection(dcDst...), - * which may avoid a copy in some situations */ - } - - sDst = X11DRV_LockDIBSection( physDevDst, DIB_Status_None ); - if (physDevDst != physDevSrc) - sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None ); - else - sSrc = sDst; - - if ((sSrc == DIB_Status_AppMod) && (rop == SRCCOPY) && - (physDevSrc->depth == physDevDst->depth)) - { - POINT pts[2]; - /* do everything ourselves; map coordinates */ - - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + width; - pts[1].y = ySrc + height; - - LPtoDP(physDevSrc->hdc, pts, 2); - width = pts[1].x - pts[0].x; - height = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - - pts[0].x = xDst; - pts[0].y = yDst; - LPtoDP(physDevDst->hdc, pts, 1); - - xDst = pts[0].x; - yDst = pts[0].y; - - /* Perform basic clipping */ - if (!BITBLT_GetVisRectangles( physDevDst, xDst, yDst, width, height, - physDevSrc, xSrc, ySrc, width, height, - &visRectSrc, &visRectDst )) - { - result = TRUE; - goto END; - } - - xSrc = visRectSrc.left; - ySrc = visRectSrc.top; - xDst = visRectDst.left; - yDst = visRectDst.top; - width = visRectDst.right - visRectDst.left; - height = visRectDst.bottom - visRectDst.top; - - if (sDst == DIB_Status_AppMod) { - result = X11DRV_ClientSideDIBCopy( physDevSrc, xSrc, ySrc, - physDevDst, xDst, yDst, - width, height ); - if (result) - goto END; - /* fall back to X server copying */ - } - X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod ); - - wine_tsx11_lock(); - XSetFunction( gdi_display, physDevDst->gc, GXcopy ); - wine_tsx11_unlock(); - - X11DRV_DIB_CopyDIBSection( physDevSrc, physDevDst, xSrc, ySrc, xDst, yDst, width, height ); - result = TRUE; - goto END; - } - - X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod ); - if (physDevDst != physDevSrc) - X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); - - result = BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, width, height, - physDevSrc, xSrc, ySrc, width, height, rop ); - -END: - if (physDevDst != physDevSrc) - X11DRV_UnlockDIBSection( physDevSrc, FALSE ); - X11DRV_UnlockDIBSection( physDevDst, TRUE ); - - return result; -} - - -/*********************************************************************** - * X11DRV_StretchBlt - */ -BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, DWORD rop ) -{ - BOOL result; - - X11DRV_LockDIBSection( physDevDst, DIB_Status_GdiMod ); - if (physDevDst != physDevSrc) - X11DRV_LockDIBSection( physDevSrc, DIB_Status_GdiMod ); - - result = BITBLT_InternalStretchBlt( physDevDst, xDst, yDst, widthDst, heightDst, - physDevSrc, xSrc, ySrc, widthSrc, heightSrc, rop ); - - if (physDevDst != physDevSrc) - X11DRV_UnlockDIBSection( physDevSrc, FALSE ); - X11DRV_UnlockDIBSection( physDevDst, TRUE ); - return result; -} Modified: branches/arwinss/reactos/dll/win32/winex11.drv/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/brush.c [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -298,8 +298,7 @@ case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); -#ifndef __REACTOS__ - if ((bmpInfo = GlobalLock16( logbrush.lbHatch ))) + if ((bmpInfo = GlobalLock( (HGLOBAL)logbrush.lbHatch ))) { int size = bitmap_info_size( bmpInfo, logbrush.lbColor ); hBitmap = CreateDIBitmap( physDev->hdc, &bmpInfo->bmiHeader, @@ -308,9 +307,8 @@ (WORD)logbrush.lbColor ); BRUSH_SelectPatternBrush( physDev, hBitmap ); DeleteObject( hBitmap ); - GlobalUnlock16( logbrush.lbHatch ); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } -#endif break; } return hbrush; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/dib.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/dib.c [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -4744,19 +4744,23 @@ &physBitmap->nColorMap ); } + if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, &dib )) + { + if (dib.dsBm.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + physBitmap->trueColor = FALSE; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + } + } + /* create pixmap and X image */ wine_tsx11_lock(); - if(dib.dsBm.bmBitsPixel == 1) - { - physBitmap->pixmap_depth = 1; - physBitmap->trueColor = FALSE; - } - else - { - physBitmap->pixmap_depth = screen_depth; - physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; - physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); - } #ifdef HAVE_LIBXXSHM physBitmap->shminfo.shmid = -1; @@ -4802,6 +4806,19 @@ wine_tsx11_unlock(); if (!physBitmap->pixmap || !physBitmap->image) return 0; + + if (physBitmap->trueColor) + { + ColorShifts *shifts = &physBitmap->pixmap_color_shifts; + + /* When XRender is around and used, we also support dibsections in other formats like 16-bit. In these + * cases we need to override the mask of XImages. The reason is that during XImage creation the masks are + * derived from a 24-bit visual (no 16-bit ones are around when X runs at 24-bit). SetImageBits and other + * functions rely on the color masks for proper color conversion, so we need to override the masks here. */ + physBitmap->image->red_mask = shifts->physicalRed.max << shifts->physicalRed.shift; + physBitmap->image->green_mask = shifts->physicalGreen.max << shifts->physicalGreen.shift; + physBitmap->image->blue_mask = shifts->physicalBlue.max << shifts->physicalBlue.shift; + } /* install fault handler */ InitializeCriticalSection( &physBitmap->lock ); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -324,7 +324,7 @@ /*********************************************************************** * process_events */ -static int process_events( Display *display, Bool (*filter)(), ULONG_PTR arg ) +static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; int count = 0; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -2,7 +2,6 @@ @ cdecl AlphaBlend(ptr long long long long ptr long long long long long) X11DRV_AlphaBlend @ cdecl Arc(ptr long long long long long long long long) X11DRV_Arc -@ cdecl BitBlt(ptr long long long long ptr long long long) X11DRV_BitBlt @ cdecl ChoosePixelFormat(ptr ptr) X11DRV_ChoosePixelFormat @ cdecl Chord(ptr long long long long long long long long) X11DRV_Chord @ cdecl CreateBitmap(ptr long ptr) X11DRV_CreateBitmap @@ -31,7 +30,6 @@ @ cdecl GetTextMetrics(ptr ptr) X11DRV_GetTextMetrics @ cdecl LineTo(ptr long long) X11DRV_LineTo @ cdecl PaintRgn(ptr long) X11DRV_PaintRgn -@ cdecl PatBlt(ptr long long long long long) X11DRV_PatBlt @ cdecl Pie(ptr long long long long long long long long) X11DRV_Pie @ cdecl PolyPolygon(ptr ptr ptr long) X11DRV_PolyPolygon @ cdecl PolyPolyline(ptr ptr ptr long) X11DRV_PolyPolyline Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -138,7 +138,7 @@ /* X physical font */ typedef UINT X_PHYSFONT; -typedef struct tagXRENDERINFO *XRENDERINFO; +struct xrender_info; /* X physical device */ typedef struct @@ -163,7 +163,7 @@ Drawable gl_drawable; Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */ int gl_copy; - XRENDERINFO xrender; + struct xrender_info *xrender; } X11DRV_PDEVICE; @@ -178,9 +178,6 @@ INT widthDst, INT heightDst, X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, BLENDFUNCTION blendfn ); -extern BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height, X11DRV_PDEVICE *physDevSrc, - INT xSrc, INT ySrc, DWORD rop ); extern BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf, FONTENUMPROCW dfeproc, LPARAM lp ); extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ); @@ -190,8 +187,6 @@ extern BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); extern BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics); -extern BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, - INT width, INT height, DWORD rop ); extern BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, @@ -291,6 +286,7 @@ extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx); +extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc, @@ -304,7 +300,7 @@ /* IME support */ extern void IME_UnregisterClasses(void); extern void IME_SetOpenStatus(BOOL fOpen); -extern INT IME_GetCursorPos(); +extern INT IME_GetCursorPos(void); extern void IME_SetCursorPos(DWORD pos); extern void IME_UpdateAssociation(HWND focus); extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -34,7 +34,9 @@ #endif #include <sys/types.h> #include <fcntl.h> +#include <errno.h> #include <math.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -1828,18 +1830,10 @@ const char *confdir = "";//wine_get_config_dir(); const char *display_name = XDisplayName(NULL); int len = strlen(confdir) + strlen(INIFontMetrics) + strlen(display_name) + 8; - int display = 0; - int screen = 0; + unsigned int display = 0; + unsigned int screen = 0; char *p, *ext; - /* - ** Normalize the display name, since on Red Hat systems, DISPLAY - ** is commonly set to one of either 'unix:0.0' or ':0' or ':0.0'. - ** after this code, all of the above will resolve to ':0.0'. - */ - if (!strncmp( display_name, "unix:", 5 )) display_name += 4; - p = strchr(display_name, ':'); - if (p) sscanf(p + 1, "%d.%d", &display, &screen); if ((len > *buf_size) && !(buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, *buf_size = len ))) @@ -1852,8 +1846,46 @@ ext = buffer + strlen(buffer); strcpy( ext, display_name ); - if (!(p = strchr( ext, ':' ))) p = ext + strlen(ext); - sprintf( p, ":%d.%d", display, screen ); + /* + ** Normalize the display name. The format of DISPLAY is + ** [protocol/] [hostname] :[:] num [.num] + ** + ** - on Red Hat systems, DISPLAY is commonly set to one of + ** either 'unix:0.0' or ':0' or ':0.0'. + ** - on MacOS X systems, DISPLAY is commonly set to + ** /tmp/foo/:0 + ** + ** after this code, all of the above will resolve to ':0.0'. + */ + p = strrchr(ext, ':'); + if (p) + { + sscanf(p + 1, "%u.%u", &display, &screen); + *p = 0; + if (display > 9999) + { + WARN("unlikely X11 display number\n"); + *buffer = 0; + return buffer; + } + } + if (!strcmp( ext, "unix" ) || + !strcmp( ext, "localhost" )) + *ext = 0; + if (!strncmp( ext, "/tmp/", 5 )) + *ext = 0; /* assume pathnames are local */ + + /* Deal with the possibility of slashes in the display name */ + for( p = ext; *p; p++ ) + if ( *p == '/' ) + *p = '_'; + + /* X11 fonts are per-display, not per-screen, so don't + ** include the screen number in the font cache filename */ + sprintf( ext + strlen(ext), ":%u", display ); + + TRACE("display '%s' -> cachefile '%s'\n", display_name, buffer); + return buffer; } @@ -2156,8 +2188,10 @@ * * INIT ONLY */ -static BOOL XFONT_ReadCachedMetrics( int fd, int res, unsigned x_checksum, int x_count ) -{ +static BOOL XFONT_ReadCachedMetrics( const char *path, int res, unsigned x_checksum, int x_count ) +{ + int fd = open( path, O_RDONLY ); + if( fd >= 0 ) { unsigned u; @@ -2270,6 +2304,8 @@ HeapFree( GetProcessHeap(), 0, fontList ); fontList = NULL; close( fd ); + } else { + TRACE("fontcache '%s': %s\n", path, strerror(errno)); } return FALSE; } @@ -2855,7 +2891,7 @@ { char** x_pattern; unsigned x_checksum; - int i, x_count, fd, buf_size; + int i, x_count, buf_size; char *buffer; HKEY hkey; @@ -2879,7 +2915,7 @@ if( j ) x_checksum ^= __genericCheckSum( x_pattern[i], j ); } x_checksum |= X_PFONT_MAGIC; - buf_size = 128; + buf_size = PATH_MAX; buffer = HeapAlloc( GetProcessHeap(), 0, buf_size ); /* deal with systemwide font metrics cache */ @@ -2895,8 +2931,8 @@ if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("system fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } if (fontList == NULL) { @@ -2904,8 +2940,8 @@ buffer = XFONT_UserMetricsCache( buffer, &buf_size ); if( buffer[0] ) { - fd = open( buffer, O_RDONLY ); - XFONT_ReadCachedMetrics(fd, DefResolution, x_checksum, x_count); + TRACE("user fontcache is '%s'\n", buffer); + XFONT_ReadCachedMetrics(buffer, DefResolution, x_checksum, x_count); } } @@ -2914,11 +2950,15 @@ int n_ff = XFONT_BuildMetrics(x_pattern, DefResolution, x_checksum, x_count); if( buffer[0] ) /* update cached metrics */ { - fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0644 ); /* -rw-r--r-- */ - if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) + int fd = open( buffer, O_CREAT | O_TRUNC | O_RDWR, 0666 ); + if ( fd < 0 ) + { + WARN("Unable to create fontcache '%s': %s\n", buffer, strerror(errno)); + } + else if( XFONT_WriteCachedMetrics( fd, x_checksum, x_count, n_ff ) == FALSE ) { WARN("Unable to write to fontcache '%s'\n", buffer); - if( fd >= 0) remove( buffer ); /* couldn't write entire file */ + remove( buffer ); /* couldn't write entire file */ } } } Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c [iso-8859-1] Mon Oct 12 17:03:17 2009 @@ -2,6 +2,7 @@ * Functions to use the XRender extension * * Copyright 2001, 2002 Huw D M Davies for CodeWeavers + * Copyright 2009 Roderick Colenbrander * * Some parts also: * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. @@ -139,7 +140,7 @@ INT next; } gsCacheEntry; -struct tagXRENDERINFO +struct xrender_info { int cache_index; Picture pict; @@ -205,6 +206,23 @@ #define get_be_word(x) RtlUshortByteSwap(x) #define NATIVE_BYTE_ORDER LSBFirst #endif + +static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) +{ + if(!physDev->xrender) + { + physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev->xrender)); + + if(!physDev->xrender) + { + ERR("Unable to allocate XRENDERINFO!\n"); + return NULL; + } + physDev->xrender->cache_index = -1; + } + + return physDev->xrender; +} static BOOL get_xrender_template(const WineXRenderFormatTemplate *fmt, XRenderPictFormat *templ, unsigned long *mask) { @@ -794,6 +812,7 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) { LFANDSIZE lfsz; + struct xrender_info *info; GetObjectW(hfont, sizeof(lfsz.lf), &lfsz.lf); TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n", @@ -805,15 +824,13 @@ GetWorldTransform( physDev->hdc, &lfsz.xform ); lfsz_calc_hash(&lfsz); + info = get_xrender_info(physDev); + if (!info) return 0; + EnterCriticalSection(&xrender_cs); - if(!physDev->xrender) { - physDev->xrender = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*physDev->xrender)); - physDev->xrender->cache_index = -1; - } - else if(physDev->xrender->cache_index != -1) - dec_ref_cache(physDev->xrender->cache_index); - physDev->xrender->cache_index = GetCacheEntry(physDev, &lfsz); + if(info->cache_index != -1) + dec_ref_cache(info->cache_index); + info->cache_index = GetCacheEntry(physDev, &lfsz); LeaveCriticalSection(&xrender_cs); return 0; } @@ -833,6 +850,33 @@ HeapFree(GetProcessHeap(), 0, physDev->xrender); physDev->xrender = NULL; return; +} + +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + WineXRenderFormat *fmt; + ColorShifts shifts; + + /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion + * in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low + * number of bits because XRender can't handle paletted formats and 8-bit TrueColor does not exist for XRender. */ + if(!X11DRV_XRender_Installed || dib->dsBm.bmBitsPixel <= 8) + return FALSE; + + X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + + /* Common formats should be in our picture format table. */ + fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); + if(fmt) + { + physBitmap->pixmap_depth = fmt->pict_format->depth; + physBitmap->trueColor = TRUE; + physBitmap->pixmap_color_shifts = shifts; + return TRUE; + } + TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", + dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + return FALSE; } /*********************************************************************** @@ -2172,6 +2216,11 @@ wine_tsx11_unlock(); } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + return FALSE; +} + BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc,

14 years, 11 months

[fireball] 43403: [arwinss] - Sync up to Wine-1.1.31.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 12 16:56:37 2009 New Revision: 43403 URL: http://svn.reactos.org/svn/reactos?rev=43403&view=rev Log: [arwinss] - Sync up to Wine-1.1.31. Modified: branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/clipboard.c branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/text.c branches/arwinss/reactos/dll/win32/user32/uitools.c Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 12 16:56:37 2009 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-43126 -/vendor/wine/dlls/user32/current:43136,43149 +/vendor/wine/dlls/user32/current:43136,43149,43398 Modified: branches/arwinss/reactos/dll/win32/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/clipboard.c [iso-8859-1] Mon Oct 12 16:56:37 2009 @@ -188,6 +188,9 @@ return bRet; } +/************************************************************************** + * CLIPBOARD_SetClipboardViewer + */ static HWND CLIPBOARD_SetClipboardViewer( HWND hWnd ) { HWND hwndPrev = 0; Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Mon Oct 12 16:56:37 2009 @@ -660,6 +660,37 @@ return &dir->idEntries[n]; } +/*********************************************************************** + * stretch_blt_icon + * + * A helper function that stretches a bitmap buffer into an HBITMAP. + * + * PARAMS + * hDest [I] The handle of the destination bitmap. + * pDestInfo [I] The BITMAPINFO of the destination bitmap. + * pSrcInfo [I] The BITMAPINFO of the source bitmap. + * pSrcBits [I] A pointer to the source bitmap buffer. + **/ +static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *pSrcInfo, char *pSrcBits) +{ + HBITMAP hOld; + BOOL res = FALSE; + HDC hdcMem = CreateCompatibleDC(screen_dc); + + if (hdcMem) + { + hOld = SelectObject(hdcMem, hDest); + res = StretchDIBits(hdcMem, + 0, 0, pDestInfo->bmiHeader.biWidth, pDestInfo->bmiHeader.biHeight, + 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, + pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); + SelectObject(hdcMem, hOld); + DeleteDC( hdcMem ); + } + + return res; +} + static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, POINT16 hotspot, BOOL bIcon, DWORD dwVersion, @@ -667,12 +698,11 @@ UINT cFlag ) { HGLOBAL hObj; - static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; - BOOL DoStretch; INT size; + BITMAPINFO *pSrcInfo, *pDestInfo; if (dwVersion == 0x00020000) { @@ -694,11 +724,10 @@ if (!width) width = bmi->bmiHeader.biWidth; if (!height) height = bmi->bmiHeader.biHeight/2; - DoStretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); /* Scale the hotspot */ - if (DoStretch && hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) + if (((bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width)) && + hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) { hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); @@ -707,8 +736,6 @@ if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { - BITMAPINFO* pInfo; - /* Make sure we have room for the monochrome bitmap later on. * Note that BITMAPINFOINFO and BITMAPCOREHEADER are the same * up to and including the biBitCount. In-memory icon resource @@ -720,40 +747,47 @@ * BYTE icAND[] // DIB bits for AND mask */ - if ((pInfo = HeapAlloc( GetProcessHeap(), 0, - max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))))) - { - memcpy( pInfo, bmi, size ); - pInfo->bmiHeader.biHeight /= 2; + pSrcInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + pDestInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + if (pSrcInfo && pDestInfo) + { + memcpy( pSrcInfo, bmi, size ); + pSrcInfo->bmiHeader.biHeight /= 2; + + memcpy( pDestInfo, bmi, size ); + pDestInfo->bmiHeader.biWidth = width; + pDestInfo->bmiHeader.biHeight = height; + pDestInfo->bmiHeader.biSizeImage = 0; /* Create the XOR bitmap */ - - if (DoStretch) { - hXorBits = CreateCompatibleBitmap(screen_dc, width, height); + if(pSrcInfo->bmiHeader.biBitCount == 32) + { + void *pDIBBuffer = NULL; + hXorBits = CreateDIBSection(screen_dc, pDestInfo, DIB_RGB_COLORS, &pDIBBuffer, NULL, 0); + if(hXorBits) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hXorBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight/2, - (char*)bmi + size, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if (!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } } - if (!res) { DeleteObject(hXorBits); hXorBits = 0; } - } - } else { - if (is_dib_monochrome(bmi)) { - hXorBits = CreateBitmap(width, height, 1, 1, NULL); - SetDIBits(screen_dc, hXorBits, 0, height, - (char*)bmi + size, pInfo, DIB_RGB_COLORS); - } - else - hXorBits = CreateDIBitmap(screen_dc, &pInfo->bmiHeader, - CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS); + } + else + { + hXorBits = CreateCompatibleBitmap(screen_dc, width, height); + + if(hXorBits) + { + if(!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } + } } if( hXorBits ) @@ -762,52 +796,43 @@ get_dib_width_bytes( bmi->bmiHeader.biWidth, bmi->bmiHeader.biBitCount ) * abs( bmi->bmiHeader.biHeight ) / 2; - pInfo->bmiHeader.biBitCount = 1; - if (pInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + pSrcInfo->bmiHeader.biBitCount = 1; + if (pSrcInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { - RGBQUAD *rgb = pInfo->bmiColors; - - pInfo->bmiHeader.biClrUsed = pInfo->bmiHeader.biClrImportant = 2; + RGBQUAD *rgb = pSrcInfo->bmiColors; + + pSrcInfo->bmiHeader.biClrUsed = pSrcInfo->bmiHeader.biClrImportant = 2; rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00; rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff; rgb[0].rgbReserved = rgb[1].rgbReserved = 0; } else { - RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pInfo) + 1); + RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pSrcInfo) + 1); rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00; rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff; } /* Create the AND bitmap */ - - if (DoStretch) { - if ((hAndBits = CreateBitmap(width, height, 1, 1, NULL))) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hAndBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight, - xbits, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + hAndBits = CreateBitmap(width, height, 1, 1, NULL); + + if(!stretch_blt_icon(hAndBits, pDestInfo, pSrcInfo, xbits)) + { + DeleteObject(hAndBits); + hAndBits = 0; } - if (!res) { DeleteObject(hAndBits); hAndBits = 0; } - } - } else { - hAndBits = CreateBitmap(width, height, 1, 1, NULL); - - if (hAndBits) SetDIBits(screen_dc, hAndBits, 0, height, - xbits, pInfo, DIB_RGB_COLORS); - + + if( !hAndBits ) + { + DeleteObject( hXorBits ); + hXorBits = 0; + } } - if( !hAndBits ) DeleteObject( hXorBits ); - } - HeapFree( GetProcessHeap(), 0, pInfo ); - } + } + + HeapFree( GetProcessHeap(), 0, pSrcInfo ); + HeapFree( GetProcessHeap(), 0, pDestInfo ); } if( !hXorBits || !hAndBits ) Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] Mon Oct 12 16:56:37 2009 @@ -44,6 +44,7 @@ #include "win.h" #include "controls.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -3067,8 +3068,20 @@ /* Process timer messages */ if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) { - if (msg->lParam) return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); + if (msg->lParam) + { + __TRY + { + retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_PAGE_FAULT + { + retval = 0; + } + __ENDTRY + return retval; + } } if (!msg->hwnd) return 0; @@ -3105,7 +3118,8 @@ * If the lpMsg parameter points to a WM_TIMER message and the * parameter of the WM_TIMER message is not NULL, the lParam parameter * points to the function that is called instead of the window - * procedure. + * procedure. The function stored in lParam (timer callback) is protected + * from causing page-faults. * * The message must be valid. * @@ -3125,8 +3139,20 @@ /* Process timer messages */ if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) { - if (msg->lParam) return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); + if (msg->lParam) + { + __TRY + { + retval = CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_PAGE_FAULT + { + retval = 0; + } + __ENDTRY + return retval; + } } if (!msg->hwnd) return 0; Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Mon Oct 12 16:56:37 2009 @@ -2321,8 +2321,15 @@ WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCK); /* 0x101F _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_GETMOUSEVANISH); /* 0x1020 _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSEVANISH); /* 0x1021 _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ + + case SPI_GETMOUSEVANISH: + ret = get_user_pref_param( 2, 0x01, pvParam ); + break; + + case SPI_SETMOUSEVANISH: + ret = set_user_pref_param( 2, 0x01, PtrToUlong(pvParam), fWinIni ); + break; + case SPI_GETFLATMENU: ret = get_user_pref_param( 2, 0x02, pvParam ); break; @@ -2331,8 +2338,14 @@ ret = set_user_pref_param( 2, 0x02, PtrToUlong(pvParam), fWinIni ); break; - WINE_SPI_FIXME(SPI_GETDROPSHADOW); /* 0x1024 _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_SETDROPSHADOW); /* 0x1025 _WIN32_WINNT >= 0x510 */ + case SPI_GETDROPSHADOW: + ret = get_user_pref_param( 2, 0x04, pvParam ); + break; + + case SPI_SETDROPSHADOW: + ret = set_user_pref_param( 2, 0x04, PtrToUlong(pvParam), fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETBLOCKSENDINPUTRESETS); WINE_SPI_FIXME(SPI_SETBLOCKSENDINPUTRESETS); case SPI_GETUIEFFECTS: Modified: branches/arwinss/reactos/dll/win32/user32/text.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/text.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/text.c [iso-8859-1] Mon Oct 12 16:56:37 2009 @@ -855,6 +855,7 @@ int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; + int invert_y=0; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -898,6 +899,15 @@ } } + if (GetGraphicsMode(hdc) == GM_COMPATIBLE) + { + SIZE window_ext, viewport_ext; + GetWindowExtEx(hdc, &window_ext); + GetViewportExtEx(hdc, &viewport_ext); + if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) + invert_y = 1; + } + if (dtp) { lmargin = dtp->iLeftMargin; @@ -932,7 +942,10 @@ do { len = sizeof(line)/sizeof(line[0]); - last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); if (flags & DT_CENTER) x = (rect->left + rect->right - @@ -1001,7 +1014,10 @@ else if (size.cx > max_width) max_width = size.cx; - y += lh; + if (invert_y) + y -= lh; + else + y += lh; if (dtp) dtp->uiLengthDrawn += len; } Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] Mon Oct 12 16:56:37 2009 @@ -1534,7 +1534,7 @@ return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); case DST_ICON: - return DrawIcon(hdc, rc->left, rc->top, (HICON)lp); + return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, 0, 0, 0, NULL, DI_NORMAL); case DST_BITMAP: memdc = CreateCompatibleDC(hdc);

14 years, 11 months

[fireball] 43402: [arwinss] - Sync up to Wine-1.1.31.

by fireball＠svn.reactos.org

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:

14 years, 11 months

[fireball] 43401: [arwinss] - Merge Wine-1.1.31 server headers.

by fireball＠svn.reactos.org

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

14 years, 11 months

[dreimer] 43400: - Updated DejaVu Fonts to Version 2.30 - Updated 3rd Party Files Document

by dreimer＠svn.reactos.org

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.

14 years, 11 months

[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

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/

14 years, 11 months

← Newer
1
...
46
47
48
49
50
51
52
...
65
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 October 2009