November 2009 - Wine-commits

Rob Shearman : rpcrt4: Replace sizeofs with FIELD_OFFSET in RPCRT4_BuildBindNackHeader to avoid relying on ANYSIZE_ARRAY being 1 .
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 03f87bc1c36fbc31fd92a5fcb1bd5c41b4d5bf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f87bc1c36fbc31fd92a5fcb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 10:31:00 2009 +0000 rpcrt4: Replace sizeofs with FIELD_OFFSET in RPCRT4_BuildBindNackHeader to avoid relying on ANYSIZE_ARRAY being 1. --- dlls/rpcrt4/rpc_message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 50db20c..535d173 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -226,13 +226,13 @@ RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, { RpcPktHdr *header; - header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(header->bind_nack)); + header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(RpcPktHdr, bind_nack.protocols[1])); if (header == NULL) { return NULL; } RPCRT4_BuildCommonHeader(header, PKT_BIND_NACK, DataRepresentation); - header->common.frag_len = sizeof(header->bind_nack); + header->common.frag_len = FIELD_OFFSET(RpcPktHdr, bind_nack.protocols[1]); header->bind_nack.reject_reason = RejectReason; header->bind_nack.protocols_count = 1; header->bind_nack.protocols[0].rpc_ver = RpcVersion;

1 0

Rob Shearman : widl: Include range types in constant BufferLength calculation for server function .
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 8e750b0ef6d810465d12566b6f03e6ce28b9451d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e750b0ef6d810465d12566b6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 10:31:25 2009 +0000 widl: Include range types in constant BufferLength calculation for server function. --- tools/widl/typegen.c | 8 +++++--- tools/widl/typegen.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f601ab3..fdb2379 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -216,11 +216,13 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att switch (type_get_type(type)) { case TYPE_BASIC: - if (is_attr(attrs, ATTR_RANGE) || is_aliaschain_attr(type, ATTR_RANGE)) + if (!(flags & TDT_IGNORE_RANGES) && + (is_attr(attrs, ATTR_RANGE) || is_aliaschain_attr(type, ATTR_RANGE))) return TGT_RANGE; return TGT_BASIC; case TYPE_ENUM: - if (is_attr(attrs, ATTR_RANGE) || is_aliaschain_attr(type, ATTR_RANGE)) + if (!(flags & TDT_IGNORE_RANGES) && + (is_attr(attrs, ATTR_RANGE) || is_aliaschain_attr(type, ATTR_RANGE))) return TGT_RANGE; return TGT_ENUM; case TYPE_POINTER: @@ -3012,7 +3014,7 @@ static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, const attr_list_t *attrs, int toplevel_param, unsigned int *alignment) { *alignment = 0; - switch (typegen_detect_type(type, NULL, TDT_IGNORE_STRINGS)) + switch (typegen_detect_type(type, NULL, TDT_IGNORE_STRINGS|TDT_IGNORE_RANGES)) { case TGT_USER_TYPE: { diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index c414d78..2b2e65d 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -40,6 +40,7 @@ enum typegen_detect_flags { TDT_ALL_TYPES = 1 << 0, TDT_IGNORE_STRINGS = 1 << 1, + TDT_IGNORE_RANGES = 1 << 2, }; enum typegen_type

1 0

Rob Shearman : Revert "rpcrt4: The get_ranged_enum test doesn' t work on Windows, so don't execute it for the moment.".
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: efda021c5de66d6219fde536dfad49b1ebbd4181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efda021c5de66d6219fde536d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 10:31:38 2009 +0000 Revert "rpcrt4: The get_ranged_enum test doesn't work on Windows, so don't execute it for the moment.". This reverts commit 81036cc51831db03f8e0eb03b5f74ae5099461cd. --- dlls/rpcrt4/tests/server.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 42753ac..1205ea4 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -775,6 +775,7 @@ basic_tests(void) wstr_struct_t ws = {wstring}; str_t str; se_t se; + renum_t re; ok(int_return() == INT_CODE, "RPC int_return\n"); @@ -887,6 +888,9 @@ basic_tests(void) ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); x = echo_ranged_int(100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); + + get_ranged_enum(&re); + ok(re == RE3, "get_ranged_enum() returned %d instead of RE3\n", re); } static void

1 0

Jörg Höhle : msg711: Correct wave format parameters to remove stuttering.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 7630a6f0dc5bfbd3b29c34bd4dc84c1077acbf54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7630a6f0dc5bfbd3b29c34bd4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 10 22:45:06 2009 +0100 msg711: Correct wave format parameters to remove stuttering. --- dlls/msg711.acm/msg711.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 203942d..d527e91 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -832,16 +832,16 @@ static LRESULT G711_FormatSuggest(PACMDRVFORMATSUGGEST adfs) switch (adfs->pwfxDst->wFormatTag) { case WAVE_FORMAT_PCM: - adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; + adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; break; case WAVE_FORMAT_ALAW: - adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; - adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2; + adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; + adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; break; case WAVE_FORMAT_MULAW: - adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels * 2; - adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels * 2; + adfs->pwfxDst->nBlockAlign = adfs->pwfxDst->nChannels; + adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxSrc->nChannels; break; default: FIXME("\n"); @@ -993,13 +993,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW)) { - adss->cbSrcLength = adss->cbDstLength / 2; + adss->cbSrcLength = adss->cbDstLength * 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - adss->cbSrcLength = adss->cbDstLength * 2; + adss->cbSrcLength = adss->cbDstLength / 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && @@ -1019,13 +1019,13 @@ static LRESULT G711_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSI (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MULAW)) { - adss->cbDstLength = adss->cbSrcLength * 2; + adss->cbDstLength = adss->cbSrcLength / 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - adss->cbDstLength = adss->cbSrcLength / 2; + adss->cbDstLength = adss->cbSrcLength * 2; } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_ALAW || adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MULAW) &&

