September 2012 - Wine-commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: b8050f057149cc8c215fdc256d7ddf719865340c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8050f057149cc8c215fdc256… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 3 23:38:53 2012 +0200 Assorted spelling fixes. --- dlls/advapi32/tests/registry.c | 4 ++-- dlls/dinput/tests/keyboard.c | 4 ++-- dlls/dssenh/tests/dssenh.c | 6 +++--- dlls/kernel32/tests/volume.c | 2 +- dlls/shell32/shellpath.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 870275e..307d1c7 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -401,9 +401,9 @@ static void test_set_value(void) /* test RegSetValueExW with data = 1 */ ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (const BYTE *)1, 1); - ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); - ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); } static void create_test_entries(void) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 4cd36c4..fe5fa89 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -183,8 +183,8 @@ static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) caps.dwSize = sizeof(caps); hr = IDirectInputDevice_GetCapabilities(pKeyboard, &caps); - ok (SUCCEEDED(hr), "GetCapabilites failed: 0x%08x\n", hr); - ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilites dwFlags: 0x%08x\n", caps.dwFlags); + ok (SUCCEEDED(hr), "GetCapabilities failed: 0x%08x\n", hr); + ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags); ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 9d29a0f..bf79407 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -562,7 +562,7 @@ static const struct encrypt_test encrypt_data[] = { {CALG_DES, 56 << 16, dataToEncrypt3, sizeof(dataToEncrypt3), (BYTE *)dataToEncrypt3, encryptedDES_3}, /* CALG_RC2 key unexpected results under Win2K when default key length is used, here we use - minimum length because Win2K's DSSENH provider has a differnt default key length compared + minimum length because Win2K's DSSENH provider has a different default key length compared to the younger operating systems, though there is no default key len issue with CALG_RC4 */ {CALG_RC2, 40 << 16, dataToEncrypt1, sizeof(dataToEncrypt1), (BYTE *)dataToEncrypt1, encryptedRC2_1}, @@ -1192,7 +1192,7 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ ok(!memcmp(pbData1, pbData2, dataLen), "Decrypted data is not identical.\n"); - /* Destory all user keys */ + /* Destroy all user keys */ result = CryptDestroyKey(sessionKey1); ok((!result && GetLastError() == ERROR_INVALID_PARAMETER) || broken(result), "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* WinNT4 */ @@ -1317,7 +1317,7 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te ok(!memcmp(pbData1, pbData2, dataLen), "Decrypted data is not identical.\n"); - /* Destory all user keys */ + /* Destroy all user keys */ result = CryptDestroyKey(sessionKey1); ok(result, "Failed to destroy session key 1, got %x\n", GetLastError()); diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 8152ae1..d788c81 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -807,7 +807,7 @@ static void test_dvd_read_structure(HANDLE handle) SetLastError(0xdeadbeef); /* On newer version, an output buffer of sizeof(DVD_READ_STRUCTURE) size fails. - I think this is to force developpers to realize that there is a header before the actual content */ + I think this is to force developers to realize that there is a header before the actual content */ ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), &dvdLayerDescriptor, sizeof(DVD_LAYER_DESCRIPTOR), &nbBytes, NULL); ok( (!ret && GetLastError() == ERROR_INVALID_PARAMETER) || broken(ret) /* < Win7 */, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 41730ea..00ee079 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2648,7 +2648,7 @@ static void _SHCreateSymbolicLinks(void) /* Create symbolic links for 'My Pictures', 'My Videos' and 'My Music'. */ for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { - /* Create the current 'My Whatever' folder and get it's unix path. */ + /* Create the current 'My Whatever' folder and get its unix path. */ hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_DEFAULT, wszTempPath); if (FAILED(hr)) continue;

1 0

Piotr Caban : ntdll/tests: Added basic NtQuerySystemInformation( SystemLogicalProcessorInformation) tests.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 67920ea6dde99e3dafde7f27147dcd80550608c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67920ea6dde99e3dafde7f271… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:39:35 2012 +0200 ntdll/tests: Added basic NtQuerySystemInformation(SystemLogicalProcessorInformation) tests. --- dlls/ntdll/tests/info.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4c23552..3dce90b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -576,6 +576,51 @@ static void test_query_regquota(void) ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); } +static void test_query_logicalproc(void) +{ + NTSTATUS status; + ULONG len, i, proc_no; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *slpi; + SYSTEM_INFO si; + + GetSystemInfo(&si); + + status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len); + if(status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemLogicalProcessorInformation is not supported\n"); + return; + } + if(status == STATUS_NOT_IMPLEMENTED) + { + todo_wine ok(0, "SystemLogicalProcessorInformation is not implemented\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len); + + slpi = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, slpi, len, &len); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + proc_no = 0; + for(i=0; i<len/sizeof(*slpi); i++) { + switch(slpi[i].Relationship) { + case RelationProcessorCore: + /* Get number of logical processors */ + for(; slpi[i].ProcessorMask; slpi[i].ProcessorMask /= 2) + proc_no += slpi[i].ProcessorMask%2; + break; + default: + break; + } + } + ok(proc_no > 0, "No processors were found\n"); + if(si.dwNumberOfProcessors <= 32) + ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %d, expected %d\n", + proc_no, si.dwNumberOfProcessors); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -1513,6 +1558,10 @@ START_TEST(info) trace("Starting test_query_regquota()\n"); test_query_regquota(); + /* 0x49 SystemLogicalProcessorInformation */ + trace("Starting test_query_logicalproc()\n"); + test_query_logicalproc(); + /* NtQueryInformationProcess */ /* 0x0 ProcessBasicInformation */

