October 2012 - Wine-Commits

Alexandre Julliard : gdi32: Store the object selection count directly in the GDI handle table.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: b95dd7e831215ca80b341332598df600bd148a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95dd7e831215ca80b3413325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:17:56 2012 +0200 gdi32: Store the object selection count directly in the GDI handle table. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 56 ++++++++++++++++++++++++++++++--------------- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 38bc172..0055fe4 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -436,7 +436,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->header.selcount && (handle != GetStockObject(DEFAULT_BITMAP))) + if (handle != GetStockObject(DEFAULT_BITMAP) && GDI_get_ref_count( handle )) { WARN( "Bitmap already selected in another DC\n" ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eed57e8..89ac980 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1589,7 +1589,7 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) goto done; } - if (bitmap->header.selcount) + if (GDI_get_ref_count( handle )) { WARN( "Bitmap already selected in another DC\n" ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5dadbc2..cb2f9cd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -61,7 +61,6 @@ typedef struct tagGDIOBJHDR { WORD system : 1; /* system object flag */ WORD deleted : 1; /* whether DeleteObject has been called on this object */ - DWORD selcount; /* number of times the object is selected in a DC */ } GDIOBJHDR; typedef struct tagGdiFont GdiFont; @@ -316,6 +315,7 @@ extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; +extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index afc0c59..4fe72a9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -53,6 +53,7 @@ struct gdi_handle_entry const struct gdi_obj_funcs *funcs; /* type-specific functions */ struct hdc_list *hdcs; /* list of HDCs interested in this object */ WORD type; /* object type (one of the OBJ_* constants) */ + WORD selcount; /* number of times the object is selected in a DC */ }; static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; @@ -524,21 +525,36 @@ static UINT get_default_charset( void ) /*********************************************************************** + * GDI_get_ref_count + * + * Retrieve the reference count of a GDI object. + * Note: the object must be locked otherwise the count is meaningless. + */ +UINT GDI_get_ref_count( HGDIOBJ handle ) +{ + struct gdi_handle_entry *entry; + UINT ret = 0; + + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) ret = entry->selcount; + LeaveCriticalSection( &gdi_section ); + return ret; +} + + +/*********************************************************************** * GDI_inc_ref_count * * Increment the reference count of a GDI object. */ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) { - GDIOBJHDR *header; + struct gdi_handle_entry *entry; - if ((header = GDI_GetObjPtr( handle, 0 ))) - { - header->selcount++; - GDI_ReleaseObj( handle ); - } + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) entry->selcount++; else handle = 0; - + LeaveCriticalSection( &gdi_section ); return handle; } @@ -550,22 +566,24 @@ HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) */ BOOL GDI_dec_ref_count( HGDIOBJ handle ) { - GDIOBJHDR *header; + struct gdi_handle_entry *entry; - if ((header = GDI_GetObjPtr( handle, 0 ))) + EnterCriticalSection( &gdi_section ); + if ((entry = handle_entry( handle ))) { - assert( header->selcount ); - if (!--header->selcount && header->deleted) + assert( entry->selcount ); + if (!--entry->selcount && entry->obj->deleted) { /* handle delayed DeleteObject*/ - header->deleted = 0; - GDI_ReleaseObj( handle ); + entry->obj->deleted = 0; + LeaveCriticalSection( &gdi_section ); TRACE( "executing delayed DeleteObject for %p\n", handle ); DeleteObject( handle ); + return TRUE; } - else GDI_ReleaseObj( handle ); } - return header != NULL; + LeaveCriticalSection( &gdi_section ); + return entry != NULL; } @@ -668,7 +686,7 @@ static void dump_gdi_objects( void ) } TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), - entry->obj->selcount, entry->obj->deleted ); + entry->selcount, entry->obj->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -689,7 +707,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs /* initialize the object header */ obj->system = 0; obj->deleted = 0; - obj->selcount = 0; EnterCriticalSection( &gdi_section ); for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) @@ -708,6 +725,7 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs entry->funcs = funcs; entry->hdcs = NULL; entry->type = type; + entry->selcount = 0; next_gdi_handle = i; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -829,9 +847,9 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) hdcs_head = entry->hdcs; entry->hdcs = NULL; - if (entry->obj->selcount) + if (entry->selcount) { - TRACE("delayed for %p because object in use, count %u\n", obj, entry->obj->selcount ); + TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount ); entry->obj->deleted = 1; /* mark for delete */ } else funcs = entry->funcs;

1 0

