September 2019 - Wine-Commits

Jacek Caban : scrobj: Improve debug traces.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: aa503dac9c7505ee36b54d526626c71379156a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa503dac9c7505ee36b54d52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 13:57:55 2019 +0200 scrobj: Improve debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 944bff0de9..8aa1eeb793 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -468,7 +468,7 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, } else { - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p) interface not supported\n", This, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOINTERFACE; } @@ -1325,6 +1325,8 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) { HRESULT hres; + TRACE("\n"); + if (factory->have_registration) { FIXME("duplicated registration element\n");

1 0

Matteo Bruni : d3dx9/tests: Add more tests loading misaligned block textures.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: c29f770e8bf1da56856b457cf92221e88f6323d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f770e8bf1da56856b457c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:56 2019 +0200 d3dx9/tests: Add more tests loading misaligned block textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 57 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2f8149fd01..11bc3159bb 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -181,6 +181,23 @@ static const BYTE dds_dxt5[] = 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, }; +/* 8x8 dxt5 */ +static const BYTE dds_dxt5_8_8[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x08,0x00,0x00,0x00, + 0x08,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0xe0,0x07,0x05,0x05,0x50,0x50, + 0x3f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,0x05,0x05,0x50,0x50, + 0x7f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0xe0,0xff,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x05,0x05,0x50,0x50, +}; + static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size) { DWORD received; @@ -729,13 +746,13 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) IDirect3DSurface9 *surf, *newsurf; RECT rect, destrect; D3DLOCKED_RECT lockrect; - const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; - const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; - const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee }; - const WORD pixdata_a8l8[] = { 0xff00, 0x00ff, 0xff30, 0x7f7f }; - const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 }; - const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 }; - const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 }; + static const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; + static const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; + static const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee }; + static const WORD pixdata_a8l8[] = { 0xff00, 0x00ff, 0xff30, 0x7f7f }; + static const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 }; + static const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 }; + static const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 }; hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); @@ -1303,8 +1320,30 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) D3DFMT_DXT5, 16, NULL, &rect, D3DX_FILTER_POINT, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - check_release((IUnknown*)newsurf, 1); - check_release((IUnknown*)tex, 0); + check_release((IUnknown *)newsurf, 1); + check_release((IUnknown *)tex, 0); + + /* More misalignment tests. */ + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, 0, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + SetRect(&rect, 2, 2, 6, 6); + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, NULL, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, NULL, D3DX_FILTER_POINT, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + check_release((IUnknown *)newsurf, 1); + check_release((IUnknown *)tex, 0); } hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_DXT1, D3DPOOL_SYSTEMMEM, &tex, NULL);

1 0

Ken Thomases : include: Always generate CFI directives on macOS.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 021c5054f6c9eb6773ef99cfaac0fb8c48beea97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=021c5054f6c9eb6773ef99cf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 26 13:38:16 2019 -0500 include: Always generate CFI directives on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47736 Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 01dfdb1deb..8c664476ef 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -33,7 +33,7 @@ # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif -#ifdef __GCC_HAVE_DWARF2_CFI_ASM +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0

Michael Stefaniuc : widl: Add the ARRAY_SIZE() macro.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: bbcf44eb970761d8c40eecc5692cf58ce378a8c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbcf44eb970761d8c40eecc5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 26 17:50:59 2019 +0200 widl: Add the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 5 ++--- tools/widl/utils.c | 2 +- tools/widl/utils.h | 2 ++ tools/widl/widl.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 79e72e0472..cf027558d0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -64,7 +64,6 @@ static const struct oatype { {"VARIANT", VT_VARIANT}, {"VARIANT_BOOL", VT_BOOL} }; -#define NTYPES (sizeof(oatypes)/sizeof(oatypes[0])) #define KWP(p) ((const struct oatype *)(p)) static int kw_cmp_func(const void *s1, const void *s2) @@ -79,11 +78,11 @@ static unsigned short builtin_vt(const type_t *t) const struct oatype *kwp; key.kw = kw; #ifdef KW_BSEARCH - kwp = bsearch(&key, oatypes, NTYPES, sizeof(oatypes[0]), kw_cmp_func); + kwp = bsearch(&key, oatypes, ARRAY_SIZE(oatypes), sizeof(oatypes[0]), kw_cmp_func); #else { unsigned int i; - for (kwp=NULL, i=0; i < NTYPES; i++) + for (kwp = NULL, i = 0; i < ARRAY_SIZE(oatypes); i++) if (!kw_cmp_func(&key, &oatypes[i])) { kwp = &oatypes[i]; break; diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 90668873aa..20c63064c7 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -309,7 +309,7 @@ void add_output_to_resources( const char *type, const char *name ) size_t data_size = output_buffer_pos; size_t header_size = 5 * sizeof(unsigned int) + 2 * sizeof(unsigned short); - assert( nb_resources < sizeof(resources)/sizeof(resources[0]) ); + assert( nb_resources < ARRAY_SIZE( resources )); if (type[0] != '#') header_size += (strlen( type ) + 1) * sizeof(unsigned short); else header_size += 2 * sizeof(unsigned short); diff --git a/tools/widl/utils.h b/tools/widl/utils.h index ec02fc7c37..74dba11d3c 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -34,6 +34,8 @@ int strendswith(const char* str, const char* end); #define __attribute__(X) #endif +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + void parser_error(const char *s) __attribute__((noreturn)); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1620dfdb3a..f5fa20c884 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -302,7 +302,7 @@ static void set_target( const char *target ) if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) { if (!strcmp( cpu_names[i].name, spec )) {

