December 2012 - Wine-commits

Christian Costa : cabarc: Handle fdintNEXT_CABINET notification to support multi-cab archive.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: f6503a8b11ee7a0c86d0363a92fa978d9bce3142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6503a8b11ee7a0c86d0363a9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 3 09:18:40 2012 +0100 cabarc: Handle fdintNEXT_CABINET notification to support multi-cab archive. --- programs/cabarc/cabarc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index bb3ad7e..47bb8db 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -454,6 +454,10 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION CloseHandle( (HANDLE)pfdin->hf ); return 0; + case fdintNEXT_CABINET: + WINE_TRACE("Next cab: status %u, path '%s', file '%s'\n", pfdin->fdie, pfdin->psz3, pfdin->psz1); + return pfdin->fdie == FDIERROR_NONE ? 0 : -1; + default: WINE_FIXME( "Unexpected notification type %d.\n", fdint ); return 0;

1 0

Christian Costa : cabarc: Handle fdintENUMERATE notification.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 6262bc7cc885d571c50a6f00433b190cbd4e8286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6262bc7cc885d571c50a6f004… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 3 09:18:47 2012 +0100 cabarc: Handle fdintENUMERATE notification. --- programs/cabarc/cabarc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 47bb8db..bef4bfc 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -458,6 +458,9 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION WINE_TRACE("Next cab: status %u, path '%s', file '%s'\n", pfdin->fdie, pfdin->psz3, pfdin->psz1); return pfdin->fdie == FDIERROR_NONE ? 0 : -1; + case fdintENUMERATE: + return 0; + default: WINE_FIXME( "Unexpected notification type %d.\n", fdint ); return 0;

1 0

Alexandre Julliard : winex11: Store a copy of the surface region.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: aa85f33c313a64fa07df93791cf929116a209912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa85f33c313a64fa07df93791… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 15:26:27 2012 +0100 winex11: Store a copy of the surface region. --- dlls/winex11.drv/bitblt.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 23837de..c5a6bd0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1565,6 +1565,7 @@ struct x11drv_window_surface BOOL byteswap; BOOL is_argb; COLORREF color_key; + HRGN region; void *bits; #ifdef HAVE_LIBXXSHM XShmSegmentInfo shminfo; @@ -1857,16 +1858,25 @@ static void x11drv_surface_set_region( struct window_surface *window_surface, HR TRACE( "updating surface %p with %p\n", surface, region ); + window_surface->funcs->lock( window_surface ); if (!region) { + if (surface->region) DeleteObject( surface->region ); + surface->region = 0; XSetClipMask( gdi_display, surface->gc, None ); } - else if ((data = X11DRV_GetRegionData( region, 0 ))) + else { - XSetClipRectangles( gdi_display, surface->gc, 0, 0, - (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); - HeapFree( GetProcessHeap(), 0, data ); + if (!surface->region) surface->region = CreateRectRgn( 0, 0, 0, 0 ); + CombineRgn( surface->region, region, 0, RGN_COPY ); + if ((data = X11DRV_GetRegionData( surface->region, 0 ))) + { + XSetClipRectangles( gdi_display, surface->gc, 0, 0, + (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); + HeapFree( GetProcessHeap(), 0, data ); + } } + window_surface->funcs->unlock( window_surface ); } /*********************************************************************** @@ -1955,6 +1965,7 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) } surface->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &surface->crit ); + if (surface->region) DeleteObject( surface->region ); HeapFree( GetProcessHeap(), 0, surface ); }

1 0

