wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Alexandre Julliard : gdi32: Leave it up to the driver to push the new device on the DC stack in CreateDC .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: a28ddddcbcd3307e58a8de42a8e4d488080353e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28ddddcbcd3307e58a8de42a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 17:01:29 2011 +0200 gdi32: Leave it up to the driver to push the new device on the DC stack in CreateDC. --- dlls/gdi32/dc.c | 4 +--- dlls/gdi32/driver.c | 2 +- dlls/wineps.drv/init.c | 8 ++++---- dlls/winex11.drv/init.c | 6 +++--- include/wine/gdi_driver.h | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7c1ebc0..5ba4e59 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -628,13 +628,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (funcs->pCreateDC) { - PHYSDEV physdev; - if (!funcs->pCreateDC( hdc, &physdev, buf, device, output, initData )) + if (!funcs->pCreateDC( &dc->physDev, buf, device, output, initData )) { WARN("creation aborted by device\n" ); goto error; } - push_dc_driver( &dc->physDev, physdev, funcs ); } dc->vis_rect.left = 0; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4d1054e..51e241f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -224,7 +224,7 @@ static BOOL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) return display_driver->funcs->pCreateCompatibleDC( NULL, pdev ); } -static BOOL nulldrv_CreateDC( HDC hdc, PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, +static BOOL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *devmode ) { assert(0); /* should never be called */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a1ed1a2..e7e545e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -323,8 +323,8 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi ) /********************************************************************** * PSDRV_CreateDC */ -static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; @@ -354,7 +354,6 @@ static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR devi } if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - *pdev = &physDev->dev; if (output && *output) { INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); @@ -369,7 +368,8 @@ static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR devi } PSDRV_UpdateDevCaps(physDev); - SelectObject( hdc, PSDRV_DefaultFont ); + SelectObject( (*pdev)->hdc, PSDRV_DefaultFont ); + push_dc_driver( pdev, &physDev->dev, &psdrv_funcs ); return TRUE; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ea96d0c..2b0df17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -144,8 +144,8 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) /********************************************************************** * X11DRV_CreateDC */ -static BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { X11DRV_PDEVICE *physDev = create_x11_physdev( root_window ); @@ -156,7 +156,7 @@ static BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR dev physDev->drawable_rect = virtual_screen_rect; SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top ); - *pdev = &physDev->dev; + push_dc_driver( pdev, &physDev->dev, &x11drv_funcs ); return TRUE; } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 3f67d81..1e7ebdb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -66,7 +66,7 @@ struct gdi_dc_funcs BOOL (*pCloseFigure)(PHYSDEV); BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); - BOOL (*pCreateDC)(HDC,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); + BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,BITMAPINFO *,UINT); BOOL (*pDeleteBitmap)(HBITMAP); BOOL (*pDeleteDC)(PHYSDEV); @@ -189,7 +189,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 12 +#define WINE_GDI_DRIVER_VERSION 13 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Don't allow CreateCompatibleDC on a metafile DC .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: c331a1a6cd1df3da30da29c56f699e7512e49b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c331a1a6cd1df3da30da29c56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 16:31:19 2011 +0200 gdi32: Don't allow CreateCompatibleDC on a metafile DC. --- dlls/gdi32/mfdrv/init.c | 13 ++++++++++++- dlls/gdi32/tests/dc.c | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index bb36a85..2139b98 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); +static BOOL MFDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ); static BOOL MFDRV_DeleteDC( PHYSDEV dev ); @@ -91,7 +92,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ NULL, /* pCreateBitmap */ - NULL, /* pCreateCompatibleDC */ + MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ @@ -247,6 +248,16 @@ static DC *MFDRV_AllocMetaFile(void) /********************************************************************** + * MFDRV_CreateCompatibleDC + */ +static BOOL MFDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) +{ + /* not supported on metafile DCs */ + return FALSE; +} + + +/********************************************************************** * MFDRV_DeleteDC */ static BOOL MFDRV_DeleteDC( PHYSDEV dev ) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 12a875a..efa7d53 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -265,20 +265,50 @@ static void test_GdiConvertToDevmodeW(void) static void test_CreateCompatibleDC(void) { BOOL bRet; - HDC hDC; - HDC hNewDC; + HDC hdc, hNewDC, hdcMetafile; + HBITMAP bitmap; + INT caps; + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); /* Create a DC compatible with the screen */ - hDC = CreateCompatibleDC(NULL); - ok(hDC != NULL, "CreateCompatibleDC returned %p\n", hDC); + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "CreateCompatibleDC returned %p\n", hdc); + ok( SelectObject( hdc, bitmap ) != 0, "SelectObject failed\n" ); + caps = GetDeviceCaps( hdc, TECHNOLOGY ); + ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); /* Delete this DC, this should succeed */ - bRet = DeleteDC(hDC); + bRet = DeleteDC(hdc); ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); /* Try to create a DC compatible to the deleted DC. This has to fail */ - hNewDC = CreateCompatibleDC(hDC); + hNewDC = CreateCompatibleDC(hdc); ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); + + hdc = GetDC( 0 ); + hdcMetafile = CreateEnhMetaFileA(hdc, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA failed\n"); + hNewDC = CreateCompatibleDC( hdcMetafile ); + ok(hNewDC != NULL, "CreateCompatibleDC failed\n"); + ok( SelectObject( hNewDC, bitmap ) != 0, "SelectObject failed\n" ); + caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); + ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + caps = GetDeviceCaps( hNewDC, TECHNOLOGY ); + ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + DeleteDC( hNewDC ); + DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile )); + ReleaseDC( 0, hdc ); + + hdcMetafile = CreateMetaFileA(NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA failed\n"); + hNewDC = CreateCompatibleDC( hdcMetafile ); + ok(hNewDC == NULL, "CreateCompatibleDC succeeded\n"); + caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); + ok( caps == DT_METAFILE, "wrong caps %u\n", caps ); + DeleteMetaFile( CloseMetaFile( hdcMetafile )); + + DeleteObject( bitmap ); } static void test_DC_bitmap(void)

