November 2014 - Wine-Commits

Sebastian Lackner : user32/tests: Reenable test function for WM_GETTEXT.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 0a6e56bdc686912adefefc06c39043a659743508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6e56bdc686912adefefc06c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:01:45 2014 +0100 user32/tests: Reenable test function for WM_GETTEXT. --- dlls/user32/tests/win.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e7ffb25..24cbd78 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5691,21 +5691,15 @@ static void test_ShowWindow(void) static void test_gettext(void) { - WNDCLASSA cls; - LPCSTR clsname = "gettexttest"; HWND hwnd; LRESULT r; - memset( &cls, 0, sizeof cls ); - cls.lpfnWndProc = DefWindowProcA; - cls.lpszClassName = clsname; - cls.hInstance = GetModuleHandleA(NULL); - - if (!RegisterClassA( &cls )) return; - - hwnd = CreateWindowA( clsname, "test text", WS_OVERLAPPED, 0, 0, 10, 10, 0, NULL, NULL, NULL); - ok( hwnd != NULL, "window was null\n"); + hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + /* seems to crash on every modern Windows version */ + if (0) + { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); ok( r == 0, "settext should return zero\n"); @@ -5717,9 +5711,9 @@ static void test_gettext(void) r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); ok( r == 0, "settext should return zero (%ld)\n", r); + } DestroyWindow(hwnd); - UnregisterClassA( clsname, NULL ); } @@ -7987,7 +7981,7 @@ START_TEST(win) test_csparentdc(); test_SetWindowLong(); test_ShowWindow(); - if (0) test_gettext(); /* crashes on NT4 */ + test_gettext(); test_GetUpdateRect(); test_Expose(); test_layered_window();

1 0

Sebastian Lackner : user32/tests: Add tests for internal window messages of FindWindowEx.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 381adbf1c4bdce69ad3e6f35eb28eb6f7c348b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381adbf1c4bdce69ad3e6f35e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 04:52:30 2014 +0100 user32/tests: Add tests for internal window messages of FindWindowEx. --- dlls/user32/tests/win.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d1a7ca4..e7ffb25 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -63,6 +63,7 @@ static DWORD (WINAPI *pGetLayout)(HDC hdc); static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; +static DWORD num_gettext_msgs; static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; @@ -794,6 +795,9 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR flush_events( FALSE ); } break; + case WM_GETTEXT: + num_gettext_msgs++; + break; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -6935,22 +6939,38 @@ static void test_FindWindowEx(void) hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); + todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd );

1 0

Stefan Dösinger : d3d9/tests: Test messages on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 9bcd9722f10a893da1e47b0a83ec1c4d16b273e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd9722f10a893da1e47b0a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:20 2014 +0100 d3d9/tests: Test messages on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 286 +++++++++++++++++++++++++++++--------------- dlls/d3d9/tests/device.c | 302 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 393 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bcd9722f10a893da1e47…

1 0

Sebastian Lackner : server: Avoid leaking file descriptor on error in create_thread function.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 0e2e9e4efcaf72d1f50efc6fec8ca402951d1006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2e9e4efcaf72d1f50efc6fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 19:23:13 2014 +0100 server: Avoid leaking file descriptor on error in create_thread function. --- server/thread.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 97860ee..ba3f1d5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -219,11 +219,16 @@ struct thread *create_thread( int fd, struct process *process ) if (process->is_terminating) { + close( fd ); set_error( STATUS_PROCESS_IS_TERMINATING ); return NULL; } - if (!(thread = alloc_object( &thread_ops ))) return NULL; + if (!(thread = alloc_object( &thread_ops ))) + { + close( fd ); + return NULL; + } init_thread_structure( thread ); @@ -236,6 +241,7 @@ struct thread *create_thread( int fd, struct process *process ) if (!(thread->id = alloc_ptid( thread ))) { + close( fd ); release_object( thread ); return NULL; }

1 0

