July 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Make the DC function structure public.
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: a31e94d27ad0b071402328990aff10d1efa4baa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31e94d27ad0b071402328990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 13 12:28:16 2011 +0200 gdi32: Make the DC function structure public. --- dlls/gdi32/gdi_private.h | 148 +-------------------------------------------- include/wine/gdi_driver.h | 149 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a31e94d27ad0b07140232…

1 0

Alexandre Julliard : winex11: Add a DC function structure and export it.
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: 605b2e6d527b8057afa04a7b3cf34e8407459550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605b2e6d527b8057afa04a7b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 13 14:05:07 2011 +0200 winex11: Add a DC function structure and export it. --- dlls/winex11.drv/init.c | 154 ++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/winex11.drv.spec | 2 + dlls/winex11.drv/x11drv.h | 99 ++++++++++++++++-------- 3 files changed, 221 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605b2e6d527b8057afa04…

1 0

Alexandre Julliard : wineps: Add a DC function structure and export it.
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: 572d0863b106aaf526f27472005422bac498f832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=572d0863b106aaf526f274720… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 13 14:05:13 2011 +0200 wineps: Add a DC function structure and export it. --- dlls/wineps.drv/init.c | 145 ++++++++++++++++++++++++++++++++++++++- dlls/wineps.drv/psdrv.h | 49 +++++++++++++ dlls/wineps.drv/wineps.drv.spec | 2 + 3 files changed, 193 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=572d0863b106aaf526f27…

1 0

