wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Alexandre Julliard : Release 1.3.18.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 41dfdb28c79dd2c6fc1530713b65d28862ee02d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dfdb28c79dd2c6fc1530713… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 19:34:28 2011 +0200 Release 1.3.18. --- ANNOUNCE | 906 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 466 insertions(+), 460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41dfdb28c79dd2c6fc153…

1 0

Huw Davies : gdi32: Add clipping for horizontal and vertical solid lines.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 1372692fe76e50fd72709f829144f44a3c465432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1372692fe76e50fd72709f829… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 13:14:34 2011 +0100 gdi32: Add clipping for horizontal and vertical solid lines. --- dlls/gdi32/dibdrv/objects.c | 93 +++++++++++++++++++++++++++++++----------- dlls/gdi32/gdi_private.h | 13 ++++++ dlls/gdi32/region.c | 21 ++++++--- dlls/gdi32/tests/dib.c | 60 +++++++++++++++++++++++++++ 4 files changed, 155 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1372692fe76e50fd72709…

1 0

Huw Davies : gdi32: Keep track of the combined clip region.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: f33bbbfdd7f56701e91e96945f27b258fe73c6d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33bbbfdd7f56701e91e96945… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 14:57:44 2011 +0100 gdi32: Keep track of the combined clip region. --- dlls/gdi32/dibdrv/dc.c | 18 +++++++++++++++++- dlls/gdi32/gdi_private.h | 1 + 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e5048d4..9e97177 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -32,7 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); */ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) { + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p)\n", dev); + DeleteObject(pdev->clip); return 0; } @@ -129,6 +131,7 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) if (!bmp) return 0; assert(bmp->dib); + pdev->clip = CreateRectRgn(0, 0, 0, 0); pdev->defer = 0; if(!init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) @@ -140,6 +143,19 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) } /*********************************************************************** + * dibdrv_SetDeviceClipping + */ +static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + TRACE("(%p, %p, %p)\n", dev, vis_rgn, clip_rgn); + + CombineRgn( pdev->clip, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + return next->funcs->pSetDeviceClipping( next, vis_rgn, clip_rgn); +} + +/*********************************************************************** * dibdrv_SetROP2 */ static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) @@ -245,7 +261,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ - NULL, /* pSetDeviceClipping */ + dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 91f4acb..e126aa1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -97,6 +97,7 @@ typedef struct dibdrv_physdev struct gdi_physdev dev; dib_info dib; + HRGN clip; DWORD defer; /* pen */

1 0

Jörg Höhle : user32: Added message names for winmm.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 5d7e6b75063d7b832ed82dc2859ec806758379aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e6b75063d7b832ed82dc28… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Mar 17 01:19:57 2011 +0100 user32: Added message names for winmm. --- dlls/user32/spy.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 26bd741..e2c5a2e 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -686,28 +686,35 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "MM_JOY2BUTTONDOWN", "MM_JOY1BUTTONUP", "MM_JOY2BUTTONUP", - "MM_MCINOTIFY", + "MM_MCINOTIFY", /* 0x03B9 */ NULL, - "MM_WOM_OPEN", - "MM_WOM_CLOSE", - "MM_WOM_DONE", - "MM_WIM_OPEN", - "MM_WIM_CLOSE", + "MM_WOM_OPEN", /* 0x03BB */ + "MM_WOM_CLOSE", /* 0x03BC */ + "MM_WOM_DONE", /* 0x03BD */ + "MM_WIM_OPEN", /* 0x03BE */ + "MM_WIM_CLOSE", /* 0x03BF */ /* 0x03c0 */ - "MM_WIM_DATA", - "MM_MIM_OPEN", - "MM_MIM_CLOSE", - "MM_MIM_DATA", - "MM_MIM_LONGDATA", - "MM_MIM_ERROR", - "MM_MIM_LONGERROR", - "MM_MOM_OPEN", - "MM_MOM_CLOSE", - "MM_MOM_DONE", + "MM_WIM_DATA", /* 0x03C0 */ + "MM_MIM_OPEN", /* 0x03C1 */ + "MM_MIM_CLOSE", /* 0x03C2 */ + "MM_MIM_DATA", /* 0x03C3 */ + "MM_MIM_LONGDATA", /* 0x03C4 */ + "MM_MIM_ERROR", /* 0x03C5 */ + "MM_MIM_LONGERROR", /* 0x03C6 */ + "MM_MOM_OPEN", /* 0x03C7 */ + "MM_MOM_CLOSE", /* 0x03C8 */ + "MM_MOM_DONE", /* 0x03C9 */ + "MM_MOM_POSITIONCB", /* 0x03CA */ + "MM_MCISIGNAL", /* 0x03CB */ + "MM_MIM_MOREDATA", /* 0x03CC */ + NULL, NULL, NULL, + + /* 0x03d0 */ + "MM_MIXM_LINE_CHANGE", + "MM_MIXM_CONTROL_CHANGE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x03e0 */ "WM_DDE_INITIATE", /* 0x3E0 */

1 0

