April 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/tests: Fix some VMR9 test failures.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 409c60f95c483102d87af39ee40ea677e9381ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409c60f95c483102d87af39e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:45 2019 -0500 quartz/tests: Fix some VMR9 test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f8e6f21..88b0562 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode) hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, mode); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); } return filter; @@ -65,7 +65,7 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -82,7 +82,7 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -134,7 +134,7 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -150,19 +150,30 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported, BOOL is_broken) { - IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; - IUnknown *unk; + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; - expected_hr = supported ? S_OK : E_NOINTERFACE; + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(out); + return hr; } static void test_interfaces(void) @@ -188,7 +199,9 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -210,7 +223,7 @@ static void test_interfaces(void) IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo, FALSE);

1 0

Zebediah Figura : quartz/tests: Add tests for VMR9 pin interfaces.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: ea30abde1804c544ae967e791b6a342da65c840a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea30abde1804c544ae967e79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:46 2019 -0500 quartz/tests: Add tests for VMR9 pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 88b0562..a0d2ea1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -178,8 +178,10 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO static void test_interfaces(void) { + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; IBaseFilter *filter = create_vmr9(0); ULONG ref; + IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); @@ -220,6 +222,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); @@ -236,6 +252,20 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Renderless); @@ -251,6 +281,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: f2deab4174270f03cdada49ff42f2752f2328b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2deab4174270f03cdada49f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 5 06:56:51 2019 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/po/lt.po b/po/lt.po index a339fcf..8c6bb23 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-04-02 10:23+0300\n" +"PO-Revision-Date: 2019-04-05 06:56+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7040,80 +7040,56 @@ msgid "No events available.\n" msgstr "Nėra pasiekiamų įvykių.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Invalid media source state transition\n" msgid "Invalid media source state transition.\n" -msgstr "Neteisingas medijos šaltinio būsenos perėjimas\n" +msgstr "Neteisingas medijos šaltinio būsenos perėjimas.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "End of media stream has been reached\n" msgid "End of media stream has been reached.\n" -msgstr "Pasiekta medijos srauto pabaiga\n" +msgstr "Pasiekta medijos srauto pabaiga.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Shutdown() buvo iškviesta.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Media stream has no duration set\n" msgid "Media stream has no duration set.\n" -msgstr "Medijos srautui nenustatyta trukmė\n" +msgstr "Medijos srautui nenustatyta trukmė.\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Media format was recognized but is invalid\n" msgid "Media format was recognized but is invalid.\n" -msgstr "Medijos formatas atpažintas, bet neteisingas\n" +msgstr "Medijos formatas atpažintas, bet neteisingas.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property wasn't found\n" msgid "Property wasn't found.\n" -msgstr "Savybė nerasta\n" +msgstr "Savybė nerasta.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is read-only\n" msgid "Property is read-only.\n" -msgstr "Savybė tik skaitymui\n" +msgstr "Savybė tik skaitymui.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property is not allowed\n" msgid "Property is not allowed.\n" -msgstr "Savybė neleidžiama\n" +msgstr "Savybė neleidžiama.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Media source is not started\n" msgid "Media source is not started.\n" -msgstr "Medijos šaltinis nepradėtas\n" +msgstr "Medijos šaltinis nepradėtas.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported media format\n" msgid "Unsupported media format.\n" -msgstr "Nepalaikomas medijos formatas\n" +msgstr "Nepalaikomas medijos formatas.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Media source is in wrong state\n" msgid "Media source is in wrong state.\n" -msgstr "Medijos šaltinis neteisingoje būsenoje\n" +msgstr "Medijos šaltinis neteisingoje būsenoje.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No media streams were selected\n" msgid "No media streams were selected.\n" -msgstr "Nepasirinktas nė vienas medijos srautas\n" +msgstr "Nepasirinktas nė vienas medijos srautas.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported media source characteristics\n" msgid "Unsupported media source characteristics.\n" -msgstr "Nepalaikomos medijos šaltinio charakteristikos\n" +msgstr "Nepalaikomos medijos šaltinio charakteristikos.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0