Alexandre Julliard : gdi32: Get rid of the GDIOBJHDR type.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: df357093ccfd78156e7db3c0a7ff5bead6317341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df357093ccfd78156e7db3c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:48:45 2012 +0200 gdi32: Get rid of the GDIOBJHDR type. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 3 +-- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/enhmetafile.c | 3 +-- dlls/gdi32/font.c | 3 +-- dlls/gdi32/gdi_private.h | 6 ------ dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/palette.c | 3 +-- dlls/gdi32/pen.c | 5 ++--- 10 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0055fe4..821f879 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -211,7 +211,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->dib.dsBm = bm; bmpobj->dib.dsBm.bmBits = NULL; - if (!(hbitmap = alloc_gdi_handle( &bmpobj->header, OBJ_BITMAP, &bitmap_funcs ))) + if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0516a0f..4f0c17d 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical brush object */ typedef struct { - GDIOBJHDR header; LOGBRUSH logbrush; struct brush_pattern pattern; } BRUSHOBJ; @@ -201,7 +200,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush = *brush; if (store_brush_pattern( &ptr->logbrush, &ptr->pattern ) && - (hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) + (hbrush = alloc_gdi_handle( ptr, OBJ_BRUSH, &brush_funcs ))) { TRACE("%p\n", hbrush); return hbrush; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5a68aa6..8d4cde0 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -118,7 +118,7 @@ DC *alloc_dc_ptr( WORD magic ) reset_bounds( &dc->bounds ); - if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) + if (!(dc->hSelf = alloc_gdi_handle( dc, magic, &dc_funcs ))) { HeapFree( GetProcessHeap(), 0, dc ); return NULL; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 89ac980..e5361c1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1549,7 +1549,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!bmp->dib.dsBm.bmBits) goto error; - if (!(ret = alloc_gdi_handle( &bmp->header, OBJ_BITMAP, &dib_funcs ))) goto error; + if (!(ret = alloc_gdi_handle( bmp, OBJ_BITMAP, &dib_funcs ))) goto error; if (bits) *bits = bmp->dib.dsBm.bmBits; return ret; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index ea0ce3b..796796e 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); typedef struct { - GDIOBJHDR header; ENHMETAHEADER *emh; BOOL on_disk; /* true if metafile is on disk */ } ENHMETAFILEOBJ; @@ -270,7 +269,7 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) metaObj->emh = emh; metaObj->on_disk = on_disk; - if (!(hmf = alloc_gdi_handle( &metaObj->header, OBJ_ENHMETAFILE, NULL ))) + if (!(hmf = alloc_gdi_handle( metaObj, OBJ_ENHMETAFILE, NULL ))) HeapFree( GetProcessHeap(), 0, metaObj ); return hmf; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 85a27f1..1f26772 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -110,7 +110,6 @@ static const struct gdi_obj_funcs font_funcs = typedef struct { - GDIOBJHDR header; LOGFONTW logfont; } FONTOBJ; @@ -447,7 +446,7 @@ HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex ) plf->lfOrientation/10., plf->lfEscapement/10., fontPtr); } - if (!(hFont = alloc_gdi_handle( &fontPtr->header, OBJ_FONT, &font_funcs ))) + if (!(hFont = alloc_gdi_handle( fontPtr, OBJ_FONT, &font_funcs ))) { HeapFree( GetProcessHeap(), 0, fontPtr ); return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c3e342a..2f4c297 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,15 +57,10 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; -typedef struct tagGDIOBJHDR -{ -} GDIOBJHDR; - typedef struct tagGdiFont GdiFont; typedef struct tagDC { - GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ PHYSDEV physDev; /* current top of the physdev stack */ @@ -180,7 +175,6 @@ static inline PHYSDEV find_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs ) typedef struct tagBITMAPOBJ { - GDIOBJHDR header; DIBSECTION dib; SIZE size; /* For SetBitmapDimension() */ RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 46c9ec3..aa8db8c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -744,7 +744,7 @@ HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *func */ void *free_gdi_handle( HGDIOBJ handle ) { - GDIOBJHDR *object = NULL; + void *object = NULL; struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); @@ -769,7 +769,7 @@ void *free_gdi_handle( HGDIOBJ handle ) */ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) { - GDIOBJHDR *ptr = NULL; + void *ptr = NULL; struct gdi_handle_entry *entry; EnterCriticalSection( &gdi_section ); diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index afb723b..6a29c76 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -42,7 +42,6 @@ typedef BOOL (*unrealize_function)(HPALETTE); typedef struct tagPALETTEOBJ { - GDIOBJHDR header; unrealize_function unrealize; WORD version; /* palette version */ WORD count; /* count of palette entries */ @@ -130,7 +129,7 @@ HPALETTE WINAPI CreatePalette( return 0; } memcpy( palettePtr->entries, palette->palPalEntry, size ); - if (!(hpalette = alloc_gdi_handle( &palettePtr->header, OBJ_PAL, &palette_funcs ))) + if (!(hpalette = alloc_gdi_handle( palettePtr, OBJ_PAL, &palette_funcs ))) { HeapFree( GetProcessHeap(), 0, palettePtr->entries ); HeapFree( GetProcessHeap(), 0, palettePtr ); diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 94c3933..2ae2f2b 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical pen object */ typedef struct { - GDIOBJHDR header; struct brush_pattern pattern; EXTLOGPEN logpen; } PENOBJ; @@ -113,7 +112,7 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) break; } - if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_PEN, &pen_funcs ))) + if (!(hpen = alloc_gdi_handle( penPtr, OBJ_PEN, &pen_funcs ))) HeapFree( GetProcessHeap(), 0, penPtr ); return hpen; } @@ -203,7 +202,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, penPtr->logpen.elpNumEntries = style_count; memcpy(penPtr->logpen.elpStyleEntry, style_bits, style_count * sizeof(DWORD)); - if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_EXTPEN, &pen_funcs ))) + if (!(hpen = alloc_gdi_handle( penPtr, OBJ_EXTPEN, &pen_funcs ))) { free_brush_pattern( &penPtr->pattern ); HeapFree( GetProcessHeap(), 0, penPtr );

1 0

Alexandre Julliard : gdi32: Get rid of the METAFILEOBJ type, instead store a pointer to the metafile data.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 3964aa4a8db926347d12dae84c07f037f3c4fac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3964aa4a8db926347d12dae84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:46:32 2012 +0200 gdi32: Get rid of the METAFILEOBJ type, instead store a pointer to the metafile data. --- dlls/gdi32/metafile.c | 158 ++++++++++++++++++------------------------------- 1 files changed, 58 insertions(+), 100 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index fbc88d1..dbbffee 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -71,12 +71,6 @@ typedef struct } METAHEADERDISK; #include "poppack.h" -typedef struct -{ - GDIOBJHDR header; - METAHEADER *mh; -} METAFILEOBJ; - /****************************************************************** * MF_AddHandle @@ -108,31 +102,7 @@ static int MF_AddHandle(HANDLETABLE *ht, UINT htlen, HGDIOBJ hobj) */ HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) { - HMETAFILE hmf; - METAFILEOBJ *metaObj; - - if (!(metaObj = HeapAlloc( GetProcessHeap(), 0, sizeof(*metaObj) ))) return 0; - metaObj->mh = mh; - if (!(hmf = alloc_gdi_handle( &metaObj->header, OBJ_METAFILE, NULL ))) - HeapFree( GetProcessHeap(), 0, metaObj ); - return hmf; -} - -/****************************************************************** - * MF_GetMetaHeader - * - * Returns ptr to METAHEADER associated with HMETAFILE - */ -static METAHEADER *MF_GetMetaHeader( HMETAFILE hmf ) -{ - METAHEADER *ret = NULL; - METAFILEOBJ * metaObj = GDI_GetObjPtr( hmf, OBJ_METAFILE ); - if (metaObj) - { - ret = metaObj->mh; - GDI_ReleaseObj( hmf ); - } - return ret; + return alloc_gdi_handle( mh, OBJ_METAFILE, NULL ); } /****************************************************************** @@ -164,10 +134,9 @@ static POINT *convert_points( UINT count, const POINTS *pts ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { - METAFILEOBJ * metaObj = free_gdi_handle( hmf ); - if (!metaObj) return FALSE; - HeapFree( GetProcessHeap(), 0, metaObj->mh ); - return HeapFree( GetProcessHeap(), 0, metaObj ); + METAHEADER *mh = free_gdi_handle( hmf ); + if (!mh) return FALSE; + return HeapFree( GetProcessHeap(), 0, mh ); } /****************************************************************** @@ -312,6 +281,24 @@ METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) return mh; } +/* return a copy of the metafile bits, to be freed with HeapFree */ +static METAHEADER *get_metafile_bits( HMETAFILE hmf ) +{ + METAHEADER *ret, *mh = GDI_GetObjPtr( hmf, OBJ_METAFILE ); + + if (!mh) return NULL; + + if (mh->mtType != METAFILE_DISK) + { + ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); + if (ret) memcpy( ret, mh, mh->mtSize * 2 ); + } + else ret = MF_LoadDiskBasedMetaFile( mh ); + + GDI_ReleaseObj( hmf ); + return ret; +} + /****************************************************************** * CopyMetaFileW (GDI32.@) * @@ -331,33 +318,25 @@ METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) */ HMETAFILE WINAPI CopyMetaFileW( HMETAFILE hSrcMetaFile, LPCWSTR lpFilename ) { - METAHEADER *mh = MF_GetMetaHeader( hSrcMetaFile ); - METAHEADER *mh2 = NULL; + METAHEADER *mh = get_metafile_bits( hSrcMetaFile ); HANDLE hFile; TRACE("(%p,%s)\n", hSrcMetaFile, debugstr_w(lpFilename)); if(!mh) return 0; - if(mh->mtType == METAFILE_DISK) - mh2 = MF_LoadDiskBasedMetaFile(mh); - else { - mh2 = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); - memcpy( mh2, mh, mh->mtSize * 2 ); - } - if(lpFilename) { /* disk based metafile */ DWORD w; if((hFile = CreateFileW(lpFilename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { - HeapFree( GetProcessHeap(), 0, mh2 ); + HeapFree( GetProcessHeap(), 0, mh ); return 0; } - WriteFile(hFile, mh2, mh2->mtSize * 2, &w, NULL); + WriteFile(hFile, mh, mh->mtSize * 2, &w, NULL); CloseHandle(hFile); } - return MF_Create_HMETAFILE( mh2 ); + return MF_Create_HMETAFILE( mh ); } @@ -380,14 +359,23 @@ HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile, LPCSTR lpFilename ) return ret; } -/******************************************************************* - * MF_PlayMetaFile +/****************************************************************** + * PlayMetaFile (GDI32.@) + * + * Renders the metafile specified by hmf in the DC specified by + * hdc. Returns FALSE on failure, TRUE on success. + * + * PARAMS + * hdc [I] handle of DC to render in + * hmf [I] handle of metafile to render * - * Helper for PlayMetaFile + * RETURNS + * Success: TRUE + * Failure: FALSE */ -static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) +BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) { - + METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; unsigned int offset = 0; @@ -396,14 +384,8 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) HBRUSH hBrush; HPALETTE hPal; HRGN hRgn; - BOOL loaded = FALSE; if (!mh) return FALSE; - if(mh->mtType == METAFILE_DISK) { /* Create a memory-based copy */ - mh = MF_LoadDiskBasedMetaFile(mh); - if(!mh) return FALSE; - loaded = TRUE; - } /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); @@ -420,7 +402,11 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) /* create the handle table */ ht = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HANDLETABLE) * mh->mtNoObjects); - if(!ht) return FALSE; + if(!ht) + { + HeapFree( GetProcessHeap(), 0, mh ); + return FALSE; + } /* loop through metafile playing records */ offset = mh->mtHeaderSize * 2; @@ -455,34 +441,12 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) if(*(ht->objectHandle + i) != 0) DeleteObject(*(ht->objectHandle + i)); - /* free handle table */ HeapFree( GetProcessHeap(), 0, ht ); - if(loaded) - HeapFree( GetProcessHeap(), 0, mh ); + HeapFree( GetProcessHeap(), 0, mh ); return TRUE; } /****************************************************************** - * PlayMetaFile (GDI32.@) - * - * Renders the metafile specified by hmf in the DC specified by - * hdc. Returns FALSE on failure, TRUE on success. - * - * PARAMS - * hdc [I] handle of DC to render in - * hmf [I] handle of metafile to render - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) -{ - METAHEADER *mh = MF_GetMetaHeader( hmf ); - return MF_PlayMetaFile( hdc, mh ); -} - -/****************************************************************** * EnumMetaFile (GDI32.@) * * Loop through the metafile records in hmf, calling the user-specified @@ -495,7 +459,7 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) */ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM lpData) { - METAHEADER *mhTemp = NULL, *mh = MF_GetMetaHeader(hmf); + METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; BOOL result = TRUE; @@ -505,14 +469,9 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l HBRUSH hBrush; HFONT hFont; - TRACE("(%p,%p,%p,%p)\n", hdc, hmf, lpEnumFunc, (void*)lpData); + TRACE("(%p,%p,%p,%lx)\n", hdc, hmf, lpEnumFunc, lpData); + if (!mh) return 0; - if(mh->mtType == METAFILE_DISK) - { - /* Create a memory-based copy */ - if (!(mhTemp = MF_LoadDiskBasedMetaFile(mh))) return FALSE; - mh = mhTemp; - } /* save the current pen, brush and font */ hPen = GetCurrentObject(hdc, OBJ_PEN); @@ -534,7 +493,7 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l } TRACE("Calling EnumFunc with record type %x\n", mr->rdFunction); - if (!lpEnumFunc( hdc, ht, mr, mh->mtNoObjects, (LONG)lpData )) + if (!lpEnumFunc( hdc, ht, mr, mh->mtNoObjects, lpData )) { result = FALSE; break; @@ -553,10 +512,8 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l if(*(ht->objectHandle + i) != 0) DeleteObject(*(ht->objectHandle + i)); - /* free handle table */ HeapFree( GetProcessHeap(), 0, ht); - /* free a copy of metafile */ - HeapFree( GetProcessHeap(), 0, mhTemp ); + HeapFree( GetProcessHeap(), 0, mh); return result; } @@ -1129,7 +1086,7 @@ HMETAFILE WINAPI SetMetaFileBitsEx( UINT size, const BYTE *lpData ) */ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) { - METAHEADER *mh = MF_GetMetaHeader(hmf); + METAHEADER *mh = GDI_GetObjPtr( hmf, OBJ_METAFILE ); UINT mfSize; TRACE("(%p,%d,%p)\n", hmf, nSize, buf); @@ -1137,12 +1094,13 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) if(mh->mtType == METAFILE_DISK) FIXME("Disk-based metafile?\n"); mfSize = mh->mtSize * 2; - if (!buf) { - TRACE("returning size %d\n", mfSize); - return mfSize; + if (buf) + { + if(mfSize > nSize) mfSize = nSize; + memmove(buf, mh, mfSize); } - if(mfSize > nSize) mfSize = nSize; - memmove(buf, mh, mfSize); + GDI_ReleaseObj( hmf ); + TRACE("returning size %d\n", mfSize); return mfSize; }