1 0

Alexandre Julliard : user32: Only show a window the first time WS_VISIBLE is toggled, to work around Steam's WM_SETREDRAW usage.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 2dc234d923b70fa0a0e1815d909035d059aa8772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc234d923b70fa0a0e1815d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 12:38:33 2012 +0200 user32: Only show a window the first time WS_VISIBLE is toggled, to work around Steam's WM_SETREDRAW usage. --- dlls/user32/win.c | 58 +++++++++++++++++++++++++++++++------------------- dlls/user32/win.h | 1 + dlls/user32/winpos.c | 3 ++ 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 66fc8cc..82d62b1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -606,7 +606,7 @@ HWND WIN_SetOwner( HWND hwnd, HWND owner ) */ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { - BOOL ok; + BOOL ok, needs_show = FALSE; STYLESTRUCT style; WND *win = WIN_GetPtr( hwnd ); @@ -638,20 +638,29 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) } } SERVER_END_REQ; - WIN_ReleasePtr( win ); - if (ok) + + if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) { - if ((style.styleOld ^ style.styleNew) & WS_VISIBLE) - { - RECT window_rect, client_rect; - UINT flags = style.styleNew & WS_VISIBLE ? SWP_SHOWWINDOW : 0; /* we don't hide it */ + /* Some apps try to make their window visible through WM_SETREDRAW. + * Only do that if the window was never explicitly hidden, + * because Steam messes with WM_SETREDRAW after hiding its windows. */ + needs_show = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + invalidate_dce( win, NULL ); + } + WIN_ReleasePtr( win ); - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | flags, &window_rect, &client_rect, NULL ); - } - USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); + if (!ok) return 0; + + if (needs_show) + { + RECT window_rect, client_rect; + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + &window_rect, &client_rect, NULL ); } + + USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); return style.styleOld; } @@ -2135,7 +2144,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOOL unicode ) { STYLESTRUCT style; - BOOL ok; + BOOL ok, needs_show = FALSE; LONG_PTR retval = 0; WND *wndPtr; @@ -2334,23 +2343,28 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B } } SERVER_END_REQ; + + if (offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + { + needs_show = !(wndPtr->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + invalidate_dce( wndPtr, NULL ); + } WIN_ReleasePtr( wndPtr ); if (!ok) return 0; + if (needs_show) + { + RECT window_rect, client_rect; + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + &window_rect, &client_rect, NULL ); + } if (offset == GWL_STYLE || offset == GWL_EXSTYLE) { style.styleOld = retval; style.styleNew = newval; - if (offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) - { - RECT window_rect, client_rect; - UINT flags = style.styleNew & WS_VISIBLE ? SWP_SHOWWINDOW : 0; /* we don't hide it */ - - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | flags, &window_rect, &client_rect, NULL ); - } USER_Driver->pSetWindowStyle( hwnd, offset, &style ); SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 13ee58e..7c899ac 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -73,6 +73,7 @@ typedef struct tagWND #define WIN_ISUNICODE 0x0010 /* Window is Unicode */ #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ +#define WIN_HIDDEN 0x0080 /* hidden by an explicit SWP_HIDEWINDOW (as opposed to WM_SETREDRAW) */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 23b0b7f..507a5ce 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1872,6 +1872,9 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) parent = GetAncestor( winpos->hwnd, GA_PARENT ); if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; + if (winpos->flags & SWP_HIDEWINDOW) wndPtr->flags |= WIN_HIDDEN; + else if (winpos->flags & SWP_SHOWWINDOW) wndPtr->flags &= ~WIN_HIDDEN; + if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW; else {

1 0

Alexandre Julliard : server: Always repaint the whole non-client area if part of it is exposed.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: a76f60d14ef8f30063219f9b333d88e24f7d5865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76f60d14ef8f30063219f9b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 13:37:46 2012 +0200 server: Always repaint the whole non-client area if part of it is exposed. --- server/window.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index fefe1ac..b6fcde0 100644 --- a/server/window.c +++ b/server/window.c @@ -1631,6 +1631,14 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->bottom - old_client_rect.bottom != y_offset || !valid_rects || memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); + /* if part of the non-client area was exposed, consider it changed */ + if (exposed_rgn && !frame_changed) + { + get_region_extents( exposed_rgn, &rect ); + offset_rect( &rect, client_rect->left, client_rect->top ); + frame_changed = (rect.left < client_rect->left || rect.top < client_rect->top || + rect.right > client_rect->right || rect.bottom > client_rect->bottom); + } } if (frame_changed || client_changed)

