September 2012 - Wine-commits

Alistair Leslie-Hughes : include: Add msdasc.idl.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: ef003f0fa080e259baf90125e8f063dd0c750eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef003f0fa080e259baf90125e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 14 08:55:59 2012 +1000 include: Add msdasc.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/msdasc.idl | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 93d649a..6baea7d 100644 --- a/.gitignore +++ b/.gitignore @@ -199,6 +199,7 @@ include/mmstream.h include/mscoree.h include/msctf.h include/msdadc.h +include/msdasc.h include/mshtmhst.h include/mshtml.h include/msident.h diff --git a/include/Makefile.in b/include/Makefile.in index 5bc1d1c..37f2c62 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -59,6 +59,7 @@ PUBLIC_IDL_H_SRCS = \ mscoree.idl \ msctf.idl \ msdadc.idl \ + msdasc.idl \ mshtmhst.idl \ mshtml.idl \ msident.idl \ diff --git a/include/msdasc.idl b/include/msdasc.idl new file mode 100644 index 0000000..1033516 --- /dev/null +++ b/include/msdasc.idl @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "oledb.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(2206CEB0-19C1-11D1-89E0-00C04FD7A829), + version(1.0) +] +library MSDASC +{ + importlib("stdole2.tlb"); + + [ + uuid(2206CCB1-19C1-11D1-89E0-00C04FD7A829), + ] + interface IDataInitialize : IUnknown + { + HRESULT GetDataSource([in] IUnknown* pUnkOuter, [in] DWORD dwClsCtx, + [in] LPWSTR pwszInitializationString, [in] REFIID riid, + [in, out] IUnknown** ppDataSource); + + HRESULT GetInitializationString([in] IUnknown* pDataSource, [in] boolean fIncludePassword, + [out] LPWSTR* ppwszInitString); + + HRESULT CreateDBInstance([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, + [in] REFIID riid, [out] IUnknown** ppDataSource); + + HRESULT RemoteCreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, + [in] DWORD cmq, [in] GUID** rgpIID, [out] IUnknown** rgpItf, + [out] HRESULT* rghr); + + HRESULT LoadStringFromStorage([in] LPWSTR pwszFileName, [out] LPWSTR* ppwszInitializationString); + + HRESULT WriteStringToStorage([in] LPWSTR pwszFileName, [in] LPWSTR pwszInitializationString, + [in] DWORD dwCreationDisposition); + } + + [ + uuid(2206CDB0-19C1-11D1-89E0-00C04FD7A829), + progid("MSDASC.MSDAINITIALIZE.1"), + vi_progid("MSDASC.MSDAINITIALIZE.1"), + ] + coclass MSDAINITIALIZE + { + [default] interface IDataInitialize; + } +}

1 0

