October 2014 - Wine-Commits

Hans Leidekker : msi: Include the terminating null in the buffer size for decoded stream names.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: f41ac94e0e2469e520db759835dee68e6bce944e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ac94e0e2469e520db75983… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 2 12:17:34 2014 +0200 msi: Include the terminating null in the buffer size for decoded stream names. --- dlls/msi/database.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b734031..e5ed16e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -131,7 +131,7 @@ UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; IStorage *stg; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index a20f196..b91fe88 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -70,7 +70,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; stream = msi_alloc(sizeof(STREAM)); if (!stream)

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: e377ad45fac4b35cb76e2917f763173a1c09a0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e377ad45fac4b35cb76e2917f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:40 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0f13c9d..6b13dd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3192,6 +3192,29 @@ static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pit } } +static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = 0x8000 | ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + else + dst_row[x] = ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3215,21 +3238,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - WORD color = *(const WORD *)source; - if (!color_in_range(&texture->src_blt_color_key, color)) - *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); - else - *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); - source += 2; - dest += 2; - } - } + convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G5R5X1:

1 0

Sebastian Lackner : shlwapi/tests: Add test for SHMapHandle.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: ef065486dd851b390b64ba7eda884e74913bf8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef065486dd851b390b64ba7ed… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:40:54 2014 +0200 shlwapi/tests: Add test for SHMapHandle. --- dlls/shlwapi/tests/ordinal.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 64b07f3..7c7c4a0 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -46,6 +46,7 @@ static HANDLE (WINAPI *pSHAllocShared)(LPCVOID,DWORD,DWORD); static LPVOID (WINAPI *pSHLockShared)(HANDLE,DWORD); static BOOL (WINAPI *pSHUnlockShared)(LPVOID); static BOOL (WINAPI *pSHFreeShared)(HANDLE,DWORD); +static HANDLE (WINAPI *pSHMapHandle)(HANDLE,DWORD,DWORD,DWORD,DWORD); static HRESULT(WINAPIV *pSHPackDispParams)(DISPPARAMS*,VARIANTARG*,UINT,...); static HRESULT(WINAPI *pIConnectionPoint_SimpleInvoke)(IConnectionPoint*,DISPID,DISPPARAMS*); static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DISPID,DISPPARAMS*,DWORD,DWORD); @@ -519,8 +520,10 @@ static void test_alloc_shared(int argc, char **argv) static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) { struct shared_struct val, *p; + HANDLE hmem2; BOOL ret; + /* test directly accessing shared memory of a remote process */ p = pSHLockShared(hmem, procid); ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); if (p == NULL) @@ -539,6 +542,35 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) ret = pSHUnlockShared(p); ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + /* test SHMapHandle */ + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); + + /* It seems like Windows Vista/2008 uses a different internal implementation + * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ + todo_wine + ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), + "SHMapHandle failed: %u\n", GetLastError()); + if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) + { + skip("Subprocess failed to map shared memory, skipping test\n"); + return; + } + + p = pSHLockShared(hmem2, GetCurrentProcessId()); + todo_wine + ok(p != NULL, "SHLockShared failed: %u\n", GetLastError()); + + if (p != NULL) + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + + ret = pSHUnlockShared(p); + todo_wine + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, GetCurrentProcessId()); + todo_wine + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -3014,6 +3046,7 @@ static void init_pointers(void) MAKEFUNC(SHLockShared, 8); MAKEFUNC(SHUnlockShared, 9); MAKEFUNC(SHFreeShared, 10); + MAKEFUNC(SHMapHandle, 11); MAKEFUNC(GetAcceptLanguagesA, 14); MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(SHSetParentHwnd, 167);

1 0

André Hentschel : Fix typo in WWN 376
by Jeremy Newman Oct. 2, 2014

Oct. 2, 2014

Module: website Branch: master Commit: bf6418c402ead5fd3b9fe425545eecdc27577758 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf6418c402ead5fd3b9fe4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:25:19 2014 +0200 Fix typo in WWN 376 --- wwn/en/wn20140930_376.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wwn/en/wn20140930_376.xml b/wwn/en/wn20140930_376.xml index 9dccc7f..20b123f 100644 --- a/wwn/en/wn20140930_376.xml +++ b/wwn/en/wn20140930_376.xml @@ -28,7 +28,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s posts="0" > -As you might have seen in <a href="//www.winehq.org/wwn/375">WWN 375</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. +As you might have seen in <a href="//www.winehq.org/wwn/369">WWN 369</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. Meanwhile I finished porting the CRT, but after a hackathon last week, we found out that we ran into a chicken-egg situation. @@ -49,7 +49,7 @@ After that the work on libgcc can begin and then we need to get a lot of things > Jacek Caban, who maintains the wine-gecko code, wrote to <a href="//www.winehq.org/pipermail/wine-devel/2014-September/105276.html">wine-devel</a> about an upcoming -wine-gecko version and why it took so long after the last release. +wine-gecko version and why it took so long after the last release. Happy testing! </section>

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmloption.c.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 256204d876cc4588cb2d38896e3beb2e6b59ce1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=256204d876cc4588cb2d38896… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:37 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmloption.c. --- dlls/mshtml/htmloption.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index b5c8b7d..c960528 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -209,11 +209,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR while(1) { nsIDOMNode *child; - nsres = nsIDOMHTMLOptionElement_GetFirstChild(This->nsoption, &child); + nsres = nsIDOMHTMLElement_GetFirstChild(This->element.nselem, &child); if(NS_FAILED(nsres) || !child) break; - nsres = nsIDOMHTMLOptionElement_RemoveChild(This->nsoption, child, &tmp); + nsres = nsIDOMHTMLElement_RemoveChild(This->element.nselem, child, &tmp); nsIDOMNode_Release(child); if(NS_SUCCEEDED(nsres)) { nsIDOMNode_Release(tmp); @@ -231,7 +231,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLOptionElement_AppendChild(This->nsoption, (nsIDOMNode*)text_node, &tmp); + nsres = nsIDOMHTMLElement_AppendChild(This->element.nselem, (nsIDOMNode*)text_node, &tmp); if(NS_SUCCEEDED(nsres)) nsIDOMNode_Release(tmp); else

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlinput.c.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: f30f506d22357818e5e8813275d083f2d9f102c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30f506d22357818e5e881327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:25 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlinput.c. --- dlls/mshtml/htmlinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e568f4b..4ce01b5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -256,6 +256,7 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); nsIDOMHTMLFormElement *nsform; + nsIDOMNode *form_node; HTMLDOMNode *node; HRESULT hres; nsresult nsres; @@ -269,8 +270,12 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF return E_FAIL; } - hres = get_node(This->element.node.doc, (nsIDOMNode*)nsform, TRUE, &node); + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); if (FAILED(hres)) return hres; @@ -1233,7 +1238,7 @@ static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid *handled = TRUE; - nsres = nsIDOMHTMLInputElement_Click(This->nsinput); + nsres = nsIDOMHTMLElement_Click(This->element.nselem); if(NS_FAILED(nsres)) { ERR("Click failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : jscript: Added tests for @if/@elif/@else/@end.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 68c61d17e0c5af5251d440efb0ee7c5292b598f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c61d17e0c5af5251d440efb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:21 2014 +0200 jscript: Added tests for @if/@elif/@else/@end. --- dlls/jscript/tests/cc.js | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index b96f21e..32f827e 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -140,9 +140,107 @@ ok(@test === false, "@test = " + @test); @set @test = (0 != true) ok(@test === true, "@test = " + @test); +(a)if (false) + this wouldn not parse +"@end + +(a)if (false) "@end + +tmp = "@if (false) @end"; +ok(tmp.length === 16, "tmp.length = " + tmp.length); + +(a)if(true) +tmp = true +(a)end +ok(tmp === true, "tmp = " + tmp); + +(a)if(false) +(a)if this would not CC parse +this will not parse +(a)elif(true) +this will also not parse +(a)else +this also will not parse +(a)if let me complicate things a bit +(a)end enough +(a)end +(a)end + +(a)if(false) +this will not parse +(a)else +tmp = 2 +(a)else +this will not be parsed +(a)else +also this +(a)end +ok(tmp === 2, "tmp = " + tmp); + +(a)if(true) +tmp = 3; +(a)else +just skip this +(a)end +ok(tmp === 3, "tmp = " + tmp); + +(a)if(true) +tmp = 4; +(a)elif(true) +this will not parse +(a)elif nor this +(a)else +just skip this +(a)end +ok(tmp === 4, "tmp = " + tmp); + +(a)if(false) +this will not parse +(a)elif(false) +nor this would +(a)elif(true) +tmp = 5; +(a)elif nor this +(a)else +just skip this +(a)end +ok(tmp === 5, "tmp = " + tmp); + +(a)if (!@_jscript) +this would not parse +(a)if(true) +(a)else +(a)if(false) +(a)end +(a)end +(a)elif (@_jscript) +tmp = 6; +(a)elif (true) +(a)if xxx +(a)else +(a)if @elif @elif @else @end +(a)end +(a)else +this would not parse +(a)end +ok(tmp === 6, "tmp = " + tmp); + +(a)if(true) +(a)if(false) +(a)else +tmp = 7; +(a)end +(a)else +this would not parse +(a)end +ok(tmp === 7, "tmp = " + tmp); + var exception_map = { + JS_E_SYNTAX: {type: "SyntaxError", number: -2146827286}, + JS_E_MISSING_LBRACKET: {type: "SyntaxError", number: -2146827283}, JS_E_EXPECTED_IDENTIFIER: {type: "SyntaxError", number: -2146827278}, JS_E_EXPECTED_ASSIGN: {type: "SyntaxError", number: -2146827277}, + JS_E_EXPECTED_CCEND: {type: "SyntaxError", number: -2146827259}, JS_E_EXPECTED_AT: {type: "SyntaxError", number: -2146827256} }; @@ -164,5 +262,11 @@ function testException(src, id) { testException("@set test=true", "JS_E_EXPECTED_AT"); testException("@set @1=true", "JS_E_EXPECTED_IDENTIFIER"); testException("@set @test x=true", "JS_E_EXPECTED_ASSIGN"); +testException("@if false\n(a)end", "JS_E_MISSING_LBRACKET"); +testException("@if (false)\n", "JS_E_EXPECTED_CCEND"); +testException("@end\n", "JS_E_SYNTAX"); +testException("@elif\n", "JS_E_SYNTAX"); +testException("@else\n", "JS_E_SYNTAX"); +testException("@if false\n(a)elif true\n(a)end", "JS_E_MISSING_LBRACKET"); reportSuccess();

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 02b031e61acf2738a772f5a2a82277e36851518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b031e61acf2738a772f5a2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:58 2014 +0200 wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5. --- dlls/wined3d/surface.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b24504e..2ee3db1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1604,7 +1604,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, @@ -3207,35 +3207,22 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - { - /* Converting the 565 format in 5551 packed to emulate color-keying. - - Note : in all these conversion, it would be best to average the averaging - pixels to get the color of the pixel that will be color-keyed to - prevent 'color bleeding'. This will be done later on if ever it is - too visible. - - Note2: Nvidia documents say that their driver does not support alpha + color keying - on the same surface and disables color keying in such a case - */ - const WORD *Source; - WORD *Dest; - - TRACE("Color keyed 565\n"); - - for (y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = *Source++; - *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1)); + for (y = 0; y < height; ++y) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; ++x) + { + WORD color = *(const WORD *)source; if (!color_in_range(&surface->container->src_blt_color_key, color)) - *Dest |= 0x0001; - Dest++; + *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); + else + *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); + source += 2; + dest += 2; } } - } - break; + break; case WINED3D_CT_CK_B5G5R5X1: {

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 6f8cb77ea968ebd671fae17bddccf939b995bd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8cb77ea968ebd671fae17bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:57 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8. --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6672525..b24504e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1638,9 +1638,9 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_P8; - format->glInternal = GL_RGBA; - format->glFormat = GL_RGBA; - format->glType = GL_UNSIGNED_BYTE; + format->glInternal = GL_RGBA8; + format->glFormat = GL_BGRA; + format->glType = GL_UNSIGNED_INT_8_8_8_8_REV; format->conv_byte_count = 4; } } @@ -3180,9 +3180,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { BYTE color = *source++; - *dest++ = palette->colors[color].rgbRed; - *dest++ = palette->colors[color].rgbGreen; *dest++ = palette->colors[color].rgbBlue; + *dest++ = palette->colors[color].rgbGreen; + *dest++ = palette->colors[color].rgbRed; *dest++ = 0; } }

