wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Jacek Caban : vbscript: Use wide char literals for lexer keywords.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 55e9c896cac1160a43f79e508b323bd23167589f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e9c896cac1160a43f79e50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 29 19:01:02 2019 +0100 vbscript: Use wide char literals for lexer keywords. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 172 +++++++++++++++++----------------------------------- 1 file changed, 57 insertions(+), 115 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 510ac0918b..6b20d1979d 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -28,125 +28,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); -static const WCHAR andW[] = {'a','n','d',0}; -static const WCHAR byrefW[] = {'b','y','r','e','f',0}; -static const WCHAR byvalW[] = {'b','y','v','a','l',0}; -static const WCHAR callW[] = {'c','a','l','l',0}; -static const WCHAR caseW[] = {'c','a','s','e',0}; -static const WCHAR classW[] = {'c','l','a','s','s',0}; -static const WCHAR constW[] = {'c','o','n','s','t',0}; -static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; -static const WCHAR dimW[] = {'d','i','m',0}; -static const WCHAR doW[] = {'d','o',0}; -static const WCHAR eachW[] = {'e','a','c','h',0}; -static const WCHAR elseW[] = {'e','l','s','e',0}; -static const WCHAR elseifW[] = {'e','l','s','e','i','f',0}; -static const WCHAR emptyW[] = {'e','m','p','t','y',0}; -static const WCHAR endW[] = {'e','n','d',0}; -static const WCHAR eqvW[] = {'e','q','v',0}; -static const WCHAR errorW[] = {'e','r','r','o','r',0}; -static const WCHAR exitW[] = {'e','x','i','t',0}; -static const WCHAR explicitW[] = {'e','x','p','l','i','c','i','t',0}; -static const WCHAR falseW[] = {'f','a','l','s','e',0}; -static const WCHAR forW[] = {'f','o','r',0}; -static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; -static const WCHAR getW[] = {'g','e','t',0}; -static const WCHAR gotoW[] = {'g','o','t','o',0}; -static const WCHAR ifW[] = {'i','f',0}; -static const WCHAR impW[] = {'i','m','p',0}; -static const WCHAR inW[] = {'i','n',0}; -static const WCHAR isW[] = {'i','s',0}; -static const WCHAR letW[] = {'l','e','t',0}; -static const WCHAR loopW[] = {'l','o','o','p',0}; -static const WCHAR meW[] = {'m','e',0}; -static const WCHAR modW[] = {'m','o','d',0}; -static const WCHAR newW[] = {'n','e','w',0}; -static const WCHAR nextW[] = {'n','e','x','t',0}; -static const WCHAR notW[] = {'n','o','t',0}; -static const WCHAR nothingW[] = {'n','o','t','h','i','n','g',0}; -static const WCHAR nullW[] = {'n','u','l','l',0}; -static const WCHAR onW[] = {'o','n',0}; -static const WCHAR optionW[] = {'o','p','t','i','o','n',0}; -static const WCHAR orW[] = {'o','r',0}; -static const WCHAR privateW[] = {'p','r','i','v','a','t','e',0}; -static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; -static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; -static const WCHAR remW[] = {'r','e','m',0}; -static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; -static const WCHAR selectW[] = {'s','e','l','e','c','t',0}; -static const WCHAR setW[] = {'s','e','t',0}; -static const WCHAR stepW[] = {'s','t','e','p',0}; -static const WCHAR stopW[] = {'s','t','o','p',0}; -static const WCHAR subW[] = {'s','u','b',0}; -static const WCHAR thenW[] = {'t','h','e','n',0}; -static const WCHAR toW[] = {'t','o',0}; -static const WCHAR trueW[] = {'t','r','u','e',0}; -static const WCHAR untilW[] = {'u','n','t','i','l',0}; -static const WCHAR wendW[] = {'w','e','n','d',0}; -static const WCHAR whileW[] = {'w','h','i','l','e',0}; -static const WCHAR xorW[] = {'x','o','r',0}; - static const struct { const WCHAR *word; int token; } keywords[] = { - {andW, tAND}, - {byrefW, tBYREF}, - {byvalW, tBYVAL}, - {callW, tCALL}, - {caseW, tCASE}, - {classW, tCLASS}, - {constW, tCONST}, - {defaultW, tDEFAULT}, - {dimW, tDIM}, - {doW, tDO}, - {eachW, tEACH}, - {elseW, tELSE}, - {elseifW, tELSEIF}, - {emptyW, tEMPTY}, - {endW, tEND}, - {eqvW, tEQV}, - {errorW, tERROR}, - {exitW, tEXIT}, - {explicitW, tEXPLICIT}, - {falseW, tFALSE}, - {forW, tFOR}, - {functionW, tFUNCTION}, - {getW, tGET}, - {gotoW, tGOTO}, - {ifW, tIF}, - {impW, tIMP}, - {inW, tIN}, - {isW, tIS}, - {letW, tLET}, - {loopW, tLOOP}, - {meW, tME}, - {modW, tMOD}, - {newW, tNEW}, - {nextW, tNEXT}, - {notW, tNOT}, - {nothingW, tNOTHING}, - {nullW, tNULL}, - {onW, tON}, - {optionW, tOPTION}, - {orW, tOR}, - {privateW, tPRIVATE}, - {propertyW, tPROPERTY}, - {publicW, tPUBLIC}, - {remW, tREM}, - {resumeW, tRESUME}, - {selectW, tSELECT}, - {setW, tSET}, - {stepW, tSTEP}, - {stopW, tSTOP}, - {subW, tSUB}, - {thenW, tTHEN}, - {toW, tTO}, - {trueW, tTRUE}, - {untilW, tUNTIL}, - {wendW, tWEND}, - {whileW, tWHILE}, - {xorW, tXOR} + {L"and", tAND}, + {L"byref", tBYREF}, + {L"byval", tBYVAL}, + {L"call", tCALL}, + {L"case", tCASE}, + {L"class", tCLASS}, + {L"const", tCONST}, + {L"default", tDEFAULT}, + {L"dim", tDIM}, + {L"do", tDO}, + {L"each", tEACH}, + {L"else", tELSE}, + {L"elseif", tELSEIF}, + {L"empty", tEMPTY}, + {L"end", tEND}, + {L"eqv", tEQV}, + {L"error", tERROR}, + {L"exit", tEXIT}, + {L"explicit", tEXPLICIT}, + {L"false", tFALSE}, + {L"for", tFOR}, + {L"function", tFUNCTION}, + {L"get", tGET}, + {L"goto", tGOTO}, + {L"if", tIF}, + {L"imp", tIMP}, + {L"in", tIN}, + {L"is", tIS}, + {L"let", tLET}, + {L"loop", tLOOP}, + {L"me", tME}, + {L"mod", tMOD}, + {L"new", tNEW}, + {L"next", tNEXT}, + {L"not", tNOT}, + {L"nothing", tNOTHING}, + {L"null", tNULL}, + {L"on", tON}, + {L"option", tOPTION}, + {L"or", tOR}, + {L"private", tPRIVATE}, + {L"property", tPROPERTY}, + {L"public", tPUBLIC}, + {L"rem", tREM}, + {L"resume", tRESUME}, + {L"select", tSELECT}, + {L"set", tSET}, + {L"step", tSTEP}, + {L"stop", tSTOP}, + {L"sub", tSUB}, + {L"then", tTHEN}, + {L"to", tTO}, + {L"true", tTRUE}, + {L"until", tUNTIL}, + {L"wend", tWEND}, + {L"while", tWHILE}, + {L"xor", tXOR} }; static inline BOOL is_identifier_char(WCHAR c)

