September 2012 - Wine-Commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

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

Henri Verbeet : wined3d: Get rid of wined3d_device_get_wined3d().
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 66ec8a5cfb392e28d0feb5a9a42337eac1676117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ec8a5cfb392e28d0feb5a9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:30 2012 +0200 wined3d: Get rid of wined3d_device_get_wined3d(). --- dlls/wined3d/device.c | 12 ------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0826957..ba8c4be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1567,18 +1567,6 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) device->create_parms.flags |= WINED3DCREATE_MULTITHREADED; } -HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d) -{ - TRACE("device %p, wined3d %p.\n", device, wined3d); - - *wined3d = device->wined3d; - wined3d_incref(*wined3d); - - TRACE("Returning %p.\n", *wined3d); - - return WINED3D_OK; -} - UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index eed1174..6555ae8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,7 +94,6 @@ @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) -@ cdecl wined3d_device_get_wined3d(ptr ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) @ cdecl wined3d_device_init_gdi(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4a11ff2..941bd8e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2176,7 +2176,6 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);

1 0

Hans Leidekker : wbemprox: Add support for boolean values in get_value_bstr .
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 4e2c2e5a6451314cac87289818db3253dc1becc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2c2e5a6451314cac8728981… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:24 2012 +0200 wbemprox: Add support for boolean values in get_value_bstr. --- dlls/wbemprox/table.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 6b584ff..c6dc845 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -144,6 +144,8 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; static const WCHAR fmt_strW[] = {'\"','%','s','\"',0}; + static const WCHAR trueW[] = {'T','R','U','E',0}; + static const WCHAR falseW[] = {'F','A','L','S','E',0}; LONGLONG val; BSTR ret; WCHAR number[22]; @@ -158,6 +160,10 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) switch (table->columns[column].type & COL_TYPE_MASK) { + case CIM_BOOLEAN: + if (val) return SysAllocString( trueW ); + else return SysAllocString( falseW ); + case CIM_DATETIME: case CIM_STRING: len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2;

1 0

Alexandre Julliard : server: Always repaint the whole non-client area if part of it is exposed.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

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

Rico Schüller : d3dx9: Make '\0' the default case in get_constant_by_name().
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

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

Rico Schüller : d3dx9: Remove ID3DXMatrixStackImpl typedef.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 6268414cab8a5f84f4c7f2e06c570e4e23f8e2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6268414cab8a5f84f4c7f2e06… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:57 2012 +0200 d3dx9: Remove ID3DXMatrixStackImpl typedef. --- dlls/d3dx9_36/math.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 81c0b65..4a477ec 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; -typedef struct ID3DXMatrixStackImpl +struct ID3DXMatrixStackImpl { ID3DXMatrixStack ID3DXMatrixStack_iface; LONG ref; @@ -45,7 +45,7 @@ typedef struct ID3DXMatrixStackImpl unsigned int current; unsigned int stack_size; D3DXMATRIX *stack; -} ID3DXMatrixStackImpl; +}; /*_________________D3DXColor____________________*/ @@ -835,9 +835,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) static const unsigned int INITIAL_STACK_SIZE = 32; -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK *ppstack) { - ID3DXMatrixStackImpl* object; + struct ID3DXMatrixStackImpl *object; TRACE("flags %#x, ppstack %p\n", flags, ppstack); @@ -868,9 +868,9 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) return D3D_OK; } -static inline ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) +static inline struct ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) { - return CONTAINING_RECORD(iface, ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); + return CONTAINING_RECORD(iface, struct ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); } static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **out) @@ -893,15 +893,15 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *ifac static ULONG WINAPI ID3DXMatrixStackImpl_AddRef(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); return ref; } -static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) +static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) { @@ -914,7 +914,7 @@ static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -923,7 +923,7 @@ static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -934,7 +934,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -945,7 +945,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -956,7 +956,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -967,7 +967,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -995,7 +995,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1023,7 +1023,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1036,7 +1036,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1049,7 +1049,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1062,7 +1062,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack * static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1075,7 +1075,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixSt static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1088,7 +1088,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1101,7 +1101,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, F static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1114,7 +1114,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FL static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); + struct ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface);

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 Sept. 4, 2012

Sept. 4, 2012

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

Jason Edmeades : cmd: Fix renaming inside directories.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

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 Sept. 4, 2012

Sept. 4, 2012

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

Hans Leidekker : wbemprox: Get rid of a duplicate string constant.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: d582950db28d8cde40c95cc2a8b4eb4926847b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d582950db28d8cde40c95cc2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:48:54 2012 +0200 wbemprox: Get rid of a duplicate string constant. --- dlls/wbemprox/builtin.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 01a7da4..1016ca5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -111,6 +111,8 @@ static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR prop_maxclockspeedW[] = + {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_methodW[] = {'M','e','t','h','o','d',0}; static const WCHAR prop_modelW[] = @@ -163,10 +165,6 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; -static const WCHAR prop_maxclockspeedW[] = - {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; -static const WCHAR prop_numberoflogicalprocessorsW[] = - {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -253,13 +251,13 @@ static const struct column col_process[] = }; static const struct column col_processor[] = { - { prop_cpustatusW, CIM_UINT16 }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_maxclockspeedW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_numberoflogicalprocessorsW, CIM_UINT32 }, - { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_cpustatusW, CIM_UINT16 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_maxclockspeedW, CIM_UINT32 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_numlogicalprocessorsW, CIM_UINT32 }, + { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_service[] = {

1 0