Rico Schüller : d3dx9: Use set_number instead of get_bool/int/float.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 26914eb3377899002ca76e44f0f3aa8d031cc1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26914eb3377899002ca76e44f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:07 2012 +0200 d3dx9: Use set_number instead of get_bool/int/float. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 --- dlls/d3dx9_36/effect.c | 19 +++++++++++-------- dlls/d3dx9_36/util.c | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index c4cc69c..bd208f8 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -94,9 +94,6 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; -FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; -BOOL get_bool(LPCVOID data) DECLSPEC_HIDDEN; void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a6dcd98..a063358 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -853,7 +853,10 @@ static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) for (i = 0; i < 4; ++i) { - ((FLOAT *)vector)[i] = i < param->columns ? get_float(param->type, (DWORD *)param->data + i) : 0.0f; + if (i < param->columns) + set_number((FLOAT *)vector + i, D3DXPT_FLOAT, (DWORD *)param->data + i, param->type); + else + ((FLOAT *)vector)[i] = 0.0f; } } @@ -876,7 +879,7 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - matrix->u.m[i][k] = get_float(param->type, (FLOAT *)param->data + i * param->columns + k); + set_number((FLOAT *)&matrix->u.m[i][k], D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); else matrix->u.m[i][k] = 0.0f; } @@ -1667,7 +1670,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHA if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) { - *b = get_bool(param->data); + set_number(b, D3DXPT_BOOL, param->data, param->type); TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); return D3D_OK; } @@ -1733,7 +1736,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBoolArray(ID3DXBaseEffect *iface, D for (i = 0; i < size; ++i) { - b[i] = get_bool((DWORD *)param->data + i); + set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); } return D3D_OK; } @@ -1794,7 +1797,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHAN { if (param->columns == 1 && param->rows == 1) { - *n = get_int(param->type, param->data); + set_number(n, D3DXPT_INT, param->data, param->type); TRACE("Returning %i\n", *n); return D3D_OK; } @@ -1879,7 +1882,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetIntArray(ID3DXBaseEffect *iface, D3 for (i = 0; i < size; ++i) { - n[i] = get_int(param->type, (DWORD *)param->data + i); + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); } return D3D_OK; } @@ -1916,7 +1919,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloat(ID3DXBaseEffect *iface, D3DXH if (f && param && !param->element_count && param->columns == 1 && param->rows == 1) { - *f = get_float(param->type, (DWORD *)param->data); + set_number(f, D3DXPT_FLOAT, (DWORD *)param->data, param->type); TRACE("Returning %f\n", *f); return D3D_OK; } @@ -1981,7 +1984,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, for (i = 0; i < size; ++i) { - f[i] = get_float(param->type, (DWORD *)param->data + i); + set_number(&f[i], D3DXPT_FLOAT, (DWORD *)param->data + i, param->type); } return D3D_OK; } diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index c5160fa..b4cdefe 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -271,12 +271,12 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR /* parameter type conversion helpers */ -BOOL get_bool(LPCVOID data) +static BOOL get_bool(LPCVOID data) { return (*(DWORD *)data) != 0; } -INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -303,7 +303,7 @@ INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) return i; } -FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) { FLOAT f;

1 0

Rico Schüller : d3dx9: Move transpose matrix into set_matrix().
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 5b06a2d113bb096bdf1d04bb06f184b115ef7dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b06a2d113bb096bdf1d04bb0… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:20 2012 +0200 d3dx9: Move transpose matrix into set_matrix(). --- dlls/d3dx9_36/effect.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a063358..0a70128 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -886,7 +886,7 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) } } -static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) +static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, BOOL transpose) { UINT i, k; @@ -894,7 +894,8 @@ static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) { for (k = 0; k < param->columns; ++k) { - set_number((FLOAT *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + set_number((FLOAT *)param->data + i * param->columns + k, param->type, + transpose ? &matrix->u.m[k][i] : &matrix->u.m[i][k], D3DXPT_FLOAT); } } } @@ -2178,7 +2179,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DX switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix); + set_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_SCALAR: @@ -2250,7 +2251,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], FALSE); } return D3D_OK; @@ -2328,7 +2329,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], FALSE); } return D3D_OK; @@ -2392,7 +2393,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *if { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); @@ -2403,7 +2403,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *if switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, D3DXMatrixTranspose(&m, matrix)); + set_matrix(param, matrix, TRUE); return D3D_OK; case D3DXPC_SCALAR: @@ -2466,7 +2466,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffec { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); @@ -2481,7 +2480,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffec case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, &matrix[i])); + set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], TRUE); } return D3D_OK; @@ -2550,7 +2549,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBa { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); @@ -2563,7 +2561,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBa case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, matrix[i])); + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], TRUE); } return D3D_OK;

1 0

Alexandre Julliard : mountmgr: Support udisks2 versions that store the uuid as an array.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: ed8d665f8c04ee70fdc8bb76967d2ad3526bc691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8d665f8c04ee70fdc8bb769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 22:37:00 2012 +0200 mountmgr: Support udisks2 versions that store the uuid as an array. --- dlls/mountmgr.sys/dbus.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index ea0341a..0384c29 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -446,8 +446,11 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess } else if (!strcmp( name, "IdUUID" )) { - char *uuid_str; - p_dbus_message_iter_get_basic( &variant, &uuid_str ); + const char *uuid_str; + if (p_dbus_message_iter_get_arg_type( &variant ) == DBUS_TYPE_ARRAY) + uuid_str = udisks2_string_from_array( &variant ); + else + p_dbus_message_iter_get_basic( &variant, &uuid_str ); guid_ptr = parse_uuid( &guid, uuid_str ); } }

1 0

