October 2019 - Wine-commits

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_b().
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: e374d4c72a3f29d66f44ecfa21c5a17563aa7feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e374d4c72a3f29d66f44ecfa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:58 2019 -0500 wined3d: Introduce wined3d_stateblock_set_ps_consts_b(). 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/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0ff3199525..dae95ae46e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1386,6 +1386,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_b[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsB |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9772874c8b..b65681f210 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 215e50116c..f79cd212a1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2661,6 +2661,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock,

1 0

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

04 Oct '19

Module: wine Branch: master Commit: 22969d43f85c84f47bac3c644e0cd2db876b9e1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=22969d43f85c84f47bac3c64… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:59 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantB(). 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 daa0b1b502..ee5de2f06f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3885,7 +3885,9 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); + hr = wined3d_stateblock_set_ps_consts_b(device->update_state, reg_idx, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

Kevin Puetz : msvcp: Use fput[w]c in basic_filebuf_char_overflow.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 925e56acff4e714364cbf3507f669aff570132b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=925e56acff4e714364cbf350… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Oct 3 18:06:42 2019 +0200 msvcp: Use fput[w]c in basic_filebuf_char_overflow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8e6884c8f9..84174e4f95 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3374,7 +3374,7 @@ int __thiscall basic_filebuf_char_overflow(basic_filebuf_char *this, int c) return !c; if(!this->cvt) - return fwrite(&ch, sizeof(char), 1, this->file) ? c : EOF; + return fputc(ch, this->file); from_next = &ch; do { @@ -4009,7 +4009,7 @@ unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this return !c; if(!this->cvt) - return fwrite(&ch, sizeof(wchar_t), 1, this->file) ? c : WEOF; + return fputwc(ch, this->file); from_next = &ch; do {

1 0

Francois Gouget : testbot/Submit: Let the user pick the Wine build and language to test.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: tools Branch: master Commit: df70bbf9adbce66031aaee24aba68f2f6ad0ce6b URL: https://source.winehq.org/git/tools.git/?a=commit;h=df70bbf9adbce66031aaee2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 3 10:11:38 2019 +0200 testbot/Submit: Let the user pick the Wine build and language to test. The Wine VMs are duplicated in the list, one entry per build, so the user can choose to test a patch or executable on one or all of the Wine builds. However the supported languages are presented in a drop-down list to keep the list size reasonable. So only one can be tested per Wine build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 34 ++- testbot/web/Submit.pl | 403 ++++++++++++++++++++++++------------ 2 files changed, 300 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=df70bbf9adbce66031a…

1 0

Francois Gouget : testbot/WineRunBuild: Import WineTestBot::Utils for GetTaskURL().
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: tools Branch: master Commit: f0de4e5c461046b2d3c94a0691149c6141d47574 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f0de4e5c461046b2d3c94a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 3 16:04:40 2019 +0200 testbot/WineRunBuild: Import WineTestBot::Utils for GetTaskURL(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 71e7e39..ccbba3b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -47,6 +47,7 @@ use WineTestBot::PatchUtils; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Utils; use WineTestBot::Engine::Notify;

1 0

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

03 Oct '19

Module: wine Branch: master Commit: 041181f1dcf83425718fd97581343379a5ce058c URL: https://source.winehq.org/git/wine.git/?a=commit;h=041181f1dcf83425718fd975… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:50 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetPixelShader(). 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eabefd8043..011364ccbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3144,7 +3144,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + wined3d_stateblock_set_pixel_shader(device->update_state, NULL); + if (!device->recording) + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); return D3D_OK; } @@ -3157,7 +3159,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD } TRACE("Setting shader %p.\n", shader_impl); - wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_stateblock_set_pixel_shader(device->update_state, shader_impl->wined3d_shader); + if (!device->recording) + wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_f().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: a84a8522d9ff935e69c8b802467543fa53ebf745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a84a8522d9ff935e69c8b802… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:51 2019 -0500 wined3d: Introduce wined3d_stateblock_set_ps_consts_f(). 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/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1ee64b3224..64a900fbde 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1352,6 +1352,20 @@ void CDECL wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateb stateblock->changed.pixelShader = TRUE; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) +{ + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; + + memcpy(&stateblock->stateblock_state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); + memset(&stateblock->changed.ps_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.ps_consts_f)); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6e6f50a7e1..016cf55c03 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2f6e7f3bc0..c4c469d4fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2661,6 +2661,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

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

03 Oct '19

Module: wine Branch: master Commit: 334e4880b33fe2a1bc79a7738c335b599517c0a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=334e4880b33fe2a1bc79a773… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:52 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantF(). 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 90882f0f92..539af97fbb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3815,8 +3815,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, + hr = wined3d_stateblock_set_ps_consts_f(device->update_state, reg_idx, count, (const struct wined3d_vec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_f(device->wined3d_device, + reg_idx, count, (const struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr;

1 0

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

03 Oct '19

Module: wine Branch: master Commit: decbed41847e7bb32dbffd6f68615eacdaa06f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=decbed41847e7bb32dbffd6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:53 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetPixelShaderConstant(). 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 011364ccbc..827ec47c60 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3231,7 +3231,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface iface, start_register, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); + hr = wined3d_stateblock_set_ps_consts_f(device->update_state, start_register, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Nikolay Sivov : include: Add IDWriteFontSet3 definition.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: de5db669138fd722deb61fac8b22634bc22a1e42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5db669138fd722deb61fac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 2 16:12:50 2019 +0300 include: Add IDWriteFontSet3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 5958e6fb1b..dc8bf0e959 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -84,6 +84,15 @@ typedef enum DWRITE_FONT_AXIS_TAG DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ } DWRITE_FONT_AXIS_TAG; +typedef enum DWRITE_FONT_SOURCE_TYPE +{ + DWRITE_FONT_SOURCE_TYPE_UNKNOWN, + DWRITE_FONT_SOURCE_TYPE_PER_MACHINE, + DWRITE_FONT_SOURCE_TYPE_PER_USER, + DWRITE_FONT_SOURCE_TYPE_APPX_PACKAGE, + DWRITE_FONT_SOURCE_TYPE_REMOTE_FONT_PROVIDER +} DWRITE_FONT_SOURCE_TYPE; + typedef struct DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG axisTag; @@ -441,6 +450,18 @@ interface IDWriteFontSet2 : IDWriteFontSet1 HANDLE GetExpirationEvent(); } +[ + local, + object, + uuid(7c073ef2-a7f4-4045-8c32-8ab8ae640f90) +] +interface IDWriteFontSet3 : IDWriteFontSet2 +{ + DWRITE_FONT_SOURCE_TYPE GetFontSourceType(UINT32 index); + UINT32 GetFontSourceNameLength(UINT32 index); + HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); +} + [ local, object,

1 0