1 0

Henri Verbeet : wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 632d2fca6e27b4498002f98c88add9559e3abed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d2fca6e27b4498002f98c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:56 2014 +0200 wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case. --- dlls/wined3d/surface.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 272b5de..6672525 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3161,6 +3161,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { const BYTE *source; + unsigned int x, y; BYTE *dest; TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", @@ -3171,7 +3172,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) { - unsigned int x, y; const struct wined3d_palette *palette = surface->container->swapchain->palette; for (y = 0; y < height; y++) { @@ -3199,9 +3199,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI * starting and we don't want the screen to flash in an ugly * color. */ FIXME("P8 surface loaded without a palette.\n"); - memset(dst, 0, height * outpitch); + for (y = 0; y < height; ++y) + { + memset(&dst[outpitch * y], 0, width * 4); + } } - break; case WINED3D_CT_CK_B5G6R5: @@ -3216,7 +3218,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Note2: Nvidia documents say that their driver does not support alpha + color keying on the same surface and disables color keying in such a case */ - unsigned int x, y; const WORD *Source; WORD *Dest; @@ -3239,7 +3240,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI case WINED3D_CT_CK_B5G5R5X1: { /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ - unsigned int x, y; const WORD *Source; WORD *Dest; TRACE("Color keyed 5551\n"); @@ -3260,9 +3260,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - { /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ - unsigned int x, y; for (y = 0; y < height; y++) { source = src + pitch * y; @@ -3277,13 +3275,10 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; case WINED3D_CT_CK_B8G8R8X8: - { /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - unsigned int x, y; for (y = 0; y < height; y++) { source = src + pitch * y; @@ -3298,12 +3293,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; case WINED3D_CT_CK_B8G8R8A8: - { - unsigned int x, y; for (y = 0; y < height; ++y) { source = src + pitch * y; @@ -3318,8 +3310,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; default: ERR("Unsupported conversion type %#x.\n", conversion_type);

1 0