May 2012 - Wine-Commits - list.winehq.org

André Hentschel : kernel32: Add stub for SetThreadStackGuarantee.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 5e5b435e7da091e493a046ccb632e40b98937bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5b435e7da091e493a046ccb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 14:18:09 2012 +0200 kernel32: Add stub for SetThreadStackGuarantee. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e5a70cf..842fc41 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1160,6 +1160,7 @@ @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) +@ stdcall SetThreadStackGuarantee(ptr) @ stdcall SetThreadUILanguage(long) @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index f990af8..bdaaee8 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -373,6 +373,16 @@ BOOL WINAPI SetThreadPriorityBoost( /********************************************************************** + * SetThreadStackGuarantee (KERNEL32.@) + */ +BOOL WINAPI SetThreadStackGuarantee(PULONG stacksize) +{ + FIXME("(%p): stub\n", stacksize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * SetThreadAffinityMask (KERNEL32.@) */ DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffinityMask )

1 0

Henri Verbeet : wined3d: Properly preload index buffers.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: aa71065d9b4456cfd9099aa5fca70b711f84f217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa71065d9b4456cfd9099aa5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:25 2012 +0200 wined3d: Properly preload index buffers. --- dlls/wined3d/context.c | 7 +++++++ dlls/wined3d/device.c | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bba4112..4037c41 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2336,6 +2336,13 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de device_preload_textures(device); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) device_update_stream_info(device, context->gl_info); + if (state->index_buffer && !state->user_stream) + { + if (device->strided_streams.all_vbo) + wined3d_buffer_preload(state->index_buffer); + else + buffer_get_sysmem(state->index_buffer, context->gl_info); + } ENTER_GL(); if (context->last_was_blit) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f154e44..a0fbe86 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -447,15 +447,8 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined } } - if (state->index_buffer && !state->user_stream) - { - if (prev_all_vbo != stream_info->all_vbo) - device_invalidate_state(device, STATE_INDEXBUFFER); - if (stream_info->all_vbo) - wined3d_buffer_preload(state->index_buffer); - else - buffer_get_sysmem(state->index_buffer, gl_info); - } + if (prev_all_vbo != stream_info->all_vbo) + device_invalidate_state(device, STATE_INDEXBUFFER); } static void device_preload_texture(const struct wined3d_state *state, unsigned int idx)

1 0