Alexandre Julliard : winegcc: Use Wine's msvcrt for Windows builds.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 45bf872a435b8354a9919f87ab49a16c7aba950c URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bf872a435b8354a9919f87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:28:19 2019 +0200 winegcc: Use Wine's msvcrt for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 79a4cbe..674d1a3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -972,11 +972,6 @@ static void build(struct options* opts) /* add the default libraries, if needed */ - if (!opts->nostdlib && opts->use_msvcrt && opts->target_platform != PLATFORM_WINDOWS) - { - if (!is_pe || !opts->shared) add_library(opts, lib_dirs, files, "msvcrt"); - } - if (!opts->wine_objdir && !opts->nodefaultlibs) { if (opts->gui_app) @@ -991,6 +986,7 @@ static void build(struct options* opts) if (!opts->nodefaultlibs) { + if (opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); add_library(opts, lib_dirs, files, "winecrt0"); if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); add_library(opts, lib_dirs, files, "kernel32"); @@ -1108,7 +1104,7 @@ static void build(struct options* opts) char *p = strrchr( lib, '/' ); *p++ = 0; - if (!strncmp( p, "lib", 3 )) + if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" )) { char *ext = strrchr( p, '.' );

1 0

Alexandre Julliard : winecrt0: Avoid using wine/port.h.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: e78ee4f436ec2e5775a8e4e7826612f0a76642fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78ee4f436ec2e5775a8e4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:59:54 2019 +0200 winecrt0: Avoid using wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 69a3ea7..f4b2573 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -20,11 +20,9 @@ #ifdef _WIN32 -#include "config.h" -#include "wine/port.h" - #include <stdio.h> #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -54,7 +52,7 @@ static void load_func( void **func, const char *name, void *def ) { HMODULE module = GetModuleHandleA( "ntdll.dll" ); void *proc = GetProcAddress( module, name ); - interlocked_xchg_ptr( func, proc ? proc : def ); + InterlockedExchangePointer( func, proc ? proc : def ); } } #define LOAD_FUNC(name) load_func( (void **)&p ## name, #name, fallback ## name ) @@ -164,8 +162,8 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) char *ret = _strdup( str ); int idx; - idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); - free( interlocked_xchg_ptr( (void **)&list[idx], ret )); + idx = InterlockedIncrement( &pos ) % ARRAY_SIZE(list); + free( InterlockedExchangePointer( (void **)&list[idx], ret )); return ret; } @@ -174,7 +172,7 @@ static int __cdecl fallback__wine_dbg_output( const char *str ) size_t len = strlen( str ); if (!len) return 0; - interlocked_xchg( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); + InterlockedExchange( (LONG *)&partial_line_tid, str[len - 1] != '\n' ? GetCurrentThreadId() : 0 ); return fwrite( str, 1, len, stderr ); }

1 0

Alexandre Julliard : configure: Check for supported warning flags also for the cross-compiler.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 870f99eced99dc143efb71f95c2cb91d40ea46cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=870f99eced99dc143efb71f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 18:47:44 2019 +0200 configure: Check for supported warning flags also for the cross-compiler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + aclocal.m4 | 23 ++ configure | 636 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 36 ++++ tools/makedep.c | 4 +- 5 files changed, 699 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=870f99eced99dc143efb…

1 0

Zebediah Figura : ddraw/tests: Add some tests for calling stateblock methods while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 7df470164bd4ba173921caacf0ad671e180894f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df470164bd4ba173921caac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:55 2019 -0500 ddraw/tests: Add some tests for calling stateblock methods while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 423dba5..168253e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15822,6 +15822,77 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_begin_end_state_block(void) +{ + DWORD stateblock, stateblock2; + IDirect3DDevice7 *device; + ULONG refcount; + DWORD value; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + stateblock = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + todo_wine ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginStateBlock(device); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15966,4 +16037,5 @@ START_TEST(ddraw7) test_multiply_transform(); test_alphatest(); test_clipper_refcount(); + test_begin_end_state_block(); }

1 0

Zebediah Figura : ddraw: Forbid applying a stateblock while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 5fd14a4e6273089f3ecae6608240278ead563ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd14a4e6273089f3ecae660… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:58 2019 -0500 ddraw: Forbid applying a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 49eb664..0ddf9a8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5822,6 +5822,12 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb TRACE("iface %p, stateblock %#x.\n", iface, stateblock); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK); if (!wined3d_sb) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e10aedb..ff73eea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15866,7 +15866,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); @@ -15886,7 +15886,7 @@ static void test_begin_end_state_block(void) hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Zebediah Figura : ddraw: Forbid capturing a stateblock while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 0da6f2a66a44e9bae5d724b59f54b58cb1359ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da6f2a66a44e9bae5d724b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:59 2019 -0500 ddraw: Forbid capturing a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0ddf9a8..b471612 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5882,6 +5882,12 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat TRACE("iface %p, stateblock %#x.\n", iface, stateblock); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to capture a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK); if (!wined3d_sb) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ff73eea..61042e3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15869,7 +15869,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : makefiles: Don' t link against wine_port when using msvcrt.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 3e6a4c4a5cd8d47fac8e4cdc814ebb2a2b2f2ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6a4c4a5cd8d47fac8e4cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 10:01:12 2019 +0200 makefiles: Don't link against wine_port when using msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2b916af..a03222b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2057,7 +2057,7 @@ static struct strarray add_default_libraries( const struct makefile *make, struc struct strarray all_libs = empty_strarray; unsigned int i, j; - strarray_add( &all_libs, "-lwine_port" ); + if (!make->use_msvcrt) strarray_add( &all_libs, "-lwine_port" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs );

1 0

Piotr Caban : msi: Use case sensitive compare in handle_msi_break.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 8c4b75f252dd5f127320144a43472d4558489af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4b75f252dd5f127320144a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 19:57:05 2019 +0200 msi: Use case sensitive compare in handle_msi_break. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index facb1d8..647961c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -468,7 +468,7 @@ static void handle_msi_break(LPCSTR target) if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) return; - if (strcasecmp(val, target)) + if (strcmp(val, target)) return; sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId());

