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

Sam Edwards : wined3d: Ignore WS_VISIBLE and WS_EX_TOPMOST when dropping out of fullscreen.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 6c43f90c50cb1c231beb4add3dcf869c83389b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c43f90c50cb1c231beb4add3… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Sun Mar 31 18:25:27 2013 -0600 wined3d: Ignore WS_VISIBLE and WS_EX_TOPMOST when dropping out of fullscreen. --- dlls/wined3d/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bca5a54..e4b970c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1044,12 +1044,21 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic if (!device->style && !device->exStyle) return; - TRACE("Restoring window style of window %p to %08x, %08x.\n", - window, device->style, device->exStyle); - style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); + /* These flags are set by wined3d_device_setup_fullscreen_window, not the + * application, and we want to ignore them in the test below, since it's + * not the application's fault that they changed. Additionally, we want to + * preserve the current status of these flags (i.e. don't restore them) to + * more closely emulate the behavior of Direct3D, which leaves these flags + * alone when returning to windowed mode. */ + device->style ^= (device->style ^ style) & WS_VISIBLE; + device->exStyle ^= (device->exStyle ^ exstyle) & WS_EX_TOPMOST; + + TRACE("Restoring window style of window %p to %08x, %08x.\n", + window, device->style, device->exStyle); + filter_messages = device->filter_messages; device->filter_messages = TRUE;

1 0

Jérôme Gardou : wined3d: Initialize adapter device name even if opengl is not used.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: b7649efb2df134aaac523c8c2e6587a7cff0f1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7649efb2df134aaac523c8c2… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Tue Apr 2 15:04:57 2013 +0200 wined3d: Initialize adapter device name even if opengl is not used. --- dlls/wined3d/directx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b6bc8e..4b42845 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5237,6 +5237,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) { + DISPLAY_DEVICEW display_device; + memset(adapter, 0, sizeof(*adapter)); adapter->ordinal = ordinal; adapter->monitorPoint.x = -1; @@ -5254,6 +5256,11 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; adapter->blitter = &cpu_blit; + + display_device.cb = sizeof(display_device); + EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); + TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->DeviceName, display_device.DeviceName); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {}

1 0

Francois Gouget : riched20: ME_StrDup() is not used anymore so remove it.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 8e304065c1da5bafcfd2baf61165ae81f2561653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e304065c1da5bafcfd2baf61… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:04 2013 +0200 riched20: ME_StrDup() is not used anymore so remove it. --- dlls/riched20/editor.h | 1 - dlls/riched20/string.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 95818cd..f7cac1f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -100,7 +100,6 @@ const char *ME_GetDITypeName(ME_DIType type) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; -ME_String *ME_StrDup(const ME_String *s) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index ce66af5..6d7d222 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -59,11 +59,6 @@ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) return s; } -ME_String *ME_StrDup(const ME_String *s) -{ - return ME_MakeStringN(s->szData, s->nLen); -} - void ME_DestroyString(ME_String *s) { if (!s) return;

1 0

André Hentschel : uxtheme/tests: Don' t test for themed app.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: f5c49aaf83db5356c18c6da4a1df573713c224eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c49aaf83db5356c18c6da4a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 2 15:42:26 2013 +0200 uxtheme/tests: Don't test for themed app. --- dlls/uxtheme/tests/system.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 8dd413b..303ff8d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -81,24 +81,11 @@ static void test_IsThemed(void) BOOL bAppThemed; BOOL bTPDefined; - SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); - /* This test is not themed */ - SetLastError(0xdeadbeef); bAppThemed = pIsAppThemed(); - - if (bThemeActive) - todo_wine - ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - else - /* Although Wine currently returns FALSE, the logic behind it is wrong. It is not a todo_wine though in the testing sense */ - ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); SetLastError(0xdeadbeef); bTPDefined = pIsThemePartDefined(NULL, 0 , 0);

1 0

Sam Edwards : wined3d: Make fullscreen windows use HWND_TOPMOST instead of HWND_TOP.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 6ab0ff5b9d2c681246257787da9f3fa4c9268b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab0ff5b9d2c681246257787d… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Sun Mar 31 18:25:18 2013 -0600 wined3d: Make fullscreen windows use HWND_TOPMOST instead of HWND_TOP. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7874ba..bca5a54 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1032,7 +1032,7 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); device->filter_messages = filter_messages; }

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: a62b7679356abde12a0d4c86926d010099d1393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62b7679356abde12a0d4c869… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:24:00 2013 +0200 msvcp: Sync spec files. --- dlls/msvcp110/msvcp110.spec | 1804 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 48 +- dlls/msvcp80/msvcp80.spec | 52 +- 3 files changed, 952 insertions(+), 952 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a62b7679356abde12a0d4…

1 0

Piotr Caban : msvcp100: Add arm exports.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 991efb93c975e8a85a8c787022596f9362c73106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991efb93c975e8a85a8c78702… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:47 2013 +0200 msvcp100: Add arm exports. --- dlls/msvcp100/msvcp100.spec | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991efb93c975e8a85a8c7…

1 0

Piotr Caban : msvcp90: Add arm exports.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 96761461d83de9f50bc0bb1abdcf5e187ad05214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96761461d83de9f50bc0bb1ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 16:23:12 2013 +0200 msvcp90: Add arm exports. --- dlls/msvcp90/msvcp90.spec | 745 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 745 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96761461d83de9f50bc0b…

1 0

Francois Gouget : ieframe: Make dump_travellog() static.
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: a5d61eef629358c879f760e3694660ea74f0afb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d61eef629358c879f760e36… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:44 2013 +0200 ieframe: Make dump_travellog() static. --- dlls/ieframe/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7522c38..c717d8b 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -363,7 +363,7 @@ static IStream *get_travellog_stream(DocHost *This) return stream; } -void dump_travellog(DocHost *This) +static void dump_travellog(DocHost *This) { unsigned i;

1 0

Francois Gouget : dplayx: Add a trailing '\n' to a TRACE().
by Alexandre Julliard April 3, 2013

April 3, 2013

Module: wine Branch: master Commit: 1891a89dd99b76566291d76dc0a1eded007bf866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1891a89dd99b76566291d76dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 3 16:07:13 2013 +0200 dplayx: Add a trailing '\n' to a TRACE(). --- dlls/dplayx/dplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e96a1e2..4658f4e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectPlay4Impl_Close( IDirectPlay4 *iface ) IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); HRESULT hr = DP_OK; - TRACE( "(%p)", This ); + TRACE( "(%p)\n", This ); /* FIXME: Need to find a new host I assume (how?) */ /* FIXME: Need to destroy all local groups */

1 0