1 0

Sven Baars : msi: Fix a leak on error path (Coverity).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: fe91ae51f1553875c1858df264c0603877d50737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe91ae51f1553875c1858df2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 16:32:28 2019 +0200 msi: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6ccf46ec30..8a28e4d4af 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4033,7 +4033,11 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di msiobj_release( &rec->hdr ); rec = MSI_CreateRecord(2); - if (!rec) return NULL; + if (!rec) + { + msi_dialog_destroy(dialog); + return NULL; + } MSI_RecordSetStringW(rec, 1, name); MSI_RecordSetStringW(rec, 2, szDialogCreated); MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec);

1 0

Sven Baars : httpapi/tests: Initialize response_buffer to 0 (Valgrind).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: a1953e4e2cc9ef51b315c3d7c3543944368268ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1953e4e2cc9ef51b315c3d7… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 14:18:26 2019 +0200 httpapi/tests: Initialize response_buffer to 0 (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 5da7101417..b19a590147 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -614,6 +614,8 @@ static void test_v1_entity_body(void) ret = HttpSendHttpResponse(queue, req->RequestId, 0, (HTTP_RESPONSE *)&response, NULL, NULL, NULL, 0, NULL, NULL); ok(!ret, "Got error %u.\n", ret); + memset(response_buffer, 0, sizeof(response_buffer)); + ret = recv(s, response_buffer, sizeof(response_buffer), 0); ok(ret > 0, "recv() failed.\n"); if (winetest_debug > 1)

1 0

Jacek Caban : scrobj: Ignore processing instructions in scriptlet files.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 142ef8a7e8fd4cb5a7859286deb8a9c4726d8e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=142ef8a7e8fd4cb5a7859286… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 13:57:48 2019 +0200 scrobj: Ignore processing instructions in scriptlet files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 14 ++++++++++++-- dlls/scrobj/tests/scrobj.wsc | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 8aa1eeb793..ce5a3dedd1 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1261,8 +1261,18 @@ static const char *debugstr_xml_name(struct scriptlet_factory *factory) static HRESULT next_xml_node(struct scriptlet_factory *factory, XmlNodeType *node_type) { HRESULT hres; - do hres = IXmlReader_Read(factory->xml_reader, node_type); - while (hres == S_OK && *node_type == XmlNodeType_Whitespace); + for (;;) + { + hres = IXmlReader_Read(factory->xml_reader, node_type); + if (FAILED(hres)) break; + if (*node_type == XmlNodeType_Whitespace) continue; + if (*node_type == XmlNodeType_ProcessingInstruction) + { + FIXME("Ignoring processing instruction\n"); + continue; + } + break; + } return hres; } diff --git a/dlls/scrobj/tests/scrobj.wsc b/dlls/scrobj/tests/scrobj.wsc index 4cc4224dd7..fe32901138 100644 --- a/dlls/scrobj/tests/scrobj.wsc +++ b/dlls/scrobj/tests/scrobj.wsc @@ -4,7 +4,9 @@ </registration> <public> <method name="vbAddOne"> - <PARAMETER name="n"></PARAMETER> + <PARAMETER name="n"> + <?pi xxx="yyy"?> + </PARAMETER> </method> <method name="jsAddTwo" /> <method name="wtTest">

1 0

Matteo Bruni : d3dx9/tests: Add even more tests for misaligned block textures.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 5472b8b98332400a7ad434ed94bed82b21f622fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5472b8b98332400a7ad434ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:57 2019 +0200 d3dx9/tests: Add even more tests for misaligned block textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 68bbd37f8a..ced362ff9f 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1583,6 +1583,28 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) 0x7fff00ff, 0x7fff00ff, 0x7fffff00, 0x7fffff00, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000, 0x7fff00ff, 0x7fff00ff, 0x7fffff00, 0x7fffff00, 0xffffffff, 0xffffffff, 0xff000000, 0xff000000, }; + static const DWORD dds_dxt5_8_8_expected_misaligned_1[] = + { + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x3fff0000, 0x3fff0000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0xff000000, 0xff000000, + }; + static const DWORD dds_dxt5_8_8_expected_misaligned_3[] = + { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0000ff00, 0x0000ff00, 0x3fff0000, 0x3fff0000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x7fff00ff, 0x7fff00ff, 0xff000000, 0xff000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + }; IDirect3DSurface9 *surface, *uncompressed_surface; IDirect3DTexture9 *texture; D3DLOCKED_RECT lock_rect; @@ -1591,6 +1613,7 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) unsigned int i, x, y; DWORD level_count; HRESULT hr; + RECT rect; hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); @@ -1706,6 +1729,75 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 2; ++y) + memset(&((BYTE *)lock_rect.pBits)[y * lock_rect.Pitch], 0, 16 * 2); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + SetRect(&rect, 2, 2, 6, 6); + hr = D3DXLoadSurfaceFromMemory(surface, NULL, NULL, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 8; ++y) + { + for (x = 0; x < 8; ++x) + { + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_1[y * 8 + x], 0), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_1[y * 8 + x]); + } + } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 2; ++y) + memset(&((BYTE *)lock_rect.pBits)[y * lock_rect.Pitch], 0, 16 * 2); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surface, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, NULL, D3DX_FILTER_POINT, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surface, NULL, &rect, &dds_dxt5_8_8[128], + D3DFMT_DXT5, 16 * 2, NULL, &rect, D3DX_FILTER_POINT, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = D3DXLoadSurfaceFromSurface(uncompressed_surface, NULL, NULL, surface, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(uncompressed_surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (y = 0; y < 8; ++y) + { + for (x = 0; x < 8; ++x) + { + ok(compare_color(((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_3[y * 8 + x], 0), + "Color at position %u, %u is 0x%08x, expected 0x%08x.\n", + x, y, ((DWORD *)lock_rect.pBits)[lock_rect.Pitch / 4 * y + x], + dds_dxt5_8_8_expected_misaligned_3[y * 8 + x]); + } + } + hr = IDirect3DSurface9_UnlockRect(uncompressed_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + IDirect3DSurface9_Release(uncompressed_surface); IDirect3DSurface9_Release(surface); IDirect3DTexture9_Release(texture);

1 0

Jacek Caban : scrobj: Use ReadValueChunk to read script body.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: a8af3543745010dd3ff41a16fee0212d571d3118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8af3543745010dd3ff41a16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 13:57:38 2019 +0200 scrobj: Use ReadValueChunk to read script body. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index e9262c53dc..944bff0de9 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1583,8 +1583,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct scriptlet_script *script) { XmlNodeType node_type; + size_t buf_size, size; + WCHAR *new_body; + DWORD read; HRESULT hres; + TRACE("\n"); + for (;;) { hres = IXmlReader_MoveToNextAttribute(factory->xml_reader); @@ -1621,9 +1626,26 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - hres = read_xml_value(factory, &script->body); - if (FAILED(hres)) return hres; + if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + size = 0; + + for (;;) + { + read = 0; + hres = IXmlReader_ReadValueChunk(factory->xml_reader, script->body + size, buf_size - size - 1, &read); + if (FAILED(hres)) return hres; + size += read; + if (hres == S_FALSE) break; + if (size + 1 == buf_size) + { + if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + script->body = new_body; + } + } + script->body[size++] = 0; + if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); }

1 0

Alexandre Julliard : kernel32: Move some misc functions to kernelbase.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: eac5395fb45a56a2e2bff6b42d1bac6fe3bb13f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eac5395fb45a56a2e2bff6b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 14:02:50 2019 +0200 kernel32: Move some misc functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 10 ----- dlls/kernel32/kernel32.spec | 8 ++-- dlls/kernel32/sync.c | 89 ----------------------------------------- dlls/kernel32/version.c | 15 ------- dlls/kernelbase/kernelbase.spec | 8 ++-- dlls/kernelbase/process.c | 30 ++++++++++++++ dlls/kernelbase/sync.c | 50 +++++++++++++++++++++++ dlls/kernelbase/version.c | 10 +++++ 8 files changed, 98 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eac5395fb45a56a2e2bf…

1 0