Jacek Caban : urlhist.idl: Added missing flags.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: ef309733709bf882887a5aaeac61a92fcf855b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef309733709bf882887a5aaea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 11:50:53 2012 +0200 urlhist.idl: Added missing flags. --- include/urlhist.idl | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/urlhist.idl b/include/urlhist.idl index 7d05901..955d7ff 100644 --- a/include/urlhist.idl +++ b/include/urlhist.idl @@ -21,6 +21,14 @@ import "oleidl.idl"; import "oaidl.idl"; import "docobj.idl"; +cpp_quote("#define STATURL_QUERYFLAG_ISCACHED 0x010000") +cpp_quote("#define STATURL_QUERYFLAG_NOURL 0x020000") +cpp_quote("#define STATURL_QUERYFLAG_NOTITLE 0x040000") +cpp_quote("#define STATURL_QUERYFLAG_TOPLEVEL 0x080000") + +cpp_quote("#define STATURLFLAG_ISCACHED 0x0001") +cpp_quote("#define STATURLFLAG_ISTOPLEVEL 0x0002") + typedef enum _ADDURL_FLAG { ADDURL_FIRST = 0, @@ -40,7 +48,7 @@ typedef enum _ADDURL_FLAG interface IEnumSTATURL : IUnknown { typedef [unique] IEnumSTATURL *LPENUMSTATURL; - + typedef struct _STATURL { DWORD cbSize; @@ -77,7 +85,7 @@ interface IEnumSTATURL : IUnknown interface IUrlHistoryStg : IUnknown { typedef [unique] IUrlHistoryStg *LPURLHISTORYSTG; - + HRESULT AddUrl( [in] LPCOLESTR pocsUrl, [in, unique] LPCOLESTR pocsTitle, @@ -91,14 +99,14 @@ interface IUrlHistoryStg : IUnknown [in] LPCOLESTR pocsUrl, [in] DWORD dwFlags, [in, out, unique] LPSTATURL lpSTATURL); - + HRESULT BindToObject( [in] LPCOLESTR pocsUrl, [in] REFIID riid, [out, iid_is(riid)] void **ppvOut); HRESULT EnumUrls( - [out] IEnumSTATURL **ppEnum); + [out] IEnumSTATURL **ppEnum); } /*****************************************************************************

1 0

Henri Verbeet : ddraw/tests: Move test_window_style() to ddraw7.c.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: ec8a9df007f3c98a9f0e45b936ef69ab65622eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8a9df007f3c98a9f0e45b93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:26 2012 +0200 ddraw/tests: Move test_window_style() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 51 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 44 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 86e93b2..0daad33 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3527,56 +3527,6 @@ static void BackBuffer3DAttachmentTest(void) DestroyWindow(window); } -static void test_window_style(void) -{ - LONG style, exstyle, tmp; - RECT fullscreen_rect, r; - IDirectDraw7 *ddraw7; - HWND window; - HRESULT hr; - ULONG ref; - - hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); - if (FAILED(hr)) - { - skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); - return; - } - - window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, - 0, 0, 100, 100, 0, 0, 0, 0); - - style = GetWindowLongA(window, GWL_STYLE); - exstyle = GetWindowLongA(window, GWL_EXSTYLE); - SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); - - hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - if (FAILED(hr)) - { - IDirectDraw7_Release(ddraw7); - DestroyWindow(window); - return; - } - - tmp = GetWindowLongA(window, GWL_STYLE); - todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); - tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); - - GetWindowRect(window, &r); - ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", - fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, - r.left, r.top, r.right, r.bottom); - GetClientRect(window, &r); - todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); - - ref = IDirectDraw7_Release(ddraw7); - ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); - - DestroyWindow(window); -} - static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; @@ -4740,7 +4690,6 @@ START_TEST(d3d) D3D1_releaseObjects(); } - test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ad3e46a..3d151e1 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1904,6 +1904,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + + ref = IDirectDraw7_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -1928,4 +1971,5 @@ START_TEST(ddraw7) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVolume9Impl.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: a91ef5217dcc7442a08bf0183ef4137a44f120c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91ef5217dcc7442a08bf0183… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:29 2012 +0200 d3d9: Get rid of IDirect3DVolume9Impl. --- dlls/d3d9/d3d9_private.h | 12 +-- dlls/d3d9/device.c | 2 +- dlls/d3d9/texture.c | 6 +- dlls/d3d9/volume.c | 189 +++++++++++++++++++++++----------------------- 4 files changed, 101 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a91ef5217dcc7442a08bf…

1 0

André Hentschel : kernel32: Add checks for DragonFly BSD.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 1f71006fe5ec644b4b43d767d9b3418ae95995a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f71006fe5ec644b4b43d767d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 19:21:08 2012 +0200 kernel32: Add checks for DragonFly BSD. --- dlls/kernel32/heap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 34fbb75..b74763f 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1147,7 +1147,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) SYSTEM_INFO si; #ifdef linux FILE *f; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) unsigned long val; int mib[2]; size_t size_sys; @@ -1219,7 +1219,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) } fclose( f ); } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; size_sys = sizeof(val);

1 0

André Hentschel : Wine 1.5.5 freigegeben
by Jeremy Newman May 29, 2012

May 29, 2012

Module: website Branch: master Commit: 627a6d97d9fe87e58ae6ddf4111f6ce060d4173e URL: http://source.winehq.org/git/website.git/?a=commit;h=627a6d97d9fe87e58ae6dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 25 21:55:16 2012 +0200 Wine 1.5.5 freigegeben --- news/de/2012052501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2012052501.xml b/news/de/2012052501.xml new file mode 100644 index 0000000..f2d2488 --- /dev/null +++ b/news/de/2012052501.xml @@ -0,0 +1,16 @@ +<news> +<date>25. Mai 2012</date> +<title>Wine 1.5.5 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für die Installation von Mono als Wine Add-on Paket.</li> + <li>Dithering von Musterpinseln in der DIB Engine.</li> + <li>Unterstützung für die Installation der .NET 4.0 Runtime.</li> + <li>DDS Dateien werden in D3DX9 unterstützt.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Eduardo García : Spanish translation for release 1.5.5
by Jeremy Newman May 29, 2012

May 29, 2012

Module: website Branch: master Commit: 5a8098e3b4a3f012be22ebb29593dc5d6491c806 URL: http://source.winehq.org/git/website.git/?a=commit;h=5a8098e3b4a3f012be22eb… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat May 26 10:31:21 2012 +0200 Spanish translation for release 1.5.5 With regards. Eduardo >From 933f99cab0af1df5fbc7a6d17ad25fbcf4674622 Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 26 May 2012 10:22:55 +0200 Subject: Spanish translation for release 1.5.5 --- news/es/2012052501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/es/2012052501.xml b/news/es/2012052501.xml new file mode 100644 index 0000000..980a3c7 --- /dev/null +++ b/news/es/2012052501.xml @@ -0,0 +1,16 @@ +<news> +<date>Mayo 25, 2012</date> +<title>Wine 1.5.5 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.5 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.5">Novedades</a> en esta versión: +<ul> + <li>Soporte para la instalación de Mono como un paquete add-on de Wine.</li> + <li>Tramado para pinceles de patrón en el motor DIB.</li> + <li>Soporte para la instalación del ejecutable .NET 4.0.</li> + <li>Soporte para archivos DDS en D3DX9.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.5
by Jeremy Newman May 29, 2012

May 29, 2012

Module: website Branch: master Commit: 056fb36dd0e61325451325256c777cdfbdad4423 URL: http://source.winehq.org/git/website.git/?a=commit;h=056fb36dd0e61325451325… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 26 13:48:15 2012 +0200 Polish translation for release 1.5.5 --- news/pl/2012052501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2012052501.xml b/news/pl/2012052501.xml new file mode 100644 index 0000000..2013d4a --- /dev/null +++ b/news/pl/2012052501.xml @@ -0,0 +1,16 @@ +<news> +<date>Maj 25, 2012</date> +<title>Wydano Wine 1.5.5</title> +<body> + Wydanie rozwojowe Wine 1.5.5 jest już dostępne. + <a href="{$root}/announce/1.5.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie instalowania Mono jako dodatkowego pakietu do Wine.</li> + <li>Dithering pędzli wzorców w silniku DIB.</li> + <li>Obsługa instalowania bibliotek uruchomieniowych .NET 4.0.</li> + <li>Wsparcie dla plików DDS w D3DX9.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.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

Lucas Fialho Zawacki : Added portuguese translation for release 1.5.5
by Jeremy Newman May 29, 2012

May 29, 2012

Module: website Branch: master Commit: a2000bb15017609b5157315db496b07c63954f0c URL: http://source.winehq.org/git/website.git/?a=commit;h=a2000bb15017609b515731… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 10:58:29 2012 -0300 Added portuguese translation for release 1.5.5 --- news/pt/2012052501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012052501.xml b/news/pt/2012052501.xml new file mode 100644 index 0000000..439ed70 --- /dev/null +++ b/news/pt/2012052501.xml @@ -0,0 +1,17 @@ +<news> +<date>25 de Maio de 2012</date> +<title>Wine 1.5.5 lançado</title> +<body> + A versão de desenvolvimento 1.5.5 já está disponível. + <a href="{$root}/announce/1.5.5">Novidades</a> desta versão: +<ul> + <li>Suporte à instalação do Mono como um pacote adicional do Wine.</li> + <li>Dithering de pincéis na engine DIB.</li> + <li>Suporte à instalação do ambiente de execução do .NET 4.0.</li> + <li>Suporte a arquivos DDS no D3DX9.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news> +

1 0