1 0

Daniel Lehman : msvcrt/tests: Fix _lseek arguments.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 0357dfbc7e4caa08d88498db5d36e7dfa393a778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0357dfbc7e4caa08d88498db… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 29 10:04:06 2019 -0700 msvcrt/tests: Fix _lseek arguments. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fe62d5c385..0ed59e347e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2548,7 +2548,7 @@ static void test__creat(void) pos = _tell(fd); ok(pos == 6, "expected pos 6 (text mode), got %d\n", pos); } - ok(_lseek(fd, SEEK_SET, 0) == 0, "_lseek failed\n"); + ok(_lseek(fd, 0, SEEK_SET) == 0, "_lseek failed\n"); count = _read(fd, buf, 6); ok(count == 4, "_read returned %d, expected 4\n", count); count = count > 0 ? count > 4 ? 4 : count : 0; @@ -2568,7 +2568,7 @@ static void test__creat(void) pos = _tell(fd); ok(pos == 4, "expected pos 4 (binary mode), got %d\n", pos); } - ok(_lseek(fd, SEEK_SET, 0) == 0, "_lseek failed\n"); + ok(_lseek(fd, 0, SEEK_SET) == 0, "_lseek failed\n"); count = _read(fd, buf, 6); ok(count == 4, "_read returned %d, expected 4\n", count); count = count > 0 ? count > 4 ? 4 : count : 0;

