January 2013 - Wine-Commits

Ludger Sprenker : windowscodecs: Introduce 24bppRGB PixelFormat.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 2a1acc2939c88943a123c6aaefe8e9c4516bce3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1acc2939c88943a123c6aae… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 4 20:20:47 2013 +0100 windowscodecs: Introduce 24bppRGB PixelFormat. --- include/wincodec.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index a878b2f..b4f2a6a 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -177,6 +177,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe, cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGRA5551, 0x05ec7c2b,0xf1e6,0x4961,0xad,0x46,0xe1,0xcc,0x81,0x0a,0x87,0xd2);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0d);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);")

1 0

Henri Verbeet : ddraw: Avoid LPD3DVIEWPORT7.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: da71c922a5e3576e4b64f1953b78e1d11eecda87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da71c922a5e3576e4b64f1953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:06 2013 +0100 ddraw: Avoid LPD3DVIEWPORT7. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 593cbc7..322384a 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1306,9 +1306,9 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; - STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; + STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix) PURE; - STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE; + STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE; STDMETHOD(SetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE;

1 0

Daniel Jelinski : comctl32/listview: Fix calculating item height.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 67eb9744d97cc6643cc448bc878589b3869085f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eb9744d97cc6643cc448bc8… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jan 5 15:04:53 2013 +0100 comctl32/listview: Fix calculating item height. --- dlls/comctl32/listview.c | 7 ++----- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 977bb18..dfa8d6e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2954,15 +2954,12 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr) nItemHeight = infoPtr->iconSpacing.cy; else { - nItemHeight = infoPtr->ntmHeight; - if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) - nItemHeight++; + nItemHeight = infoPtr->ntmHeight; if (infoPtr->himlState) nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy); if (infoPtr->himlSmall) nItemHeight = max(nItemHeight, infoPtr->iconSize.cy); - if (infoPtr->himlState || infoPtr->himlSmall) - nItemHeight += HEIGHT_PADDING; + nItemHeight += HEIGHT_PADDING; if (infoPtr->nMeasureItemHeight > 0) nItemHeight = infoPtr->nMeasureItemHeight; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0620afe..0a42dad 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2432,7 +2432,6 @@ static void test_subitem_rect(void) expect(100, rect.left); expect(250, rect.right); -todo_wine expect(3, rect.top); rect.left = LVIR_BOUNDS; @@ -2443,7 +2442,6 @@ todo_wine expect(250, rect.left); expect(450, rect.right); -todo_wine expect(3, rect.top); /* item LVS_REPORT padding isn't applied to subitems */

1 0

Jason Edmeades : cmd: Add beginnings of support for delayed expansion.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 0b00b717b9ef2982281fb298c0573515d35c2ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b00b717b9ef2982281fb298c… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jan 6 23:06:28 2013 +0000 cmd: Add beginnings of support for delayed expansion. --- programs/cmd/batch.c | 4 +- programs/cmd/builtins.c | 22 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +- programs/cmd/tests/test_cmdline.cmd.exp | 2 +- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 79 +++++++++++++++++++++-------- 6 files changed, 88 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b00b717b9ef2982281fb…

1 0

Henri Verbeet : ddraw: Get rid of some redundant code in IDirect3DImpl_GetCaps().
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: da817d8e91c69885feb3c74b6ebe231508fdfe0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da817d8e91c69885feb3c74b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:09 2013 +0100 ddraw: Get rid of some redundant code in IDirect3DImpl_GetCaps(). dwTextureBlendCaps is overwritten later, and (potentially) uninitialized here. --- dlls/ddraw/ddraw.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 97b071f..205bf5d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4740,11 +4740,6 @@ HRESULT IDirect3DImpl_GetCaps(const struct wined3d *wined3d, D3DDEVICEDESC *desc D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC); - desc7->dpcLineCaps.dwTextureBlendCaps &= ( - D3DPTBLENDCAPS_DECAL | D3DPTBLENDCAPS_MODULATE | D3DPTBLENDCAPS_DECALALPHA | - D3DPTBLENDCAPS_MODULATEALPHA | D3DPTBLENDCAPS_DECALMASK | D3DPTBLENDCAPS_MODULATEMASK | - D3DPTBLENDCAPS_COPY | D3DPTBLENDCAPS_ADD); - desc7->dpcLineCaps.dwTextureAddressCaps &= ( D3DPTADDRESSCAPS_WRAP | D3DPTADDRESSCAPS_MIRROR | D3DPTADDRESSCAPS_CLAMP | D3DPTADDRESSCAPS_BORDER | D3DPTADDRESSCAPS_INDEPENDENTUV);

1 0