Alexandre Julliard : gdi32: Ask the graphics driver for the function table instead of loading functions one by one .
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: 4c2f8bc35d4d5a69ba5963c5981c2093f4d23c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c2f8bc35d4d5a69ba5963c59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 13 14:18:26 2011 +0200 gdi32: Ask the graphics driver for the function table instead of loading functions one by one. --- dlls/gdi32/driver.c | 156 +++++---------------------------------------------- 1 files changed, 14 insertions(+), 142 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1c4c2d7..4c5d308 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,9 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); struct graphics_driver { - struct list entry; - HMODULE module; /* module handle */ - DC_FUNCTIONS funcs; + struct list entry; + HMODULE module; /* module handle */ + const struct gdi_dc_funcs *funcs; }; static struct list drivers = LIST_INIT( drivers ); @@ -65,150 +65,22 @@ static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; */ static struct graphics_driver *create_driver( HMODULE module ) { + static const struct gdi_dc_funcs empty_funcs; + const struct gdi_dc_funcs *funcs = NULL; struct graphics_driver *driver; if (!(driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver)))) return NULL; driver->module = module; - /* fill the function table */ if (module) { -#define GET_FUNC(name) driver->funcs.p##name = (void*)GetProcAddress( module, #name ) - GET_FUNC(AbortDoc); - GET_FUNC(AbortPath); - GET_FUNC(AlphaBlend); - GET_FUNC(AngleArc); - GET_FUNC(Arc); - GET_FUNC(ArcTo); - GET_FUNC(BeginPath); - GET_FUNC(ChoosePixelFormat); - GET_FUNC(Chord); - GET_FUNC(CloseFigure); - GET_FUNC(CreateBitmap); - GET_FUNC(CreateDC); - GET_FUNC(CreateDIBSection); - GET_FUNC(DeleteBitmap); - GET_FUNC(DeleteDC); - GET_FUNC(DescribePixelFormat); - GET_FUNC(DeviceCapabilities); - GET_FUNC(Ellipse); - GET_FUNC(EndDoc); - GET_FUNC(EndPage); - GET_FUNC(EndPath); - GET_FUNC(EnumDeviceFonts); - GET_FUNC(EnumICMProfiles); - GET_FUNC(ExcludeClipRect); - GET_FUNC(ExtDeviceMode); - GET_FUNC(ExtEscape); - GET_FUNC(ExtFloodFill); - GET_FUNC(ExtSelectClipRgn); - GET_FUNC(ExtTextOut); - GET_FUNC(FillPath); - GET_FUNC(FillRgn); - GET_FUNC(FlattenPath); - GET_FUNC(FrameRgn); - GET_FUNC(GdiComment); - GET_FUNC(GetBitmapBits); - GET_FUNC(GetCharWidth); - GET_FUNC(GetDIBits); - GET_FUNC(GetDeviceCaps); - GET_FUNC(GetDeviceGammaRamp); - GET_FUNC(GetICMProfile); - GET_FUNC(GetNearestColor); - GET_FUNC(GetPixel); - GET_FUNC(GetPixelFormat); - GET_FUNC(GetSystemPaletteEntries); - GET_FUNC(GetTextExtentExPoint); - GET_FUNC(GetTextMetrics); - GET_FUNC(IntersectClipRect); - GET_FUNC(InvertRgn); - GET_FUNC(LineTo); - GET_FUNC(MoveTo); - GET_FUNC(ModifyWorldTransform); - GET_FUNC(OffsetClipRgn); - GET_FUNC(OffsetViewportOrgEx); - GET_FUNC(OffsetWindowOrgEx); - GET_FUNC(PaintRgn); - GET_FUNC(PatBlt); - GET_FUNC(Pie); - GET_FUNC(PolyBezier); - GET_FUNC(PolyBezierTo); - GET_FUNC(PolyDraw); - GET_FUNC(PolyPolygon); - GET_FUNC(PolyPolyline); - GET_FUNC(Polygon); - GET_FUNC(Polyline); - GET_FUNC(PolylineTo); - GET_FUNC(RealizeDefaultPalette); - GET_FUNC(RealizePalette); - GET_FUNC(Rectangle); - GET_FUNC(ResetDC); - GET_FUNC(RestoreDC); - GET_FUNC(RoundRect); - GET_FUNC(SaveDC); - GET_FUNC(ScaleViewportExtEx); - GET_FUNC(ScaleWindowExtEx); - GET_FUNC(SelectBitmap); - GET_FUNC(SelectBrush); - GET_FUNC(SelectClipPath); - GET_FUNC(SelectFont); - GET_FUNC(SelectPalette); - GET_FUNC(SelectPen); - GET_FUNC(SetArcDirection); - GET_FUNC(SetBitmapBits); - GET_FUNC(SetBkColor); - GET_FUNC(SetBkMode); - GET_FUNC(SetDCBrushColor); - GET_FUNC(SetDCPenColor); - GET_FUNC(SetDIBColorTable); - GET_FUNC(SetDIBits); - GET_FUNC(SetDIBitsToDevice); - GET_FUNC(SetDeviceClipping); - GET_FUNC(SetDeviceGammaRamp); - GET_FUNC(SetLayout); - GET_FUNC(SetMapMode); - GET_FUNC(SetMapperFlags); - GET_FUNC(SetPixel); - GET_FUNC(SetPixelFormat); - GET_FUNC(SetPolyFillMode); - GET_FUNC(SetROP2); - GET_FUNC(SetRelAbs); - GET_FUNC(SetStretchBltMode); - GET_FUNC(SetTextAlign); - GET_FUNC(SetTextCharacterExtra); - GET_FUNC(SetTextColor); - GET_FUNC(SetTextJustification); - GET_FUNC(SetViewportExtEx); - GET_FUNC(SetViewportOrgEx); - GET_FUNC(SetWindowExtEx); - GET_FUNC(SetWindowOrgEx); - GET_FUNC(SetWorldTransform); - GET_FUNC(StartDoc); - GET_FUNC(StartPage); - GET_FUNC(StretchBlt); - GET_FUNC(StretchDIBits); - GET_FUNC(StrokeAndFillPath); - GET_FUNC(StrokePath); - GET_FUNC(SwapBuffers); - GET_FUNC(UnrealizePalette); - GET_FUNC(WidenPath); - - /* OpenGL32 */ - GET_FUNC(wglCreateContext); - GET_FUNC(wglCreateContextAttribsARB); - GET_FUNC(wglDeleteContext); - GET_FUNC(wglGetProcAddress); - GET_FUNC(wglGetPbufferDCARB); - GET_FUNC(wglMakeContextCurrentARB); - GET_FUNC(wglMakeCurrent); - GET_FUNC(wglSetPixelFormatWINE); - GET_FUNC(wglShareLists); - GET_FUNC(wglUseFontBitmapsA); - GET_FUNC(wglUseFontBitmapsW); -#undef GET_FUNC - } - else memset( &driver->funcs, 0, sizeof(driver->funcs) ); + const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int version ); + if ((wine_get_gdi_driver = (void *)GetProcAddress( module, "wine_get_gdi_driver" ))) + funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION ); + } + if (!funcs) funcs = &empty_funcs; + driver->funcs = funcs; return driver; } @@ -225,7 +97,7 @@ const DC_FUNCTIONS *DRIVER_get_display_driver(void) HMODULE module = 0; HKEY hkey; - if (display_driver) return &display_driver->funcs; /* already loaded */ + if (display_driver) return display_driver->funcs; /* already loaded */ strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -259,7 +131,7 @@ const DC_FUNCTIONS *DRIVER_get_display_driver(void) FreeLibrary( driver->module ); HeapFree( GetProcessHeap(), 0, driver ); } - return &display_driver->funcs; + return display_driver->funcs; } @@ -278,7 +150,7 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) if ((module = GetModuleHandleW( name ))) { - if (display_driver && display_driver->module == module) return &display_driver->funcs; + if (display_driver && display_driver->module == module) return display_driver->funcs; EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { @@ -309,7 +181,7 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); done: LeaveCriticalSection( &driver_section ); - return &driver->funcs; + return driver->funcs; }

1 0

Alexandre Julliard : gdi32: Sort the OpenGL driver functions alphabetically .
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: 715d8100730e5edd6ab11b7d00195360ef43d733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715d8100730e5edd6ab11b7d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 13 14:22:59 2011 +0200 gdi32: Sort the OpenGL driver functions alphabetically. --- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/driver.c | 4 ++-- dlls/winex11.drv/init.c | 4 ++-- include/wine/gdi_driver.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2923aeb..a6823c9 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -551,10 +551,10 @@ const DC_FUNCTIONS dib_driver = NULL, /* pwglCreateContext */ NULL, /* pwglCreateContextAttribsARB */ NULL, /* pwglDeleteContext */ - NULL, /* pwglGetProcAddress */ NULL, /* pwglGetPbufferDCARB */ - NULL, /* pwglMakeCurrent */ + NULL, /* pwglGetProcAddress */ NULL, /* pwglMakeContextCurrentARB */ + NULL, /* pwglMakeCurrent */ NULL, /* pwglSetPixelFormatWINE */ NULL, /* pwglShareLists */ NULL, /* pwglUseFontBitmapsA */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4c5d308..e870b17 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -788,10 +788,10 @@ const DC_FUNCTIONS null_driver = nulldrv_wglCreateContext, /* pwglCreateContext */ nulldrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ nulldrv_wglDeleteContext, /* pwglDeleteContext */ - nulldrv_wglGetProcAddress, /* pwglGetProcAddress */ nulldrv_wglGetPbufferDCARB, /* pwglGetPbufferDCARB */ - nulldrv_wglMakeCurrent, /* pwglMakeCurrent */ + nulldrv_wglGetProcAddress, /* pwglGetProcAddress */ nulldrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ + nulldrv_wglMakeCurrent, /* pwglMakeCurrent */ nulldrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ nulldrv_wglShareLists, /* pwglShareLists */ nulldrv_wglUseFontBitmapsA, /* pwglUseFontBitmapsA */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6f734b5..15680c4 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -568,10 +568,10 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_wglCreateContext, /* pwglCreateContext */ X11DRV_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ X11DRV_wglDeleteContext, /* pwglDeleteContext */ - X11DRV_wglGetProcAddress, /* pwglGetProcAddress */ X11DRV_wglGetPbufferDCARB, /* pwglGetPbufferDCARB */ - X11DRV_wglMakeCurrent, /* pwglMakeCurrent */ + X11DRV_wglGetProcAddress, /* pwglGetProcAddress */ X11DRV_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ + X11DRV_wglMakeCurrent, /* pwglMakeCurrent */ X11DRV_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ X11DRV_wglShareLists, /* pwglShareLists */ X11DRV_wglUseFontBitmapsA, /* pwglUseFontBitmapsA */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index ffcf634..c28e4d3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -171,10 +171,10 @@ struct gdi_dc_funcs HGLRC (CDECL *pwglCreateContext)(PHYSDEV); HGLRC (CDECL *pwglCreateContextAttribsARB)(PHYSDEV,HGLRC,const int*); BOOL (CDECL *pwglDeleteContext)(HGLRC); - PROC (CDECL *pwglGetProcAddress)(LPCSTR); HDC (CDECL *pwglGetPbufferDCARB)(PHYSDEV,void*); - BOOL (CDECL *pwglMakeCurrent)(PHYSDEV,HGLRC); + PROC (CDECL *pwglGetProcAddress)(LPCSTR); BOOL (CDECL *pwglMakeContextCurrentARB)(PHYSDEV,PHYSDEV,HGLRC); + BOOL (CDECL *pwglMakeCurrent)(PHYSDEV,HGLRC); BOOL (CDECL *pwglSetPixelFormatWINE)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR*); BOOL (CDECL *pwglShareLists)(HGLRC,HGLRC); BOOL (CDECL *pwglUseFontBitmapsA)(PHYSDEV,DWORD,DWORD,DWORD); @@ -182,7 +182,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 1 +#define WINE_GDI_DRIVER_VERSION 2 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Graphics driver functions no longer need to be CDECL.
by Alexandre Julliard 13 Jul '11