Dmitry Timoshkov : ole32: Replace a spurious FIXME by a TRACE.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 30b6b53adfabaef7c7b1829c63274ae85ba97544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b6b53adfabaef7c7b1829c6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 15 17:44:43 2011 +0900 ole32: Replace a spurious FIXME by a TRACE. --- dlls/ole32/memlockbytes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 57acf37..87bbfcb 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -165,7 +165,7 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* plkbyt, HGLOBAL* phglobal) ERR("Cannot ILockBytes_Stat, %x\n",hres); return hres; } - FIXME("cbSize is %d\n",stbuf.cbSize.u.LowPart); + TRACE("cbSize is %s\n", wine_dbgstr_longlong(stbuf.cbSize.QuadPart)); *phglobal = GlobalAlloc( GMEM_MOVEABLE|GMEM_SHARE, stbuf.cbSize.u.LowPart); if (!*phglobal) return E_INVALIDARG;

1 0

Alexandre Julliard : ntdll: Rewrite the SystemProcessorPerformanceInformation handing to avoid code duplication .
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: cc01c46f415821ec458845f678287a2419a11a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc01c46f415821ec458845f67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 10:54:28 2011 +0200 ntdll: Rewrite the SystemProcessorPerformanceInformation handing to avoid code duplication. Also include idle time in kernel time. --- dlls/ntdll/nt.c | 95 +++++++++++++----------------------------------------- 1 files changed, 23 insertions(+), 72 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index fb89a42..ef5f703 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1310,25 +1310,6 @@ void fill_cpu_info(void) cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); } -static void fill_in_sppi(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi, DWORD64 idle, DWORD64 sys, DWORD64 usr) -{ - DWORD64 steal; - sppi->IdleTime.QuadPart = idle * 10000000 / sysconf(_SC_CLK_TCK); - sppi->KernelTime.QuadPart = sys * 10000000 / sysconf(_SC_CLK_TCK); - sppi->UserTime.QuadPart = usr * 10000000 / sysconf(_SC_CLK_TCK); - - /* Add 1% from idle time to kernel time, to make .NET happy */ - steal = sppi->IdleTime.QuadPart / 100; - sppi->IdleTime.QuadPart -= steal; - sppi->KernelTime.QuadPart += steal; - - /* DPC time */ - sppi->Reserved1[0].QuadPart = 0; - /* Interrupt time */ - sppi->Reserved1[1].QuadPart = 0; - sppi->Reserved2 = 0; -} - /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -1605,66 +1586,36 @@ NTSTATUS WINAPI NtQuerySystemInformation( FILE *cpuinfo = fopen("/proc/stat", "r"); if (cpuinfo) { + unsigned long clk_tck = sysconf(_SC_CLK_TCK); unsigned long usr,nice,sys,idle,remainder[8]; - int count; - char name[10]; + int i, count; + char name[32]; char line[255]; /* first line is combined usage */ - if (fgets(line,255,cpuinfo)) - count = sscanf(line, "%s %lu %lu %lu %lu " - "%lu %lu %lu %lu %lu %lu %lu %lu", - name, &usr, &nice, &sys, &idle, - &remainder[0], &remainder[1], &remainder[2], - &remainder[3], &remainder[4], &remainder[5], - &remainder[6], &remainder[7]); - else - count = 0; - /* we set this up in the for older non-smp enabled kernels */ - if (count >= 5 && strcmp(name, "cpu") == 0) + while (fgets(line,255,cpuinfo)) { - int i; - for (i = 0; i + 5 < count; ++i) - sys += remainder[i]; + count = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", + name, &usr, &nice, &sys, &idle, + &remainder[0], &remainder[1], &remainder[2], &remainder[3], + &remainder[4], &remainder[5], &remainder[6], &remainder[7]); + + if (count < 5 || strncmp( name, "cpu", 3 )) break; + for (i = 0; i + 5 < count; ++i) sys += remainder[i]; + sys += idle; usr += nice; - sppi = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - fill_in_sppi(sppi, idle, sys, usr); - cpus = 1; - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - } - - do - { - if (fgets(line, 255, cpuinfo)) - count = sscanf(line, "%s %lu %lu %lu %lu " - "%lu %lu %lu %lu %lu %lu %lu %lu", - name, &usr, &nice, &sys, &idle, - &remainder[0], &remainder[1], &remainder[2], - &remainder[3], &remainder[4], &remainder[5], - &remainder[6], &remainder[7]); + cpus = atoi( name + 3 ) + 1; + if (cpus > out_cpus) break; + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; + if (sppi) + sppi = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sppi, len ); else - count = 0; - if (count >= 5 && strncmp(name, "cpu", 3)==0) - { - int i; - for (i = 0; i + 5 < count; ++i) - sys += remainder[i]; - usr += nice; - out_cpus --; - if (name[3]=='0') /* first cpu */ - fill_in_sppi(sppi, idle, sys, usr); - else /* new cpu */ - { - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * (cpus+1); - sppi = RtlReAllocateHeap(GetProcessHeap(), 0, sppi, len); - fill_in_sppi(sppi + cpus, idle, sys, usr); - cpus++; - } - } - else - break; - } while (out_cpus > 0); + sppi = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + + sppi[cpus-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; + sppi[cpus-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; + sppi[cpus-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; + } fclose(cpuinfo); } }

1 0

Vincent Povirk : windowscodecs: Add support for converting to 32bppPBGRA.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: c3dc0cfa3281608580d8fd58876162f3f9db7ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dc0cfa3281608580d8fd588… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:31:12 2011 -0500 windowscodecs: Add support for converting to 32bppPBGRA. --- dlls/windowscodecs/converter.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bde7eb6..a52c7d2 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -793,6 +793,39 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec } } +static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppPBGRA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + if (SUCCEEDED(hr) && prc) + { + UINT x, y; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE alpha = pbBuffer[cbStride*y+4*x+3]; + if (alpha != 255) + { + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; + pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; + pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + } + } + } + return hr; + } +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, @@ -809,7 +842,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, - {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, NULL}, + {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL},