1 0

Piotr Caban : wineps.drv: Don't use strcasecmp.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: c191a1d44dc4464ed7c6c69b03253d239f17743e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c191a1d44dc4464ed7c6c69b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:50 2019 +0200 wineps.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/builtin.c | 3 ++- dlls/wineps.drv/font.c | 5 +++-- dlls/wineps.drv/mkagl.c | 4 ++-- dlls/wineps.drv/ppd.c | 21 +++++++++++---------- dlls/wineps.drv/type1afm.c | 7 ++++--- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index e2106d3..75485cd 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -28,6 +28,7 @@ #include "winerror.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -168,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, /* Look for a matching font family */ for(family = physDev->pi->Fonts; family; family = family->next) { - if(!strcasecmp(FaceName, family->FamilyName)) + if(!_strnicmp(FaceName, family->FamilyName, -1)) break; } diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index c8ec976..5c5033c 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winnls.h" #include "winspool.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -93,8 +94,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) for (i = 0; i < physDev->pi->FontSubTableSize; ++i) { - if (!strcasecmp (FaceName, - physDev->pi->FontSubTable[i].pValueName)) + if (!_strnicmp (FaceName, + physDev->pi->FontSubTable[i].pValueName, -1)) { TRACE ("substituting facename '%s' for '%s'\n", (LPSTR) physDev->pi->FontSubTable[i].pData, FaceName); diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index f8919e3..788fb6e 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -190,8 +190,8 @@ static void read_afms(FILE *f_c, FILE *f_h) char *cp, linebuf[256], font_family[128]; int i, num_metrics; - cp = strrchr(de->d_name, '.'); /* Does it end in */ - if (cp == NULL || strcasecmp(cp, ".afm") != 0) /* .afm or .AFM? */ + cp = strrchr(de->d_name, '.'); /* Does it end in */ + if (cp == NULL || _strnicmp(cp, ".afm", -1) != 0) /* .afm or .AFM? */ continue; f = fopen(de->d_name, "r"); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index f8de57b..08d07b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -30,6 +30,7 @@ #include <assert.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "psdrv.h" @@ -748,7 +749,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*ColorDevice", tuple.key)) { - if(!strcasecmp(tuple.value, "true")) + if(!_strnicmp(tuple.value, "true", -1)) ppd->ColorDevice = CD_True; else ppd->ColorDevice = CD_False; @@ -966,13 +967,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*TTRasterizer", tuple.key)) { - if(!strcasecmp("None", tuple.value)) + if(!_strnicmp("None", tuple.value, -1)) ppd->TTRasterizer = RO_None; - else if(!strcasecmp("Accept68K", tuple.value)) + else if(!_strnicmp("Accept68K", tuple.value, -1)) ppd->TTRasterizer = RO_Accept68K; - else if(!strcasecmp("Type42", tuple.value)) + else if(!_strnicmp("Type42", tuple.value, -1)) ppd->TTRasterizer = RO_Type42; - else if(!strcasecmp("TrueImage", tuple.value)) + else if(!_strnicmp("TrueImage", tuple.value, -1)) ppd->TTRasterizer = RO_TrueImage; else { FIXME("Unknown option %s for *TTRasterizer\n", @@ -988,14 +989,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) duplex->Name = tuple.option; duplex->FullName = tuple.opttrans; duplex->InvocationString = tuple.value; - if(!strcasecmp("None", tuple.option) || !strcasecmp("False", tuple.option) - || !strcasecmp("Simplex", tuple.option)) + if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1) + || !_strnicmp("Simplex", tuple.option, -1)) duplex->WinDuplex = DMDUP_SIMPLEX; - else if(!strcasecmp("DuplexNoTumble", tuple.option)) + else if(!_strnicmp("DuplexNoTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_VERTICAL; - else if(!strcasecmp("DuplexTumble", tuple.option)) + else if(!_strnicmp("DuplexTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_HORIZONTAL; - else if(!strcasecmp("Notcapable", tuple.option)) + else if(!_strnicmp("Notcapable", tuple.option, -1)) duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index f9a8bcb..19bb2d3 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -48,6 +48,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -464,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "false") == 0) + if (_strnicmp(sz, "false", -1) == 0) { afm->IsFixedPitch = FALSE; *p_found = TRUE; @@ -472,7 +473,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "true") == 0) + if (_strnicmp(sz, "true", -1) == 0) { afm->IsFixedPitch = TRUE; *p_found = TRUE; @@ -1142,7 +1143,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) CHAR *file_extension = strchr(dent->d_name, '.'); int fn_len; - if (file_extension == NULL || strcasecmp(file_extension, ".afm") != 0) + if (file_extension == NULL || _strnicmp(file_extension, ".afm", -1) != 0) continue; fn_len = snprintf(filename, 256, "%s/%s", dirname, dent->d_name);