1 0

Alexandre Julliard : winex11: Create the whole window at window creation time.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: ea07c310ecfee6b301e7af8413760eb446e6f184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea07c310ecfee6b301e7af841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 13:34:15 2012 +0200 winex11: Create the whole window at window creation time. --- dlls/winex11.drv/opengl.c | 3 +-- dlls/winex11.drv/systray.c | 5 +---- dlls/winex11.drv/window.c | 29 ++++++++--------------------- dlls/winex11.drv/x11drv.h | 1 - 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a2d88a0..b23ec98 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1176,8 +1176,7 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) if (!(format = pixelformat_from_fbconfig_id( fbconfig_id ))) return FALSE; - if (!(data = X11DRV_get_win_data(hwnd)) && - !(data = X11DRV_create_win_data(hwnd))) return FALSE; + if (!(data = X11DRV_get_win_data(hwnd))) return FALSE; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); gl->pixel_format = format; diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 7efc63d..f46ea29 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -517,10 +517,7 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window icon->window = CreateWindowW( icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, icon_cx, icon_cy, NULL, NULL, NULL, icon ); - if (!icon->window) return; - - if (!(data = X11DRV_get_win_data( icon->window )) && - !(data = X11DRV_create_win_data( icon->window ))) return; + if (!(data = X11DRV_get_win_data( icon->window ))) return; TRACE( "icon window %p/%lx managed %u\n", data->hwnd, data->whole_window, data->managed ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7d2d1e2..e5b731c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -911,12 +911,9 @@ static Window get_owner_whole_window( HWND owner, BOOL force_managed ) if (!owner) return 0; - if (!(data = X11DRV_get_win_data( owner ))) - { - if (!(data = X11DRV_create_win_data( owner ))) - return (Window)GetPropA( owner, whole_window_prop ); - } - else if (!data->managed && force_managed) /* make it managed */ + if (!(data = X11DRV_get_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); + + if (!data->managed && force_managed) /* make it managed */ { SetWindowPos( owner, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | @@ -1722,7 +1719,8 @@ struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) * * Create an X11 data window structure for an existing window. */ -struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) +static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *window_rect, + const RECT *client_rect ) { Display *display; struct x11drv_win_data *data; @@ -1733,16 +1731,11 @@ struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) /* don't create win data for HWND_MESSAGE windows */ if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; - if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; - display = thread_init_display(); if (!(data = alloc_win_data( display, hwnd ))) return NULL; - GetWindowRect( hwnd, &data->window_rect ); - MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); - data->whole_rect = data->window_rect; - GetClientRect( hwnd, &data->client_rect ); - MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); + data->whole_rect = data->window_rect = *window_rect; + data->client_rect = *client_rect; if (parent == GetDesktopWindow()) { @@ -2076,14 +2069,8 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag const RECT *window_rect, const RECT *client_rect, RECT *visible_rect ) { struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - if (!data) - { - /* create the win data if the window is being made visible */ - if (!(style & WS_VISIBLE) && !(swp_flags & SWP_SHOWWINDOW)) return; - if (!(data = X11DRV_create_win_data( hwnd ))) return; - } + if (!data && !(data = X11DRV_create_win_data( hwnd, window_rect, client_rect ))) return; /* check if we need to switch the window to managed */ if (!data->managed && data->whole_window && is_window_managed( hwnd, swp_flags, window_rect )) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d1db819..eae047a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -551,7 +551,6 @@ struct x11drv_win_data }; extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; -extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Store the rectangle of the GL drawable and use it when updating the window size .
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 514eb695846b45c89c0fc0d56653d187f1840eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=514eb695846b45c89c0fc0d56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 15:03:04 2012 +0200 winex11: Store the rectangle of the GL drawable and use it when updating the window size. --- dlls/winex11.drv/opengl.c | 70 ++++++++++++++++++++++++++++---------------- dlls/winex11.drv/window.c | 58 +------------------------------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 46 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=514eb695846b45c89c0fc…

