May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Move some internal definitions to strmbase_private.h.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: e48559b2bfcc108f6cf270b38c89af178fed258d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48559b2bfcc108f6cf270b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 9 10:12:32 2019 -0500 strmbase: Move some internal definitions to strmbase_private.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/audio.c | 9 +-------- dlls/strmbase/dispatch.c | 8 +------- dlls/strmbase/dllfunc.c | 19 +------------------ dlls/strmbase/enumpins.c | 6 +----- dlls/strmbase/filter.c | 8 +------- dlls/strmbase/outputqueue.c | 10 +--------- dlls/strmbase/pin.c | 9 +-------- dlls/strmbase/pospass.c | 10 +--------- dlls/strmbase/qualitycontrol.c | 9 --------- dlls/strmbase/renderer.c | 7 ------- dlls/strmbase/seeking.c | 10 +--------- dlls/strmbase/strmbase_private.h | 32 ++++++++++++++++++++++++++++++++ dlls/strmbase/transform.c | 15 --------------- dlls/strmbase/video.c | 9 +-------- dlls/strmbase/window.c | 9 +-------- include/wine/strmbase.h | 13 ------------- 16 files changed, 43 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e48559b2bfcc108f6cf2…

1 0

Zebediah Figura : strmbase: Move "AttemptConnection" to the base source pin function table.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: 7e6ab5e53cc16a4ab7205789498469d44c692967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e6ab5e53cc16a4ab7205789… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 9 10:12:33 2019 -0500 strmbase: Move "AttemptConnection" to the base source pin function table. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 2 -- dlls/qcap/avico.c | 3 +-- dlls/qcap/avimux.c | 5 ++--- dlls/qcap/smartteefilter.c | 5 ++--- dlls/qcap/vfwcapture.c | 2 +- dlls/quartz/filesource.c | 8 ++++---- dlls/quartz/parser.c | 2 +- dlls/strmbase/pin.c | 17 ++++++++--------- dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 3 +-- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 10 +++++----- 13 files changed, 27 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e6ab5e53cc16a4ab720…

1 0

Rosanne DiMesio : Show 10 latest Wine versions on test report form
by Jeremy Newman 10 May '19

10 May '19

Module: appdb Branch: master Commit: c2b0b708d90d26d686213eb64e6575d02513e6f8 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=c2b0b708d90d26d686213eb… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu May 9 14:52:54 2019 -0500 Show 10 latest Wine versions on test report form Increases the number of Wine versions shown in the dropdown list from 8 to 10. This is needed to prevent the newest stable release from dropping off the list prematurely when it is followed by an update to the previous stable version (see bug 47118). Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <laxdragon(a)gmail.com> --- include/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/util.php b/include/util.php index f948f6d..27fff17 100644 --- a/include/util.php +++ b/include/util.php @@ -156,7 +156,7 @@ function get_bugzilla_versions($bReturnIds = false) foreach($aBranches as $sBranch) { $sWhere = "WHERE product_id =".BUGZILLA_PRODUCT_ID." AND value LIKE '$sBranch%'"; - $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 8"; + $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 10"; $hResult = query_bugzilladb($sQuery); if($hResult) {

1 0

Francois Gouget : kernel32/tests: Use ok_() so the TestBot can correctly detect the line.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 6a20bb2daff0547438fe5f55e3182d142a4dce84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a20bb2daff0547438fe5f55… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 9 11:05:57 2019 +0200 kernel32/tests: Use ok_() so the TestBot can correctly detect the line. Otherwise the messages appear to change every time the line count changes, which making old errors new again. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b8dc72b..bc6f4ab 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -627,13 +627,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG { if (!has_code && is_win64) { - ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ - "%u: loading failed err %u\n", line, GetLastError() ); + ok_(__FILE__,line)( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ + "loading failed err %u\n", GetLastError() ); } else { - ok( !mod, "%u: loading succeeded\n", line ); - ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); + ok_(__FILE__, line)( !mod, "loading succeeded\n" ); + ok_(__FILE__, line)( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError() ); } } else

