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

Paul Gofman : d3dx9: Implement array selectors in effect.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 4620bb80b05a933b59e5c1dd62df2f93793d2b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4620bb80b05a933b59e5c1dd6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 13:30:54 2016 +0300 d3dx9: Implement array selectors in effect. 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 | 84 ++++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/effect.c | 6 ++-- 2 files changed, 53 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4620bb80b05a933b59e5c…

1 0

Paul Gofman : d3dx9: Implement fxlc constants (expressions) in effect.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 43208b6348ba09617d2625e9b12f08913cb02b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43208b6348ba09617d2625e9b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 13:30:52 2016 +0300 d3dx9: Implement fxlc constants (expressions) in effect. 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/d3dx9_private.h | 2 + dlls/d3dx9_36/effect.c | 81 ++++++----- dlls/d3dx9_36/preshader.c | 328 ++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/effect.c | 4 +- 4 files changed, 369 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43208b6348ba09617d262…

1 0

Francois Gouget : d3d9/tests: Spelling fixes for a couple of ok() calls.
by Alexandre Julliard April 18, 2016

April 18, 2016

Module: wine Branch: master Commit: 0277ba190b2486a3e1c62dfe40cddaf6a8afb1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0277ba190b2486a3e1c62dfe4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 02:24:33 2016 +0200 d3d9/tests: Spelling fixes for a couple of ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 237fcc3..8fc9a22 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3205,7 +3205,7 @@ static void test_scissor_size(void) ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, - "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, + "Scissorrect mismatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ @@ -3221,7 +3221,7 @@ static void test_scissor_size(void) ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: %08x\n", hr); ok(scissorrect.right == registry_mode.dmPelsWidth && scissorrect.bottom == registry_mode.dmPelsHeight && scissorrect.top == 0 && scissorrect.left == 0, - "Scissorrect missmatch (%d, %d) should be (%u, %u)\n", scissorrect.right, scissorrect.bottom, + "Scissorrect mismatch (%d, %d) should be (%u, %u)\n", scissorrect.right, scissorrect.bottom, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight); if(device_ptr) {

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.8
by Jeremy Newman April 18, 2016

April 18, 2016

Module: website Branch: master Commit: 8aa8525faf9c0ec534ac92ff76aa2be0c16617ac URL: http://source.winehq.org/git/website.git/?a=commit;h=8aa8525faf9c0ec534ac92… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 16 17:15:39 2016 +0200 Polish translation for release 1.9.8 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016041601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/pl/2016041601.xml b/news/pl/2016041601.xml new file mode 100644 index 0000000..beb9ec2 --- /dev/null +++ b/news/pl/2016041601.xml @@ -0,0 +1,18 @@ +<news> +<date>Kwiecień 16, 2016</date> +<title>Wydano Wine 1.9.8</title> +<body> + Wydanie rozwojowe Wine 1.9.8 jest już dostępne. + <a href="{$root}/announce/1.9.8">Co nowego</a> w tym wydaniu: +<ul> + <li>Więcej pracy w obszarze strumienia poleceń WineD3D.</li> + <li>Poprawkowe wydanie silnika Mono.</li> + <li>Szersza obsługa czytnika Usług Sieciowych.</li> + <li>Szersza obsługa Modelu Cieniowania 5.</li> + <li>Obsługa gradientów w metaplikach.</li> + <li>Ulepszono formatowanie tabeli w WinHelp.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.8.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8.2
by Jeremy Newman April 18, 2016

April 18, 2016

