wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Alexandre Julliard : include: Avoid direct access to wine_ldt_copy outside of kernel.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: e340a2ffacbcac542189b2aa713cac969f7623a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e340a2ffacbcac542189b2aa7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:52:52 2009 +0200 include: Avoid direct access to wine_ldt_copy outside of kernel. --- include/wine/winbase16.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 680bb69..0e41cba 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -522,10 +522,4 @@ BOOL16 WINAPI WritePrivateProfileSection16(LPCSTR,LPCSTR,LPCSTR); BOOL16 WINAPI WritePrivateProfileStruct16(LPCSTR,LPCSTR,LPVOID,UINT16,LPCSTR); BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); -/* Some optimizations */ -extern inline LPVOID WINAPI MapSL( SEGPTR segptr ) -{ - return (char *)wine_ldt_copy.base[SELECTOROF(segptr) >> __AHSHIFT] + OFFSETOF(segptr); -} - #endif /* __WINE_WINE_WINBASE16_H */

1 0

Alexandre Julliard : gdi32: Move the 16-bit DIB pointer support to gdi16.c.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 29d68b3fa77c2a55d3f82d839beba8fdbd91afc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d68b3fa77c2a55d3f82d839… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:50:37 2009 +0200 gdi32: Move the 16-bit DIB pointer support to gdi16.c. --- dlls/gdi32/bitmap.c | 10 ----- dlls/gdi32/gdi16.c | 89 ++++++++++++++++++++++++++++------------------ dlls/gdi32/gdi_private.h | 1 - 3 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index f4c48c6..609cc9c 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -292,7 +292,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->bitmap.bmBits = NULL; bmpobj->funcs = NULL; bmpobj->dib = NULL; - bmpobj->segptr_bits = 0; bmpobj->color_table = NULL; bmpobj->nb_colors = 0; @@ -657,15 +656,6 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) VirtualFree(dib->dsBm.bmBits, 0L, MEM_RELEASE ); } HeapFree(GetProcessHeap(), 0, dib); - bmp->dib = NULL; - 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)); - } HeapFree(GetProcessHeap(), 0, bmp->color_table); } return HeapFree( GetProcessHeap(), 0, bmp ); diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 5fd779e..ee829e1 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -26,6 +26,7 @@ #include "wownt32.h" #include "wine/wingdi16.h" #include "gdi_private.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -222,6 +223,57 @@ static INT CALLBACK enum_font_callback( const LOGFONTW *plf, return LOWORD(ret); } +struct dib_segptr_bits +{ + struct list entry; + HBITMAP16 bmp; + WORD sel; + WORD count; +}; + +static struct list dib_segptr_list = LIST_INIT( dib_segptr_list ); + +static SEGPTR alloc_segptr_bits( HBITMAP bmp, void *bits32 ) +{ + DIBSECTION dib; + unsigned int i, size; + struct dib_segptr_bits *bits; + + if (!(bits = HeapAlloc( GetProcessHeap(), 0, sizeof(*bits) ))) return 0; + + GetObjectW( bmp, sizeof(dib), &dib ); + size = dib.dsBm.bmHeight * dib.dsBm.bmWidthBytes; + + /* calculate number of sel's needed for size with 64K steps */ + bits->bmp = HBITMAP_16( bmp ); + bits->count = (size + 0xffff) / 0x10000; + bits->sel = AllocSelectorArray16( bits->count ); + + for (i = 0; i < bits->count; i++) + { + SetSelectorBase(bits->sel + (i << __AHSHIFT), (DWORD)bits32 + i * 0x10000); + SetSelectorLimit16(bits->sel + (i << __AHSHIFT), size - 1); /* yep, limit is correct */ + size -= 0x10000; + } + list_add_head( &dib_segptr_list, &bits->entry ); + return MAKESEGPTR( bits->sel, 0 ); +} + +static void free_segptr_bits( HBITMAP16 bmp ) +{ + unsigned int i; + struct dib_segptr_bits *bits; + + LIST_FOR_EACH_ENTRY( bits, &dib_segptr_list, struct dib_segptr_bits, entry ) + { + if (bits->bmp != bmp) continue; + for (i = 0; i < bits->count; i++) FreeSelector16( bits->sel + (i << __AHSHIFT) ); + + list_remove( &bits->entry ); + HeapFree( GetProcessHeap(), 0, bits ); + return; + } +} /*********************************************************************** * SetBkColor (GDI.1) @@ -1125,6 +1177,7 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) */ BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj ) { + if (GetObjectType( HGDIOBJ_32(obj) ) == OBJ_BITMAP) free_segptr_bits( obj ); return DeleteObject( HGDIOBJ_32(obj) ); } @@ -3623,40 +3676,6 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, const BITMAPINFO *bmi, UINT16 us HBITMAP hbitmap; hbitmap = CreateDIBSection( HDC_32(hdc), bmi, usage, &bits32, section, offset ); - if (hbitmap) - { - BITMAPOBJ *bmp = GDI_GetObjPtr(hbitmap, OBJ_BITMAP); - if (bmp && bmp->dib && bits32) - { - const BITMAPINFOHEADER *bi = &bmi->bmiHeader; - LONG width, height; - WORD planes, bpp; - DWORD compr, size; - INT width_bytes; - WORD count, sel; - int i; - - DIB_GetBitmapInfo(bi, &width, &height, &planes, &bpp, &compr, &size); - - height = height >= 0 ? height : -height; - width_bytes = DIB_GetDIBWidthBytes(width, bpp); - - if (!size || (compr != BI_RLE4 && compr != BI_RLE8)) size = width_bytes * height; - - /* calculate number of sel's needed for size with 64K steps */ - count = (size + 0xffff) / 0x10000; - sel = AllocSelectorArray16(count); - - for (i = 0; i < count; i++) - { - SetSelectorBase(sel + (i << __AHSHIFT), (DWORD)bits32 + i * 0x10000); - SetSelectorLimit16(sel + (i << __AHSHIFT), size - 1); /* yep, limit is correct */ - size -= 0x10000; - } - bmp->segptr_bits = MAKESEGPTR( sel, 0 ); - if (bits16) *bits16 = bmp->segptr_bits; - } - if (bmp) GDI_ReleaseObj( hbitmap ); - } + if (hbitmap && bits32 && bits16) *bits16 = alloc_segptr_bits( hbitmap, bits32 ); return HBITMAP_16(hbitmap); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a637a98..f0248c9 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -343,7 +343,6 @@ typedef struct tagBITMAPOBJ 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;