Alexandre Julliard : winex11: Fall back to normal expose processing for areas outside of the surface region .
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 8e6548573233ecdb85a01ac8f6f48456fd259147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6548573233ecdb85a01ac8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 15:27:04 2012 +0100 winex11: Fall back to normal expose processing for areas outside of the surface region. --- dlls/winex11.drv/bitblt.c | 23 +++++++++++++++++++++++ dlls/winex11.drv/event.c | 23 +++++++++++++---------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c5a6bd0..161fa73 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2062,3 +2062,26 @@ void set_surface_color_key( struct window_surface *window_surface, COLORREF colo if (surface->color_key != prev) update_surface_region( surface ); window_surface->funcs->unlock( window_surface ); } + +/*********************************************************************** + * expose_surface + */ +HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) +{ + struct x11drv_window_surface *surface = get_x11_surface( window_surface ); + HRGN region = 0; + + window_surface->funcs->lock( window_surface ); + add_bounds_rect( &surface->bounds, rect ); + if (surface->region) + { + region = CreateRectRgnIndirect( rect ); + if (CombineRgn( region, region, surface->region, RGN_DIFF ) <= NULLREGION) + { + DeleteObject( region ); + region = 0; + } + } + window_surface->funcs->unlock( window_surface ); + return region; +} diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f908413..90b2068 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -816,7 +816,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) XExposeEvent *event = &xev->xexpose; RECT rect; struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME; + HRGN surface_region = 0; + UINT flags = RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN; TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); @@ -830,9 +831,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) if (data->surface) { - data->surface->funcs->lock( data->surface ); - add_bounds_rect( data->surface->funcs->get_bounds( data->surface ), &rect ); - data->surface->funcs->unlock( data->surface ); + surface_region = expose_surface( data->surface, &rect ); + if (!surface_region) flags = 0; if (data->vis.visualid != default_visual.visualid) data->surface->funcs->flush( data->surface ); } @@ -841,6 +841,8 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) { OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, data->whole_rect.top - data->client_rect.top ); + if (surface_region) OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); @@ -855,15 +857,16 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) wine_server_call( req ); } SERVER_END_REQ; - - flags |= RDW_ALLCHILDREN; } - else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - - if (data->surface) flags = 0; + else + { + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + flags &= ~RDW_ALLCHILDREN; + } release_win_data( data ); - if (flags) RedrawWindow( hwnd, &rect, 0, flags ); + if (flags) RedrawWindow( hwnd, &rect, surface_region, flags ); + if (surface_region) DeleteObject( surface_region ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 314a438..0c462d6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -200,6 +200,7 @@ extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisu extern struct window_surface *create_surface( Window window, const XVisualInfo *vis, const RECT *rect, COLORREF color_key, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void set_surface_color_key( struct window_surface *window_surface, COLORREF color_key ) DECLSPEC_HIDDEN; +extern HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; extern BOOL add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Avoid binary ROPs when stretching in DELETESCANS mode.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 6f6e919e2bd0c3a721868b6137e1fd72a5b58353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6e919e2bd0c3a721868b613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 17:32:59 2012 +0100 gdi32: Avoid binary ROPs when stretching in DELETESCANS mode. --- dlls/gdi32/dibdrv/primitives.c | 150 ++++++++++++++++++++++++++++++---------- 1 files changed, 112 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index a8270ae..15b333b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5697,19 +5697,37 @@ static void stretch_row_32(const dib_info *dst_dib, const POINT *dst_start, DWORD *src_ptr = get_pixel_ptr_32( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_32( dst_ptr, *src_ptr, &codes ); - dst_ptr += params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += params->src_inc; - err += params->err_add_1; + *dst_ptr = *src_ptr; + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_32( dst_ptr, *src_ptr, &codes ); + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5722,21 +5740,41 @@ static void stretch_row_24(const dib_info *dst_dib, const POINT *dst_start, BYTE *src_ptr = get_pixel_ptr_24( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_8( dst_ptr, *src_ptr, &codes ); - do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes ); - do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes ); - dst_ptr += 3 * params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += 3 * params->src_inc; - err += params->err_add_1; + dst_ptr[0] = src_ptr[0]; + dst_ptr[1] = src_ptr[1]; + dst_ptr[2] = src_ptr[2]; + dst_ptr += 3 * params->dst_inc; + if (err > 0) + { + src_ptr += 3 * params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_8( dst_ptr, *src_ptr, &codes ); + do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes ); + do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes ); + dst_ptr += 3 * params->dst_inc; + if (err > 0) + { + src_ptr += 3 * params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5749,19 +5787,37 @@ static void stretch_row_16(const dib_info *dst_dib, const POINT *dst_start, WORD *src_ptr = get_pixel_ptr_16( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_16( dst_ptr, *src_ptr, &codes ); - dst_ptr += params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += params->src_inc; - err += params->err_add_1; + *dst_ptr = *src_ptr; + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_16( dst_ptr, *src_ptr, &codes ); + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } } @@ -5774,19 +5830,37 @@ static void stretch_row_8(const dib_info *dst_dib, const POINT *dst_start, BYTE *src_ptr = get_pixel_ptr_8( src_dib, src_start->x, src_start->y ); int err = params->err_start; int width; - struct rop_codes codes; - rop_codes_from_stretch_mode( mode, &codes ); - for (width = params->length; width; width--) + if (mode == STRETCH_DELETESCANS) { - do_rop_codes_8( dst_ptr, *src_ptr, &codes ); - dst_ptr += params->dst_inc; - if (err > 0) + for (width = params->length; width; width--) { - src_ptr += params->src_inc; - err += params->err_add_1; + *dst_ptr = *src_ptr; + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + struct rop_codes codes; + + rop_codes_from_stretch_mode( mode, &codes ); + for (width = params->length; width; width--) + { + do_rop_codes_8( dst_ptr, *src_ptr, &codes ); + dst_ptr += params->dst_inc; + if (err > 0) + { + src_ptr += params->src_inc; + err += params->err_add_1; + } + else err += params->err_add_2; } - else err += params->err_add_2; } }

1 0

Andrew Talbot : ws2_32: Remove unused semicolon.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 26898ef7845b83d2706c9ba5f3cb823161c6981b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26898ef7845b83d2706c9ba5f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:38:05 2012 +0000 ws2_32: Remove unused semicolon. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ceda75b..eeb5265 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6793,4 +6793,4 @@ INT WINAPI WSANSPIoctl( HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion); WSASetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; -}; +}

1 0

Andrew Talbot : winspool.drv: Remove unused semicolons.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: e72e40b3dae01fe69adf7d846cfafb106a53cb0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72e40b3dae01fe69adf7d846… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:38:02 2012 +0000 winspool.drv: Remove unused semicolons. --- dlls/winspool.drv/info.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d8a78b0..f23d8cc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -784,9 +784,9 @@ static void *cupshandle; DO_FUNC(cupsGetOption); \ DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsParseOptions); \ - DO_FUNC(cupsPrintFile); + DO_FUNC(cupsPrintFile) #define CUPS_OPT_FUNCS \ - DO_FUNC(cupsGetPPD3); + DO_FUNC(cupsGetPPD3) #define DO_FUNC(f) static typeof(f) *p##f CUPS_FUNCS; @@ -894,10 +894,10 @@ static BOOL CUPS_LoadPrinters(void) } TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); if (!p##x) return FALSE; +#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); if (!p##x) return FALSE CUPS_FUNCS; #undef DO_FUNC -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); +#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) CUPS_OPT_FUNCS; #undef DO_FUNC

1 0

Andrew Talbot : msvcp100: Remove unused semicolons.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 054d23e437bcd0169586ad5daf936bbf2c2cd672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054d23e437bcd0169586ad5da… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:37:58 2012 +0000 msvcp100: Remove unused semicolons. --- dlls/msvcp100/ios.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 948646a..58b60db 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -224,59 +224,59 @@ extern const vtable_ptr MSVCP_basic_iostream_short_vtable; DEFINE_RTTI_DATA0(iosb, 0, ".?AV?$_Iosb(a)H@std@@") DEFINE_RTTI_DATA1(ios_base, 0, &iosb_rtti_base_descriptor, ".?AV?$_Iosb(a)H@std@@") DEFINE_RTTI_DATA2(basic_ios_char, 0, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@"); + ".?AV?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA2(basic_ios_wchar, 0, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@"); + ".?AV?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA2(basic_ios_short, 0, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@"); + ".?AV?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA0(basic_streambuf_char, 0, - ".?AV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@"); + ".?AV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA0(basic_streambuf_wchar, 0, - ".?AV?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@"); + ".?AV?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA0(basic_streambuf_short, 0, - ".?AV?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@"); + ".?AV?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_char, 0, &basic_streambuf_char_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@"); + ".?AV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_wchar, 0, &basic_streambuf_wchar_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@"); + ".?AV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_short, 0, &basic_streambuf_short_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@"); + ".?AV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA3(basic_ostream_char, sizeof(basic_ostream_char), &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@"); + ".?AV?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA3(basic_ostream_wchar, sizeof(basic_ostream_wchar), &basic_ios_wchar_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@"); + ".?AV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA3(basic_ostream_short, sizeof(basic_ostream_wchar), &basic_ios_short_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@"); + ".?AV?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA3(basic_istream_char, sizeof(basic_istream_char), &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@"); + ".?AV?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA3(basic_istream_wchar, sizeof(basic_istream_wchar), &basic_ios_wchar_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@"); + ".?AV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA3(basic_istream_short, sizeof(basic_istream_wchar), &basic_ios_short_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@"); + ".?AV?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA8(basic_iostream_char, sizeof(basic_iostream_char), &basic_istream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, &basic_ostream_char_rtti_base_descriptor, &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@"); + ".?AV?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA8(basic_iostream_wchar, sizeof(basic_iostream_wchar), &basic_istream_wchar_rtti_base_descriptor, &basic_ios_wchar_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, &basic_ostream_wchar_rtti_base_descriptor, &basic_ios_wchar_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@"); + ".?AV?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA8(basic_iostream_short, sizeof(basic_iostream_wchar), &basic_istream_short_rtti_base_descriptor, &basic_ios_short_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, &basic_ostream_short_rtti_base_descriptor, &basic_ios_short_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@"); + ".?AV?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@") #ifndef __GNUC__ void __asm_dummy_vtables(void) {

1 0

Andrew Talbot : msvcp90: Remove unused semicolons.
by Alexandre Julliard 03 Dec '12

03 Dec '12

Module: wine Branch: master Commit: 19c7cb6f38cdda983d4117a0d50aab4019af8655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c7cb6f38cdda983d4117a0d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:37:55 2012 +0000 msvcp90: Remove unused semicolons. --- dlls/msvcp90/ios.c | 80 ++++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19c7cb6f38cdda983d411…

1 0