Nikolay Sivov : dwrite: Remove null pointer checks that can't fail.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 65644170826d65f0f38eac779241481059bab9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65644170826d65f0f38eac779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 12:26:01 2014 +0300 dwrite: Remove null pointer checks that can't fail. --- dlls/dwrite/font.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a8d1efe..91aca96 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -179,10 +179,8 @@ static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) static void release_font_data(struct dwrite_font_data *data) { int i; - if (!data) - return; - i = InterlockedDecrement(&data->ref); - if (i > 0) + + if (InterlockedDecrement(&data->ref) > 0) return; for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < sizeof(data->info_strings)/sizeof(data->info_strings[0]); i++) { @@ -196,14 +194,13 @@ static void release_font_data(struct dwrite_font_data *data) heap_free(data); } -static VOID _free_fontfamily_data(struct dwrite_fontfamily_data *data) +static void release_fontfamily_data(struct dwrite_fontfamily_data *data) { int i; - if (!data) - return; - i = InterlockedDecrement(&data->ref); - if (i > 0) + + if (InterlockedDecrement(&data->ref) > 0) return; + for (i = 0; i < data->font_count; i++) release_font_data(data->fonts[i]); heap_free(data->fonts); @@ -1060,7 +1057,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { IDWriteFontCollection_Release(This->collection); - _free_fontfamily_data(This->data); + release_fontfamily_data(This->data); heap_free(This); } @@ -1238,7 +1235,7 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) if (!ref) { for (i = 0; i < This->family_count; i++) - _free_fontfamily_data(This->family_data[i]); + release_fontfamily_data(This->family_data[i]); heap_free(This->family_data); heap_free(This); }

1 0

