July 2017 - Wine-Commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: 31539c4a954d1b06d81c068d0007c30a162a2935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31539c4a954d1b06d81c068d0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jul 11 12:11:55 2017 +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 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4b302a4..1d9f9ef 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-07 23:08+0300\n" +"PO-Revision-Date: 2017-07-11 12:11+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" @@ -6893,27 +6893,23 @@ msgstr "parinkite aplanką, kuris turi %s" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Lemtingoji klaida: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Klaida [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Įspėjimas [1]." #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " msgid "Info [1]." -msgstr "Informacija [1]. " +msgstr "Informacija [1]." #: msi.rc:75 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Diskas pilnas.\n" +msgstr "{{Diskas pilnas: }}" #: msi.rc:76 msgid "Action %s: [1]. [2]"

1 0

Francois Gouget : testbot/web: Only allow retrieving our cookies through Http.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: tools Branch: master Commit: f5d82db8fdded58a0524f7f1ab0a03756f6f724d URL: http://source.winehq.org/git/tools.git/?a=commit;h=f5d82db8fdded58a0524f7f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 11 12:39:59 2017 +0200 testbot/web: Only allow retrieving our cookies through Http. The WineTestBot JavaScript code does not need to access cookies so reduce the attack surface (and possibly prevent some XSS attacks). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 0f89e46..04759ca 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -163,7 +163,8 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, - -Secure => $UseSSL); + -Secure => $UseSSL, + -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } else @@ -183,7 +184,8 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, - -Secure => !1); + -Secure => !1, + -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } else

1 0

Francois Gouget : testbot/web: Remove an unused reference to CGI::Cookie.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: tools Branch: master Commit: 9b237187edb63efb9b38561df1650d589aebdd47 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9b237187edb63efb9b38561d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 11 12:40:06 2017 +0200 testbot/web: Remove an unused reference to CGI::Cookie. All the cookie contains is the session id. So to log out a user all we need to do is delete the server-side session id. This instantly invalidates the client-side cookie and thus there is no need to use CGI:Cookie to modify it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Logout.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 6e6abc2..417232d 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -24,7 +24,6 @@ package LogoutPage; use ObjectModel::CGI::Page; use WineTestBot::CGI::Sessions; use CGI qw(:standard); -use CGI::Cookie; @LogoutPage::ISA = qw(ObjectModel::CGI::Page);

1 0

Francois Gouget : testbot/testagentd: Fix handling the --run in/out/ err redirection options.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: tools Branch: master Commit: 14a04dd784e2a593de188be92ad4969da01994cc URL: http://source.winehq.org/git/tools.git/?a=commit;h=14a04dd784e2a593de188be9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 11 12:35:22 2017 +0200 testbot/testagentd: Fix handling the --run in/out/err redirection options. Preventing handle inheritance at the CreateProcess() level also prevents us from redirecting the child processes stdin/out/err. So instead disable handle inheritance directly on the TestAgentd sockets. TestAgentd also opens file descriptors for the sendfile, getfile and upgrade operations but those are closed before handling any other operation. So we only have to prevent the sockets from being inherited. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index c72cf25..70272a6 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -126,7 +126,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) si.hStdInput = fhs[0]; si.hStdOutput = fhs[1]; si.hStdError = fhs[2]; - if (!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, + if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) { set_status(ST_ERROR, "could not run '%s': %lu", cmdline, GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index bc3d32b..fce28b2 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1347,6 +1347,9 @@ int main(int argc, char** argv) if (master < 0) continue; setsockopt(master, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)); +#ifdef HANDLE_FLAG_INHERIT + SetHandleInformation((HANDLE)master, HANDLE_FLAG_INHERIT, 0); +#endif debug("Trying to bind to %s\n", sockaddr_to_string(addrp->ai_addr, addrp->ai_addrlen)); if (bind(master, addrp->ai_addr, addrp->ai_addrlen) == 0) @@ -1376,6 +1379,9 @@ int main(int argc, char** argv) #ifdef O_CLOEXEC fcntl(client, F_SETFL, fcntl(client, F_GETFL, 0) | O_CLOEXEC); #endif +#ifdef HANDLE_FLAG_INHERIT + SetHandleInformation((HANDLE)client, HANDLE_FLAG_INHERIT, 0); +#endif if (client >= 0) { if (is_host_allowed(client, opt_srchost, addrlen))