Alexandre Julliard : ddraw/tests: Allow the clip region to contain multiple rectangles.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 83cfd54f8509008a298623fa4cd4e45acf6b7927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cfd54f8509008a298623fa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 23:35:18 2012 +0200 ddraw/tests: Allow the clip region to contain multiple rectangles. --- dlls/ddraw/tests/ddraw4.c | 10 ++-------- dlls/ddraw/tests/ddraw7.c | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0bf0eea..a8332c7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -665,7 +665,7 @@ static void test_coop_level_create_device_window(void) static void test_clipper_blt(void) { IDirectDrawSurface4 *src_surface, *dst_surface; - RECT client_rect, src_rect, *rect; + RECT client_rect, src_rect; IDirectDrawClipper *clipper; DDSURFACEDESC2 surface_desc; unsigned int i, j, x, y; @@ -731,18 +731,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to get clip list, hr %#x.\n", hr); ok(rgn_data->rdh.dwSize == sizeof(rgn_data->rdh), "Got unexpected structure size %#x.\n", rgn_data->rdh.dwSize); ok(rgn_data->rdh.iType == RDH_RECTANGLES, "Got unexpected type %#x.\n", rgn_data->rdh.iType); - ok(rgn_data->rdh.nCount == 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); - ok(rgn_data->rdh.nRgnSize == 16, "Got unexpected region size %u.\n", rgn_data->rdh.nRgnSize); + ok(rgn_data->rdh.nCount >= 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); ok(EqualRect(&rgn_data->rdh.rcBound, &client_rect), "Got unexpected bounding rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", rgn_data->rdh.rcBound.left, rgn_data->rdh.rcBound.top, rgn_data->rdh.rcBound.right, rgn_data->rdh.rcBound.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); - rect = (RECT *)&rgn_data->Buffer[0]; - ok(EqualRect(rect, &client_rect), - "Got unexpected clip rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - rect->left, rect->top, rect->right, rect->bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); HeapFree(GetProcessHeap(), 0, rgn_data); r1 = CreateRectRgn(0, 0, 320, 240); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4152f6b..37592f7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -617,7 +617,7 @@ static void test_coop_level_create_device_window(void) static void test_clipper_blt(void) { IDirectDrawSurface7 *src_surface, *dst_surface; - RECT client_rect, src_rect, *rect; + RECT client_rect, src_rect; IDirectDrawClipper *clipper; DDSURFACEDESC2 surface_desc; unsigned int i, j, x, y; @@ -683,18 +683,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to get clip list, hr %#x.\n", hr); ok(rgn_data->rdh.dwSize == sizeof(rgn_data->rdh), "Got unexpected structure size %#x.\n", rgn_data->rdh.dwSize); ok(rgn_data->rdh.iType == RDH_RECTANGLES, "Got unexpected type %#x.\n", rgn_data->rdh.iType); - ok(rgn_data->rdh.nCount == 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); - ok(rgn_data->rdh.nRgnSize == 16, "Got unexpected region size %u.\n", rgn_data->rdh.nRgnSize); + ok(rgn_data->rdh.nCount >= 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); ok(EqualRect(&rgn_data->rdh.rcBound, &client_rect), "Got unexpected bounding rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", rgn_data->rdh.rcBound.left, rgn_data->rdh.rcBound.top, rgn_data->rdh.rcBound.right, rgn_data->rdh.rcBound.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); - rect = (RECT *)&rgn_data->Buffer[0]; - ok(EqualRect(rect, &client_rect), - "Got unexpected clip rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - rect->left, rect->top, rect->right, rect->bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); HeapFree(GetProcessHeap(), 0, rgn_data); r1 = CreateRectRgn(0, 0, 320, 240);

1 0

Vincent Povirk : propsys: Stub PropVariantCompareEx.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 52d1db190884445bf7d1078ddb43b4a4e8c06c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d1db190884445bf7d1078dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 13 14:33:11 2012 -0500 propsys: Stub PropVariantCompareEx. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 8 ++++++++ include/propvarutil.h | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 64d116c..fefc5f0 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -94,7 +94,7 @@ @ stdcall PSStringFromPropertyKey(ptr ptr long) @ stdcall PSUnregisterPropertySchema(wstr) @ stdcall PropVariantChangeType(ptr ptr long long) -@ stub PropVariantCompareEx +@ stdcall PropVariantCompareEx(ptr ptr long long) @ stub PropVariantGetBooleanElem @ stub PropVariantGetDoubleElem @ stub PropVariantGetElementCount diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 4ea01d9..0877801 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -283,3 +283,11 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) return E_NOTIMPL; } } + +INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, + PROPVAR_COMPARE_UNIT unit, PROPVAR_COMPARE_FLAGS flags) +{ + FIXME("%p,%p,%x,%x\n", propvar1, propvar2, unit, flags); + + return -1; +} diff --git a/include/propvarutil.h b/include/propvarutil.h index 96265a5..94a80b4 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -34,6 +34,31 @@ enum tagPROPVAR_CHANGE_FLAGS typedef int PROPVAR_CHANGE_FLAGS; +enum tagPROPVAR_COMPARE_UNIT +{ + PVCU_DEFAULT = 0x00000000, + PVCU_SECOND = 0x00000001, + PVCU_MINUTE = 0x00000002, + PVCU_HOUR = 0x00000003, + PVCU_DAY = 0x00000004, + PVCU_MONTH = 0x00000005, + PVCU_YEAR = 0x00000006, +}; + +typedef int PROPVAR_COMPARE_UNIT; + +enum tagPROPVAR_COMPARE_FLAGS +{ + PVCF_DEFAULT = 0x00000000, + PVCF_TREATEMPTYASGREATERTHAN = 0x00000001, + PVCF_USESTRCMP = 0x00000002, + PVCF_USESTRCMPC = 0x00000004, + PVCF_USESTRCMPI = 0x00000008, + PVCF_USESTRCMPIC = 0x00000010, +}; + +typedef int PROPVAR_COMPARE_FLAGS; + HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); @@ -42,6 +67,8 @@ HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *p HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); +INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, + PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); #ifdef __cplusplus