Stefan Dösinger : d3d8/tests: Test messages on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 33976b4f445c1991988e999544909330f5fe9844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33976b4f445c1991988e99954… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:22 2014 +0100 d3d8/tests: Test messages on focus loss. --- dlls/d3d8/tests/device.c | 102 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index bf7f181..55d522f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2136,6 +2136,8 @@ struct message { UINT message; enum message_window window; + BOOL check_wparam; + WPARAM expect_wparam; }; static const struct message *expect_messages; @@ -2176,7 +2178,15 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM break; }; - if (hwnd == w && expect_messages->message == message) ++expect_messages; + if (hwnd == w && expect_messages->message == message) + { + if (expect_messages->check_wparam) + ok(wparam == expect_messages->expect_wparam, + "Got unexpected wparam %lx for message %x, expected %lx.\n", + wparam, message, expect_messages->expect_wparam); + + ++expect_messages; + } } return DefWindowProcA(hwnd, message, wparam, lparam); @@ -2227,16 +2237,41 @@ static void test_wndproc(void) ULONG ref; DWORD res, tid; HWND tmp; + HRESULT hr; - static const struct message messages[] = - { - {WM_WINDOWPOSCHANGING, FOCUS_WINDOW}, - {WM_ACTIVATE, FOCUS_WINDOW}, - {WM_SETFOCUS, FOCUS_WINDOW}, - {WM_WINDOWPOSCHANGING, DEVICE_WINDOW}, - {WM_MOVE, DEVICE_WINDOW}, - {WM_SIZE, DEVICE_WINDOW}, - {0, 0}, + static const struct message create_messages[] = + { + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + /* Do not test wparam here. If device creation succeeds, + * wparam is WA_ACTIVE. If device creation fails (testbot) + * wparam is set to WA_INACTIVE on some Windows versions. */ + {WM_ACTIVATE, FOCUS_WINDOW, FALSE, 0}, + {WM_SETFOCUS, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {0, 0, FALSE, 0}, + }; + static const struct message focus_loss_messages[] = + { + /* WM_ACTIVATE (wparam = WA_INACTIVE) is sent on Windows. It is + * not reliable on X11 WMs. When the window focus follows the + * mouse pointer the message is not sent. + * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + /* Windows sends WM_ACTIVATE to the device window, indicating that + * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards + * the foreground and focus window are NULL. On Wine SW_SHOWMINIMIZED + * leaves the device window active, breaking re-activation in the + * lost device test. + * {WM_ACTIVATE, DEVICE_WINDOW, TRUE, 0x200000 | WA_ACTIVE}, */ + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, TRUE, SIZE_MINIMIZED}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, + /* WM_ACTIVATEAPP is sent to the device window too, but the order is + * not deterministic. It may be sent after the focus window handling + * or before. */ + {0, 0, FALSE, 0}, }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); @@ -2286,7 +2321,7 @@ static void test_wndproc(void) flush_events(); - expect_messages = messages; + expect_messages = create_messages; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; @@ -2312,8 +2347,6 @@ static void test_wndproc(void) SetForegroundWindow(focus_window); flush_events(); - filter_messages = focus_window; - proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); @@ -2321,6 +2354,49 @@ static void test_wndproc(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); + expect_messages = focus_loss_messages; + /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or + * manually changing the focus. It generates the same messages, but the task + * bar still shows the previous foreground window as active, and the window has + * an inactive titlebar if reactivated with SetForegroundWindow. Reactivating + * the device is difficult, see below. */ + SetForegroundWindow(GetDesktopWindow()); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + tmp = GetFocus(); + ok(tmp != device_window, "The device window is active.\n"); + ok(tmp != focus_window, "The focus window is active.\n"); + + /* The Present call is necessary to make native realize the device is lost. */ + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + /* Focus-follows-mouse WMs prematurely reactivate our window. */ + if (hr == D3DERR_DEVICENOTRESET) + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + else + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + /* I have to minimize and restore the focus window, otherwise native d3d9 fails + * device::reset with D3DERR_DEVICELOST. This does not happen when the window + * restore is triggered by the user. */ + ShowWindow(focus_window, SW_MINIMIZE); + ShowWindow(focus_window, SW_RESTORE); + /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ + SetForegroundWindow(focus_window); + flush_events(); + SetForegroundWindow(focus_window); + flush_events(); + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + + /* Releasing a device in lost state breaks follow-up tests on native. */ + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + filter_messages = focus_window; ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Stefan Dösinger : d3d9/tests: Test style changes on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: ef60604d44191f2675e2f26c5c7d930422e3a9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef60604d44191f2675e2f26c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:21 2014 +0100 d3d9/tests: Test style changes on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 85 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d9/tests/device.c | 40 +++++++++++++++++++++-- 2 files changed, 117 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index a43baa4..ff3864a 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2227,24 +2227,27 @@ done: static void test_window_style(void) { RECT focus_rect, device_rect, fullscreen_rect, r, r2; - LONG device_style, device_exstyle; + LONG device_style, device_exstyle, expected_style; LONG focus_style, focus_exstyle; struct device_desc device_desc; LONG style; IDirect3DDevice9Ex *device; HRESULT hr; ULONG ref; + BOOL ret; static const struct { LONG style_flags; DWORD device_flags; + LONG focus_loss_style; + LONG create2_style, create2_exstyle; } tests[] = { - {0, 0}, - {WS_VISIBLE, 0}, - {0, CREATE_DEVICE_NOWINDOWCHANGES}, - {WS_VISIBLE, CREATE_DEVICE_NOWINDOWCHANGES}, + {0, 0, 0, WS_VISIBLE, WS_EX_TOPMOST}, + {WS_VISIBLE, 0, WS_MINIMIZE, WS_VISIBLE, WS_EX_TOPMOST}, + {0, CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, + {WS_VISIBLE, CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, }; unsigned int i; @@ -2332,6 +2335,78 @@ static void test_window_style(void) ref = IDirect3DDevice9Ex_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + style = GetWindowLongA(device_window, GWL_STYLE); + if (device_style & WS_VISIBLE) + ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + device_style, style, i); + else + todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + device_style, style, i); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + device_exstyle, style, i); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x, i=%u.\n", + focus_style, style, i); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", + focus_exstyle, style, i); + + /* The second time a device is created on the window the window becomes visible and + * topmost if D3DCREATE_NOWINDOWCHANGES is not set. */ + device_desc.flags = CREATE_DEVICE_FULLSCREEN | tests[i].device_flags; + device = create_device(focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | tests[i].create2_style; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + expected_style, style, i); + expected_style = device_exstyle | tests[i].create2_exstyle; + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", + expected_style, style, i); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x, i=%u.\n", + focus_style, style, i); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", + focus_exstyle, style, i); + ref = IDirect3DDevice9Ex_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + DestroyWindow(device_window); + DestroyWindow(focus_window); + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | tests[i].style_flags, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | tests[i].style_flags, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_desc.device_window = device_window; + device = create_device(focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | tests[i].focus_loss_style; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + expected_style, style, i); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + device_exstyle, style, i); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x, i=%u.\n", + focus_style, style, i); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", + focus_exstyle, style, i); + + ref = IDirect3DDevice9Ex_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); DestroyWindow(focus_window); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5ffcfdc..e41dcbc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3796,15 +3796,16 @@ static void test_window_style(void) IDirect3D9 *d3d9; HRESULT hr; ULONG ref; + BOOL ret; static const struct { DWORD device_flags; - LONG style, exstyle; + LONG style, focus_loss_style, exstyle; } tests[] = { - {0, WS_VISIBLE, WS_EX_TOPMOST}, - {CREATE_DEVICE_NOWINDOWCHANGES, 0}, + {0, WS_VISIBLE, WS_MINIMIZE, WS_EX_TOPMOST}, + {CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, }; unsigned int i; @@ -3899,6 +3900,39 @@ static void test_window_style(void) ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", focus_exstyle, style, i); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | tests[i].focus_loss_style | tests[i].style; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | tests[i].exstyle; + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + /* In d3d8 follow-up tests fail on native if the device is destroyed while + * lost. This doesn't happen in d3d9 on my test machine but it still seems + * like a good idea to reset it first. */ + ShowWindow(focus_window, SW_MINIMIZE); + ShowWindow(focus_window, SW_RESTORE); + ret = SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Michael Stefaniuc : comdlg32: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: b4b58a82e3ddddbc0bc5837b912bd85966501e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b58a82e3ddddbc0bc5837b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:18:20 2014 +0100 comdlg32: Simplify check for an empty string (PVS-Studio). --- dlls/comdlg32/filedlgbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 499ebb7..eed34f5 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -942,7 +942,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr return S_OK; /* Check if there is a mask to apply if not */ - if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) + if(!fodInfos->ShellInfos.lpstrCurrentFilter || !fodInfos->ShellInfos.lpstrCurrentFilter[0]) return S_OK; if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str)))