Module: website Branch: master Commit: dd3b343447b3f10f5d2aec2b44c288b5e1b4b6ab URL: http://source.winehq.org/git/website.git/?a=commit;h=dd3b343447b3f10f5d2aec… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 16 17:15:38 2016 +0200 Polish translation for release 1.8.2 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016041201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/pl/2016041201.xml b/news/pl/2016041201.xml new file mode 100644 index 0000000..375cdaa --- /dev/null +++ b/news/pl/2016041201.xml @@ -0,0 +1,13 @@ +<news> +<date>Kwiecień 12, 2016</date> +<title>Wydano Wine 1.8.2</title> +<body> + Poprawione wydanie Wine 1.8.2 jest już dostępne. + <a href="{$root}/announce/1.8.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite poprawki błędów.</li> + <li>Małe uaktualnienie tłumaczenia.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.9.8
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: website Branch: master Commit: aac42259f7deb00913d2d06650ac85d01cb908b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=aac42259f7deb00913d2d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 16 00:00:32 2016 +0900 Wine release 1.9.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016041601.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2016041601.xml b/news/en/2016041601.xml new file mode 100644 index 0000000..cacd424 --- /dev/null +++ b/news/en/2016041601.xml @@ -0,0 +1,18 @@ +<news> +<date>April 16, 2016</date> +<title>Wine 1.9.8 Released</title> +<body> + The Wine development release 1.9.8 is now available. + <a href="{$root}/announce/1.9.8">What's new</a> in this release: +<ul> + <li>More work towards the WineD3D command stream.</li> + <li>Bug fix update of the Mono engine.</li> + <li>More WebServices reader support.</li> + <li>Still more Shader Model 5 support.</li> + <li>Support for gradients in metafiles.</li> + <li>Improved table formatting in WinHelp.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.8.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sebastian Lackner : ntdll: Handle stack guard pages on x86_64.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: d25ae3ca25c177f659eb0cd54e3d171b048811f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25ae3ca25c177f659eb0cd54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 15 10:52:17 2016 +0200 ntdll: Handle stack guard pages on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a79fd6e..ca3e6ca 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2587,9 +2587,27 @@ static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *r */ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - EXCEPTION_RECORD *rec = setup_exception( sigcontext, raise_segv_exception ); + EXCEPTION_RECORD *rec; ucontext_t *ucontext = sigcontext; + /* check for page fault inside the thread stack */ + if (TRAP_sig(ucontext) == TRAP_x86_PAGEFLT && + (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && + (char *)siginfo->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && + virtual_handle_stack_fault( siginfo->si_addr )) + { + /* check if this was the last guard page */ + if ((char *)siginfo->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) + { + rec = setup_exception( sigcontext, raise_segv_exception ); + rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; + } + return; + } + + rec = setup_exception( sigcontext, raise_segv_exception ); + if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; + switch(TRAP_sig(ucontext)) { case TRAP_x86_OFLOW: /* Overflow exception */

1 0

Sebastian Lackner : services: Initialize environment block immediately after startup.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: ce07a77610dec0f273912425dc68fc646a7f3624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce07a77610dec0f273912425d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 15 10:03:52 2016 +0200 services: Initialize environment block immediately after startup. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 8f53e7e..0f8615f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -724,17 +724,6 @@ static DWORD service_start_process(struct service_entry *service_entry) service_lock(service_entry); - if (!env) - { - HANDLE htok; - - if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) - CreateEnvironmentBlock(&env, htok, FALSE); - - if (!env) - WINE_ERR("failed to create services environment\n"); - } - if ((err = get_service_binary_path(service_entry, &path))) { service_unlock(service_entry); @@ -976,9 +965,20 @@ static void load_registry_parameters(void) int main(int argc, char *argv[]) { static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; + HANDLE htok; DWORD err; g_hStartedEvent = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event); + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) + { + CreateEnvironmentBlock(&env, htok, FALSE); + CloseHandle(htok); + } + + if (!env) + WINE_ERR("failed to create services environment\n"); + load_registry_parameters(); err = scmdatabase_create(&active_database); if (err != ERROR_SUCCESS)

1 0

Henri Verbeet : wined3d: Check texture usage/pool in volumetexture_init().
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: 5eedb704f18d555b0252f31053ac6859a1ff16a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eedb704f18d555b0252f3105… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 19:32:49 2016 +0200 wined3d: Check texture usage/pool in volumetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/volume.c | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52b026b..0f29367 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1850,6 +1850,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } } + if (desc->usage & WINED3DUSAGE_DYNAMIC && (desc->pool == WINED3D_POOL_MANAGED + || desc->pool == WINED3D_POOL_SCRATCH)) + { + WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); + return WINED3DERR_INVALIDCALL; + } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { UINT pow2_w, pow2_h, pow2_d; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index cb60a24..643969c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -441,15 +441,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur HRESULT hr; UINT size; - /* TODO: Write tests for other resources and move this check - * to resource_init, if applicable. */ - if (desc->usage & WINED3DUSAGE_DYNAMIC - && (desc->pool == WINED3D_POOL_MANAGED || desc->pool == WINED3D_POOL_SCRATCH)) - { - WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); - return WINED3DERR_INVALIDCALL; - } - size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, desc->depth); if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format,

1 0

Francois Gouget : ole32: Rightmost spelling fix.
by Alexandre Julliard April 15, 2016

April 15, 2016

Module: wine Branch: master Commit: f384ba52cd95a2890cdd65a117378687ad43ec20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f384ba52cd95a2890cdd65a11… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 15 14:28:08 2016 +0200 ole32: Rightmost spelling fix. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 66 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f384ba52cd95a2890cdd6…

1 0