1 0

Alexandre Julliard : gdi32: Get rid of the RGNOBJ type, instead store a pointer to the region itself.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 89ecf02ca5ab0ce07850162c383f1ebdbf522658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ecf02ca5ab0ce07850162c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 13:28:25 2012 +0200 gdi32: Get rid of the RGNOBJ type, instead store a pointer to the region itself. --- dlls/gdi32/gdi_private.h | 7 ++- dlls/gdi32/region.c | 217 +++++++++++++++++++++------------------------- 2 files changed, 104 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89ecf02ca5ab0ce078501…

1 0

Jacek Caban : mshtml: Added IOmNavigator::onLine semi-stub.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 75994335e3b3080072c487116cdeb2ec95464ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75994335e3b3080072c487116… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:18:48 2012 +0200 mshtml: Added IOmNavigator::onLine semi-stub. --- dlls/mshtml/omnavigator.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 73bb0bb..6d7ec15 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -881,8 +881,11 @@ static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, LONG static HRESULT WINAPI OmNavigator_get_onLine(IOmNavigator *iface, VARIANT_BOOL *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + WARN("(%p)->(%p) semi-stub, returning true\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI OmNavigator_get_userProfile(IOmNavigator *iface, IHTMLOpsProfile **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02ba3ef..ea54b4d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4496,6 +4496,7 @@ static void test_navigator(IHTMLDocument2 *doc) { IHTMLWindow2 *window; IOmNavigator *navigator, *navigator2; + VARIANT_BOOL b; char buf[512]; DWORD size; ULONG ref; @@ -4581,6 +4582,11 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!strcmp_wa(bstr, "[object]"), "toString returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + b = 100; + hres = IOmNavigator_get_onLine(navigator, &b); + ok(hres == S_OK, "get_onLine failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "onLine = %x\n", b); + size = sizeof(buf); hres = ObtainUserAgentString(0, buf, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres);

1 0

Piotr Caban : msvcp71: Added ostrstream class implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 13fa0a8e58de4d61d23784d0e4b1d62f91e22f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fa0a8e58de4d61d23784d0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:17 2012 +0200 msvcp71: Added ostrstream class implementation. --- dlls/msvcp71/ios.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 6 +- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index f1b354b..b9af853 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -277,6 +277,14 @@ typedef struct { } strstreambuf; typedef struct { + basic_ostream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} ostrstream; + +typedef struct { basic_iostream_char base; strstreambuf buf; /* virtual inheritance @@ -475,6 +483,9 @@ extern const vtable_ptr MSVCP_basic_stringstream_short_vtable; /* ??_7strstreambuf(a)std@@6B */ extern const vtable_ptr MSVCP_strstreambuf_vtable; +static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)}; +extern const vtable_ptr MSVCP_ostrstream_vtable; + static const int strstream_vbtable1[] = {0, sizeof(strstream)}; static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; extern const vtable_ptr MSVCP_strstream_vtable; @@ -627,6 +638,10 @@ DEFINE_RTTI_DATA8(basic_stringstream_short, sizeof(basic_stringstream_wchar), ".?AV?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@"); DEFINE_RTTI_DATA1(strstreambuf, sizeof(strstreambuf), &basic_streambuf_char_rtti_base_descriptor, ".?AVstrstreambuf(a)std@@"); +DEFINE_RTTI_DATA4(ostrstream, sizeof(ostrstream), + &basic_ostream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, + &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, + "?AVostrstream(a)std@@"); DEFINE_RTTI_DATA8(strstream, sizeof(strstream), &basic_istream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, @@ -847,6 +862,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_setbuf) VTABLE_ADD_FUNC(basic_streambuf_char_sync) VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); + __ASM_VTABLE(ostrstream, + VTABLE_ADD_FUNC(ostrstream_vector_dtor)); __ASM_VTABLE(strstream, VTABLE_ADD_FUNC(strstream_vector_dtor)); #ifndef __GNUC__ @@ -12379,6 +12396,83 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) return (unsigned char)(*gptr); } +static inline basic_ios_char* ostrstream_to_basic_ios(ostrstream *ptr) +{ + return (basic_ios_char*)((char*)ptr+ostrstream_vbtable[1]); +} + +static inline ostrstream* ostrstream_from_basic_ios(basic_ios_char *ptr) +{ + return (ostrstream*)((char*)ptr-ostrstream_vbtable[1]); +} + +/* ??0ostrstream(a)std@@QAE(a)PADHH@Z */ +DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 20) +ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize size, int mode, MSVCP_bool virt_init) +{ + basic_ios_char *basic_ios; + + TRACE("(%p %p %ld %d %d)\n", this, buf, size, mode, virt_init); + + if(virt_init) { + this->base.vbtable = ostrstream_vbtable; + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + basic_ios_char_ctor(basic_ios); + }else { + basic_ios = basic_ostream_char_get_basic_ios(&this->base); + } + + strstreambuf_ctor_get_put(&this->buf, buf, size, + buf && (mode & OPENMODE_app) ? buf+strlen(buf) : buf); + basic_ostream_char_ctor(&this->base, &this->buf.base, FALSE, FALSE); + basic_ios->base.vtable = &MSVCP_ostrstream_vtable; + return this; +} + +/* ??1ostrstream(a)std@@UAE(a)XZ */ +/* ??1ostrstream(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(ostrstream_dtor, 4) +void __thiscall ostrstream_dtor(basic_ios_char *base) +{ + ostrstream *this = ostrstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + +static void ostrstream_vbase_dtor(ostrstream *this) +{ + TRACE("(%p)\n", this); + + ostrstream_dtor(ostrstream_to_basic_ios(this)); + basic_ios_char_dtor(basic_ostream_char_get_basic_ios(&this->base)); +} + +DEFINE_THISCALL_WRAPPER(ostrstream_vector_dtor, 8) +ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int flags) +{ + ostrstream *this = ostrstream_from_basic_ios(base); + + TRACE("(%p %x)\n", this, flags); + + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + ostrstream_vbase_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + ostrstream_vbase_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) { return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); @@ -12807,6 +12901,7 @@ void init_io(void *base) init_basic_stringstream_short_rtti(base); init_strstreambuf_rtti(base); init_strstream_rtti(base); + init_ostrstream_rtti(base); #endif basic_filebuf_char_ctor_file(&filebuf_char_stdin, stdin); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 0e3928d..726bfd8 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1002,7 +1002,7 @@ @ stub -arch=win64 ??0messages_base(a)std@@QEAA(a)_K@Z @ stub -arch=win32 ??0money_base(a)std@@QAE(a)I@Z @ stub -arch=win64 ??0money_base(a)std@@QEAA(a)_K@Z -@ stub -arch=win32 ??0ostrstream(a)std@@QAE(a)PADHH@Z +@ thiscall -arch=win32 ??0ostrstream(a)std@@QAE(a)PADHH@Z(ptr ptr long long long) ostrstream_ctor @ thiscall -arch=win32 ??0strstream(a)std@@QAE(a)PADHH@Z(ptr ptr long long long) strstream_ctor @ cdecl -arch=win64 ??0strstream(a)std@@QEAA(a)PEAD_JH@Z(ptr ptr long long long) strstream_ctor @ stub -arch=win32 ??0time_base(a)std@@QAE(a)I@Z @@ -1205,8 +1205,8 @@ @ stub -arch=win64 ??1messages_base(a)std@@UEAA(a)XZ @ stub -arch=win32 ??1money_base(a)std@@UAE(a)XZ @ stub -arch=win64 ??1money_base(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1ostrstream(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1ostrstream(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1ostrstream(a)std@@UAE(a)XZ(ptr) ostrstream_dtor +@ cdecl -arch=win64 ??1ostrstream(a)std@@UEAA(a)XZ(ptr) ostrstream_dtor @ thiscall -arch=win32 ??1strstream(a)std@@UAE(a)XZ(ptr) strstream_dtor @ cdecl -arch=win64 ??1strstream(a)std@@UEAA(a)XZ(ptr) strstream_dtor @ thiscall -arch=win32 ??1strstreambuf(a)std@@UAE(a)XZ(ptr) strstreambuf_dtor

1 0

Piotr Caban : msvcp60: Fixed basic_stringbuf class structure.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 5b1ee41daa2e1d0a16d77b3e9b2e0d6630c90608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1ee41daa2e1d0a16d77b3e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:01:21 2012 +0200 msvcp60: Fixed basic_stringbuf class structure. --- dlls/msvcp60/ios.c | 9 ++++----- dlls/msvcp60/msvcp.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index ba6299c..3eea5d2 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -91,14 +91,18 @@ typedef enum { typedef struct { basic_streambuf_char base; + char *pendsave; char *seekhigh; + int alsize; int state; char allocator; /* empty struct */ } basic_stringbuf_char; typedef struct { basic_streambuf_wchar base; + wchar_t *pendsave; wchar_t *seekhigh; + int alsize; int state; char allocator; /* empty struct */ } basic_stringbuf_wchar; @@ -884,7 +888,6 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; - mutex_ctor(&this->lock); return this; } @@ -896,7 +899,6 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; - mutex_ctor(&this->lock); this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -911,7 +913,6 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_dtor(&this->lock); locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -995,7 +996,6 @@ void __thiscall basic_streambuf_char__Init(basic_streambuf_char *this, char **gf static void basic_streambuf_char__Lock(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ */ @@ -1092,7 +1092,6 @@ static streamsize basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char static void basic_streambuf_char__Unlock(basic_streambuf_char *this) { TRACE("(%p)\n", this); - mutex_unlock(&this->lock); } /* ?eback@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index e1c13ea..e5476fd 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -290,7 +290,6 @@ typedef struct _ios_base { /* class basic_streambuf<char> */ typedef struct { const vtable_ptr *vtable; - mutex lock; char *rbuf; char *wbuf; char **prbuf;

1 0

Piotr Caban : msvcp60: Fixed overflow in basic_string_char_find_cstr_substr function.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 1b6dfafce240745f6b509492673e1c1c60fe9f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6dfafce240745f6b5094926… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 10:00:13 2012 +0200 msvcp60: Fixed overflow in basic_string_char_find_cstr_substr function. --- dlls/msvcp60/string.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2bef248..591ffdf 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -826,6 +826,8 @@ MSVCP_size_t __thiscall basic_string_char_find_cstr_substr( if(len==0 && pos<=this->size) return pos; + if(pos>=this->size || len>this->size) + return basic_string_char_npos; end = this->ptr+this->size-len+1; for(p=this->ptr+pos; p<end; p++) { @@ -2531,6 +2533,8 @@ MSVCP_size_t __thiscall basic_string_wchar_find_cstr_substr( if(len==0 && pos<=this->size) return pos; + if(pos>=this->size || len>this->size) + return basic_string_wchar_npos; end = this->ptr+this->size-len+1; for(p=this->ptr+pos; p<end; p++) {

1 0

Piotr Caban : msvcp71: Fixed basic_string::ptr implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 8de45a3df1ea0f2afe833e5638d1492244b19578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de45a3df1ea0f2afe833e563… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:53 2012 +0200 msvcp71: Fixed basic_string::ptr implementation. --- dlls/msvcp71/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index 9907ad1..d6336ad 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -531,7 +531,7 @@ const MSVCP_size_t MSVCP_basic_string_char_npos = -1; DEFINE_THISCALL_WRAPPER(basic_string_char_ptr, 4) char* __thiscall basic_string_char_ptr(basic_string_char *this) { - if(this->res == BUF_SIZE_CHAR-1) + if(this->res < BUF_SIZE_CHAR) return this->data.buf; return this->data.ptr; } @@ -541,7 +541,7 @@ char* __thiscall basic_string_char_ptr(basic_string_char *this) DEFINE_THISCALL_WRAPPER(basic_string_char_const_ptr, 4) const char* __thiscall basic_string_char_const_ptr(const basic_string_char *this) { - if(this->res == BUF_SIZE_CHAR-1) + if(this->res < BUF_SIZE_CHAR) return this->data.buf; return this->data.ptr; } @@ -2214,7 +2214,7 @@ const MSVCP_size_t MSVCP_basic_string_wchar_npos = -1; DEFINE_THISCALL_WRAPPER(basic_string_wchar_ptr, 4) wchar_t* __thiscall basic_string_wchar_ptr(basic_string_wchar *this) { - if(this->res == BUF_SIZE_WCHAR-1) + if(this->res < BUF_SIZE_WCHAR) return this->data.buf; return this->data.ptr; } @@ -2226,7 +2226,7 @@ wchar_t* __thiscall basic_string_wchar_ptr(basic_string_wchar *this) DEFINE_THISCALL_WRAPPER(basic_string_wchar_const_ptr, 4) const wchar_t* __thiscall basic_string_wchar_const_ptr(const basic_string_wchar *this) { - if(this->res == BUF_SIZE_WCHAR-1) + if(this->res < BUF_SIZE_WCHAR) return this->data.buf; return this->data.ptr; }

1 0

Piotr Caban : msvcp71: Added istrstream destructor implementation.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 84c5e3a198ce7993bf1f880508715fde61003f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c5e3a198ce7993bf1f88050… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:59:32 2012 +0200 msvcp71: Added istrstream destructor implementation. --- dlls/msvcp71/ios.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index b9af853..8c4e4dc 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -285,6 +285,14 @@ typedef struct { } ostrstream; typedef struct { + basic_istream_char base; + strstreambuf buf; + /* virtual inheritance + * basic_ios_char basic_ios; + */ +} istrstream; + +typedef struct { basic_iostream_char base; strstreambuf buf; /* virtual inheritance @@ -486,6 +494,8 @@ extern const vtable_ptr MSVCP_strstreambuf_vtable; static const int ostrstream_vbtable[] = {0, sizeof(ostrstream)}; extern const vtable_ptr MSVCP_ostrstream_vtable; +static const int istrstream_vbtable[] = {0, sizeof(istrstream)}; + static const int strstream_vbtable1[] = {0, sizeof(strstream)}; static const int strstream_vbtable2[] = {0, sizeof(strstream)-FIELD_OFFSET(strstream, base.base2)}; extern const vtable_ptr MSVCP_strstream_vtable; @@ -12473,6 +12483,24 @@ ostrstream* __thiscall ostrstream_vector_dtor(basic_ios_char *base, unsigned int return this; } +static inline istrstream* istrstream_from_basic_ios(basic_ios_char *ptr) +{ + return (istrstream*)((char*)ptr-istrstream_vbtable[1]); +} + +/* ??1istrstream(a)std@@UAE(a)XZ */ +/* ??1istrstream(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(istrstream_dtor, 4) +void __thiscall istrstream_dtor(basic_ios_char *base) +{ + istrstream *this = istrstream_from_basic_ios(base); + + TRACE("(%p)\n", this); + + basic_istream_char_dtor(basic_istream_char_to_basic_ios(&this->base)); + strstreambuf_dtor(&this->buf); +} + static inline basic_ios_char* strstream_to_basic_ios(strstream *ptr) { return (basic_ios_char*)((char*)ptr+strstream_vbtable1[1]); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 726bfd8..26083b8 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1197,8 +1197,8 @@ @ cdecl -arch=win64 ??1facet(a)locale@std@@UEAA(a)XZ(ptr) locale_facet_dtor @ thiscall -arch=win32 ??1ios_base(a)std@@UAE(a)XZ(ptr) ios_base_dtor @ cdecl -arch=win64 ??1ios_base(a)std@@UEAA(a)XZ(ptr) ios_base_dtor -@ stub -arch=win32 ??1istrstream(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1istrstream(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1istrstream(a)std@@UAE(a)XZ(ptr) istrstream_dtor +@ cdecl -arch=win64 ??1istrstream(a)std@@UEAA(a)XZ(ptr) istrstream_dtor @ thiscall -arch=win32 ??1locale(a)std@@QAE(a)XZ(ptr) locale_dtor @ cdecl -arch=win64 ??1locale(a)std@@QEAA(a)XZ(ptr) locale_dtor @ stub -arch=win32 ??1messages_base(a)std@@UAE(a)XZ

1 0