1 0

Sebastian Lackner : shlwapi: Fix invalid usage of CompareString in PathCreateFromUrlW.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 132164423905c495785bd64f74867712c5fcec97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132164423905c495785bd64f7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 07:11:39 2014 +0100 shlwapi: Fix invalid usage of CompareString in PathCreateFromUrlW. --- dlls/shlwapi/path.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 5c7a88a..a3b462c 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3313,6 +3313,9 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) return E_INVALIDARG; + if (lstrlenW(pszUrl) < 5) + return E_INVALIDARG; + if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, file_colon, 5) != CSTR_EQUAL) return E_INVALIDARG; @@ -3354,9 +3357,8 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, src -= 1; break; case 2: - if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, src, 9, - localhost, 9) == CSTR_EQUAL && - (src[9] == '/' || src[9] == '\\')) + if (lstrlenW(src) >= 10 && CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, + src, 9, localhost, 9) == CSTR_EQUAL && (src[9] == '/' || src[9] == '\\')) { /* 'file://localhost/' + escaped DOS path */ src += 10;

1 0

Sebastian Lackner : user32/tests: Remove unnecessary char array and add additional test in test_FindWindowEx.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 0cf86baf65e265fe81d93c5299a325bf658b15c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf86baf65e265fe81d93c529… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 04:46:08 2014 +0100 user32/tests: Remove unnecessary char array and add additional test in test_FindWindowEx. --- dlls/user32/tests/win.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cfc2a02..d1a7ca4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6931,24 +6931,23 @@ todo_wine static void test_FindWindowEx(void) { HWND hwnd, found; - CHAR title[1]; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); - title[0] = 0; - - found = FindWindowExA( 0, 0, "MainWindowClass", title ); + found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); DestroyWindow( hwnd ); hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); - found = FindWindowExA( 0, 0, "MainWindowClass", title ); + found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); @@ -6956,7 +6955,7 @@ static void test_FindWindowEx(void) DestroyWindow( hwnd ); /* test behaviour with a window title that is an empty character */ - found = FindWindowExA( 0, 0, "Shell_TrayWnd", title ); + found = FindWindowExA( 0, 0, "Shell_TrayWnd", "" ); ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); found = FindWindowExA( 0, 0, "Shell_TrayWnd", NULL ); ok( found != NULL, "found is NULL, expected a valid hwnd\n" );

1 0

Stefan Dösinger : d3d8/tests: Test style changes on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: f6f4af46db7514261167cfd0db3b605a2a0491df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f4af46db7514261167cfd0d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:23 2014 +0100 d3d8/tests: Test style changes on focus loss. --- dlls/d3d8/tests/device.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 55d522f..3b2d4ac 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2867,6 +2867,7 @@ static void test_window_style(void) IDirect3D8 *d3d8; HRESULT hr; ULONG ref; + BOOL ret; focus_window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); @@ -2940,6 +2941,36 @@ static void test_window_style(void) ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", focus_exstyle, style); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_MINIMIZE | WS_VISIBLE; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + /* Follow-up tests fail on native if the device is destroyed while lost. */ + ShowWindow(focus_window, SW_MINIMIZE); + ShowWindow(focus_window, SW_RESTORE); + ret = SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Sebastian Lackner : server: Avoid leaking file descriptor on error in create_file_for_fd.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 3d3c92782a3ef14ba62d751ba1e321bba19a891a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3c92782a3ef14ba62d751ba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 19:19:08 2014 +0100 server: Avoid leaking file descriptor on error in create_file_for_fd. --- server/file.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/server/file.c b/server/file.c index cceb8ad..abda2c3 100644 --- a/server/file.c +++ b/server/file.c @@ -120,21 +120,25 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari if (fstat( fd, &st ) == -1) { file_set_error(); + close( fd ); return NULL; } - if ((file = alloc_object( &file_ops ))) + if (!(file = alloc_object( &file_ops ))) { - file->mode = st.st_mode; - file->access = default_fd_map_access( &file->obj, access ); - if (!(file->fd = create_anonymous_fd( &file_fd_ops, fd, &file->obj, - FILE_SYNCHRONOUS_IO_NONALERT ))) - { - release_object( file ); - return NULL; - } - allow_fd_caching( file->fd ); + close( fd ); + return NULL; + } + + file->mode = st.st_mode; + file->access = default_fd_map_access( &file->obj, access ); + if (!(file->fd = create_anonymous_fd( &file_fd_ops, fd, &file->obj, + FILE_SYNCHRONOUS_IO_NONALERT ))) + { + release_object( file ); + return NULL; } + allow_fd_caching( file->fd ); return file; }