1 0

Alexandre Julliard : gdi32: Add a driver entry point for CreateCompatibleDC .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: cef1832bfb7ff58f39589d47d7137ae5be4acfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef1832bfb7ff58f39589d47d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 15:36:58 2011 +0200 gdi32: Add a driver entry point for CreateCompatibleDC. --- dlls/gdi32/dc.c | 22 +++-------- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 13 +++++-- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 + dlls/wineps.drv/init.c | 85 ++++++++++++++++++++++++++----------------- dlls/winex11.drv/init.c | 80 ++++++++++++++++++++++++++--------------- include/wine/gdi_driver.h | 3 +- 9 files changed, 122 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cef1832bfb7ff58f39589…

1 0

Alexandre Julliard : gdi32: Make the push/ pop_dc_driver functions available to the drivers.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 901c1997cb9f29471a1776d58fc4c2319f4ca0c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901c1997cb9f29471a1776d58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 14:39:46 2011 +0200 gdi32: Make the push/pop_dc_driver functions available to the drivers. --- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/dc.c | 34 +++------------------------------- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 -- dlls/gdi32/mfdrv/init.c | 2 +- include/wine/gdi_driver.h | 15 +++++++++++++++ 6 files changed, 24 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 3a4caca..95a45ff 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -703,12 +703,12 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) old_physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); if(old_physdev == &dc->dibdrv.dev) - pop_dc_driver( dc, old_physdev ); + old_physdev = pop_dc_driver( &dc->physDev ); if(bitmap->dib) { physdev = &dc->dibdrv.dev; - push_dc_driver( dc, physdev, physdev->funcs ); + push_dc_driver( &dc->physDev, physdev, physdev->funcs ); } else physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); @@ -742,8 +742,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) done: if(!ret) { - if(physdev == &dc->dibdrv.dev) pop_dc_driver( dc, physdev ); - if(old_physdev == &dc->dibdrv.dev) push_dc_driver( dc, old_physdev, old_physdev->funcs ); + if(physdev == &dc->dibdrv.dev) pop_dc_driver( &dc->physDev ); + if(old_physdev == &dc->dibdrv.dev) push_dc_driver( &dc->physDev, old_physdev, old_physdev->funcs ); } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 286fa0e..5ab054a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -183,8 +183,7 @@ void free_dc_ptr( DC *dc ) while (dc->physDev != &dc->nulldrv) { - PHYSDEV physdev = dc->physDev; - pop_dc_driver( dc, physdev ); + PHYSDEV physdev = pop_dc_driver( &dc->physDev ); physdev->funcs->pDeleteDC( physdev ); } free_gdi_handle( dc->hSelf ); @@ -248,33 +247,6 @@ void update_dc( DC *dc ) /*********************************************************************** - * push_dc_driver - * - * Push a driver on top of the DC driver stack. - */ -void push_dc_driver( DC * dc, PHYSDEV physdev, const DC_FUNCTIONS *funcs ) -{ - physdev->funcs = funcs; - physdev->next = dc->physDev; - physdev->hdc = dc->hSelf; - dc->physDev = physdev; -} - - -/*********************************************************************** - * pop_dc_driver - * - * Pop the top driver from the DC driver stack. - */ -void pop_dc_driver( DC * dc, PHYSDEV physdev ) -{ - assert( physdev == dc->physDev ); - assert( physdev != &dc->nulldrv ); - dc->physDev = physdev->next; -} - - -/*********************************************************************** * DC_DeleteObject */ static BOOL DC_DeleteObject( HGDIOBJ handle ) @@ -662,7 +634,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, WARN("creation aborted by device\n" ); goto error; } - push_dc_driver( dc, physdev, funcs ); + push_dc_driver( &dc->physDev, physdev, funcs ); } dc->vis_rect.left = 0; @@ -786,7 +758,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) WARN("creation aborted by device\n"); goto error; } - push_dc_driver( dc, physDev, funcs ); + push_dc_driver( &dc->physDev, physDev, funcs ); } DC_InitDC( dc ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 9f80854..558ebd1 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -331,7 +331,7 @@ HDC WINAPI CreateEnhMetaFileW( return 0; } - push_dc_driver( dc, &physDev->dev, &EMFDRV_Funcs ); + push_dc_driver( &dc->physDev, &physDev->dev, &EMFDRV_Funcs ); physDev->handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(physDev->handles[0])); physDev->handles_size = HANDLE_LIST_INC; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c4ed75a..2e12f4d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -330,8 +330,6 @@ extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; -extern void push_dc_driver( DC * dc, PHYSDEV physdev, const DC_FUNCTIONS *funcs ) DECLSPEC_HIDDEN; -extern void pop_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index dca30db..421edef 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -224,7 +224,7 @@ static DC *MFDRV_AllocMetaFile(void) return NULL; } - push_dc_driver( dc, &physDev->dev, &MFDRV_Funcs ); + push_dc_driver( &dc->physDev, &physDev->dev, &MFDRV_Funcs ); physDev->handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(physDev->handles[0])); physDev->handles_size = HANDLE_LIST_INC; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 36a265a..caf4d0d 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -199,4 +199,19 @@ static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) #define GET_NEXT_PHYSDEV(dev,func) \ get_physdev_entry_point( (dev)->next, FIELD_OFFSET(struct gdi_dc_funcs,func)) +static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct gdi_dc_funcs *funcs ) +{ + physdev->funcs = funcs; + physdev->next = *dev; + physdev->hdc = (*dev)->hdc; + *dev = physdev; +} + +static inline PHYSDEV pop_dc_driver( PHYSDEV *dev ) +{ + PHYSDEV ret = *dev; + *dev = ret->next; + return ret; +} + #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Alexandre Julliard : gdi32: Don't free a driver when it' s popped from the stack.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 9a63a25b9d2dc55d01b36863225b67daa2467bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a63a25b9d2dc55d01b368632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 12:08:16 2011 +0200 gdi32: Don't free a driver when it's popped from the stack. --- dlls/gdi32/dc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 45bff98..286fa0e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -181,7 +181,12 @@ void free_dc_ptr( DC *dc ) { assert( dc->refcount == 1 ); - while (dc->physDev != &dc->nulldrv) pop_dc_driver( dc, dc->physDev ); + while (dc->physDev != &dc->nulldrv) + { + PHYSDEV physdev = dc->physDev; + pop_dc_driver( dc, physdev ); + physdev->funcs->pDeleteDC( physdev ); + } free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } @@ -266,7 +271,6 @@ void pop_dc_driver( DC * dc, PHYSDEV physdev ) assert( physdev == dc->physDev ); assert( physdev != &dc->nulldrv ); dc->physDev = physdev->next; - physdev->funcs->pDeleteDC( physdev ); }