1 0

Alexandre Julliard : gdi32: Get rid of the 16-bit DC hook support.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 3411821ff6a9e94b7fed330976736c0271f3954d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3411821ff6a9e94b7fed33097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:32:47 2009 +0200 gdi32: Get rid of the 16-bit DC hook support. It can only work with native user32 anyway. --- dlls/gdi32/dc.c | 72 ++++------------------------------------------ dlls/gdi32/gdi16.c | 20 +++++++++++++ dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 27 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index db8a91b..f7b295a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -87,7 +87,6 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) 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 release_dc_ptr( DC *dc ) */ 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 @@ INT save_dc_state( HDC hdc ) 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 @@ BOOL WINAPI DeleteDC( HDC hdc ) } /* 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 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) if (!(dc->flags & DC_SAVED)) { dc->dwHookData = dwHookData; - dc->hookThunk = hookProc; + dc->hookProc = hookProc; } release_dc_ptr( dc ); return TRUE; @@ -1407,65 +1405,7 @@ DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) DWORD_PTR ret; if (!dc) return 0; - if (proc) *proc = dc->hookThunk; - ret = dc->dwHookData; - release_dc_ptr( dc ); - return ret; -} - - -/* relay function to call the 16-bit DC hook proc */ -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; + if (proc) *proc = dc->hookProc; ret = dc->dwHookData; release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index f442d51..5fd779e 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1769,6 +1769,26 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, /*********************************************************************** + * SetDCHook (GDI.190) + */ +BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData ) +{ + FIXME( "%04x %p %x: not supported\n", hdc16, hookProc, dwHookData ); + return FALSE; +} + + +/*********************************************************************** + * GetDCHook (GDI.191) + */ +DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) +{ + FIXME( "%04x: not supported\n", hdc16 ); + return 0; +} + + +/*********************************************************************** * SetHookFlags (GDI.192) */ WORD WINAPI SetHookFlags16( HDC16 hdc, WORD flags ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 03c63d4..a637a98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -252,8 +252,7 @@ typedef struct tagDC 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;

1 0

Alexandre Julliard : gdi32: Make wing.dll into a stand-alone 16-bit module.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 6ad951804a2188dc0614ae0b9bd18e843937e8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad951804a2188dc0614ae0b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:32:25 2009 +0200 gdi32: Make wing.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 3 +- dlls/gdi32/Makefile.in | 7 +- dlls/wing.dll16/Makefile.in | 13 +++ dlls/{gdi32 => wing.dll16}/wing.c | 97 ++++++++++---------- .../wing.spec => wing.dll16/wing.dll16.spec} | 0 8 files changed, 74 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad951804a2188dc0614a…