1 0

Sebastian Lackner : server: Avoid leaking file descriptors if create_console_input fails.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 609d43e4086188838e0900477db5651709ef36be URL: http://source.winehq.org/git/wine.git/?a=commit;h=609d43e4086188838e0900477… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 19:15:20 2014 +0100 server: Avoid leaking file descriptors if create_console_input fails. --- server/console.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/console.c b/server/console.c index 2a5ca80..b7f8206 100644 --- a/server/console.c +++ b/server/console.c @@ -299,7 +299,11 @@ static struct object *create_console_input( struct thread* renderer, int fd ) { struct console_input *console_input; - if (!(console_input = alloc_object( &console_input_ops ))) return NULL; + if (!(console_input = alloc_object( &console_input_ops ))) + { + if (fd != -1) close( fd ); + return NULL; + } console_input->renderer = renderer; console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | @@ -323,8 +327,9 @@ static struct object *create_console_input( struct thread* renderer, int fd ) if (!console_input->history || (renderer && !console_input->evt) || !console_input->event) { - release_object( console_input ); - return NULL; + if (fd != -1) close( fd ); + release_object( console_input ); + return NULL; } if (fd != -1) /* bare console */ {

1 0

Bruno Jesus : include: Add SO_BSP_STATE definition.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: b82bb857607e38495d14b10685fd6dbf9ec100e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82bb857607e38495d14b1068… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 17 23:31:15 2014 -0200 include: Add SO_BSP_STATE definition. --- include/winsock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winsock.h b/include/winsock.h index d5c1e0b..21e984c 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -662,6 +662,7 @@ typedef struct WS(WSAData) #define SO_RCVTIMEO 0x1006 #define SO_ERROR 0x1007 #define SO_TYPE 0x1008 +#define SO_BSP_STATE 0x1009 #define IOCPARM_MASK 0x7f

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.5.4.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 35c7ac8a0b857f96018924731151b0e4539f2479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c7ac8a0b857f96018924731… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 17 14:49:59 2014 -0600 mscoree: Update Wine Mono to 4.5.4. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 3dfd28e..3a7d35d 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.5.2" -#define MONO_SHA "73d6b8aa7a8921f43b22c6d930e8d7e421058187" +#define MONO_VERSION "4.5.4" +#define MONO_SHA "2b271d0bc92d5c9c45febd76fb11f9fcc29ea6d8" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7534108..c84b25f 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.5.2"; + static const char* mono_version = "4.5.4"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Vincent Povirk : winemono.php: Added 4.5.4 release.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: tools Branch: master Commit: 32c8d134535e3ad23c80334332e521d3a9ff9d6b URL: http://source.winehq.org/git/tools.git/?a=commit;h=32c8d134535e3ad23c803343… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 17 14:44:20 2014 -0600 winemono.php: Added 4.5.4 release. --- winemono.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winemono.php b/winemono.php index c82ddda..10bf13f 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '4.5.2'; +$sVersion = '4.5.4'; // Suffix appended to base name of file $sFileSuffix = ''; @@ -29,7 +29,8 @@ $sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, $aFileSizes = array( '0.0.4'=>44408320, '0.0.8'=>46967296, - '4.5.2'=>52502528 + '4.5.2'=>52502528, + '4.5.4'=>53706752 ); // Exact size of the file:

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.31
by Jeremy Newman Nov. 17, 2014

Nov. 17, 2014