1 0

Alexandre Julliard : gdi32: Always set biClrUsed in internal BITMAPINFO structures.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: f4e9bdb90436b0e06c0cd30bfd3d2a12f5c56747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e9bdb90436b0e06c0cd30bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 12:07:15 2011 +0200 gdi32: Always set biClrUsed in internal BITMAPINFO structures. --- dlls/gdi32/dib.c | 5 ++--- dlls/gdi32/dibdrv/bitblt.c | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 57d830d..3739cb7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -203,6 +203,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * dst->bmiColors[i].rgbReserved = 0; } } + dst->bmiHeader.biClrUsed = colors; } return TRUE; } @@ -995,6 +996,7 @@ static void fill_default_color_table( BITMAPINFO *info ) default: ERR("called with bitcount %d\n", info->bmiHeader.biBitCount); } + info->bmiHeader.biClrUsed = 1 << info->bmiHeader.biBitCount; } void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) @@ -1180,10 +1182,7 @@ INT WINAPI GetDIBits( /* fill out the src colour table, if it needs one */ if (src_info->bmiHeader.biBitCount <= 8 && src_info->bmiHeader.biClrUsed == 0) - { fill_default_color_table( src_info ); - src_info->bmiHeader.biClrUsed = 1 << src_info->bmiHeader.biBitCount; - } /* if the src and dst are the same depth, copy the colour info across */ if (dst_info->bmiHeader.biBitCount == src_info->bmiHeader.biBitCount && coloruse == DIB_RGB_COLORS ) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 563cb0a..356d276 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -664,6 +664,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); + if (!info->bmiHeader.biClrUsed) return FALSE; if (dib->color_table_size != get_dib_num_of_colors( info )) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); }