1 0

Vincent Povirk : windowscodecs: Add support for converting from 32bppPBGRA.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 10dd670056861e652d790a64721e5d7731e7fb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10dd670056861e652d790a647… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:22:12 2011 -0500 windowscodecs: Add support for converting from 32bppPBGRA. --- dlls/windowscodecs/converter.c | 25 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 7e91183..bde7eb6 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -51,6 +51,7 @@ enum pixelformat { format_24bppBGR, format_32bppBGR, format_32bppBGRA, + format_32bppPBGRA, format_48bppRGB, format_64bppRGBA, format_32bppCMYK, @@ -639,6 +640,28 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; + case format_32bppPBGRA: + if (prc) + { + HRESULT res; + UINT x, y; + + res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(res)) return res; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE alpha = pbBuffer[cbStride*y+4*x+3]; + if (alpha != 0 && alpha != 255) + { + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * 255 / alpha; + pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * 255 / alpha; + pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * 255 / alpha; + } + } + } + return S_OK; case format_48bppRGB: if (prc) { @@ -761,6 +784,7 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec { case format_32bppBGR: case format_32bppBGRA: + case format_32bppPBGRA: if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; @@ -785,6 +809,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, NULL}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d25c977..1ea0aa0 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -983,6 +983,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat32bppPBGRA, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat32bppCMYK,

1 0

Vincent Povirk : windowscodecs: Log unsupported conversion formats.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 80470260d069d71441478389cd363bbfffcfb3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=80470260d069d71441478389c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:13:15 2011 -0500 windowscodecs: Log unsupported conversion formats. --- dlls/windowscodecs/converter.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 663e3d4..7e91183 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -960,6 +960,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (!srcinfo) { res = WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + FIXME("Unsupported source format %s\n", debugstr_guid(&srcFormat)); goto end; } @@ -967,6 +968,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (!dstinfo) { res = WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + FIXME("Unsupported destination format %s\n", debugstr_guid(dstFormat)); goto end; } @@ -981,7 +983,10 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, This->source = pISource; } else + { + FIXME("Unsupported conversion %s -> %s\n", debugstr_guid(&srcFormat), debugstr_guid(dstFormat)); res = WINCODEC_ERR_UNSUPPORTEDOPERATION; + } end: @@ -1001,16 +1006,27 @@ static HRESULT WINAPI FormatConverter_CanConvert(IWICFormatConverter *iface, debugstr_guid(dstPixelFormat), pfCanConvert); srcinfo = get_formatinfo(srcPixelFormat); - if (!srcinfo) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + if (!srcinfo) + { + FIXME("Unsupported source format %s\n", debugstr_guid(srcPixelFormat)); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } dstinfo = get_formatinfo(dstPixelFormat); - if (!dstinfo) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + if (!dstinfo) + { + FIXME("Unsupported destination format %s\n", debugstr_guid(dstPixelFormat)); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } if (dstinfo->copy_function && SUCCEEDED(dstinfo->copy_function(This, NULL, 0, 0, NULL, dstinfo->format))) *pfCanConvert = TRUE; else + { + FIXME("Unsupported conversion %s -> %s\n", debugstr_guid(srcPixelFormat), debugstr_guid(dstPixelFormat)); *pfCanConvert = FALSE; + } return S_OK; }

1 0

Vincent Povirk : windowscodecs: Implement FlipRotator_GetPixelFormat.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: d65f5799128e1cb6ec84736777e276429674ae8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65f5799128e1cb6ec8473677… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:02:21 2011 -0500 windowscodecs: Implement FlipRotator_GetPixelFormat. --- dlls/windowscodecs/fliprotate.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 45ec509..2e834a2 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -117,9 +117,13 @@ static HRESULT WINAPI FlipRotator_GetSize(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_GetPixelFormat(IWICBitmapFlipRotator *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p): stub\n", iface, pPixelFormat); + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + else + return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat); } static HRESULT WINAPI FlipRotator_GetResolution(IWICBitmapFlipRotator *iface,

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011