1 0

Maarten Lankhorst : avrt: Add initial stub implementation.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 77d0ece9c9dcf01764477b76ca546cad3c640b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d0ece9c9dcf01764477b76c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 20:40:03 2009 +0100 avrt: Add initial stub implementation. --- configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 5 +++++ dlls/avrt/Makefile.in | 14 ++++++++++++++ dlls/avrt/avrt.spec | 14 ++++++++++++++ dlls/avrt/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/avrt.h | 2 +- 7 files changed, 91 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 4cba951..708d40d 100755 --- a/configure +++ b/configure @@ -13959,6 +13959,14 @@ dlls/avifile.dll16/Makefile: dlls/avifile.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/avifile.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/avrt/Makefile" +test "x$enable_avrt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + avrt" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/avrt/Makefile: dlls/avrt/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/avrt/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/bcrypt/Makefile" test "x$enable_bcrypt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ bcrypt" @@ -18796,6 +18804,7 @@ do "dlls/avicap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avicap32/Makefile" ;; "dlls/avifil32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifil32/Makefile" ;; "dlls/avifile.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifile.dll16/Makefile" ;; + "dlls/avrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avrt/Makefile" ;; "dlls/bcrypt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/bcrypt/Makefile" ;; "dlls/browseui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/Makefile" ;; "dlls/browseui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 58b0d75..4a01615 100644 --- a/configure.ac +++ b/configure.ac @@ -2131,6 +2131,7 @@ WINE_CONFIG_MAKEFILE([dlls/authz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_ WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifile.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/avrt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/bcrypt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 92f129f..4f0416a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -72,6 +72,7 @@ IMPORT_LIBS = \ atl/libatl.$(IMPLIBEXT) \ avicap32/libavicap32.$(IMPLIBEXT) \ avifil32/libavifil32.$(IMPLIBEXT) \ + avrt/libavrt.$(IMPLIBEXT) \ cabinet/libcabinet.$(IMPLIBEXT) \ capi2032/libcapi2032.$(IMPLIBEXT) \ cards/libcards.$(IMPLIBEXT) \ @@ -218,6 +219,7 @@ CROSS_IMPLIBS = \ atl/libatl.a \ avicap32/libavicap32.a \ avifil32/libavifil32.a \ + avrt/libavrt.a \ cabinet/libcabinet.a \ capi2032/libcapi2032.a \ cards/libcards.a \ @@ -380,6 +382,9 @@ avicap32/libavicap32.def avicap32/libavicap32.a: avicap32/avicap32.spec $(WINEBU avifil32/libavifil32.def avifil32/libavifil32.a: avifil32/avifil32.spec $(WINEBUILD) @cd avifil32 && $(MAKE) `basename $@` +avrt/libavrt.def avrt/libavrt.a: avrt/avrt.spec $(WINEBUILD) + @cd avrt && $(MAKE) `basename $@` + cabinet/libcabinet.def cabinet/libcabinet.a: cabinet/cabinet.spec $(WINEBUILD) @cd cabinet && $(MAKE) `basename $@` diff --git a/dlls/avrt/Makefile.in b/dlls/avrt/Makefile.in new file mode 100644 index 0000000..dc36c89 --- /dev/null +++ b/dlls/avrt/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = avrt.dll +IMPORTLIB = avrt +IMPORTS = user32 kernel32 ntdll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec new file mode 100644 index 0000000..103798d --- /dev/null +++ b/dlls/avrt/avrt.spec @@ -0,0 +1,14 @@ +@ stub AvQuerySystemResponsiveness +@ stub AvRevertMmThreadCharacteristics +@ stub AvRtCreateThreadOrderingGroup +@ stub AvRtCreateThreadOrderingGroupExA +@ stub AvRtCreateThreadOrderingGroupExW +@ stub AvRtDeleteThreadOrderingGroup +@ stub AvRtJoinThreadOrderingGroup +@ stub AvRtLeaveThreadOrderingGroup +@ stub AvRtWaitOnThreadOrderingGroup +@ stub AvSetMmMaxThreadCharacteristicsA +@ stub AvSetMmMaxThreadCharacteristicsW +@ stub AvSetMmThreadCharacteristicsA +@ stub AvSetMmThreadCharacteristicsW +@ stub AvSetMmThreadPriority diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c new file mode 100644 index 0000000..a39743c --- /dev/null +++ b/dlls/avrt/main.c @@ -0,0 +1,47 @@ +/* Avrt dll implementation + * + * Copyright (C) 2009 Maarten Lankhorst + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "avrt.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avrt); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/include/avrt.h b/include/avrt.h index 691d36a..2d0ab09 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -57,7 +57,7 @@ BOOL WINAPI AvRtCreateThreadOrderingGroupExA( LPCSTR TaskName); BOOL WINAPI AvRtCreateThreadOrderingGroupExW( PHANDLE Context, PLARGE_INTEGER Period, - GUID *ThreadOrderingGuid, PLARGE_INTEGER Timeout + GUID *ThreadOrderingGuid, PLARGE_INTEGER Timeout, LPCSTR TaskName); #define AvRtCreateThreadOrderingGroupEx WINELIB_NAME_AW(AvRtCreateThreadOrderingGroupEx)