1 0

Alexandre Julliard : gdi32: Move remaining 16-bit metafile functions to metafile16.c
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 7582b13d8d413e195e8a4401d41d566fc32431d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7582b13d8d413e195e8a4401d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:31:45 2009 +0200 gdi32: Move remaining 16-bit metafile functions to metafile16.c --- dlls/gdi32/gdi16.c | 9 ------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/metafile16.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/init.c | 48 ---------------------------------------- 4 files changed, 55 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 2f49948..f442d51 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1601,15 +1601,6 @@ void WINAPI Resurrection16(HDC16 hdc, } -/********************************************************************** - * CreateMetaFile (GDI.125) - */ -HDC16 WINAPI CreateMetaFile16( LPCSTR filename ) -{ - return HDC_16( CreateMetaFileA( filename ) ); -} - - /*********************************************************************** * MulDiv (GDI.128) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d7f1d91..03c63d4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -460,7 +460,6 @@ extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; /* 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; diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi32/metafile16.c index a8e8ca6..812fb9c 100644 --- a/dlls/gdi32/metafile16.c +++ b/dlls/gdi32/metafile16.c @@ -58,6 +58,61 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 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; +} + +/****************************************************************** * DeleteMetaFile (GDI.127) */ BOOL16 WINAPI DeleteMetaFile16( HMETAFILE16 hmf ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a5b18d3..b6cf549 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -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" @@ -354,52 +352,6 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) } /****************************************************************** - * 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

1 0

Alexandre Julliard : winex11.drv: BS_DIBPATTERN brushes use a 32-bit handle in 32-bit mode.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: ab35d6e7278b3db7b1f2d059a5f66ad3422f4e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab35d6e7278b3db7b1f2d059a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:30:48 2009 +0200 winex11.drv: BS_DIBPATTERN brushes use a 32-bit handle in 32-bit mode. --- dlls/winex11.drv/brush.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 372cb13..ffbf4cb 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -298,7 +298,7 @@ HBRUSH CDECL X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush ) case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); - 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, @@ -307,7 +307,7 @@ HBRUSH CDECL X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush ) (WORD)logbrush.lbColor ); BRUSH_SelectPatternBrush( physDev, hBitmap ); DeleteObject( hBitmap ); - GlobalUnlock16( logbrush.lbHatch ); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } break;

1 0

Alexandre Julliard : wineps.drv: BS_DIBPATTERN brushes use a 32-bit handle in 32-bit mode.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 10b0d11e0df21e4de5615c5cba4feb46f618f896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b0d11e0df21e4de5615c5cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:30:42 2009 +0200 wineps.drv: BS_DIBPATTERN brushes use a 32-bit handle in 32-bit mode. --- dlls/wineps.drv/brush.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index e55bf1a..fb063ec 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -233,7 +233,7 @@ BOOL PSDRV_Brush(PSDRV_PDEVICE *physDev, BOOL EO) case BS_DIBPATTERN: { - BITMAPINFO *bmi = GlobalLock16(logbrush.lbHatch); + BITMAPINFO *bmi = GlobalLock( (HGLOBAL)logbrush.lbHatch ); UINT usage = logbrush.lbColor; TRACE("size %dx%dx%d\n", bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); @@ -246,7 +246,7 @@ BOOL PSDRV_Brush(PSDRV_PDEVICE *physDev, BOOL EO) FIXME("Trying to set a pattern brush on a level 1 printer\n"); ret = FALSE; } - GlobalUnlock16(logbrush.lbHatch); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } break;

1 0