13 Jul '11

1 0

Ken Thomases : winex11.drv: Fix X11DRV_KeymapNotify when multiple keycodes map to same vkey.
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: c4daf281865c494c7e7dba0901eeebacef4cae29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4daf281865c494c7e7dba090… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 13 06:03:43 2011 -0500 winex11.drv: Fix X11DRV_KeymapNotify when multiple keycodes map to same vkey. --- dlls/winex11.drv/keyboard.c | 46 ++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 42ca462..5648d79 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1189,9 +1189,17 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) int i, j; DWORD time = GetCurrentTime(); BYTE keystate[256]; + WORD vkey; + struct { + WORD vkey; + WORD scan; + BOOL pressed; + } modifiers[6]; /* VK_LSHIFT through VK_RMENU are contiguous */ if (!get_async_key_state( keystate )) return; + memset(modifiers, 0, sizeof(modifiers)); + /* the minimum keycode is always greater or equal to 8, so we can * skip the first 8 values, hence start at 1 */ @@ -1199,7 +1207,9 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { for (j = 0; j < 8; j++) { - WORD vkey = keyc2vkey[(i * 8) + j]; + int m; + + vkey = keyc2vkey[(i * 8) + j]; switch(vkey & 0xff) { @@ -1209,22 +1219,36 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) case VK_RCONTROL: case VK_LSHIFT: case VK_RSHIFT: - if (!(keystate[vkey & 0xff] & 0x80) != !(event->xkeymap.key_vector[i] & (1<<j))) + m = (vkey & 0xff) - VK_LSHIFT; + /* Take the vkey and scan from the first keycode we encounter + for this modifier. */ + if (!modifiers[m].vkey) { - WORD scan = keyc2scan[(i * 8) + j]; - DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; - if (!(event->xkeymap.key_vector[i] & (1<<j))) flags |= KEYEVENTF_KEYUP; - - TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", - vkey, keystate[vkey & 0xff]); - - /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time ); + modifiers[m].vkey = vkey; + modifiers[m].scan = keyc2scan[(i * 8) + j]; } + if (event->xkeymap.key_vector[i] & (1<<j)) + modifiers[m].pressed = TRUE; break; } } } + + for (vkey = VK_LSHIFT; vkey <= VK_RMENU; vkey++) + { + int m = vkey - VK_LSHIFT; + if (modifiers[m].vkey && !(keystate[vkey] & 0x80) != !modifiers[m].pressed) + { + DWORD flags = modifiers[m].vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; + if (!modifiers[m].pressed) flags |= KEYEVENTF_KEYUP; + + TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", + modifiers[m].vkey, keystate[vkey]); + + /* Fake key being pressed inside wine */ + X11DRV_send_keyboard_input( hwnd, vkey, modifiers[m].scan & 0xff, flags, time ); + } + } } static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time )

