September 2009 - Wine-commits

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 : 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

Markus Stockhausen : ole32/storage32: Fix for reference counters in nested storage.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: abdebcdbbe61cfaf7c9198f279637ec69daa63d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdebcdbbe61cfaf7c9198f27… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Fri Sep 25 16:27:49 2009 +0200 ole32/storage32: Fix for reference counters in nested storage. --- dlls/ole32/storage32.c | 4 +--- dlls/ole32/tests/storage32.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6e3e1e1..9082334 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3713,7 +3713,6 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; - StorageBaseImpl_Release((IStorage*)This->base.ancestorStorage); HeapFree(GetProcessHeap(), 0, This); } @@ -4312,10 +4311,9 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.openFlags = (openFlags & ~STGM_CREATE); /* - * Keep the ancestor storage pointer and nail a reference to it. + * Keep the ancestor storage pointer but do not nail a reference to it. */ newStorage->base.ancestorStorage = ancestorStorage; - StorageBaseImpl_AddRef((IStorage*)(newStorage->base.ancestorStorage)); /* * Keep the index of the root property set for this storage, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index fec854e..620e6cb 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1470,6 +1470,45 @@ static void test_fmtusertypestg(void) } } +static void test_references(void) +{ + IStorage *stg,*stg2; + HRESULT hr; + unsigned c1,c2; + static const WCHAR StorName[] = { 'D','a','t','a','S','p','a','c','e','I','n','f','o',0 }; + + DeleteFileA(filenameA); + + hr = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfile failed\n"); + + if (SUCCEEDED(hr)) + { + IStorage_Release(stg); + + hr = StgOpenStorage( filename, NULL, STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg); + ok(hr==S_OK, "StgOpenStorage failed (result=%x)\n",hr); + + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStorage(stg,StorName,STGM_READWRITE | STGM_SHARE_EXCLUSIVE,0,0,&stg2); + ok(hr == S_OK, "IStorage_CreateStorage failed (result=%x)\n",hr); + + if (SUCCEEDED(hr)) + { + c1 = IStorage_AddRef(stg); + ok(c1 == 2, "creating internal storage added references to ancestor\n"); + c1 = IStorage_AddRef(stg); + IStorage_Release(stg2); + c2 = IStorage_AddRef(stg) - 1; + ok(c1 == c2, "releasing internal storage removed references to ancestor\n"); + } + c1 = IStorage_Release(stg); + while ( c1 ) c1 = IStorage_Release(stg); + } + } +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -1497,4 +1536,5 @@ START_TEST(storage32) test_readonly(); test_simple(); test_fmtusertypestg(); + test_references(); }

1 0

Colin Fowler : libport: Add generic interlocked instruction support fallback.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: c741ad7dde3210843bb0d9eb07145e5f705bf355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c741ad7dde3210843bb0d9eb0… Author: Colin Fowler <elethiomel(a)gmail.com> Date: Fri Sep 25 16:53:17 2009 +0100 libport: Add generic interlocked instruction support fallback. --- libs/port/interlocked.c | 147 ++++++++++++++++++++++++----------------------- 1 files changed, 75 insertions(+), 72 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 51794d3..b2d4b52 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -268,77 +268,6 @@ void* interlocked_xchg_ptr( void** dest, void* val ) return ret; } -#elif defined(__sparc__) && defined(__sun__) - -/* - * As the earlier Sparc processors lack necessary atomic instructions, - * I'm simply falling back to the library-provided _lwp_mutex routines - * to ensure mutual exclusion in a way appropriate for the current - * architecture. - * - * FIXME: If we have the compare-and-swap instruction (Sparc v9 and above) - * we could use this to speed up the Interlocked operations ... - */ -#include <synch.h> -static lwp_mutex_t interlocked_mutex = DEFAULTMUTEX; - -int interlocked_cmpxchg( int *dest, int xchg, int compare ) -{ - _lwp_mutex_lock( &interlocked_mutex ); - if (*dest == compare) *dest = xchg; - else compare = *dest; - _lwp_mutex_unlock( &interlocked_mutex ); - return compare; -} - -void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) -{ - _lwp_mutex_lock( &interlocked_mutex ); - if (*dest == compare) *dest = xchg; - else compare = *dest; - _lwp_mutex_unlock( &interlocked_mutex ); - return compare; -} - -__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) -{ - _lwp_mutex_lock( &interlocked_mutex ); - if (*dest == compare) *dest = xchg; - else compare = *dest; - _lwp_mutex_unlock( &interlocked_mutex ); - return compare; -} - -int interlocked_xchg( int *dest, int val ) -{ - int retv; - _lwp_mutex_lock( &interlocked_mutex ); - retv = *dest; - *dest = val; - _lwp_mutex_unlock( &interlocked_mutex ); - return retv; -} - -void *interlocked_xchg_ptr( void **dest, void *val ) -{ - void *retv; - _lwp_mutex_lock( &interlocked_mutex ); - retv = *dest; - *dest = val; - _lwp_mutex_unlock( &interlocked_mutex ); - return retv; -} - -int interlocked_xchg_add( int *dest, int incr ) -{ - int retv; - _lwp_mutex_lock( &interlocked_mutex ); - retv = *dest; - *dest += incr; - _lwp_mutex_unlock( &interlocked_mutex ); - return retv; -} - #elif defined(__ALPHA__) && defined(__GNUC__) __ASM_GLOBAL_FUNC(interlocked_cmpxchg, @@ -395,6 +324,80 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add, "beq $1,L0xchg_add\n\t" "mb") + #else -# error You must implement the interlocked* functions for your CPU + +#include <pthread.h> + +static pthread_mutex_t interlocked_mutex = PTHREAD_MUTEX_INITIALIZER; + +int interlocked_cmpxchg( int *dest, int xchg, int compare ) +{ + pthread_mutex_lock( &interlocked_mutex ); + + if (*dest == compare) + *dest = xchg; + else + compare = *dest; + + pthread_mutex_unlock( &interlocked_mutex ); + return compare; +} + +void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) +{ + pthread_mutex_lock( &interlocked_mutex ); + + if (*dest == compare) + *dest = xchg; + else + compare = *dest; + + pthread_mutex_unlock( &interlocked_mutex ); + return compare; +} + +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) +{ + pthread_mutex_lock( &interlocked_mutex ); + + if (*dest == compare) + *dest = xchg; + else + compare = *dest; + + pthread_mutex_unlock( &interlocked_mutex ); + return compare; +} + +int interlocked_xchg( int *dest, int val ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + retv = *dest; + *dest = val; + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} + +void *interlocked_xchg_ptr( void **dest, void *val ) +{ + void *retv; + pthread_mutex_lock( &interlocked_mutex ); + retv = *dest; + *dest = val; + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} + +int interlocked_xchg_add( int *dest, int incr ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + retv = *dest; + *dest += incr; + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} + #endif

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 5e030ac12657c21d9fc64bcc29ce8bab29a0af7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e030ac12657c21d9fc64bcc2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 25 17:54:59 2009 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 39a229b..80a150e 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -40,5 +40,8 @@ STRINGTABLE DISCARDABLE IDS_ILLEGAL_ASSIGN "Unzulässige Zuweisung" IDS_UNDEFINED "'|' nicht definiert" IDS_NOT_BOOL "Boolisches Objekt erwartet" + IDS_JSCRIPT_EXPECTED "JScript Objekt erwartet" + IDS_REGEXP_SYNTAX_ERROR "Syntax Fehler in regulärem Ausdruck" IDS_INVALID_LENGTH "Array-Größe muss eine endliche, positive Ganzzahl sein" + IDS_ARRAY_EXPECTED "Array Objekt erwartet" }

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

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 : 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

Ł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