1 0

Paul Gofman : d3dx9: Factor out is_parameter_used() function.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 57de7e99192c5dd260dfcaa85fdd71fa1fbba051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57de7e99192c5dd260dfcaa85… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:06 2017 +0300 d3dx9: Factor out is_parameter_used() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c3647d3..333feab 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4030,16 +4030,11 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ return FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_technique *tech) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); unsigned int i, j; - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); struct d3dx_pass *pass; - TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); - TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); if (!tech || !param) return FALSE; @@ -4049,16 +4044,27 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL for (j = 0; j < pass->state_count; ++j) { if (walk_state_dep(&pass->states[j], is_same_parameter, param)) - { - TRACE("Returning TRUE.\n"); return TRUE; - } } } - TRACE("Returning FALSE.\n"); return FALSE; } +static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +{ + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + BOOL ret; + + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); + + ret = is_parameter_used(param, tech); + TRACE("Returning %#x.\n", ret); + return ret; +} + static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);

1 0

Hugh McMaster : regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ hex data during concatenation if we reach EOF.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 7f11a24fee2ffe538b6991b6d57dad618485acee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f11a24fee2ffe538b6991b6d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 10 11:28:17 2017 +0000 regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ hex data during concatenation if we reach EOF. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 40 +++++++++++++++++++++++----------------- programs/regedit/tests/regedit.c | 4 ++-- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0a356cb..ea0b6f8 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -504,6 +504,27 @@ static void free_parser_data(struct parser *parser) parser->data_size = 0; } +static void prepare_hex_string_data(struct parser *parser) +{ + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + { + BYTE *data = parser->data; + + if (data[parser->data_size - 1] != 0) + { + data[parser->data_size] = 0; + parser->data_size++; + } + + if (!parser->is_unicode) + { + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); + parser->data_size *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, data); + } + } +} + enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -852,23 +873,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; } - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) - { - BYTE *data = parser->data; - - if (data[parser->data_size - 1] != 0x00) - { - data[parser->data_size] = 0x00; - parser->data_size++; - } - - if (!parser->is_unicode) - { - parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); - parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, data); - } - } + prepare_hex_string_data(parser); set_state(parser, SET_VALUE); return line; @@ -903,6 +908,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) if (!(line = get_line(parser->file))) { + prepare_hex_string_data(parser); set_state(parser, SET_VALUE); return pos; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b3f6e76..2839a11 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -500,7 +500,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17b\"=hex(2):25,50,41,54,48,25,\\"); - verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE | TODO_REG_DATA); + verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -510,7 +510,7 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine17d\"=hex(7):4c,69,6e,65,\\"); - verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE | TODO_REG_DATA); + verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Jacek Caban : server: Don' t allow APCs on objects associated with completion port.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 82e6713b75d223ee1ac68812a394626aa2884c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e6713b75d223ee1ac68812a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 12:51:05 2017 +0200 server: Don't allow APCs on objects associated with completion port. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 -- dlls/ws2_32/tests/sock.c | 1 - server/async.c | 11 +++++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 71b37e4..ff27d98 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1045,7 +1045,6 @@ static void test_iocp_fileio(HANDLE h) /* using APCs on handle with associated completion port is not allowed */ res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -1094,7 +1093,6 @@ static void test_iocp_fileio(HANDLE h) /* using APCs on handle with associated completion port is not allowed */ res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2790fea..efe10b3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6824,7 +6824,6 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); completion_called = 0; iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); - todo_wine ok(iret == SOCKET_ERROR && GetLastError() == WSAEINVAL, "WSARecv failed - %d error %d\n", iret, GetLastError()); ok(!completion_called, "completion called\n"); diff --git a/server/async.c b/server/async.c index 0205807..1cb020f 100644 --- a/server/async.c +++ b/server/async.c @@ -192,7 +192,7 @@ void free_async_queue( struct async_queue *queue ) LIST_FOR_EACH_ENTRY_SAFE( async, next, &queue->queue, struct async, queue_entry ) { - async->completion = fd_get_completion( async->fd, &async->comp_key ); + if (!async->completion) async->completion = fd_get_completion( async->fd, &async->comp_key ); async->fd = NULL; async_terminate( async, STATUS_HANDLES_CLOSED ); async->queue = NULL; @@ -236,7 +236,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->signaled = 0; async->wait_handle = 0; async->direct_result = 0; - async->completion = NULL; + async->completion = fd_get_completion( fd, &async->comp_key ); if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -244,6 +244,13 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da list_add_head( &thread->process->asyncs, &async->process_entry ); if (event) reset_event( event ); + if (async->completion && data->apc) + { + release_object( async ); + set_error( STATUS_INVALID_PARAMETER ); + return NULL; + } + return async; }