1 0

Alexandre Julliard : kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 35d202fc0982da4e7ae3596414482318af118acb URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d202fc0982da4e7ae35964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:42:09 2019 +0200 kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 8 +++++++- dlls/kernel32/tests/module.c | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index eb0471c..2f078a0 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1102,6 +1102,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { + void *ptr = (void *)((ULONG_PTR)hLibModule & ~3); + if (!RtlImageNtHeader( ptr )) + { + SetLastError( ERROR_BAD_EXE_FORMAT ); + return FALSE; + } if ((ULONG_PTR)hLibModule & 1) { struct exclusive_datafile *file; @@ -1119,7 +1125,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) } LdrUnlockLoaderLock( 0, magic ); } - return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); + return UnmapViewOfFile( ptr ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 3e077f3..c059b98 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -430,6 +430,11 @@ static void testLoadLibraryEx(void) ok(hmodule != 0, "Expected valid module handle\n"); SetLastError(0xdeadbeef); + ret = FreeLibrary( (HMODULE)((ULONG_PTR)hmodule + 0x1230)); + ok(!ret, "Free succeeded on wrong handle\n"); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = FreeLibrary(hmodule); ok(ret, "Expected to be able to free the module, failed with %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Paul Gofman : wined3d: Store and use stream offset in state block.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 57653b9527ed377747b898f11484219466902fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=57653b9527ed377747b898f1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 4 19:07:13 2019 +0300 wined3d: Store and use stream offset in state block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21161 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/stateblock.c | 79 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/device.c | 1 + dlls/wined3d/stateblock.c | 30 ++++++++++++---- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 87 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57653b9527ed377747b8…

1 0

Alexandre Julliard : winmm/tests: Fix printf format warnings for the Windows build.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 1c7312a0c66e56c1d44d086849682a30145dd0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7312a0c66e56c1d44d0868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 18:47:14 2019 +0200 winmm/tests: Fix printf format warnings for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 11 +++++------ dlls/winmm/tests/wave.c | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index ba71f9c..4290c35 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -141,7 +141,8 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; win=NULL; - rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags); + flags |= CALLBACK_EVENT; + rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || @@ -154,8 +155,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), "waveInOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc)); + pwfx->nChannels,flags,wave_open_flags(flags),wave_in_error(rc)); if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) trace(" Reason: The device lists this format as supported in its " @@ -261,10 +261,9 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, rc==MMSYSERR_ALLOCATED || ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && !(pcaps->dwFormats & format)), - "waveOutOpen(%s) format=%dx%2dx%d flags=%x(%s) rc=%s\n", + "waveOutOpen(%s) format=%dx%2dx%d flags=CALLBACK_EVENT rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT),wave_out_error(rc)); + pwfx->nChannels,wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { rc=waveOutPrepareHeader(wout, &frag, sizeof(frag)); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 9c114c8..a2f2a82 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -665,8 +665,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), "waveOutOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc)); + pwfx->nChannels,flags,wave_open_flags(flags),wave_out_error(rc)); if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) trace(" Reason: The device lists this format as supported in its "