1 0

Maarten Lankhorst : include: Fix REFPROPVARIANT definition.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 3edbeed94c4e99cf009b68d9a9597b9cf3e473b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3edbeed94c4e99cf009b68d9a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 11 14:36:17 2009 +0100 include: Fix REFPROPVARIANT definition. --- include/propidl.idl | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/propidl.idl b/include/propidl.idl index be67394..e2da625 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -206,7 +206,17 @@ interface IPropertyStorage : IUnknown typedef struct tagPROPVARIANT *LPPROPVARIANT; - cpp_quote("#define REFPROPVARIANT const PROPVARIANT *") + cpp_quote("#if 0") + typedef const PROPVARIANT * REFPROPVARIANT; + cpp_quote("#endif") + cpp_quote("#ifndef _REFPROPVARIANT_DEFINED") + cpp_quote("#define _REFPROPVARIANT_DEFINED") + cpp_quote("#ifdef __cplusplus") + cpp_quote("#define REFPROPVARIANT const PROPVARIANT &") + cpp_quote("#else") + cpp_quote("#define REFPROPVARIANT const PROPVARIANT * __MIDL_CONST") + cpp_quote("#endif") + cpp_quote("#endif") cpp_quote("#define PIDDI_THUMBNAIL 0x00000002L /* VT_BLOB */") cpp_quote("")