Alexandre Julliard : gdi32: BS_DIBPATTERN brushes use a 32-bit handle in 32-bit mode.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: d69dd564956285f77d8973c7e28ed344aee0e5d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69dd564956285f77d8973c7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:30:06 2009 +0200 gdi32: BS_DIBPATTERN brushes use a 32-bit handle in 32-bit mode. --- dlls/gdi32/brush.c | 16 ++++++++-------- dlls/gdi32/enhmfdrv/objects.c | 4 ++-- dlls/gdi32/mfdrv/objects.c | 9 +++++++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index a9f3ae1..721da98 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -53,10 +53,10 @@ static const struct gdi_obj_funcs brush_funcs = BRUSH_DeleteObject /* pDeleteObject */ }; -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) @@ -67,13 +67,13 @@ static HGLOBAL16 dib_copy(const BITMAPINFO *info, UINT coloruse) 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; } @@ -133,7 +133,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) 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; @@ -156,7 +156,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) if (ptr->logbrush.lbStyle == BS_PATTERN) DeleteObject( (HGDIOBJ)ptr->logbrush.lbHatch ); else if (ptr->logbrush.lbStyle == BS_DIBPATTERN) - GlobalFree16( (HGLOBAL16)ptr->logbrush.lbHatch ); + GlobalFree( (HGLOBAL)ptr->logbrush.lbHatch ); } HeapFree( GetProcessHeap(), 0, ptr ); return 0; @@ -423,7 +423,7 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) DeleteObject( (HGDIOBJ)brush->logbrush.lbHatch ); break; case BS_DIBPATTERN: - GlobalFree16( (HGLOBAL16)brush->logbrush.lbHatch ); + GlobalFree( (HGLOBAL)brush->logbrush.lbHatch ); break; } return HeapFree( GetProcessHeap(), 0, brush ); diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index d2e7251..6879650 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -166,7 +166,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) { 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 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0; HeapFree( GetProcessHeap(), 0, emr ); - GlobalUnlock16(logbrush.lbHatch); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); } break; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index b4f66ec..e74cde8 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -300,7 +300,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) 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 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); size = sizeof(METARECORD) + biSize + bmSize + 2; mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(!mr) goto done; + if (!mr) + { + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); + goto done; + } mr->rdFunction = META_DIBCREATEPATTERNBRUSH; mr->rdSize = size / 2; *(mr->rdParm) = logbrush.lbStyle; *(mr->rdParm + 1) = LOWORD(logbrush.lbColor); memcpy(mr->rdParm + 2, info, biSize + bmSize); + GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); break; } default:

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.30
by Jeremy Newman 28 Sep '09

28 Sep '09

Module: website Branch: master Commit: 2951612a5d28918ef2f020e4dbb12f0e8c62bc9e URL: http://source.winehq.org/git/website.git/?a=commit;h=2951612a5d28918ef2f020… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Sep 25 20:40:17 2009 +0200 Polish translation for release 1.1.30 --- news/pl/2009092501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2009092501.xml b/news/pl/2009092501.xml new file mode 100644 index 0000000..5c66956 --- /dev/null +++ b/news/pl/2009092501.xml @@ -0,0 +1,17 @@ +<news> +<date>Wrzesień 25, 2009</date> +<title>Wydano Wine 1.1.30</title> +<body> + Wydanie rozwojowe Wine 1.1.30 jest już dostępne. + <a href="{$root}/announce/1.1.30">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla OpenAL.</li> + <li>Wiele ulepszeń we wsparciu dla HTML i JavaScript.</li> + <li>Wiele porawek i ulepszeń powszechnych kontrolek.</li> + <li>Więcej pracy włożonej w Direct3D 10.</li> + <li>Lepsze wsparcie MAPI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.30.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.30
by Alexandre Julliard 25 Sep '09

25 Sep '09

Module: website Branch: master Commit: d8216554ea72e03e31caa04bb2b27ac88f8dd08b URL: http://source.winehq.org/git/website.git/?a=commit;h=d8216554ea72e03e31caa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 19:00:17 2009 +0200 Wine release 1.1.30 --- news/en/2009092501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009092501.xml b/news/en/2009092501.xml new file mode 100644 index 0000000..3d7793b --- /dev/null +++ b/news/en/2009092501.xml @@ -0,0 +1,17 @@ +<news> +<date>September 25, 2009</date> +<title>Wine 1.1.30 Released</title> +<body> + The Wine development release 1.1.30 is now available. + <a href="{$root}/announce/1.1.30">What's new</a> in this release: +<ul> + <li>Support for OpenAL.</li> + <li>Many improvements in HTML and JavaScript support.</li> + <li>Many common controls fixes and improvements.</li> + <li>More Direct3D 10 work.</li> + <li>Better MAPI support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.30.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
87
Older →

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 2009