1 0

Piotr Caban : gdiplus: Remove unused clsid parameter from encode_image_func helpers.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 1a75f763db60876c6b71dd3d25f5fa547d86157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75f763db60876c6b71dd3d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 10 11:29:56 2017 +0200 gdiplus: Remove unused clsid parameter from encode_image_func helpers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 720f8f2..eb705d1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4140,7 +4140,7 @@ static GpStatus decode_image_emf(IStream *stream, GpImage **image) } typedef GpStatus (*encode_image_func)(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params); + GDIPCONST EncoderParameters* params); typedef GpStatus (*decode_image_func)(IStream *stream, GpImage **image); @@ -4516,31 +4516,31 @@ static GpStatus encode_image_wic(GpImage *image, IStream* stream, } static GpStatus encode_image_BMP(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatBmp, params); } static GpStatus encode_image_tiff(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatTiff, params); } static GpStatus encode_image_png(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatPng, params); } static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); } static GpStatus encode_image_gif(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) + GDIPCONST EncoderParameters* params) { return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); } @@ -4570,7 +4570,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, if (encode_image == NULL) return UnknownImageFormat; - stat = encode_image(image, stream, clsid, params); + stat = encode_image(image, stream, params); return stat; }

1 0

Paul Gofman : d3dx9: Simplify init and cleanup in get_constants_desc().
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 9fc4e4a1a9a5aa257fded8fcdeaa83b4f1d9903c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc4e4a1a9a5aa257fded8fcd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:07 2017 +0300 d3dx9: Simplify init and cleanup in get_constants_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2fb14ab..cabddcd 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -618,10 +618,6 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab D3DXHANDLE hc; unsigned int i; - out->inputs = cdesc = NULL; - out->inputs_param = NULL; - out->input_count = 0; - inputs_param = NULL; hr = D3DXGetShaderConstantTable(byte_code, &ctab); if (FAILED(hr) || !ctab) { @@ -635,8 +631,8 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab goto err_out; } - cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); - inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); + out->inputs = cdesc = HeapAlloc(GetProcessHeap(), 0, sizeof(*cdesc) * desc.Constants); + out->inputs_param = inputs_param = HeapAlloc(GetProcessHeap(), 0, sizeof(*inputs_param) * desc.Constants); if (!cdesc || !inputs_param) { hr = E_OUTOFMEMORY; @@ -678,16 +674,9 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab } } out->input_count = desc.Constants; - out->inputs = cdesc; - out->inputs_param = inputs_param; hr = init_set_constants(out, ctab); - ID3DXConstantTable_Release(ctab); - return hr; err_out: - HeapFree(GetProcessHeap(), 0, cdesc); - HeapFree(GetProcessHeap(), 0, inputs_param); - if (ctab) - ID3DXConstantTable_Release(ctab); + ID3DXConstantTable_Release(ctab); return hr; }

