September 2012 - Wine-commits

Jacek Caban : include: Added uiautomationclient.idl.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 5f6d133f112dc6d66f67534ec66ace3c99e89616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6d133f112dc6d66f67534ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 11:01:14 2012 +0200 include: Added uiautomationclient.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/uiautomation.h | 2 +- include/uiautomationclient.idl | 149 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6d133f112dc6d66f675…

1 0

Piotr Caban : wininet: Don' t ask for confirmation while deleting cache directory.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: d2e5bb30eb271d8c297a7abc0eb17ee368b88a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e5bb30eb271d8c297a7abc0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 26 11:37:41 2012 +0200 wininet: Don't ask for confirmation while deleting cache directory. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index eac3402..36e0a35 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1657,7 +1657,7 @@ static BOOL URLCache_DeleteCacheDirectory(LPCWSTR lpszPath) shfos.wFunc = FO_DELETE; shfos.pFrom = path; shfos.pTo = NULL; - shfos.fFlags = 0; + shfos.fFlags = FOF_NOCONFIRMATION; shfos.fAnyOperationsAborted = FALSE; ret = SHFileOperationW(&shfos); if (ret)

1 0

Piotr Caban : wininet: Delete cache directory when cache version doesn' t match.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: fa0f0630c59c5f13f8d5f2303fb85ebf00ea889e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0f0630c59c5f13f8d5f2303… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 26 11:37:55 2012 +0200 wininet: Delete cache directory when cache version doesn't match. --- dlls/wininet/urlcache.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 36e0a35..3be3b15 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -60,6 +60,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +static const char urlcache_ver_prefix[] = "WINE URLCache Ver "; +static const char urlcache_ver[] = "0.2012001"; + #define ENTRY_START_OFFSET 0x4000 #define DIR_LENGTH 8 #define MAX_DIR_NO 0x20 @@ -337,7 +340,8 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer, DWORD b HASH_CACHEFILE_ENTRY *pHashEntry; /* First set some constants and defaults in the header */ - strcpy(pHeader->szSignature, "WINE URLCache Ver 0.2005001"); + memcpy(pHeader->szSignature, urlcache_ver_prefix, sizeof(urlcache_ver_prefix)-1); + memcpy(pHeader->szSignature+sizeof(urlcache_ver_prefix)-1, urlcache_ver, sizeof(urlcache_ver)-1); pHeader->dwFileSize = new_file_size; pHeader->dwIndexCapacityInBlocks = blocks_no; /* 127MB - taken from default for Windows 2000 */ @@ -457,8 +461,41 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer, DWORD b URLCache_PathToObjectName(wszFilePath, '_'); pContainer->hMapping = OpenFileMappingW(FILE_MAP_WRITE, FALSE, wszFilePath); if (!pContainer->hMapping) + { pContainer->hMapping = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, 0, 0, wszFilePath); - CloseHandle(hFile); + CloseHandle(hFile); + + /* Validate cache index file on first open */ + if (pContainer->hMapping && blocks_no==MIN_BLOCK_NO) + { + URLCACHE_HEADER *pHeader = MapViewOfFile(pContainer->hMapping, FILE_MAP_WRITE, 0, 0, 0); + if (!pHeader) + { + ERR("MapViewOfFile failed (error is %d)\n", GetLastError()); + CloseHandle(pContainer->hMapping); + pContainer->hMapping = NULL; + ReleaseMutex(pContainer->hMutex); + return GetLastError(); + } + + if (!memcmp(pHeader->szSignature, urlcache_ver_prefix, sizeof(urlcache_ver_prefix)-1) && + memcmp(pHeader->szSignature+sizeof(urlcache_ver_prefix)-1, urlcache_ver, sizeof(urlcache_ver)-1)) + { + TRACE("detected wrong version of cache: %s, expected %s\n", pHeader->szSignature, urlcache_ver); + UnmapViewOfFile(pHeader); + + FreeUrlCacheSpaceW(pContainer->path, 100, 0); + } + else + { + UnmapViewOfFile(pHeader); + } + } + } + else + { + CloseHandle(hFile); + } if (!pContainer->hMapping) { ERR("Couldn't create file mapping (error is %d)\n", GetLastError());

1 0

Francois Gouget : wininet: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 83af29fb03c3d00be7bd490b0203a6f71df9118a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83af29fb03c3d00be7bd490b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 26 11:12:46 2012 +0200 wininet: Add a trailing '\n' to a couple of Wine traces. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3be3b15..13633ac 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1772,7 +1772,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( return FALSE; } if (dwFlags & ~GET_INSTALLED_ENTRY) - FIXME("ignorring unsupported flags: %x", dwFlags); + FIXME("ignoring unsupported flags: %x\n", dwFlags); error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1913,7 +1913,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( return FALSE; } if (dwFlags) - FIXME("ignorring unsupported flags: %x", dwFlags); + FIXME("ignoring unsupported flags: %x\n", dwFlags); error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS)