1 0

Jason Edmeades : cmd: Fix rmdir error during recursive delete.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 94f9e789c94f90dad3d771cdabded15aeeedba8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f9e789c94f90dad3d771cda… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 3 22:03:58 2012 +0100 cmd: Fix rmdir error during recursive delete. --- programs/cmd/builtins.c | 4 ++++ programs/cmd/tests/test_builtins.cmd | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a83947b..c92822b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1827,6 +1827,10 @@ void WCMD_remove_dir (WCHAR *command) { lpDir.pFrom = thisArg; lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; lpDir.wFunc = FO_DELETE; + + /* SHFileOperationW needs file list with a double null termination */ + thisArg[lstrlenW(thisArg) + 1] = 0x00; + if (SHFileOperationW(&lpDir)) WCMD_print_error (); } } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 36bc73f..13b53c5 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1163,7 +1163,7 @@ if not exist foo ( ) mkdir foo\bar\baz echo foo > foo\bar\brol -rmdir /s /Q foo +rmdir /s /Q foo 2>&1 if not exist foo ( echo recursive rmdir succeeded ) else (

1 0

Jason Edmeades : cmd: Fix renaming inside directories.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: c5a72379a1fd8b61e649ff3c45225b7111ec1249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a72379a1fd8b61e649ff3c4… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Sep 3 22:48:08 2012 +0100 cmd: Fix renaming inside directories. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c92822b..16f4eff 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1872,7 +1872,7 @@ void WCMD_rename (void) } /* Destination cannot contain a drive letter or directory separator */ - if ((strchrW(param1,':') != NULL) || (strchrW(param1,'\\') != NULL)) { + if ((strchrW(param2,':') != NULL) || (strchrW(param2,'\\') != NULL)) { SetLastError(ERROR_INVALID_PARAMETER); WCMD_print_error(); errorlevel = 1; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c444be6..b7bcd96 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -629,8 +629,8 @@ read-only file renamed dir renamed read-only dir renamed --- rename in other directory -(a)todo_wine@rename impossible in other directory -(a)todo_wine@original file still present +rename impossible in other directory +original file still present ------------ Testing move ------------ --- file move file move succeeded

1 0

Rico Schüller : d3dx9: Fix ID3DXConstantTable:: GetConstantElement() for structs.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: b999ab16b3d5f69b3fa4b8c80a3a4d3f690c419e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b999ab16b3d5f69b3fa4b8c80… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:28 2012 +0200 d3dx9: Fix ID3DXConstantTable::GetConstantElement() for structs. --- dlls/d3dx9_36/shader.c | 2 +- dlls/d3dx9_36/tests/shader.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 766b897..5745884 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1009,7 +1009,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant if (c && index < c->desc.Elements) { - if (c->constants) c = &c->constants[index]; + if (c->desc.Elements > 1) c = &c->constants[index]; TRACE("Returning constant %p\n", c); return handle_from_constant(c); } diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2792327..ad092ab 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1848,6 +1848,12 @@ static void test_get_shader_constant_variables(void) element = ID3DXConstantTable_GetConstantByName(ctable, "s_2[0]", "invalid"); ok(element == NULL, "GetConstantByName failed\n"); + constant = ID3DXConstantTable_GetConstantByName(ctable, NULL, "s_2[0]"); + ok(constant != NULL, "GetConstantByName failed\n"); + + element = ID3DXConstantTable_GetConstantElement(ctable, "s_2[0]", 0); + ok(constant == element, "GetConstantByName failed, got %p, expected %p\n", element, constant); + count = ID3DXConstantTable_Release(ctable); ok(count == 0, "Release failed, got %u, expected %u\n", count, 0); }

1 0

Rico Schüller : d3dx9: Make '\0' the default case in get_constant_by_name().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 7d08ae9b29fae7831d03c19d9f605f8166bd5804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d08ae9b29fae7831d03c19d9… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:38 2012 +0200 d3dx9: Make '\0' the default case in get_constant_by_name(). --- dlls/d3dx9_36/shader.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 5745884..c62c8e5 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -752,7 +752,7 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl handles = constant->constants; } - length = strcspn( name, "[." ); + length = strcspn(name, "[."); part = name + length; for (i = 0; i < count; i++) @@ -767,13 +767,9 @@ static struct ctab_constant *get_constant_by_name(struct ID3DXConstantTableImpl case '[': return get_constant_element_by_name(&handles[i], part); - case '\0': + default: TRACE("Returning parameter %p\n", &handles[i]); return &handles[i]; - - default: - FIXME("Unhandled case \"%c\"\n", *--part); - break; } } }

1 0