Module: website Branch: master Commit: 124c771134b613098a9605638057a1f6972dd058 URL: http://source.winehq.org/git/website.git/?a=commit;h=124c771134b613098a9605… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Nov 16 07:34:55 2014 +0100 Polish translation for release 1.7.31 --- news/pl/2014111401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014111401.xml b/news/pl/2014111401.xml new file mode 100644 index 0000000..f1a8567 --- /dev/null +++ b/news/pl/2014111401.xml @@ -0,0 +1,16 @@ +<news> +<date>Listopad 14, 2014</date> +<title>Wydano Wine 1.7.31</title> +<body> + Wydanie rozwojowe Wine 1.7.31 jest już dostępne. + <a href="{$root}/announce/1.7.31">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Gecko na podstawie Firefoksa 34.</li> + <li>Wsparcie dla bibliotek uruchomieniowych C/C++ Visual Studio w wersji 2013 .</li> + <li>Pełniejsza obsługa krojów czcionek w DirectWrite.</li> + <li>Popracowano więcej nad obsługą Direct2D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.31.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

Julian Rüger : German translation for release 1.7.31
by Jeremy Newman Nov. 17, 2014

Nov. 17, 2014

Module: website Branch: master Commit: cacd6ca6e76c5535fcd0ce1d7e4aaa18680c489b URL: http://source.winehq.org/git/website.git/?a=commit;h=cacd6ca6e76c5535fcd0ce… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 14 16:24:11 2014 +0100 German translation for release 1.7.31 --- news/de/2014111401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014111401.xml b/news/de/2014111401.xml new file mode 100644 index 0000000..0bbbb65 --- /dev/null +++ b/news/de/2014111401.xml @@ -0,0 +1,16 @@ +<news> +<date>14. November 2014</date> +<title>Wine 1.7.31 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.31 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.31">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko-Engine basierend auf Firefox 34.</li> + <li>Unterstützung für die Visual Studio 2013 Version der C/C++ Laufzeit.</li> + <li>Mehr Unterstützung für Schriftarteigenschaften in DirectWrite.</li> + <li>Zusätzliche Arbeit an Direct2D.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.31.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

Julian Rüger : Ubuntu Download: Update and overhaul German translation. (try 2)
by Jeremy Newman Nov. 17, 2014

Nov. 17, 2014