1 0

Paul Gofman : d3dx9/tests: Add test for skip_constants effect parameter.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: ec7e76663577c6e2333171c0e4faa1727858b6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7e76663577c6e2333171c0e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jul 6 14:15:05 2017 +0300 d3dx9/tests: Add test for skip_constants effect parameter. Signed-off-by: Paul Gofman <gofmanp(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/effect.c | 148 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 55f48e9..b966b42 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6837,6 +6837,153 @@ static void test_effect_get_pass_desc(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +#if 0 +float v1 : register(c2); +float v2 : register(c3); +float v3; +float v4 : register(c4); +float v5; +float v6[2] : register(c5) = {11, 22}; + +struct VS_OUTPUT +{ + float4 Position : POSITION; +}; + +VS_OUTPUT RenderSceneVS(float4 vPos : POSITION) +{ + VS_OUTPUT Output; + + Output.Position = v1 * v2 * vPos + v2 + v3 + v4; + Output.Position += v6[0] + v6[1]; + return Output; +} + +technique tech0 +{ + pass p0 + { + PointScale_A = v4; + VertexShader = compile vs_3_0 RenderSceneVS(); + } +} +#endif +static const DWORD test_effect_skip_constants_blob[] = +{ + 0xfeff0901, 0x00000144, 0x00000000, 0x00000003, 0x00000000, 0x00000024, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000000, 0x00000003, 0x00003176, 0x00000003, 0x00000000, 0x0000004c, + 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000003, 0x00003276, 0x00000003, + 0x00000000, 0x00000074, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000003, + 0x00003376, 0x00000003, 0x00000000, 0x0000009c, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000000, 0x00000003, 0x00003476, 0x00000003, 0x00000000, 0x000000c4, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000000, 0x00000003, 0x00003576, 0x00000003, 0x00000000, 0x000000f0, + 0x00000000, 0x00000002, 0x00000001, 0x00000001, 0x41300000, 0x41b00000, 0x00000003, 0x00003676, + 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, + 0x00000001, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00003070, + 0x00000006, 0x68636574, 0x00000030, 0x00000006, 0x00000001, 0x00000002, 0x00000002, 0x00000004, + 0x00000020, 0x00000000, 0x00000000, 0x0000002c, 0x00000048, 0x00000000, 0x00000000, 0x00000054, + 0x00000070, 0x00000000, 0x00000000, 0x0000007c, 0x00000098, 0x00000000, 0x00000000, 0x000000a4, + 0x000000c0, 0x00000000, 0x00000000, 0x000000cc, 0x000000e8, 0x00000000, 0x00000000, 0x00000138, + 0x00000000, 0x00000001, 0x00000130, 0x00000000, 0x00000002, 0x00000041, 0x00000000, 0x000000fc, + 0x000000f8, 0x00000092, 0x00000000, 0x0000011c, 0x00000118, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0xffffffff, 0x00000001, 0x00000000, 0x000001bc, 0xfffe0300, 0x0047fffe, 0x42415443, + 0x0000001c, 0x000000e7, 0xfffe0300, 0x00000005, 0x0000001c, 0x20000000, 0x000000e0, 0x00000080, + 0x00020002, 0x000a0001, 0x00000084, 0x00000094, 0x000000a4, 0x00030002, 0x000e0001, 0x00000084, + 0x00000094, 0x000000a7, 0x00000002, 0x00000001, 0x00000084, 0x00000094, 0x000000aa, 0x00040002, + 0x00120001, 0x00000084, 0x00000094, 0x000000ad, 0x00050002, 0x00160002, 0x000000b0, 0x000000c0, + 0xab003176, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x76003276, 0x34760033, 0x00367600, 0x00030000, 0x00010001, 0x00000002, 0x00000000, + 0x41300000, 0x00000000, 0x00000000, 0x00000000, 0x41b00000, 0x00000000, 0x00000000, 0x00000000, + 0x335f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x0200001f, 0x80000000, + 0x900f0000, 0x0200001f, 0x80000000, 0xe00f0000, 0x02000001, 0x80010000, 0xa0000003, 0x03000005, + 0x80010000, 0x80000000, 0xa0000002, 0x04000004, 0x800f0000, 0x80000000, 0x90e40000, 0xa0000003, + 0x03000002, 0x800f0000, 0x80e40000, 0xa0000000, 0x03000002, 0x800f0000, 0x80e40000, 0xa0000004, + 0x02000001, 0x80010001, 0xa0000005, 0x03000002, 0x80010001, 0x80000001, 0xa0000006, 0x03000002, + 0xe00f0000, 0x80e40000, 0x80000001, 0x0000ffff, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, + 0x00000000, 0x000000d8, 0x46580200, 0x0023fffe, 0x42415443, 0x0000001c, 0x00000057, 0x46580200, + 0x00000001, 0x0000001c, 0x20000100, 0x00000054, 0x00000030, 0x00040002, 0x00120001, 0x00000034, + 0x00000044, 0xab003476, 0x00030000, 0x00010001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, + 0x54494c43, 0x00000000, 0x000cfffe, 0x434c5846, 0x00000001, 0x10000001, 0x00000001, 0x00000000, + 0x00000002, 0x00000010, 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, +}; + +static void test_effect_skip_constants(IDirect3DDevice9 *device) +{ + HRESULT hr; + ID3DXEffect *effect; + unsigned int passes_count; + D3DXVECTOR4 fvect; + unsigned int i; + + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, "v3", 0, NULL, &effect, NULL); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + effect->lpVtbl->Release(effect); + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, "v4", 0, NULL, &effect, NULL); + todo_wine + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + effect->lpVtbl->Release(effect); + + hr = D3DXCreateEffectEx(device, test_effect_skip_constants_blob, sizeof(test_effect_skip_constants_blob), + NULL, NULL, " v1#,.+-= &\t\nv2*/!\"'v5 v6[1]", 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + todo_wine + ok(!effect->lpVtbl->IsParameterUsed(effect, "v1", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect->lpVtbl->IsParameterUsed(effect, "v2", "tech0"), + "Unexpected IsParameterUsed result.\n"); + ok(effect->lpVtbl->IsParameterUsed(effect, "v3", "tech0"), + "Unexpected IsParameterUsed result.\n"); + ok(effect->lpVtbl->IsParameterUsed(effect, "v4", "tech0"), + "Unexpected IsParameterUsed result.\n"); + ok(!effect->lpVtbl->IsParameterUsed(effect, "v5", "tech0"), + "Unexpected IsParameterUsed result.\n"); + + hr = effect->lpVtbl->SetFloat(effect, "v1", 28.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v2", 29.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v3", 30.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v4", 31.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "v5", 32.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_clear_vconsts(device); + + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + fvect.y = fvect.z = fvect.w = 0.0f; + fvect.x = 30.0f; + test_effect_shared_parameters_compare_vconst(device, 0, &fvect, FALSE); + for (i = 1; i < 4; ++i) + test_effect_shared_parameters_compare_vconst(device, i, &fvect_filler, i > 1); + fvect.x = 31.0f; + test_effect_shared_parameters_compare_vconst(device, 4, &fvect, FALSE); + for (i = 5; i < 256; ++i) + test_effect_shared_parameters_compare_vconst(device, i, &fvect_filler, i < 7); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -6888,6 +7035,7 @@ START_TEST(effect) test_effect_shared_parameters(device); test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); + test_effect_skip_constants(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0