1 0

Ken Thomases : winex11.drv: Map Meta keys to VK_{L, R}MENU, not just VK_MENU.
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: ebebee5b9e4e0929c971e9b2a4ffb70950b737cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebebee5b9e4e0929c971e9b2a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 13 06:03:49 2011 -0500 winex11.drv: Map Meta keys to VK_{L, R}MENU, not just VK_MENU. This fixes a problem with X11DRV_KeymapNotify sending incorrect key-up events. --- dlls/winex11.drv/keyboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5648d79..7c229fd 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1006,8 +1006,8 @@ static const WORD nonchar_key_vkey[256] = 0, 0, 0, 0, 0, 0, 0, 0, /* FFD8 */ /* modifier keys */ 0, VK_LSHIFT, VK_RSHIFT, VK_LCONTROL, /* FFE0 */ - VK_RCONTROL, VK_CAPITAL, 0, VK_MENU, - VK_MENU, VK_LMENU, VK_RMENU, VK_LWIN, VK_RWIN, 0, 0, 0, /* FFE8 */ + VK_RCONTROL, VK_CAPITAL, 0, VK_LMENU, + VK_RMENU, VK_LMENU, VK_RMENU, VK_LWIN, VK_RWIN, 0, 0, 0, /* FFE8 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FFF0 */ 0, 0, 0, 0, 0, 0, 0, VK_DELETE /* FFF8 */ };