Henri Verbeet : ddraw: Avoid LPD3DVIEWPORT2.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 768c7121b7abbeec20e3f0a3fd3031eea93910be URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c7121b7abbeec20e3f0a3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:05 2013 +0100 ddraw: Avoid LPD3DVIEWPORT2. --- include/d3d.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 72b73d1..593cbc7 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -734,8 +734,8 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ - STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; - STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; + STDMETHOD(GetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; + STDMETHOD(SetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; }; #undef INTERFACE @@ -810,8 +810,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ - STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; - STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; + STDMETHOD(GetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; + STDMETHOD(SetViewport2)(THIS_ D3DVIEWPORT2 *data) PURE; /*** IDirect3DViewport3 methods ***/ STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: f963f939645f1c36419230b85e7a60fdd7a63850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f963f939645f1c36419230b85… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 5 16:17:18 2013 +0100 Assorted spelling fixes. --- dlls/crypt32/rootstore.c | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/ole32/tests/compobj.c | 2 +- dlls/usp10/tests/usp10.c | 2 +- dlls/winmm/waveform.c | 2 +- dlls/xmllite/reader.c | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 386bc9b..4e4e4e4 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -189,7 +189,7 @@ static const char *trust_status_to_str(DWORD status) "\n\tbad name constraints"); if (status & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT) pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsuported name constraint"); + "\n\tunsupported name constraint"); if (status & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT) pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tundefined name constraint"); diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 1bc3641..1546bfe 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -642,7 +642,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge "function names\n"); ok(errors != NULL, "No errors returned for a shader with invalid variable and function " "names\n"); - ok(compiled == NULL, "A shader blob was returend for a shader with invalid variable and " + ok(compiled == NULL, "A shader blob was returned for a shader with invalid variable and " "function names\n"); IUnknown_Release(errors); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ebaf385..7c69d90 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1591,7 +1591,7 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(levelcount == 3, "GetLevelCount returned %u, expected 3\n", levelcount); hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); - ok(hr == D3D_OK, "GetLevelDesc returend %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(volume_desc.Width == 4, "Got width %u, expected 4\n", volume_desc.Width); ok(volume_desc.Height == 4, "Got height %u, expected 4\n", volume_desc.Height); ok(volume_desc.Depth == 2, "Got depth %u, expected 2\n", volume_desc.Depth); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb4f1e8..89729f1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1248,7 +1248,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_QueryInterface(nsIAsyncVerif nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface); if(IsEqualGUID(&IID_nsISupports, riid)) { - TRACE("(%p)->(IID_nsISuports %p)\n", This, result); + TRACE("(%p)->(IID_nsISupports %p)\n", This, result); *result = &This->nsIAsyncVerifyRedirectCallback_iface; }else if(IsEqualGUID(&IID_nsIAsyncVerifyRedirectCallback, riid)) { TRACE("(%p)->(IID_nsIAsyncVerifyRedirectCallback %p)\n", This, result); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7584d0d..d0adf79 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -707,7 +707,7 @@ static void test_CoRegisterPSClsid(void) CLSID clsid; hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); - ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returened CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d6786cd..9f7088d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1860,7 +1860,7 @@ static void test_ScriptGetFontProperties(HDC hdc) static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unkown, found by black box testing */ + U+F71B: unknown, found by black box testing */ BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8957c4c..e6fe360 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -107,7 +107,7 @@ typedef struct _WINMM_Device { BOOL stopped; DWORD loop_counter; UINT32 bytes_per_frame, samples_per_sec, ofs_bytes, played_frames; - UINT32 remainder_frames; /* header chunk frames already played when a device switch occured */ + UINT32 remainder_frames; /* header chunk frames already played when a device switch occurred */ /* stored in frames of sample rate, *not* AC::GetFrequency */ UINT64 last_clock_pos; diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a6caf66..a1ce662 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -366,7 +366,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) ULONG read; HRESULT hr; - /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + /* always try to get aligned to 4 bytes, so the only case we can get partially read characters is variable width encodings like UTF-8 */ len = (len + 3) & ~3; /* try to use allocated space or grow */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2899418..4590769 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3778,7 +3778,7 @@ static int WCMD_handleExpression(WCHAR **expr, int *ret, int depth) WCHAR *nextpos; /* Cannot have an expression with var/number twice, without an operator - inbetween, nor or number following a half constructed << or >> operator */ + in-between, nor or number following a half constructed << or >> operator */ if (lastwasnumber || foundhalf) { rc = WCMD_NOOPERATOR; goto exprerrorreturn; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 508691e..54070bc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1220,7 +1220,7 @@ set WINE_foo=2 set /a WINE_bar=WINE_foo=7 call :checkenvvars WINE_foo 7 WINE_bar 7 echo ----- equal precedence on stack -rem Unary - dont reduce if precedence is equal +rem Unary - don't reduce if precedence is equal set /a WINE_foo=!!1 call :checkenvvars WINE_foo 1 set /a WINE_foo=!!0 @@ -1262,7 +1262,7 @@ set /a WINE_foo=10-5+2 call :checkenvvars WINE_foo 7 set /a WINE_foo=1^<^<4^>^>1 call :checkenvvars WINE_foo 8 -rem Assignment - dont reduce if precedence is equal +rem Assignment - don't reduce if precedence is equal set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6

1 0

Daniel Jelinski : comctl32/listview: Fix subitem drawing.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 8257ab9a766c20324aadbe2eaca55ddeaf879a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8257ab9a766c20324aadbe2ea… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jan 5 22:46:12 2013 +0100 comctl32/listview: Fix subitem drawing. lpColumnInfo->fmt & LVCFMT_IMAGE is supposed to mean that header item has an image. It is not supposed to mean that all items in that column should reserve space for an icon if they don't have any. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a67b637..d670a9b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2363,7 +2363,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW Icon.top = Box.top; Icon.right = Icon.left; if (infoPtr->himlSmall && - (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) || + (!lpColumnInfo || lpLVItem->iSubItem == 0 || ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK))) Icon.right += infoPtr->iconSize.cx; Icon.bottom = Icon.top + infoPtr->iconSize.cy;

1 0

Ludger Sprenker : windowscodecs: Support 24bppRGB in tiff encoder.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: ead7c50b5d8b7c699285ecb426c2a3d6e9428653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead7c50b5d8b7c699285ecb42… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 4 20:21:34 2013 +0100 windowscodecs: Support 24bppRGB in tiff encoder. --- dlls/windowscodecs/tiffformat.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 6c29bab..fcaa905 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1304,6 +1304,7 @@ struct tiff_encode_format { static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, + {&GUID_WICPixelFormat24bppRGB, 2, 8, 3, 24, 0, 0, 0}, {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0},

1 0

Ludger Sprenker : windowscodecs: Support conversions of the 24bpp PixelFormats.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 968eac9aaf5bc5f53b012a2b83fdc21f38224ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968eac9aaf5bc5f53b012a2b8… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 4 20:21:05 2013 +0100 windowscodecs: Support conversions of the 24bpp PixelFormats. --- dlls/windowscodecs/converter.c | 190 +++++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/regsvr.c | 12 +++ 2 files changed, 201 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 8611560..975730a 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -49,6 +49,7 @@ enum pixelformat { format_16bppBGR565, format_16bppBGRA5551, format_24bppBGR, + format_24bppRGB, format_32bppBGR, format_32bppBGRA, format_32bppPBGRA, @@ -602,6 +603,54 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe return res; } return S_OK; + case format_24bppRGB: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + BYTE *dstpixel; + BYTE tmppixel[3]; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=dstrow; + for (x=0; x<prc->Width; x++) { + tmppixel[0]=*srcpixel++; /* red */ + tmppixel[1]=*srcpixel++; /* green */ + tmppixel[2]=*srcpixel++; /* blue */ + + *dstpixel++=tmppixel[2]; /* blue */ + *dstpixel++=tmppixel[1]; /* green */ + *dstpixel++=tmppixel[0]; /* red */ + *dstpixel++=255; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_32bppBGR: if (prc) { @@ -807,6 +856,144 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR } } +static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_24bppBGR: + case format_24bppRGB: + if (prc) + { + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (SUCCEEDED(hr) && source_format == format_24bppRGB) + reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); + return hr; + } + return S_OK; + case format_32bppBGR: + case format_32bppBGRA: + case format_32bppPBGRA: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + BYTE *dstpixel; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=dstrow; + for (x=0; x<prc->Width; x++) { + *dstpixel++=*srcpixel++; /* blue */ + *dstpixel++=*srcpixel++; /* green */ + *dstpixel++=*srcpixel++; /* red */ + srcpixel++; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + default: + FIXME("Unimplemented conversion path!\n"); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } +} + +static HRESULT copypixels_to_24bppRGB(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_24bppBGR: + case format_24bppRGB: + if (prc) + { + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (SUCCEEDED(hr) && source_format == format_24bppBGR) + reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); + return hr; + } + return S_OK; + case format_32bppBGR: + case format_32bppBGRA: + case format_32bppPBGRA: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + BYTE *dstpixel; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=dstrow; + for (x=0; x<prc->Width; x++) { + *dstpixel++=*srcpixel++; /* blue */ + *dstpixel++=*srcpixel++; /* green */ + *dstpixel++=*srcpixel++; /* red */ + srcpixel++; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; + } + + reverse_bgr8(3, pbBuffer, prc->Width, prc->Height, cbStride); + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + default: + FIXME("Unimplemented conversion path!\n"); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + } +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, @@ -820,7 +1007,8 @@ static const struct pixelformatinfo supported_formats[] = { {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_16bppBGRA5551, &GUID_WICPixelFormat16bppBGRA5551, NULL}, - {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, + {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, copypixels_to_24bppBGR}, + {format_24bppRGB, &GUID_WICPixelFormat24bppRGB, copypixels_to_24bppRGB}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index e424819..408794d 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1467,6 +1467,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat16bppBGRA5551, &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat24bppRGB, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, @@ -1856,6 +1857,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat24bppRGB, + "The Wine Project", + "24bpp RGB", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 24, /* bitsperpixel */ + 3, /* channel count */ + channel_masks_8bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 0 + }, { &GUID_WICPixelFormat32bppBGR, "The Wine Project", "32bpp BGR",

1 0