1 0

Rob Shearman : oledb32: Fix IDBProperties::GetProperties test on Windows.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: b81b24f9dae7639c3f795d49e15ebd622e741849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81b24f9dae7639c3f795d49e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 00:30:26 2009 +0000 oledb32: Fix IDBProperties::GetProperties test on Windows. --- dlls/oledb32/tests/marshal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 45fc3bc..4ca3aac 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -165,7 +165,9 @@ static HRESULT WINAPI Test_DBProperties_GetProperties( DBPROPSET **prgPropertySets) { ok(cPropertyIDSets == 0, "Expected cPropertyIDSets to be 0 instead of %d\n", cPropertyIDSets); - ok(*pcPropertySets == 1, "Expected *pcPropertySets to be 1 instead of %d\n", *pcPropertySets); + todo_wine + ok(*pcPropertySets == 0, "Expected *pcPropertySets to be 0 instead of %d\n", *pcPropertySets); + *pcPropertySets = 1; prgPropertySets[0] = CoTaskMemAlloc(sizeof(DBPROPSET)); prgPropertySets[0]->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); prgPropertySets[0]->rgProperties[0].dwPropertyID = TEST_PROPID; @@ -241,7 +243,7 @@ static void test_IDBProperties(void) propset_count = 1; hr = IDBProperties_GetProperties(pProxy, 0, NULL, &propset_count, &propsets); - ok_ole_success(hr, "IDBProperties_GetProperties"); + ok(hr == S_OK, "IDBProperties_GetProperties failed with error 0x%08x", hr); ok(propset_count == 1, "Expected propset_count of 1 but got %d\n", propset_count); ok(propsets->rgProperties[0].dwPropertyID == TEST_PROPID, "Expected property ID of 0x%x, but got 0x%x\n", TEST_PROPID, propsets->rgProperties[0].dwPropertyID);

1 0