1 0

Francois Gouget : d3dx9_36/tests: Remove spaces before '\n's in ok() calls.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 91c7dca35fee32bfc8fa286223cfa2ff75da78f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c7dca35fee32bfc8fa28622… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 26 11:12:51 2012 +0200 d3dx9_36/tests: Remove spaces before '\n's in ok() calls. --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2cb6a7a..9043ab3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2560,7 +2560,7 @@ static void test_D3DXSHEvalDirectionalLight(void) else expected = test[l].red_out[startindex + j]; ok(relative_error(expected, red_out[j]) < admitted_error, - "Red: case %u, order %u: expected[%u] = %f, received %f \n", l, order, j, expected, red_out[j]); + "Red: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, red_out[j]); if ( green_out ) { @@ -2569,7 +2569,7 @@ static void test_D3DXSHEvalDirectionalLight(void) else expected = test[l].green_out[startindex + j]; ok(relative_error(expected, green_out[j]) < admitted_error, - "Green: case %u, order %u: expected[%u] = %f, received %f \n", l, order, j, expected, green_out[j]); + "Green: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, green_out[j]); } if ( blue_out ) @@ -2579,7 +2579,7 @@ static void test_D3DXSHEvalDirectionalLight(void) else expected = test[l].blue_out[startindex + j]; ok(relative_error(expected, blue_out[j]) < admitted_error, - "Blue: case %u, order %u: expected[%u] = %f, received %f \n", l, order, j, expected, blue_out[j]); + "Blue: case %u, order %u: expected[%u] = %f, received %f\n", l, order, j, expected, blue_out[j]); } }

1 0

Rico Schüller : winex11.drv: Remove unneeded include file.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 9be684622495906f25d99663154438dc07026449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be684622495906f25d996631… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 11:45:58 2012 +0200 winex11.drv: Remove unneeded include file. --- dlls/winex11.drv/brush.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 3f3a79b..46bd2dd 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -22,7 +22,6 @@ #include <stdlib.h> -#include "wine/winbase16.h" #include "x11drv.h" #include "wine/debug.h"

1 0

Rico Schüller : d3dx9: Handle D3DXPT_VOID in get_float /bool/int().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: e817bc3f0483fdde3536eb754ed1d8c31206706b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e817bc3f0483fdde3536eb754… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 11:52:02 2012 +0200 d3dx9: Handle D3DXPT_VOID in get_float/bool/int(). --- dlls/d3dx9_36/util.c | 61 ++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index b4cdefe..72008a2 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -271,63 +271,62 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR /* parameter type conversion helpers */ -static BOOL get_bool(LPCVOID data) +static BOOL get_bool(D3DXPARAMETER_TYPE type, LPCVOID data) { - return (*(DWORD *)data) != 0; + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_INT: + case D3DXPT_BOOL: + return *(DWORD *)data != 0; + + case D3DXPT_VOID: + return *(BOOL *)data; + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); + return FALSE; + } } static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { - INT i; - switch (type) { case D3DXPT_FLOAT: - i = *(FLOAT *)data; - break; + return *(FLOAT *)data; case D3DXPT_INT: - i = *(INT *)data; - break; + case D3DXPT_VOID: + return *(INT *)data; case D3DXPT_BOOL: - i = get_bool(data); - break; + return get_bool(type, data); default: - i = 0; - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); - break; + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); + return 0; } - - return i; } static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) { - FLOAT f; - switch (type) { case D3DXPT_FLOAT: - f = *(FLOAT *)data; - break; + case D3DXPT_VOID: + return *(FLOAT *)data; case D3DXPT_INT: - f = *(INT *)data; - break; + return *(INT *)data; case D3DXPT_BOOL: - f = get_bool(data); - break; + return get_bool(type, data); default: - f = 0.0f; - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); - break; + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); + return 0.0f; } - - return f; } void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) @@ -347,7 +346,7 @@ void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DX break; case D3DXPT_BOOL: - *(BOOL *)outdata = get_bool(indata); + *(BOOL *)outdata = get_bool(intype, indata); break; case D3DXPT_INT: @@ -355,8 +354,8 @@ void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DX break; default: - FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(outtype)); - *(INT *)outdata = 0; + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(outtype)); + *(DWORD *)outdata = 0; break; } }

1 0