1 0

André Hentschel : dnsapi: Use internal name_skip function.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 9e50294f2391a63d9b3819f7c0f7d40e8aaf61a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e50294f2391a63d9b3819f7c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 01:41:39 2011 +0200 dnsapi: Use internal name_skip function. --- dlls/dnsapi/ns_parse.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index bfb83c2..df4933a 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -32,9 +32,14 @@ #ifdef HAVE_RESOLV_H # include <resolv.h> #endif +#include <stdarg.h> #include <string.h> #include "windef.h" +#include "winbase.h" +#include "winnls.h" + +#include "dnsapi.h" /* Forward. */ @@ -75,12 +80,11 @@ dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) const u_char *optr = ptr; while (count-- > 0) { - int b, rdlength; + int rdlength; - b = dn_skipname(ptr, eom); - if (b < 0) + if (dns_ns_name_skip(&ptr, eom) < 0) RETERR(EMSGSIZE); - ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/; + ptr += NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/; if (section != ns_s_qd) { if (ptr + NS_INT32SZ + NS_INT16SZ > eom) RETERR(EMSGSIZE);

1 0

Francois Gouget : cmd: Add a trailing full stops to a couple of usage messages.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Hwang YunSong : winecfg: Updated Korean translation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 526d4e2b984e17dac768f0522d9330bb3e63b440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526d4e2b984e17dac768f0522… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 6 16:21:50 2011 +0900 winecfg: Updated Korean translation. --- programs/winecfg/Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 244eb5f..ea21a95 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -94,13 +94,13 @@ IDD_DLLCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " DLL 오버라이드 ",IDC_STATIC,8,4,244,210 + GROUPBOX " DLL 덮어쓰기 ",IDC_STATIC,8,4,244,210 LTEXT "동적 링크 라이브러리는 개별적으로 내장(Wine에 의해 제공)이나 네이티브(윈도우즈나 프로그램에 의해 제공)으로 지정될수 있습니다." ,IDC_STATIC,16,16,220,32 - LTEXT "새로 오버라이드할 라이브러리(&N):",IDC_STATIC,16,58,112,8 + LTEXT "새로 덮어쓸 라이브러리(&N):",IDC_STATIC,16,58,112,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "더하기(&A)",IDC_DLLS_ADDDLL, 164,68,82,13 - LTEXT "현재 오버라이드 목록(&O):",IDC_STATIC,16,86,100,8 + LTEXT "현재 덮어쓰기 목록(&O):",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,112,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "고치기(&E)...",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "지우기(&R)",IDC_DLLS_REMOVEDLL,164,114,82,14 @@ -108,7 +108,7 @@ END IDD_LOADORDER DIALOG 80, 90, 110, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "오버라이드 수정" +CAPTION "덮어쓰기 고치기" FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "불러오기 순서 ",IDC_STATIC,8,4,94,66 @@ -161,7 +161,7 @@ BEGIN LTEXT "시리얼(&E):",IDC_STATIC_SERIAL,13,183,34,12 EDITTEXT IDC_EDIT_SERIAL,47,180,78,13,ES_AUTOHSCROLL | WS_TABSTOP - CONTROL "닷 파일 보이기(&D)",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 + CONTROL "숨은 파일 보이기(&D)",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 END IDD_AUDIOCFG DIALOG 0, 0, 260, 220 @@ -173,7 +173,7 @@ BEGIN COMBOBOX IDC_DSOUND_HW_ACCEL,100,12,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "기본 샘플 비율(&S):",IDC_STATIC,15,31,70,8 COMBOBOX IDC_DSOUND_RATES,90,29,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "기본 비트/샘플(&B):",IDC_STATIC,197,31,80,8 + LTEXT "기본 비트/샘플(&B):",IDC_STATIC,143,31,80,8 COMBOBOX IDC_DSOUND_BITS,220,29,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "소리 테스트(&T)",IDC_AUDIO_TEST,8,50,59,14 END

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: eecb79618c21732f67ce3cabf9c431439d966039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecb79618c21732f67ce3cabf… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 6 16:17:07 2011 +0900 po: Updated Korean translation. --- po/ko.po | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/po/ko.po b/po/ko.po index 65a6289..fe9965a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-02-08 18:50+0900\n" +"PO-Revision-Date: 2011-09-06 18:50+0900\n" "Last-Translator: YunSong Hwang <hys545(a)dreamwiz.com>\n" "Language-Team: none\n" "Language: Korean\n" @@ -690,7 +690,6 @@ msgid "Prefer Signed Data" msgstr "선호하는 사인된 데이타" #: crypt32.rc:53 cryptdlg.rc:31 -#, fuzzy msgctxt "Certification Practice Statement" msgid "CPS" msgstr "CPS" @@ -1228,7 +1227,6 @@ msgid "Subject Type=" msgstr "제목 형식=" #: crypt32.rc:195 -#, fuzzy msgctxt "Certificate Authority" msgid "CA" msgstr "CA" @@ -1259,7 +1257,6 @@ msgid "Access Method=" msgstr "접근 방법=" #: crypt32.rc:202 -#, fuzzy msgctxt "Online Certificate Status Protocol" msgid "OCSP" msgstr "OCSP" @@ -2350,9 +2347,8 @@ msgid "URI to be encoded contains invalid characters" msgstr "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음" #: jscript.rc:48 -#, fuzzy msgid "URI to be decoded is incorrect" -msgstr "URI 는 올바르지 않은 문자를 포함해서 인코딩되었음" +msgstr "해독하는 URI가 올바르지 않음" #: jscript.rc:50 msgid "Array length must be a finite positive integer" @@ -5848,12 +5844,12 @@ msgstr "내가 만든 프로그램" #: sane.rc:31 msgctxt "unit: pixels" msgid "px" -msgstr "px" +msgstr "픽셀" #: sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "b" +msgstr "비트" #: sane.rc:34 msgctxt "unit: dots/inch" @@ -5863,12 +5859,12 @@ msgstr "dpi" #: sane.rc:35 msgctxt "unit: percent" msgid "%" -msgstr "%" +msgstr "퍼센트" #: sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "µs" +msgstr "마이크로초" #: setupapi.rc:28 msgid "The file '%s' on %s is needed" @@ -6722,19 +6718,16 @@ msgid "%ld bytes" msgstr "%ld 바이트" #: shlwapi.rc:28 -#, fuzzy msgctxt "time unit: hours" msgid " hr" msgstr "시" #: shlwapi.rc:29 -#, fuzzy msgctxt "time unit: minutes" msgid " min" msgstr "분" #: shlwapi.rc:30 -#, fuzzy msgctxt "time unit: seconds" msgid " sec" msgstr "초" @@ -8190,7 +8183,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:287 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8229,6 +8221,7 @@ msgid "" "Enter HELP <command> for further information on any of the above commands\n" msgstr "" "CMD 내부 명령들:\n" +"ASSOC\t\t파일 확장명 연결을 보여주거나 고치기\n" "ATTRIB\t\t도스 파일 속성 보여주거나 바꾸기\n" "CALL\t\tI배치 파일 안에서 다른 파일 불러오기\n" "CD (CHDIR)\t현재 기본 디렉토리 바꾸기\n" @@ -8240,6 +8233,8 @@ msgstr "" "DEL (ERASE)\t하나의 파일이나 여러 파일을 지우기\n" "DIR\t\t디렉토리 내용 보여주기\n" "ECHO\t\t문자를 바로 화면 출력으로 복사\n" +"ENDLOCAL\t배치파일에서 환경변수의 지역화의 끝을 알려줌\n" +"FTYPE\t\t파일 형식과 관련된 열기 명령어를 표시 또는 고치기\n" "HELP\t\t 목차의 짤막한 도움말 항목 보여줌\n" "MD (MKDIR)\t하위 디렉토리 만들기\n" "MORE\t\t페이지 출력 보여주기\n" @@ -8247,10 +8242,11 @@ msgstr "" "PATH\t\t탐색 경로 보여주거나 설정하기\n" "POPD\t\tPUSHD로 마지막으로 저장했던 디렉토리로 돌아가기\n" "PROMPT\t\t명령 프롬프트 바꾸기\n" -"PUSHD\t\t현재 디렉토리를 저장하고, 새 디렉토리롤 바꾸기\n" +"PUSHD\t\t현재 디렉토리를 저장하고, 새 디렉토리로 바꾸기\n" "REN (RENAME)\t파일 이름 바꾸기\n" "RD (RMDIR)\t하위 디렉토리 지우기\n" "SET\t\t환경 변수 보여주거나 바꾸기\n" +"SETLOCAL\t배치 파일에서 환경변수의 지역화 시작을 알려줌\n" "TIME\t\t시스템 날짜 바꾸거나 보여주기\n" "TITLE\t\tCMD 세션의 창 제목 설정\n" "TYPE\t\t텍스트 파일의 내용 보여주기\n" @@ -8616,16 +8612,15 @@ msgstr "네트워크 오류가 발생함" #: net.rc:48 msgid "Connection is being made" -msgstr "연결이 활성화됨" +msgstr "연결이 만들어짐" #: net.rc:49 msgid "Reconnecting" msgstr "다시 연결중" #: net.rc:40 -#, fuzzy msgid "The following services are running:\n" -msgstr "의존하고 있는 서비스가 실행중임\n" +msgstr "다음 서비스가 실행중임:\n" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -9814,18 +9809,16 @@ msgid "&Realtime" msgstr "실시간(&R)" #: taskmgr.rc:160 -#, fuzzy msgid "&Above Normal" msgstr "보통보다 위(&A)" #: taskmgr.rc:164 -#, fuzzy msgid "&Below Normal" msgstr "보통보다 아래(&B)" #: taskmgr.rc:169 msgid "Set &Affinity..." -msgstr "친화도 설정(&A)..." +msgstr "선호도 설정(&A)..." #: taskmgr.rc:170 msgid "Edit Debug &Channels..." @@ -11182,26 +11175,23 @@ msgid "Pages" msgstr "페이지들" #: wordpad.rc:172 -#, fuzzy msgctxt "unit: centimeter" msgid "cm" -msgstr "cm" +msgstr "센치미터" #: wordpad.rc:173 -#, fuzzy msgctxt "unit: inch" msgid "in" -msgstr "in" +msgstr "인치" #: wordpad.rc:174 msgid "inch" msgstr "인치" #: wordpad.rc:175 -#, fuzzy msgctxt "unit: point" msgid "pt" -msgstr "pt" +msgstr "포인트" #: wordpad.rc:180 msgid "Document"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011