1 0

Vincent Povirk : propsys: Add tests for PropVariantCompareEx.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 8191af07d83b190c791bb5d43e1c3b9791e9e657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8191af07d83b190c791bb5d43… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 13 15:21:15 2012 -0500 propsys: Add tests for PropVariantCompareEx. --- dlls/propsys/tests/propsys.c | 118 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 9641d05..92a6668 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -633,6 +633,123 @@ static void test_PropVariantToGUID(void) PropVariantClear(&propvar); } +static void test_PropVariantCompare(void) +{ + PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; + INT res; + static const WCHAR str_2W[] = {'2', 0}; + static const WCHAR str_02W[] = {'0', '2', 0}; + static const WCHAR str_bW[] = {'b', 0}; + SAFEARRAY emptysafearray; + + PropVariantInit(&empty); + PropVariantInit(&null); + PropVariantInit(&emptyarray); + PropVariantInit(&i2_0); + PropVariantInit(&i2_2); + PropVariantInit(&i4_large); + PropVariantInit(&i4_largeneg); + PropVariantInit(&i4_2); + PropVariantInit(&str_2); + PropVariantInit(&str_b); + + empty.vt = VT_EMPTY; + null.vt = VT_NULL; + emptyarray.vt = VT_ARRAY | VT_I4; + emptyarray.u.parray = &emptysafearray; + emptysafearray.cDims = 1; + emptysafearray.fFeatures = FADF_FIXEDSIZE; + emptysafearray.cbElements = 4; + emptysafearray.cLocks = 0; + emptysafearray.pvData = NULL; + emptysafearray.rgsabound[0].cElements = 0; + emptysafearray.rgsabound[0].lLbound = 0; + i2_0.vt = VT_I2; + i2_0.u.iVal = 0; + i2_2.vt = VT_I2; + i2_2.u.iVal = 2; + i4_large.vt = VT_I4; + i4_large.u.lVal = 65536; + i4_largeneg.vt = VT_I4; + i4_largeneg.u.lVal = -65536; + i4_2.vt = VT_I4; + i4_2.u.lVal = 2; + str_2.vt = VT_BSTR; + str_2.u.bstrVal = SysAllocString(str_2W); + str_02.vt = VT_BSTR; + str_02.u.bstrVal = SysAllocString(str_02W); + str_b.vt = VT_BSTR; + str_b.u.bstrVal = SysAllocString(str_bW); + + res = PropVariantCompareEx(&empty, &empty, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&empty, &null, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&null, &emptyarray, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&null, &i2_0, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_0, &null, 0, 0); + todo_wine ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&null, &i2_0, 0, PVCF_TREATEMPTYASGREATERTHAN); + todo_wine ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_0, &null, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_2, &i2_0, 0, 0); + todo_wine ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_0, &i2_2, 0, 0); + ok(res == -1, "res=%i\n", res); + + /* Always return -1 if second value cannot be converted to first type */ + res = PropVariantCompareEx(&i2_0, &i4_large, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_0, &i4_largeneg, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&i4_large, &i2_0, 0, 0); + todo_wine ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&i4_largeneg, &i2_0, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_2, &i4_2, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_2, &str_2, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&i2_2, &str_02, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&str_2, &i2_2, 0, 0); + todo_wine ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&str_02, &i2_2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&str_02, &str_2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&str_02, &str_b, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&i4_large, &str_b, 0, 0); + todo_wine ok(res == -5 /* ??? */, "res=%i\n", res); + + SysFreeString(str_2.u.bstrVal); + SysFreeString(str_02.u.bstrVal); + SysFreeString(str_b.u.bstrVal); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -641,4 +758,5 @@ START_TEST(propsys) test_InitPropVariantFromGUIDAsString(); test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); + test_PropVariantCompare(); }