1 0

Hans Leidekker : msi/tests: Remove workarounds for Windows 2000.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 71f755820642777261c54d3fe6a04ba202059340 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f755820642777261c54d3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:44 2019 +0100 msi/tests: Remove workarounds for Windows 2000. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 84 ++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71f755820642777261c5…

1 0

Hans Leidekker : msi/tests: Run the package tests from a temporary directory.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 8503ad172229979e9929e8d54dac546c5b799a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8503ad172229979e9929e8d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:43 2019 +0100 msi/tests: Run the package tests from a temporary directory. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ba1b83a6fb..3c547bf04a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9640,15 +9640,25 @@ static void test_top_level_action(void) START_TEST(package) { + char temp_path[MAX_PATH], prev_path[MAX_PATH]; STATEMGRSTATUS status; BOOL ret = FALSE; + DWORD len; init_functionpointers(); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + GetCurrentDirectoryA(MAX_PATH, prev_path); + GetTempPathA(MAX_PATH, temp_path); + SetCurrentDirectoryA(temp_path); + + lstrcpyA(CURR_DIR, temp_path); + len = lstrlenA(CURR_DIR); + + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. @@ -9706,4 +9716,6 @@ START_TEST(package) if (ret) remove_restore_point(status.llSequenceNumber); } + + SetCurrentDirectoryA(prev_path); }

1 0

Hans Leidekker : msi/tests: Fix test failures.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 1b4b37cc7e05724fac235cef278a97b358d0cba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b4b37cc7e05724fac235cef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 29 10:58:42 2019 +0100 msi/tests: Fix test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/package.c | 9 ++++ dlls/msi/tests/source.c | 21 +++++++++ 3 files changed, 149 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b4b37cc7e05724fac23…

1 0