Module: website Branch: master Commit: 740690ecc01ec98c0737d543e13756b3ea6f01c2 URL: http://source.winehq.org/git/website.git/?a=commit;h=740690ecc01ec98c0737d5… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 14 17:40:27 2014 +0100 Ubuntu Download: Update and overhaul German translation. (try 2) Try 2: I missed some of Rosanne's changes (stop identifying the PPA as WineHQ's). Fixed. --- images/distro/de_ubuntu-ppa.png | Bin 0 -> 80414 bytes images/distro/de_ubuntu-softwaresources1.png | Bin 60224 -> 0 bytes images/distro/de_ubuntu-softwaresources2.png | Bin 49699 -> 0 bytes templates/de/download/ubuntu.template | 65 ++++++++++++++------------- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/images/distro/de_ubuntu-ppa.png b/images/distro/de_ubuntu-ppa.png new file mode 100644 index 0000000..7a55111 Binary files /dev/null and b/images/distro/de_ubuntu-ppa.png differ diff --git a/images/distro/de_ubuntu-softwaresources1.png b/images/distro/de_ubuntu-softwaresources1.png deleted file mode 100644 index 18e7d67..0000000 Binary files a/images/distro/de_ubuntu-softwaresources1.png and /dev/null differ diff --git a/images/distro/de_ubuntu-softwaresources2.png b/images/distro/de_ubuntu-softwaresources2.png deleted file mode 100644 index 297bc1e..0000000 Binary files a/images/distro/de_ubuntu-softwaresources2.png and /dev/null differ diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template index fc64ef7..0d3d36f 100644 --- a/templates/de/download/ubuntu.template +++ b/templates/de/download/ubuntu.template @@ -1,63 +1,66 @@ - - + + <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> -Wine für Ubuntu und Ubuntu Derivate +Wine für Ubuntu und Ubuntu-Varianten <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> -Ubuntu und Ubuntu derivate (wie Kubuntu) bekommen ihre Software -als Pakete die in Repositories untergebracht sind. Ubuntu's -Standard Repository enthält Wine, wenn du allerdings mit dem -neuesten Wine auf dem Laufenden bleiben willst nutze das von -WineHQ mit folgender Anleitung. +Ubuntu und Ubuntu-Varianten (wie Kubuntu) beziehen ihre Software +aus Paketen die in Repositories untergebracht sind. Ubuntus Standard-Repository enthält +bereits ein Wine-Paket des "stable"-Zweigs. Wenn Sie allerdings auf dem neuesten Stand bleiben möchten, +können Sie nach folgender Anleitung eine aktuelle Entwicklungsversion installieren. -<h2>Hinzufügen des WineHQ Repository:</h2> +Ubuntu-Derivate: Diese Pakete und Anweisungen sind auf Ubuntu und dessen <a href="http://wiki.ubuntu.com/UbuntuFlavors">offiziell anerkannten Varianten (en)</a> ausgelegt. +Benutzer von anderen Ubuntu-Derivaten (z.B. Linux Mint) können diese Pakete ebenfalls verwenden, sie sollten allerdings beachten, dass Probleme, die durch Unterschiede zwischen den Derivaten +und der offiziellen Ubuntu-Distribution entstehen, keine Fehler in Wine oder diesen Paketen darstellen. Derartige Probleme werden nicht von WineHQ unterstützt und sollten +ausschließlich an die jeweiligen Distributionen gemeldet werden. -Öffne das Software-Paketquellenmenü durch -Anwendungen->Software-Center, dann Bearbeiten->Software-Paketquellen... -Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinzufügen. +<h2>Hinzufügen des PPA-Repositories:</h2> -<img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> +Öffnen Sie den Paketquellen-Einstellungsdialog, indem Sie im +Software-Center den Menüeintrag Bearbeiten -> Software-Paketquellen auswählen. +Klicken Sie im Reiter Andere Software auf Hinzufügen. -Dann, kopiere die untere Zeile dort hinein. +<img src="{$root}/images/distro/de_ubuntu-ppa.png" width="756" height="472" alt="Software-Paketquellen" border="0"> + +Kopieren Sie die folgende Zeile in das Eingabefeld: ppa:ubuntu-wine/ppa <h2>Warnung: Betapakete</h2> -Die 1.7 Pakete hier sind Betapakete. Das bedeutet, dass sie +Die hier angebotenen Versionen 1.7.x sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen <a href="http://wiki.winehq.org/RegressionTesting">Regressionen</a> erleiden, wodurch -eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version -Wine 1.6 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. +eine Aktualisierung die Funktionalität unter Wine beeinträchtigen kann. Wenn die stabile Version +Wine 1.6 mit ihren Anwendungen funktioniert, möchten Sie diese Betapakete möglicherweise nicht benutzen. <h2>Installieren von Wine:</h2> -Sobald du das WineHQ PPA Repository hinzugefügt hast, kannst du es installieren. +Sobald Sie das PPA-Repository hinzugefügt haben, können Sie Wine installieren. Für die aktuellste Wine 1.7 Beta, -<a href="apt://wine1.7">klicke diesen Link um das wine1.7 Paket zu installieren</a>. -Für die ältere, stabile Wine 1.6 Version, -<a href="apt://wine1.6">klicke diesen Link um das wine1.6 Paket zu installieren</a>. +<a href="apt://wine1.7">klicken Sie diesen Link, um das Paket 'wine1.7' zu installieren</a>. +Für die ältere, stabile Version Wine 1.6, +<a href="apt://wine1.6">klicken Sie diesen Link, um das Paket 'wine1.6' zu installieren</a>. <h2>Aktualisierung auf eine neue Ubuntuversion</h2> -Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 13.10 auf -14.04, musst Du zu dieser Seite zurückkehren und das Repository nochmal hinzufügen. -Die eingebaute Aktualisierungsverwaltung wird das Wine repository nicht automatisch updaten. +Wenn Sie ihr gesamtes System aktualisieren, zum Beispiel von Ubuntu 13.10 auf +14.04, müssen Sie zu dieser Seite zurückkehren und das Repository erneut hinzufügen. +Die eingebaute Aktualisierungsverwaltung wird das Wine-Repository nicht automatisch übernehmen. <h2>Alternative Kommandozeileninstruktionen für die Wine-Installation:</h2> -Es ist auch möglich, das Hinzufügen des Wine PPA und die Installation -wie folgt mit der Kommandozeile durchzuführen. -Die Instruktionen sind nützlich für Kubuntu, Xubuntu und andere Ubuntu -Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal). +Es ist auch möglich, das Hinzufügen des PPA und die Installation der Pakete wie folgt mit der Kommandozeile durchzuführen. +Diese Methode könnte sich für Ubuntu-Varianten und Derivate, bei denen die obigen Anweisungen nicht zutreffen, +als nützlich erweisen. sudo add-apt-repository ppa:ubuntu-wine/ppa -Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get -update'. Du kannst nun Wine durch Ausführen von 'sudo apt-get +Aktualisieren Sie anschließend die APT-Paketinformationen durch Ausführen von 'sudo apt-get +update'. Sie können Wine nun durch Ausführen von 'sudo apt-get install wine1.7' im Terminal installieren. -Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>. +Wenn Sie das PPA manuell durchsuchen möchten, können Sie dessen <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">Seite auf Launchpad</a> benutzen.