Rob Shearman : oledb32: Fix style of accessing prgPropertySets in Test_DBProperties_GetProperty.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: bafd91106ec93cb795756066b0642bc97c356cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafd91106ec93cb795756066b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 00:30:32 2009 +0000 oledb32: Fix style of accessing prgPropertySets in Test_DBProperties_GetProperty. The parameter is a pointer to an array, so don't access it like it is an array of pointers. --- dlls/oledb32/tests/marshal.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 4ca3aac..67fc7fd 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -168,21 +168,21 @@ static HRESULT WINAPI Test_DBProperties_GetProperties( todo_wine ok(*pcPropertySets == 0, "Expected *pcPropertySets to be 0 instead of %d\n", *pcPropertySets); *pcPropertySets = 1; - prgPropertySets[0] = CoTaskMemAlloc(sizeof(DBPROPSET)); - prgPropertySets[0]->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); - prgPropertySets[0]->rgProperties[0].dwPropertyID = TEST_PROPID; - prgPropertySets[0]->rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; - prgPropertySets[0]->rgProperties[0].dwStatus = S_OK; - prgPropertySets[0]->rgProperties[0].colid.eKind = DBKIND_GUID_NAME; + *prgPropertySets = CoTaskMemAlloc(sizeof(DBPROPSET)); + (*prgPropertySets)[0].rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); + (*prgPropertySets)[0].rgProperties[0].dwPropertyID = TEST_PROPID; + (*prgPropertySets)[0].rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; + (*prgPropertySets)[0].rgProperties[0].dwStatus = S_OK; + (*prgPropertySets)[0].rgProperties[0].colid.eKind = DBKIND_GUID_NAME; /* colid contents */ - prgPropertySets[0]->rgProperties[0].colid.uGuid.guid = IID_IDBProperties; - prgPropertySets[0]->rgProperties[0].colid.uName.pwszName = CoTaskMemAlloc(sizeof(wszDBPropertyColumnName)); - memcpy(prgPropertySets[0]->rgProperties[0].colid.uName.pwszName, wszDBPropertyColumnName, sizeof(wszDBPropertyColumnName)); + (*prgPropertySets)[0].rgProperties[0].colid.uGuid.guid = IID_IDBProperties; + (*prgPropertySets)[0].rgProperties[0].colid.uName.pwszName = CoTaskMemAlloc(sizeof(wszDBPropertyColumnName)); + memcpy((*prgPropertySets)[0].rgProperties[0].colid.uName.pwszName, wszDBPropertyColumnName, sizeof(wszDBPropertyColumnName)); /* vValue contents */ - V_VT(&prgPropertySets[0]->rgProperties[0].vValue) = VT_BSTR; - V_BSTR(&prgPropertySets[0]->rgProperties[0].vValue) = SysAllocString(wszDBPropertyTestString); - prgPropertySets[0]->cProperties = 1; - prgPropertySets[0]->guidPropertySet = IID_IDBProperties; + V_VT(&(*prgPropertySets)[0].rgProperties[0].vValue) = VT_BSTR; + V_BSTR(&(*prgPropertySets)[0].rgProperties[0].vValue) = SysAllocString(wszDBPropertyTestString); + (*prgPropertySets)[0].cProperties = 1; + (*prgPropertySets)[0].guidPropertySet = IID_IDBProperties; return S_OK; }

1 0

Rob Shearman : rpcrt4: Stop searching through transfer syntaxes in process_bind_packet when one has been found .
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: a638bff53ddefe52cecc54e1980d9636658a7aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a638bff53ddefe52cecc54e19… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 00:31:28 2009 +0000 rpcrt4: Stop searching through transfer syntaxes in process_bind_packet when one has been found. Fixes Valgrind errors in various tests using RPC. --- dlls/rpcrt4/rpc_server.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index eb31e8b..1bd1235 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -213,8 +213,12 @@ static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, R unsigned int j; for (j = 0; !sif && j < ctxt_elem->num_syntaxes; j++) + { sif = RPCRT4_find_interface(NULL, &ctxt_elem->abstract_syntax, &ctxt_elem->transfer_syntaxes[j], FALSE); + if (sif) + break; + } if (sif) {

1 0

Henri Verbeet : d3d8/tests: Don' t require dynamic usage for textures in the stateblock tests.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 141b995b8f9fb9aff9a0baa0192f6aaf37e24f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=141b995b8f9fb9aff9a0baa01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 10:26:51 2009 +0100 d3d8/tests: Don't require dynamic usage for textures in the stateblock tests. Not all cards support dynamic usage textures, and we don't actually need it. --- dlls/d3d8/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 30d022c..630c4de 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1737,7 +1737,7 @@ static void resource_test_data_init(IDirect3DDevice8 *device, data->tex = HeapAlloc(GetProcessHeap(), 0, arg->tex_count * sizeof(*data->tex)); for (i = 0; i < arg->tex_count; ++i) { - hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 0, D3DUSAGE_DYNAMIC, + hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &data->tex[i]); ok(SUCCEEDED(hr), "CreateTexture (%u) returned hr %#x.\n", i, hr); }

1 0