Rico Schüller : d3dx9: Fix shader constant byte calculation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 3eb26010d8a1b350035dafeb47af4bdc1cc9766f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb26010d8a1b350035dafeb4… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 12:21:54 2012 +0200 d3dx9: Fix shader constant byte calculation. --- dlls/d3dx9_36/shader.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c62c8e5..dfa0488 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -671,15 +671,6 @@ static inline int is_vertex_shader(DWORD version) return (version & 0xFFFF0000) == 0xFFFE0000; } -static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) -{ - if (desc->RegisterSet != D3DXRS_FLOAT4 && desc->RegisterSet != D3DXRS_SAMPLER) - FIXME("Don't know how to calculate Bytes for constants of type %s\n", - debug_d3dxparameter_registerset(desc->RegisterSet)); - - return 4 * desc->Elements * desc->Rows * desc->Columns; -} - static inline struct ctab_constant *constant_from_handle(D3DXHANDLE handle) { return (struct ctab_constant *)handle; @@ -1656,7 +1647,7 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru } constant->desc.RegisterCount = max(0, min(max - index, size)); - constant->desc.Bytes = calc_bytes(&constant->desc); + constant->desc.Bytes = 4 * constant->desc.Elements * type->Rows * type->Columns; return D3D_OK;

1 0

Rico Schüller : d3dx9: Improve RegisterCount calculation for D3DXRS_INT4/BOOL.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 82a800c128be2681633e6d4c9e62a1d2e0984b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a800c128be2681633e6d4c9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 12:22:02 2012 +0200 d3dx9: Improve RegisterCount calculation for D3DXRS_INT4/BOOL. --- dlls/d3dx9_36/shader.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index dfa0488..3147d40 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1644,6 +1644,27 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ if (offset) *offset += offsetdiff * 4 * 4; + + /* int and bool registerset have different sizes */ + if (regset == D3DXRS_INT4 || regset == D3DXRS_BOOL) + { + switch (type->Class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + size = type->Columns; + break; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + size = 4 * type->Columns; + break; + + default: + FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); + break; + } + } } constant->desc.RegisterCount = max(0, min(max - index, size));

1 0

Rico Schüller : d3dx9: Use float functions in D3DXSHRotateZ().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 398eb275387c51ba9543d40e1fee77643361b7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398eb275387c51ba9543d40e1… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:56:57 2012 +0200 d3dx9: Use float functions in D3DXSHRotateZ(). --- dlls/d3dx9_36/math.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 00cf9c3..1e80e2e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2466,38 +2466,33 @@ FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CON return out; } -FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) +FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) { FLOAT c1a, c2a, c3a, c4a, c5a, s1a, s2a, s3a, s4a, s5a; - TRACE("%p, %u, %f, %p)\n", out, order, angle, in); - - c1a = cos( angle ); - c2a = cos( 2.0f * angle ); - c3a = cos( 3.0f * angle ); - c4a = cos( 4.0f * angle ); - c5a = cos( 5.0f * angle ); - s1a = sin( angle ); - s2a = sin( 2.0f * angle ); - s3a = sin( 3.0f * angle ); - s4a = sin( 4.0f * angle ); - s5a = sin( 5.0f * angle ); + TRACE("out %p, order %u, angle %f, in %p\n", out, order, angle, in); + c1a = cosf(angle); + s1a = sinf(angle); out[0] = in[0]; out[1] = c1a * in[1] + s1a * in[3]; out[2] = in[2]; - out[3] = c1a * in[3] - s1a * in[1]; - if ( order <= D3DXSH_MINORDER ) + out[3] = c1a * in[3] - s1a * in[1]; + if (order <= D3DXSH_MINORDER) return out; + c2a = cosf(2.0f * angle); + s2a = sinf(2.0f * angle); out[4] = c2a * in[4] + s2a * in[8]; out[5] = c1a * in[5] + s1a * in[7]; out[6] = in[6]; out[7] = c1a * in[7] - s1a * in[5]; out[8] = c2a * in[8] - s2a * in[4]; - if ( order == 3 ) + if (order == 3) return out; + c3a = cosf(3.0f * angle); + s3a = sinf(3.0f * angle); out[9] = c3a * in[9] + s3a * in[15]; out[10] = c2a * in[10] + s2a * in[14]; out[11] = c1a * in[11] + s1a * in[13]; @@ -2505,9 +2500,11 @@ FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in out[13] = c1a * in[13] - s1a * in[11]; out[14] = c2a * in[14] - s2a * in[10]; out[15] = c3a * in[15] - s3a * in[9]; - if ( order == 4 ) + if (order == 4) return out; + c4a = cosf(4.0f * angle); + s4a = sinf(4.0f * angle); out[16] = c4a * in[16] + s4a * in[24]; out[17] = c3a * in[17] + s3a * in[23]; out[18] = c2a * in[18] + s2a * in[22]; @@ -2517,9 +2514,11 @@ FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in out[22] = c2a * in[22] - s2a * in[18]; out[23] = c3a * in[23] - s3a * in[17]; out[24] = c4a * in[24] - s4a * in[16]; - if ( order == 5 ) + if (order == 5) return out; + c5a = cosf(5.0f * angle); + s5a = sinf(5.0f * angle); out[25] = c5a * in[25] + s5a * in[35]; out[26] = c4a * in[26] + s4a * in[34]; out[27] = c3a * in[27] + s3a * in[33];

1 0