1 0

Frédéric Delanoy : French translation for release 1.7.31
by Jeremy Newman Nov. 17, 2014

Nov. 17, 2014

Module: website Branch: master Commit: b7dfac9fd585fb87b257e8a6403228ac84a77aea URL: http://source.winehq.org/git/website.git/?a=commit;h=b7dfac9fd585fb87b257e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Nov 16 08:17:39 2014 +0100 French translation for release 1.7.31 --- news/fr/2014111401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014111401.xml b/news/fr/2014111401.xml new file mode 100644 index 0000000..2c49570 --- /dev/null +++ b/news/fr/2014111401.xml @@ -0,0 +1,15 @@ +<news> +<date>14 novembre 2014</date> +<title>Sortie de Wine 1.7.31</title> +<body> + La version de développement 1.7.31 de Wine est disponible. + <a href="{$root}/announce/1.7.31">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Gecko basée sur Firefox 34.</li> + <li>Prise en charge de la version Visual Studio 2013 des moteurs d'exécution C/C++.</li> + <li>Meilleure prise en charge des métriques de fontes dans DirectWrite.</li> + <li>Travail additionnel sur Direct2D.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.31.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetOpacity().
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 5cc7996b1f207c41d940e4a926e098dfc7ee89a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc7996b1f207c41d940e4a92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:22 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetOpacity(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 8837cee..6366086 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -226,9 +226,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColor static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface,

1 0

Henri Verbeet : d3d10core/tests: Port alpha_test() to d3d10core.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 1c116c35279dac5396734757b7ee434a0629201e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c116c35279dac5396734757b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:25 2014 +0100 d3d10core/tests: Port alpha_test() to d3d10core. --- dlls/d3d10core/tests/device.c | 253 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 +- dlls/d3d9/tests/visual.c | 4 +- dlls/ddraw/tests/visual.c | 4 +- 4 files changed, 259 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c116c35279dac5396734…

1 0

Henri Verbeet : wined3d: Explicitly convert the condition to bool shader_glsl_if().
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 8681999eee64221f230d34e74608382886de0980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681999eee64221f230d34e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:23 2014 +0100 wined3d: Explicitly convert the condition to bool shader_glsl_if(). In SM4 shaders the condition is likely to be an integer instead of a bool uniform like in SM3. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7379ba2..9a0a43b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3360,7 +3360,7 @@ static void shader_glsl_if(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s) {\n", src0_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) {\n", src0_param.param_str); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : wined3d: Recognize the SM4 uge opcode.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 8c18ebf66a75d77d884499f2e31809f930803fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c18ebf66a75d77d884499f2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:24 2014 +0100 wined3d: Recognize the SM4 uge opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a7bc23d..f5e614e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5279,6 +5279,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a0a43b..98239ef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2348,6 +2348,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break; + case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; default: op = "<unhandled operator>"; @@ -2365,6 +2366,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break; + case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; default: op = "<unhandled operator>"; @@ -6764,6 +6766,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, + /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7a98dd8..f32d248 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cba55ad..ac0fab5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -117,6 +117,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -259,6 +260,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "F", "F"}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, "FF", "F"}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "UU", "UU"}, + {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "U", "UU"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cba20f4..b7803c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -547,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_UGE, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Henri Verbeet : d3d9: Remove some incorrect constants from d3d9types.h.
by Alexandre Julliard Nov. 17, 2014

Nov. 17, 2014

Module: wine Branch: master Commit: 82f70e25c1e476d35d60268df9cb0d22f6dc0e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f70e25c1e476d35d60268df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:21 2014 +0100 d3d9: Remove some incorrect constants from d3d9types.h. D3DPRESENT_BACK_BUFFER_MAX doesn't exist at all and D3DPRESENT_BACK_BUFFERS_MAX is in d3d9.h. --- include/d3d9types.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4cc1195..fd7c4ce 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -206,7 +206,6 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -643,8 +642,6 @@ typedef enum _D3DBACKBUFFER_TYPE { D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; -#define D3DPRESENT_BACK_BUFFER_MAX __MSABI_LONG(3) - typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0, D3DBASIS_BSPLINE = 1,

1 0