1 0

Huw Davies : gdi32: Implement the conversion between two identical bitfield dibs.
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: dddc079d4f276303b40afd4a35ad43e17684ece5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddc079d4f276303b40afd4a3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 13 13:04:58 2011 +0100 gdi32: Implement the conversion between two identical bitfield dibs. --- dlls/gdi32/dibdrv/primitives.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 68eb4ae..ebcf830 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -719,6 +719,15 @@ static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) return 0; } +static inline BOOL bit_fields_match(const dib_info *d1, const dib_info *d2) +{ + assert( d1->bit_count > 8 && d1->bit_count == d2->bit_count ); + + return d1->red_mask == d2->red_mask && + d1->green_mask == d2->green_mask && + d1->blue_mask == d2->blue_mask; +} + static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_rect) { DWORD *dst_start = dst->bits, *dst_pixel, src_val; @@ -904,6 +913,20 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re src_start += src->stride / 4; } } + else if(bit_fields_match(src, dst)) + { + if(src->stride > 0 && dst->stride > 0 && src_rect->left == 0 && src_rect->right == src->width) + memcpy(dst->bits, src_start, (src_rect->bottom - src_rect->top) * src->stride); + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + memcpy(dst_start, src_start, (src_rect->right - src_rect->left) * 4); + dst_start += dst->stride / 4; + src_start += src->stride / 4; + } + } + } else { FIXME("Unsupported conversion: 32 -> 32\n"); @@ -1456,6 +1479,20 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re src_start += src->stride / 2; } } + else if(bit_fields_match(src, dst)) + { + if(src->stride > 0 && dst->stride > 0 && src_rect->left == 0 && src_rect->right == src->width) + memcpy(dst->bits, src_start, (src_rect->bottom - src_rect->top) * src->stride); + else + { + for(y = src_rect->top; y < src_rect->bottom; y++) + { + memcpy(dst_start, src_start, (src_rect->right - src_rect->left) * 2); + dst_start += dst->stride / 2; + src_start += src->stride / 2; + } + } + } else { FIXME("Unsupported conversion: 16 -> 16\n");

1 0

Huw Davies : gdi32: Add conversion routines for source dibs with an arbitrary order of 8-bit channels .
by Alexandre Julliard 13 Jul '11

13 Jul '11

Module: wine Branch: master Commit: 4c3cec75f2918effbbd57f42b2b778d527e3bf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3cec75f2918effbbd57f42b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 13 13:04:59 2011 +0100 gdi32: Add conversion routines for source dibs with an arbitrary order of 8-bit channels. --- dlls/gdi32/dibdrv/primitives.c | 172 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 163 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c3cec75f2918effbbd57…

1 0