1 0

Louis Lenders : kernel32: Add K32GetWsChangesEx stub.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: fb4116ee02cb4e8f31a2f4de7bd3b6ebfdfc7a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4116ee02cb4e8f31a2f4de… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 6 22:55:33 2019 +0200 kernel32: Add K32GetWsChangesEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47131 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-psapi-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/virtual.c | 11 +++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/psapi/psapi.spec | 1 + include/psapi.h | 7 +++++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec index c966b3f..c54c107 100644 --- a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec +++ b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec @@ -9,7 +9,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall K32GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall K32GetWsChanges(long ptr long) kernel32.K32GetWsChanges -@ stub K32GetWsChangesEx +@ stdcall K32GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx @ stdcall K32InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall K32QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 295a4db..2e2828e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1018,7 +1018,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) @ stdcall K32GetWsChanges(long ptr long) -# @ stub K32GetWsChangesEx +@ stdcall K32GetWsChangesEx(long ptr ptr) @ stdcall K32InitializeProcessForWsWatch(long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 59c96bd..a5a2dfd 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -725,6 +725,17 @@ BOOL WINAPI K32GetWsChanges(HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinf } /*********************************************************************** + * K32GetWsChangesEx (KERNEL32.@) + */ +BOOL WINAPI K32GetWsChangesEx(HANDLE process, PSAPI_WS_WATCH_INFORMATION_EX *watchinfoex, DWORD *size) +{ + FIXME_(seh)("(%p, %p, %p)\n", process, watchinfoex, size); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * K32InitializeProcessForWsWatch (KERNEL32.@) */ BOOL WINAPI K32InitializeProcessForWsWatch(HANDLE process) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 22ea65f..9bba9ae 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -908,7 +908,7 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall K32GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall K32GetWsChanges(long ptr long) kernel32.K32GetWsChanges -# @ stub K32GetWsChangesEx +@ stdcall K32GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx @ stdcall K32InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall K32QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index d6116f8..6a7bc14 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -21,6 +21,7 @@ @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo @ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges +@ stdcall GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx @ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/include/psapi.h b/include/psapi.h index c7663f8..742bf7b 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -50,6 +50,12 @@ typedef struct _PSAPI_WS_WATCH_INFORMATION { LPVOID FaultingVa; } PSAPI_WS_WATCH_INFORMATION, *PPSAPI_WS_WATCH_INFORMATION; +typedef struct _PSAPI_WS_WATCH_INFORMATION_EX { + PSAPI_WS_WATCH_INFORMATION BasicInfo; + ULONG_PTR FaultingThreadId; + ULONG_PTR Flags; +} PSAPI_WS_WATCH_INFORMATION_EX, *PPSAPI_WS_WATCH_INFORMATION_EX; + typedef struct _PERFORMANCE_INFORMATION { DWORD cb; SIZE_T CommitTotal; @@ -128,6 +134,7 @@ BOOL WINAPI QueryWorkingSet(HANDLE, PVOID, DWORD); BOOL WINAPI QueryWorkingSetEx(HANDLE, PVOID, DWORD); BOOL WINAPI InitializeProcessForWsWatch(HANDLE); BOOL WINAPI GetWsChanges(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); +BOOL WINAPI GetWsChangesEx(HANDLE, PSAPI_WS_WATCH_INFORMATION_EX*, DWORD*); DWORD WINAPI GetMappedFileNameW(HANDLE, LPVOID, LPWSTR, DWORD); DWORD WINAPI GetMappedFileNameA(HANDLE, LPVOID, LPSTR, DWORD); #define GetMappedFileName WINELIB_NAME_AW(GetMappedFileName)

1 0