Alistair Leslie-Hughes : uianimation/tests: Add IUIAnimationTimer test.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: ecb59b0b8ce4fa219065f940b75ffae0306ef1d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb59b0b8ce4fa219065f940… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 29 00:29:00 2019 +0000 uianimation/tests: Add IUIAnimationTimer test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/tests/uianimation.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c index 0cb2fbf2b8..5c85e8f4dc 100644 --- a/dlls/uianimation/tests/uianimation.c +++ b/dlls/uianimation/tests/uianimation.c @@ -47,6 +47,42 @@ static void test_UIAnimationManager(void) IUIAnimationManager_Release(manager); } +static void test_IUIAnimationTimer(void) +{ + HRESULT hr; + IUIAnimationTimer *timer; + + hr = CoCreateInstance( &CLSID_UIAnimationTimer, NULL, CLSCTX_ALL, &IID_IUIAnimationTimer, (void**)&timer); + if(FAILED(hr)) + { + win_skip("IUIAnimationTimer not found\n"); + return; + } + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Enable(timer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Enable(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Disable(timer); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Disable(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IUIAnimationTimer_Release(timer); +} + START_TEST(uianimation) { HRESULT hr; @@ -57,6 +93,7 @@ START_TEST(uianimation) return; test_UIAnimationManager(); + test_IUIAnimationTimer(); CoUninitialize(); }

1 0

Louis Lenders : uianimation: Add IUIAnimationTimer stubbed interface.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: d8d032da8bae7172a971baadacf2fb74e5d03e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d032da8bae7172a971baad… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 29 00:28:58 2019 +0000 uianimation: Add IUIAnimationTimer stubbed interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c9ce692ebc..3f1c6a182b 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -351,7 +351,145 @@ static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) return hr; } +/*********************************************************************** + * IUIAnimationTimer + */ +struct timer +{ + IUIAnimationTimer IUIAnimationTimer_iface; + LONG ref; +}; + +struct timer *impl_from_IUIAnimationTimer( IUIAnimationTimer *iface ) +{ + return CONTAINING_RECORD( iface, struct timer, IUIAnimationTimer_iface ); +} + +static HRESULT WINAPI timer_QueryInterface( IUIAnimationTimer *iface, REFIID iid, void **obj ) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_IUIAnimationTimer )) + { + IUIAnimationTimer_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI timer_AddRef( IUIAnimationTimer *iface ) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + heap_free( This ); + + return ref; +} + +static HRESULT WINAPI timer_SetTimerUpdateHandler (IUIAnimationTimer *iface, + IUIAnimationTimerUpdateHandler *update_handler, + UI_ANIMATION_IDLE_BEHAVIOR idle_behaviour) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->(%p, %d)\n", This, update_handler, idle_behaviour ); + return E_NOTIMPL; +} + + static HRESULT WINAPI timer_SetTimerEventHandler (IUIAnimationTimer *iface, + IUIAnimationTimerEventHandler *handler) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return S_OK; +} + +static HRESULT WINAPI timer_Enable (IUIAnimationTimer *iface) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return S_OK; +} + +static HRESULT WINAPI timer_Disable (IUIAnimationTimer *iface) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI timer_IsEnabled (IUIAnimationTimer *iface) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI timer_GetTime (IUIAnimationTimer *iface, UI_ANIMATION_SECONDS *seconds) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->(%p)\n", This, seconds ); + return S_OK; +} + +static HRESULT WINAPI timer_SetFrameRateThreshold (IUIAnimationTimer *iface, UINT32 frames_per_sec) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->(%d)\n", This, frames_per_sec ); + return E_NOTIMPL; +} + +const struct IUIAnimationTimerVtbl timer_vtbl = +{ + timer_QueryInterface, + timer_AddRef, + timer_Release, + timer_SetTimerUpdateHandler, + timer_SetTimerEventHandler, + timer_Enable, + timer_Disable, + timer_IsEnabled, + timer_GetTime, + timer_SetFrameRateThreshold, +}; + +static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct timer *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) + return E_OUTOFMEMORY; + This->IUIAnimationTimer_iface.lpVtbl = &timer_vtbl; + This->ref = 1; + + hr = IUIAnimationTimer_QueryInterface( &This->IUIAnimationTimer_iface, iid, obj ); + + IUIAnimationTimer_Release( &This->IUIAnimationTimer_iface ); + return hr; +} + static struct class_factory manager_cf = { { &class_factory_vtbl }, manager_create }; +static struct class_factory timer_cf = { { &class_factory_vtbl }, timer_create }; /****************************************************************** * DllGetClassObject @@ -364,6 +502,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) if (IsEqualCLSID( clsid, &CLSID_UIAnimationManager )) cf = &manager_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTimer )) + cf = &timer_cf.IClassFactory_iface; if (!cf) return CLASS_E_CLASSNOTAVAILABLE;

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTransform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 3feef4fb1d1918eb345f050da11e27442b573765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3feef4fb1d1918eb345f050d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:55 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetTransform(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9b7754bd8d..599e45c24f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3135,7 +3135,9 @@ static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, wined3d_state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, wined3d_state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetTransform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 070eea856d0b8b3695f9595c14ebfa0c5de7375b URL: https://source.winehq.org/git/wine.git/?a=commit;h=070eea856d0b8b3695f9595c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:53 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetTransform(). 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/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cd870c90a6..aa742c8c1f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2070,7 +2070,9 @@ static HRESULT WINAPI d3d9_device_SetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetTransform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: c8bbe970e30ca65ea6b5df67ec3450ab30d12ab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8bbe970e30ca65ea6b5df67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:54 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetTransform(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6b6f5edfbc..90bcfae498 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1610,7 +1610,9 @@ static HRESULT WINAPI d3d8_device_SetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019