December 2012 - Wine-Commits

Stefan Dösinger : ddraw: Don't map 1, 2 and 4 bit alpha formats to WINED3DFMT_A8_UNORM.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 21e2ceb4c1334016764e65c1721ddca6e684e687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e2ceb4c1334016764e65c17… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 2 16:00:45 2012 +0100 ddraw: Don't map 1, 2 and 4 bit alpha formats to WINED3DFMT_A8_UNORM. --- dlls/ddraw/utils.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 1964452..a1fb43b 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -458,10 +458,6 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat /* Alpha only Pixelformat */ switch(DDPixelFormat->u1.dwAlphaBitDepth) { - case 1: - case 2: - case 4: - FIXME("Unsupported Alpha-Only bit depth 0x%x.\n", DDPixelFormat->u1.dwAlphaBitDepth); case 8: return WINED3DFMT_A8_UNORM;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXANIMATIONCONTROLLER.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: ff11a32f999610ff5e77aa09b42431d37faf6a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff11a32f999610ff5e77aa09b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 2 18:53:18 2012 +0100 d3dx9: Avoid LPD3DXANIMATIONCONTROLLER. --- include/d3dx9anim.h | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 84f80e8..f70faac 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -359,7 +359,7 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD(ValidateEvent)(THIS_ D3DXEVENTHANDLE event) PURE; STDMETHOD(GetEventDesc)(THIS_ D3DXEVENTHANDLE event, LPD3DXEVENT_DESC desc) PURE; STDMETHOD(CloneAnimationController)(THIS_ UINT max_num_anim_outputs, UINT max_num_anim_sets, - UINT max_num_tracks, UINT max_num_events, LPD3DXANIMATIONCONTROLLER *anim_controller) PURE; + UINT max_num_tracks, UINT max_num_events, ID3DXAnimationController **anim_controller) PURE; }; #undef INTERFACE @@ -378,20 +378,25 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *data, DWORD data_s struct IDirect3DDevice9 *device, struct ID3DXAllocateHierarchy *alloc, struct ID3DXLoadUserData *user_data_loader, D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **animation_controller); -HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(LPCSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA); -HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(LPCWSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA); +HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(const char *filename, DWORD format, + const D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller, + ID3DXSaveUserData *user_data_saver); +HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format, + const D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller, + ID3DXSaveUserData *user_data_saver); #define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile) HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME, LPD3DXALLOCATEHIERARCHY); HRESULT WINAPI D3DXFrameAppendChild(LPD3DXFRAME, CONST D3DXFRAME*); LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR); -HRESULT WINAPI D3DXFrameRegisterNamedMatrices(LPD3DXFRAME, LPD3DXANIMATIONCONTROLLER); +HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller); UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); HRESULT WINAPI D3DXCreateKeyframedAnimationSet(LPCSTR, DOUBLE, D3DXPLAYBACK_TYPE, UINT, UINT, CONST D3DXKEY_CALLBACK*, LPD3DXKEYFRAMEDANIMATIONSET*); HRESULT WINAPI D3DXCreateCompressedAnimationSet(const char *name, double ticks_per_second, D3DXPLAYBACK_TYPE playback_type, ID3DXBuffer *compressed_data, UINT callback_key_count, const D3DXKEY_CALLBACK *callback_keys, ID3DXCompressedAnimationSet **animation_set); -HRESULT WINAPI D3DXCreateAnimationController(UINT, UINT, UINT, UINT, LPD3DXANIMATIONCONTROLLER*); +HRESULT WINAPI D3DXCreateAnimationController(UINT max_animation_output_count, UINT max_animation_set_count, + UINT max_track_count, UINT max_event_count, ID3DXAnimationController **animation_controller); #ifdef __cplusplus }

1 0

Andrew Talbot : hhctrl.ocx: Constify some variables.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: d3229eb9d75d6d59ee0c2c51025826719501703d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3229eb9d75d6d59ee0c2c510… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 22:11:59 2012 +0000 hhctrl.ocx: Constify some variables. --- dlls/hhctrl.ocx/help.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index f6155c7..5c922b3 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1895,8 +1895,8 @@ static char find_html_symbol(const char *entity, int entity_len) */ WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) { - const char *h = html_fragment; - char *amp, *sem, symbol, *tmp; + const char *h = html_fragment, *amp, *sem; + char symbol, *tmp; int len, tmp_len = 0; WCHAR *unicode_text;

1 0

André Hentschel : ntdll/tests: Fix check for PAGE_READWRITE.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

Module: wine Branch: master Commit: 7f74df02249bd0108ca4a6cabe65d66a7a8cef1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f74df02249bd0108ca4a6cab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 1 15:22:43 2012 +0100 ntdll/tests: Fix check for PAGE_READWRITE. --- dlls/ntdll/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c670731..47e5587 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1336,7 +1336,7 @@ static void test_mapprotection(void) status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); - ok(info.Protect == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); + ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); status = pNtUnmapViewOfSection (GetCurrentProcess(), addr); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

1 0

Alexandre Julliard : winex11: Store a copy of the surface region.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

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

Andrew Talbot : msvcp100: Remove unused semicolons.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

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 Dec. 3, 2012

Dec. 3, 2012

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

Andrew Talbot : ws2_32: Remove unused semicolon.
by Alexandre Julliard Dec. 3, 2012

Dec. 3, 2012

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 Dec. 3, 2012

Dec. 3, 2012

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