Józef Kucia : wined3d: Fix wined3d_get_wine_vk_version().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 9cbd33b62e1804a5de2d8df1c1318723f9ac38d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbd33b62e1804a5de2d8df1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 8 17:08:55 2019 +0200 wined3d: Fix wined3d_get_wine_vk_version(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fad78ae..b8d94a0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -454,7 +454,9 @@ static unsigned int wined3d_get_wine_vk_version(void) major = atoi(ptr); - while (isdigit(*ptr) || *ptr == '.') + while (isdigit(*ptr)) + ++ptr; + if (*ptr == '.') ++ptr; minor = atoi(ptr);

1 0

Paul Gofman : wined3d: Apply stencil mask to stencil reference value.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: a9e199e5ad76c0540381f25011d6051ace3e7c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e199e5ad76c0540381f250… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 8 20:28:32 2019 +0300 wined3d: Apply stencil mask to stencil reference value. This is consistent with the docs and confirmed by the test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28196 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/visual.c | 59 +++++++++++++++++++++++++----------------------- dlls/wined3d/state.c | 2 +- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8be58bf..89571a1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11052,70 +11052,73 @@ static void stencil_cull_test(void) /* First pass: Fill the stencil buffer with some values... */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CCW); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_EQUAL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0x000000ff); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* 2nd pass: Make the stencil values visible */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < 16; ++i) { - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, i); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x0000ff00 | i); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); painter[0].diffuse = (i * 16); /* Creates shades of blue */ @@ -11123,13 +11126,13 @@ static void stencil_cull_test(void) painter[2].diffuse = (i * 16); painter[3].diffuse = (i * 16); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 160, 420); ok(color == 0x00000030, "CCW triangle, twoside FALSE, cull cw, replace, has color 0x%08x, expected 0x00000030\n", color); @@ -11152,7 +11155,7 @@ static void stencil_cull_test(void) ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); cleanup: refcount = IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f35f2a..0c3e845 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -921,8 +921,8 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func = GL_ALWAYS; if (!(func_back = wined3d_gl_compare_func(state->render_states[WINED3D_RS_BACK_STENCILFUNC]))) func_back = GL_ALWAYS; - ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; + ref = state->render_states[WINED3D_RS_STENCILREF] & mask; stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_get_tex_unit_mapping().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: a1d3939254647120a587ba30f03c8a623619bd48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d3939254647120a587ba30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 19:29:09 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_get_tex_unit_mapping(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 +++++++------ dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 9 +++++++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 97d7656..6279268 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2369,16 +2369,16 @@ void wined3d_context_destroy(struct wined3d_context *context) device->adapter->adapter_ops->adapter_destroy_context(context); } -const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, +const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!shader_version) { *base = 0; *count = WINED3D_MAX_TEXTURES; - return context->tex_unit_map; + return context_gl->c.tex_unit_map; } if (shader_version->major >= 4) @@ -2403,7 +2403,7 @@ const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, *count = 0; } - return context->tex_unit_map; + return context_gl->c.tex_unit_map; } static void context_get_rt_size(const struct wined3d_context *context, SIZE *size) @@ -3777,18 +3777,19 @@ static void context_load_shader_resources(struct wined3d_context *context, const static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int bind_idx, shader_sampler_count, base, count, i; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; + const unsigned int *tex_unit_map; struct wined3d_sampler *sampler; - const DWORD *tex_unit_map; if (!(shader = state->shader[shader_type])) return; - tex_unit_map = context_get_tex_unit_mapping(context, + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, &shader->reg_maps.shader_version, &base, &count); shader_sampler_count = shader->reg_maps.sampler_map.count; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6493e7f..5ee40b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -705,10 +705,11 @@ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_inf static unsigned int shader_glsl_map_tex_unit(const struct wined3d_context *context, const struct wined3d_shader_version *shader_version, unsigned int sampler_idx) { - const DWORD *tex_unit_map; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const unsigned int *tex_unit_map; unsigned int base, count; - tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, shader_version, &base, &count); if (sampler_idx >= count) return WINED3D_UNMAPPED_STAGE; if (!tex_unit_map) @@ -731,9 +732,10 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_version *shader_version; - const DWORD *tex_unit_map; + const unsigned int *tex_unit_map; unsigned int base, count; const char *prefix; @@ -742,7 +744,7 @@ static void shader_glsl_load_samplers(const struct wined3d_context *context, shader_version = reg_maps ? &reg_maps->shader_version : NULL; prefix = shader_glsl_get_prefix(shader_version ? shader_version->type : WINED3D_SHADER_TYPE_PIXEL); - tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, shader_version, &base, &count); shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a226cd4..fc75ddd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2049,9 +2049,16 @@ static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_conte return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +static inline const struct wined3d_context_gl *wined3d_context_gl_const(const struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_gl, c); +} + void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, @@ -2231,8 +2238,6 @@ void context_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; -const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, - const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_shader_resources().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 81f5f21ab5f5f7110679486dadaba21182d4dadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f5f21ab5f5f7110679486d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 19:29:10 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_shader_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6279268..b72f61b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3774,12 +3774,11 @@ static void context_load_shader_resources(struct wined3d_context *context, const } } -static void context_bind_shader_resources(struct wined3d_context *context, +static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_device *device = context->device; + const struct wined3d_device *device = context_gl->c.device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; @@ -3815,7 +3814,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c); } } @@ -3927,6 +3926,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct wined3d_state_entry *state_table = context->state_table; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; @@ -4005,7 +4005,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_shader_resource_bindings) { for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - context_bind_shader_resources(context, state, i); + wined3d_context_gl_bind_shader_resources(context_gl, state, i); context->update_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_compute_shader_resource_bindings = 1; @@ -4063,7 +4063,7 @@ static void context_apply_compute_state(struct wined3d_context *context, if (context->update_compute_shader_resource_bindings) { - context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE); + wined3d_context_gl_bind_shader_resources(wined3d_context_gl(context), state, WINED3D_SHADER_TYPE_COMPUTE); context->update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_shader_resource_bindings = 1;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_blit_state().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 54945f04de7ff17d235e54309e80c780ac2ca2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=54945f04de7ff17d235e5430… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 19:29:11 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_blit_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++++----- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b72f61b..506bb72 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2749,16 +2749,20 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *conte } /* Context activation is done by the caller. */ -void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) +void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) { - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *rt = context->current_rt.texture; + struct wined3d_context *context = &context_gl->c; + const struct wined3d_gl_info *gl_info; + struct wined3d_texture *rt; DWORD rt_mask, *cur_mask; unsigned int sampler; SIZE rt_size; TRACE("Setting up context %p for blitting.\n", context); + gl_info = context->gl_info; + rt = context->current_rt.texture; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (context->render_offscreen) @@ -2906,6 +2910,7 @@ static void context_apply_blit_projection(const struct wined3d_context *context, /* Context activation is done by the caller. */ void context_apply_ffp_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, sampler; @@ -2919,14 +2924,14 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, const struct context_get_rt_size(context, &rt_size); if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) context_apply_blit_projection(context, rt_size.cx, rt_size.cy); - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(context_gl, device); checkGLcall("ffp blit state application"); return; } context->last_was_ffp_blit = TRUE; - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(context_gl, device); /* Disable all textures. The caller can then bind a texture it wants to blit * from. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ee40b0..386ce78 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13307,7 +13307,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wined3d_texture_load(src_texture, context, FALSE); } - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(wined3d_context_gl(context), device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2c5ea75..06c0a23 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -737,7 +737,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns } else { - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(wined3d_context_gl(context), device); } /* Select the correct read buffer, and give some debug output. @@ -908,7 +908,7 @@ static void fb_copy_to_texture_direct(struct wined3d_texture_gl *dst_texture, un context = context_acquire(device, &src_texture->t, src_sub_resource_idx); context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(context_gl, device); wined3d_texture_load(&dst_texture->t, context, FALSE); /* Bind the target texture */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc75ddd..bb57f62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2054,6 +2054,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, + const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; @@ -2207,7 +2209,6 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, void context_alloc_fence(struct wined3d_context *context, struct wined3d_fence *fence) DECLSPEC_HIDDEN; void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; -void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0