1 0

Vincent Povirk : propsys: Add basic implementation of PropVariantCompareEx.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 6d52262e5683ec89df6c4dc39d471bcc9a6ace88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d52262e5683ec89df6c4dc39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 13 15:54:39 2012 -0500 propsys: Add basic implementation of PropVariantCompareEx. --- dlls/propsys/propvar.c | 97 +++++++++++++++++++++++++++++++++++++++++- dlls/propsys/tests/propsys.c | 15 ++++--- 2 files changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 0877801..bbfe8ca 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -284,10 +284,103 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) } } +static int isemptyornull(const PROPVARIANT *propvar) +{ + if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL) + return 1; + if ((propvar->vt & VT_ARRAY) == VT_ARRAY) + { + int i; + for (i=0; i<propvar->u.parray->cDims; i++) + { + if (propvar->u.parray->rgsabound[i].cElements != 0) + break; + } + return i == propvar->u.parray->cDims; + } + /* FIXME: vectors, byrefs, errors? */ + return 0; +} + INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT unit, PROPVAR_COMPARE_FLAGS flags) { - FIXME("%p,%p,%x,%x\n", propvar1, propvar2, unit, flags); + const PROPVARIANT *propvar2_converted; + PROPVARIANT propvar2_static; + HRESULT hr; + INT res=-1; + + TRACE("%p,%p,%x,%x\n", propvar1, propvar2, unit, flags); + + if (isemptyornull(propvar1)) + { + if (isemptyornull(propvar2)) + return 0; + return (flags & PVCF_TREATEMPTYASGREATERTHAN) ? 1 : -1; + } + + if (isemptyornull(propvar2)) + return (flags & PVCF_TREATEMPTYASGREATERTHAN) ? -1 : 1; + + if (propvar1->vt != propvar2->vt) + { + hr = PropVariantChangeType(&propvar2_static, propvar2, 0, propvar1->vt); + + if (FAILED(hr)) + return -1; + + propvar2_converted = &propvar2_static; + } + else + propvar2_converted = propvar2; + +#define CMP_INT_VALUE(var) do { \ + if (propvar1->u.var > propvar2_converted->u.var) \ + res = 1; \ + else if (propvar1->u.var < propvar2_converted->u.var) \ + res = -1; \ + else \ + res = 0; \ + } while (0) + + switch (propvar1->vt) + { + case VT_I1: + CMP_INT_VALUE(cVal); + break; + case VT_UI1: + CMP_INT_VALUE(bVal); + break; + case VT_I2: + CMP_INT_VALUE(iVal); + break; + case VT_UI2: + CMP_INT_VALUE(uiVal); + break; + case VT_I4: + CMP_INT_VALUE(lVal); + break; + case VT_UI4: + CMP_INT_VALUE(uiVal); + break; + case VT_I8: + CMP_INT_VALUE(hVal.QuadPart); + break; + case VT_UI8: + CMP_INT_VALUE(uhVal.QuadPart); + break; + case VT_BSTR: + /* FIXME: Use string flags. */ + res = lstrcmpW(propvar1->u.bstrVal, propvar2->u.bstrVal); + break; + default: + FIXME("vartype %d not handled\n", propvar1->vt); + res = -1; + break; + } + + if (propvar2_converted == &propvar2_static) + PropVariantClear(&propvar2_static); - return -1; + return res; } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 92a6668..789eee8 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -682,28 +682,28 @@ static void test_PropVariantCompare(void) str_b.u.bstrVal = SysAllocString(str_bW); res = PropVariantCompareEx(&empty, &empty, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&empty, &null, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&null, &emptyarray, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&null, &i2_0, 0, 0); ok(res == -1, "res=%i\n", res); res = PropVariantCompareEx(&i2_0, &null, 0, 0); - todo_wine ok(res == 1, "res=%i\n", res); + ok(res == 1, "res=%i\n", res); res = PropVariantCompareEx(&null, &i2_0, 0, PVCF_TREATEMPTYASGREATERTHAN); - todo_wine ok(res == 1, "res=%i\n", res); + ok(res == 1, "res=%i\n", res); res = PropVariantCompareEx(&i2_0, &null, 0, PVCF_TREATEMPTYASGREATERTHAN); ok(res == -1, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &i2_0, 0, 0); - todo_wine ok(res == 1, "res=%i\n", res); + ok(res == 1, "res=%i\n", res); res = PropVariantCompareEx(&i2_0, &i2_2, 0, 0); ok(res == -1, "res=%i\n", res); @@ -742,6 +742,9 @@ static void test_PropVariantCompare(void) res = PropVariantCompareEx(&str_02, &str_b, 0, 0); ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&str_2, &str_02, 0, 0); + ok(res == 1, "res=%i\n", res); + res = PropVariantCompareEx(&i4_large, &str_b, 0, 0); todo_wine ok(res == -5 /* ??? */, "res=%i\n", res);

1 0

Vincent Povirk : propsys: Implement prop variant integer conversions with tests.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: c66b5ac4c3db0b6c4b43711db25d4d85b925dfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66b5ac4c3db0b6c4b43711db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 13 16:10:35 2012 -0500 propsys: Implement prop variant integer conversions with tests. --- dlls/propsys/propsys.spec | 12 ++-- dlls/propsys/propvar.c | 141 ++++++++++++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 126 +++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 6 ++ 4 files changed, 279 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c66b5ac4c3db0b6c4b437…

1 0

Vincent Povirk : propsys: Use integer conversion functions in PropVariantCompareEx.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 60dae84bc69ad357c803718170b0099a536a681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dae84bc69ad357c80371817… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 13 17:16:26 2012 -0500 propsys: Use integer conversion functions in PropVariantCompareEx. --- dlls/propsys/propvar.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 4 +- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 28100a0..69b2e60 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -215,9 +215,81 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt) { + HRESULT hr; + FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, propvarSrc->vt, flags, vt); + switch (vt) + { + case VT_I2: + { + SHORT res; + hr = PropVariantToInt16(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I2; + ppropvarDest->u.iVal = res; + } + return hr; + } + case VT_UI2: + { + USHORT res; + hr = PropVariantToUInt16(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI2; + ppropvarDest->u.uiVal = res; + } + return hr; + } + case VT_I4: + { + LONG res; + hr = PropVariantToInt32(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I4; + ppropvarDest->u.lVal = res; + } + return hr; + } + case VT_UI4: + { + ULONG res; + hr = PropVariantToUInt32(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI4; + ppropvarDest->u.ulVal = res; + } + return hr; + } + case VT_I8: + { + LONGLONG res; + hr = PropVariantToInt64(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I8; + ppropvarDest->u.hVal.QuadPart = res; + } + return hr; + } + case VT_UI8: + { + ULONGLONG res; + hr = PropVariantToUInt64(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI8; + ppropvarDest->u.uhVal.QuadPart = res; + } + return hr; + } + } + switch (propvarSrc->vt) { case VT_FILETIME: diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index c9df1c9..a18d6b1 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -716,13 +716,13 @@ static void test_PropVariantCompare(void) ok(res == -1, "res=%i\n", res); res = PropVariantCompareEx(&i4_large, &i2_0, 0, 0); - todo_wine ok(res == 1, "res=%i\n", res); + ok(res == 1, "res=%i\n", res); res = PropVariantCompareEx(&i4_largeneg, &i2_0, 0, 0); ok(res == -1, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &i4_2, 0, 0); - todo_wine ok(res == 0, "res=%i\n", res); + ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&i2_2, &str_2, 0, 0); todo_wine ok(res == 0, "res=%i\n", res);

1 0