1 0

Zebediah Figura : ddraw: Return D3DERR_INBEGINSTATEBLOCK when BeginStateBlock() is called while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: f9b9004f81ab5c1c9fbbc507bac963fb71de92af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9b9004f81ab5c1c9fbbc507… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:56 2019 -0500 ddraw: Return D3DERR_INBEGINSTATEBLOCK when BeginStateBlock() is called while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 10 +++++++++- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2e58123..19f21a8 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -346,6 +346,8 @@ struct d3d_device D3DMATRIXHANDLE world, proj, view; struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; + + BOOL recording; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index adfbc41..4ab7621 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5644,7 +5644,14 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_begin_stateblock(device->wined3d_device); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) + device->recording = TRUE; wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -5705,6 +5712,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl *stateblock = 0; return hr_ddraw_from_wined3d(hr); } + device->recording = FALSE; h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); if (h == DDRAW_INVALID_HANDLE) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 168253e..c0d2aad 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15863,7 +15863,7 @@ static void test_begin_end_state_block(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginStateBlock(device); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : ddraw: Return D3DERR_NOTINBEGINSTATEBLOCK when EndStateBlock() is called while not recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 90af51d041103ae4e8990077b85dfb79f5cc466b URL: https://source.winehq.org/git/wine.git/?a=commit;h=90af51d041103ae4e8990077… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:57 2019 -0500 ddraw: Return D3DERR_NOTINBEGINSTATEBLOCK when EndStateBlock() is called while not recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 7 ++++++- dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4ab7621..49eb664 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5703,7 +5703,12 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - + if (!device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); + return D3DERR_NOTINBEGINSTATEBLOCK; + } hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_sb); if (FAILED(hr)) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c0d2aad..e10aedb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15852,8 +15852,8 @@ static void test_begin_end_state_block(void) stateblock2 = 0xdeadbeef; hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); - todo_wine ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Paul Gofman : d3d8: Keep previous stream source stride only when setting NULL buffer.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 1035d2ae28b5bcf53d9f2a4d83d83cc174fd4ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1035d2ae28b5bcf53d9f2a4d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 4 23:13:06 2019 +0300 d3d8: Keep previous stream source stride only when setting NULL buffer. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 11 ++++------- dlls/d3d8/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4eb44e2..3dce0f6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3282,16 +3282,13 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, iface, stream_idx, buffer, stride); wined3d_mutex_lock(); - if (!stride) - { - unsigned int cur_offset; - - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &cur_offset, &stride); - } if (!buffer_impl) + { + wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + NULL, &stride); wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; else diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index af58789..b0a279b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2310,6 +2310,55 @@ cleanup: DestroyWindow(window); } +static void test_set_stream_source(void) +{ + IDirect3DVertexBuffer8 *vb, *current_vb; + IDirect3DDevice8 *device; + unsigned int stride; + IDirect3D8 *d3d8; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d8, window, NULL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + goto cleanup; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 512, 0, 0, D3DPOOL_DEFAULT, &vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 32); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer8_Release(current_vb); + ok(!stride, "Got unexpected stride %u.\n", stride); + + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +cleanup: + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + static void test_render_zero_triangles(void) { IDirect3DDevice8 *device; @@ -9774,6 +9823,7 @@ START_TEST(device) test_shader(); test_limits(); test_lights(); + test_set_stream_source(); test_ApplyStateBlock(); test_render_zero_triangles(); test_depth_stencil_reset();

1 0

Alexandre Julliard : msvcrt: Don't export _matherr().
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 9a364c1a663611f9ef6668ebb71e792f03be1add URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a364c1a663611f9ef6668eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:27:37 2019 +0200 msvcrt: Don't export _matherr(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 28 +++++++++++----------------- dlls/msvcrt/msvcrt.spec | 1 - dlls/msvcrt20/msvcrt20.c | 10 ++++++++++ dlls/msvcrt20/msvcrt20.spec | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ca181d9..754e46c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -62,24 +62,26 @@ void msvcrt_init_math(void) } /********************************************************************* - * _matherr (MSVCRT.@) + * _matherr (CRTDLL.@) */ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) { - int ret; + return 0; +} - if (e) - TRACE("(%p = {%d, \"%s\", %g, %g, %g})\n", e, e->type, e->name, e->arg1, e->arg2, e->retval); - else - TRACE("(null)\n"); + +static void math_error(int type, const char *name, double arg1, double arg2, double retval) +{ + TRACE("(%d, %s, %g, %g, %g)\n", type, debugstr_a(name), arg1, arg2, retval); if (MSVCRT_default_matherr_func) { - ret = MSVCRT_default_matherr_func(e); - if (ret) return ret; + struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; + + if (MSVCRT_default_matherr_func(&exception)) return; } - switch (e->type) + switch (type) { case _DOMAIN: *MSVCRT__errno() = MSVCRT_EDOM; @@ -94,8 +96,6 @@ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) default: ERR("Unhandled math error!\n"); } - - return 0; } /********************************************************************* @@ -107,12 +107,6 @@ void CDECL MSVCRT___setusermatherr(MSVCRT_matherr_func func) TRACE("new matherr handler %p\n", func); } -static inline void math_error(int type, const char *name, double arg1, double arg2, double retval) -{ - struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; - MSVCRT__matherr(&exception); -} - /********************************************************************* * _set_SSE2_enable (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 101e2c7..0c2881d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -683,7 +683,6 @@ @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s # stub _malloc_dbg(long long str long) -@ cdecl _matherr(ptr) MSVCRT__matherr @ cdecl _mbbtombc(long) # stub _mbbtombc_l(long ptr) @ cdecl _mbbtype(long long) diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c index e8d2b3c..3cb1e67 100644 --- a/dlls/msvcrt20/msvcrt20.c +++ b/dlls/msvcrt20/msvcrt20.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <math.h> #include "windef.h" @@ -48,3 +49,12 @@ void CDECL MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, { __wgetmainargs( argc, wargv, wenvp, expand_wildcards, &new_mode ); } + + +/********************************************************************* + * _matherr (MSVCRT20.@) + */ +int CDECL MSVCRT20__matherr(struct _exception *e) +{ + return 0; +} diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 6ced0fd..84a1014 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1012,7 +1012,7 @@ @ cdecl _ltoa(long ptr long) msvcrt._ltoa @ cdecl _ltow(long ptr long) msvcrt._ltow @ cdecl _makepath(ptr str str str str) msvcrt._makepath -@ cdecl _matherr(ptr) msvcrt._matherr +@ cdecl _matherr(ptr) MSVCRT20__matherr @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype @ cdecl _mbccpy(ptr ptr) msvcrt._mbccpy

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.8.1.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 4cae8334159a692c0e6a2623729502c34f5a2fc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cae8334159a692c0e6a2623… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:29 2019 -0500 mscoree: Update Wine Mono to 4.8.1. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b070307..143931b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.0" -#define MONO_SHA "890159ffd1679ca7d45e840e1890caba8c24acbc18c59db1ca718b35a5ab8778" +#define MONO_VERSION "4.8.1" +#define MONO_SHA "4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index db5f426..198e279 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.8.0"; + static const char* mono_version = "4.8.1"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Matteo Bruni : d3dx9: Fix argument type in convert_dib_to_bmp().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 8bed853c4380ebf86220ffe2fd89d48d98a90921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bed853c4380ebf86220ffe2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 4 16:56:03 2019 +0200 d3dx9: Fix argument type in convert_dib_to_bmp(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index cf8286e..c82c222 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -770,7 +770,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co return D3D_OK; } -static BOOL convert_dib_to_bmp(void **data, UINT *size) +static BOOL convert_dib_to_bmp(const void **data, unsigned int *size) { ULONG header_size; ULONG count = 0; @@ -878,7 +878,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, } /* In case of DIB file, convert it to BMP */ - dib = convert_dib_to_bmp((void**)&data, &datasize); + dib = convert_dib_to_bmp(&data, &datasize); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); @@ -1154,7 +1154,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, } if (imginfo.ImageFileFormat == D3DXIFF_DIB) - convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); + convert_dib_to_bmp(&pSrcData, &SrcDataSize); if (FAILED(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto cleanup_err;

1 0

Christian Costa : d3dx9/tests: Add tests for 32 bpp BMP with alpha.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: a30fd8c0e44833b2a6412987a348273bfe42fe2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30fd8c0e44833b2a6412987… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 4 16:54:34 2019 +0200 d3dx9/tests: Add tests for 32 bpp BMP with alpha. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index b7c52a2..56b79d8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -67,6 +67,26 @@ static const unsigned char bmp_8bpp[] = { 0x00,0x00 }; +/* 2x2 bmp (32 bpp XRGB) */ +static const unsigned char bmp_32bpp_xrgb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x00 +}; + +/* 2x2 bmp (32 bpp ARGB) */ +static const unsigned char bmp_32bpp_argb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x01 +}; + static const unsigned char png_grayscale[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, @@ -560,6 +580,13 @@ static void test_D3DXGetImageInfo(void) ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_xrgb, sizeof(bmp_32bpp_xrgb), &info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Format == D3DFMT_X8R8G8B8, "Got unexpected format %u.\n", info.Format); + hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), &info); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); + /* Grayscale PNG */ hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Zebediah Figura : d3d8: Forbid capturing a stateblock while recording.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 2e01e46aeb06e7ec880efcf639f2ce202ce93fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e01e46aeb06e7ec880efcf6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:43 2019 -0500 d3d8: Forbid capturing a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 381588f..4bd7578 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1964,6 +1964,12 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO TRACE("iface %p, token %#x.\n", iface, token); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to capture stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } stateblock = d3d8_get_object(&device->handle_table, token - 1, D3D8_HANDLE_SB); if (!stateblock) { diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fee73de..37f4c5c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7280,7 +7280,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : d3d8: Forbid applying a stateblock while recording.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: d63e1bc9ab5aa60a952ad7b06101e37c48f4cde7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63e1bc9ab5aa60a952ad7b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:42 2019 -0500 d3d8: Forbid applying a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5016ac4..381588f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1924,6 +1924,12 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD return D3D_OK; wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } stateblock = d3d8_get_object(&device->handle_table, token - 1, D3D8_HANDLE_SB); if (!stateblock) { diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f0acd9f..fee73de 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7277,7 +7277,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); @@ -7297,7 +7297,7 @@ static void test_begin_end_state_block(void) hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Paul Gofman : d3d9: Keep previous stream source stride and offset only when setting NULL buffer.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 467199d59385e8bb145190e11a5a6fde906b81c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=467199d59385e8bb145190e1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 3 20:26:06 2019 +0300 d3d9: Keep previous stream source stride and offset only when setting NULL buffer. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 +++------- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bad9211..f7f9358 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3558,13 +3558,9 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, stride); wined3d_mutex_lock(); - if (!stride) - { - unsigned int cur_offset; - - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &cur_offset, &stride); - } + if (!buffer_impl) + wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + &offset, &stride); if (!buffer_impl) wined3d_buffer = NULL; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e7366b1..f5c8972 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3240,7 +3240,8 @@ cleanup: static void test_set_stream_source(void) { - IDirect3DVertexBuffer9 *vb; + IDirect3DVertexBuffer9 *vb, *current_vb; + unsigned int offset, stride; IDirect3DDevice9 *device; IDirect3D9 *d3d9; ULONG refcount; @@ -3273,7 +3274,24 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 3, 32); ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 4, 32); - ok(SUCCEEDED(hr), "Failed to set the stream source, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(offset == 4, "Got unexpected offset %u.\n", offset); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer9_Release(current_vb); + ok(!offset, "Got unexpected offset %u.\n", offset); + ok(!stride, "Got unexpected stride %u.\n", stride); /* Try to set the NULL buffer with an offset and stride 0 */ hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0);

1 0