March 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Make the IWICPalette implementation thread-safe.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 8255df56984a7178a7a703b838bf3cf7ca17a1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8255df56984a7178a7a703b83… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 19 13:17:29 2010 -0500 windowscodecs: Make the IWICPalette implementation thread-safe. --- dlls/windowscodecs/palette.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 842d3b5..40ab190 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -40,6 +40,7 @@ typedef struct { UINT count; WICColor *colors; WICBitmapPaletteType type; + CRITICAL_SECTION lock; /* must be held when count, colors, or type is accessed */ } PaletteImpl; static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, @@ -83,6 +84,8 @@ static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->colors); HeapFree(GetProcessHeap(), 0, This); } @@ -117,10 +120,12 @@ static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, memcpy(new_colors, pColors, sizeof(WICColor) * colorCount); } + EnterCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->colors); This->colors = new_colors; This->count = colorCount; This->type = WICBitmapPaletteTypeCustom; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -148,7 +153,9 @@ static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, if (!pePaletteType) return E_INVALIDARG; + EnterCriticalSection(&This->lock); *pePaletteType = This->type; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -161,7 +168,9 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun if (!pcCount) return E_INVALIDARG; + EnterCriticalSection(&This->lock); *pcCount = This->count; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -175,12 +184,16 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, if (!pColors || !pcActualColors) return E_INVALIDARG; + EnterCriticalSection(&This->lock); + if (This->count < colorCount) colorCount = This->count; memcpy(pColors, This->colors, sizeof(WICColor) * colorCount); *pcActualColors = colorCount; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -192,10 +205,12 @@ static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBla if (!pfIsBlackWhite) return E_INVALIDARG; + EnterCriticalSection(&This->lock); if (This->type == WICBitmapPaletteTypeFixedBW) *pfIsBlackWhite = TRUE; else *pfIsBlackWhite = FALSE; + LeaveCriticalSection(&This->lock); return S_OK; } @@ -208,6 +223,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray if (!pfIsGrayscale) return E_INVALIDARG; + EnterCriticalSection(&This->lock); switch(This->type) { case WICBitmapPaletteTypeFixedBW: @@ -219,6 +235,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray default: *pfIsGrayscale = FALSE; } + LeaveCriticalSection(&This->lock); return S_OK; } @@ -234,12 +251,14 @@ static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) *pfHasAlpha = FALSE; + EnterCriticalSection(&This->lock); for (i=0; i<This->count; i++) if ((This->colors[i]&0xff000000) != 0xff000000) { *pfHasAlpha = TRUE; break; } + LeaveCriticalSection(&This->lock); return S_OK; } @@ -272,6 +291,8 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) This->count = 0; This->colors = NULL; This->type = WICBitmapPaletteTypeCustom; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PaletteImpl.lock"); *palette = (IWICPalette*)This;

1 0

Juan Lang : crypt32: Fix overestimating size required for base64-encoded strings.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 67bf4dc62e7a9e459cfe16f0cc34cbe3a93e919f URL: http://source.winehq.org/git/wine.git/?a=commit;h=67bf4dc62e7a9e459cfe16f0c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 19 15:51:24 2010 -0700 crypt32: Fix overestimating size required for base64-encoded strings. --- dlls/crypt32/base64.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 4a6504a..2a91372 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -204,8 +204,6 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, charsNeeded = 0; encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded); - if (sep) - charsNeeded += strlen(sep); if (header) charsNeeded += strlen(header) + strlen(sep); if (trailer) @@ -409,8 +407,6 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, charsNeeded = 0; encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded); - if (sep) - charsNeeded += strlenW(sep); if (header) charsNeeded += strlenW(header) + strlenW(sep); if (trailer)

1 0

Paul Vriens : msi/tests: Remove temporary files.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: ba51763f4abc9b35a692b1f751fcfae54fd97b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba51763f4abc9b35a692b1f75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 20 13:40:29 2010 +0100 msi/tests: Remove temporary files. --- dlls/msi/tests/install.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 23b4564..3d99fb9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -8015,6 +8015,7 @@ static void test_file_in_use(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + DeleteFileA("msitest\\maximus"); delete_test_files(); } @@ -8432,6 +8433,7 @@ static void test_register_font(void) RegDeleteValueA(key, "msi test font"); RegCloseKey(key); + DeleteFileA("msitest\\font.ttf"); delete_test_files(); } @@ -8496,6 +8498,11 @@ static void test_install_remove_odbc(void) ok(delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not created\n"); ok(delete_pf("msitest", FALSE), "directory not created\n"); + DeleteFileA("msitest\\ODBCdriver.dll"); + DeleteFileA("msitest\\ODBCdriver2.dll"); + DeleteFileA("msitest\\ODBCtranslator.dll"); + DeleteFileA("msitest\\ODBCtranslator2.dll"); + DeleteFileA("msitest\\ODBCsetup.dll"); delete_test_files(); } @@ -8521,6 +8528,7 @@ static void test_register_typelib(void) ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + DeleteFileA("msitest\\typelib.dll"); delete_test_files(); } @@ -8547,6 +8555,7 @@ static void test_create_remove_shortcut(void) ok(!delete_pf("msitest\\target.txt", TRUE), "file not removed\n"); todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + DeleteFileA("msitest\\target.txt"); delete_test_files(); } @@ -8583,6 +8592,8 @@ static void test_publish_components(void) ok(!delete_pf("msitest\\english.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\english.txt"); delete_test_files(); } @@ -8616,6 +8627,10 @@ static void test_remove_duplicate_files(void) ok(!delete_pf("msitest\\duplicate.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest\\duplicate2.txt", TRUE), "file not removed\n"); ok(delete_pf("msitest", FALSE), "directory removed\n"); + + DeleteFileA("msitest\\original.txt"); + DeleteFileA("msitest\\original2.txt"); + DeleteFileA("msitest\\original3.txt"); delete_test_files(); } @@ -8687,6 +8702,8 @@ static void test_remove_registry_values(void) ok(!delete_pf("msitest\\registry.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\registry.txt"); delete_test_files(); } @@ -8712,6 +8729,8 @@ static void test_find_related_products(void) ok(!delete_pf("msitest\\product.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\product.txt"); delete_test_files(); } @@ -8763,6 +8782,8 @@ static void test_remove_ini_values(void) todo_wine ok(!delete_pf("msitest\\test.ini", TRUE), "file removed\n"); ok(!delete_pf("msitest\\inifile.txt", TRUE), "file not removed\n"); ok(delete_pf("msitest", FALSE), "directory removed\n"); + + DeleteFileA("msitest\\inifile.txt"); delete_test_files(); } @@ -8882,6 +8903,8 @@ static void test_remove_env_strings(void) ok(!delete_pf("msitest\\envvar.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\envvar.txt"); delete_test_files(); }

1 0

Andrew Eikum : mshtml: Fix typo determining if channel is HTTP.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 341ba18d75d94fb846f6f46d03bfd2e8131da6c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341ba18d75d94fb846f6f46d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 19 15:57:26 2010 -0500 mshtml: Fix typo determining if channel is HTTP. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 88a4e55..4610bbc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -307,7 +307,7 @@ static void set_uri_window(nsWineURI *This, HTMLWindow *window) static inline BOOL is_http_channel(nsChannel *This) { - return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTP; + return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS; } #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface)

1 0

Vincent Povirk : ole32: Track the lowest possibly-free small block in storage files.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: e05b8416b846790a2b3ec82ba69282e9724d581d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05b8416b846790a2b3ec82ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 20 13:13:47 2010 -0500 ole32: Track the lowest possibly-free small block in storage files. This makes creating small block chains O(n) instead of O(n**2) because we don't have to keep rechecking the first blocks in the file. --- dlls/ole32/storage32.c | 7 ++++++- dlls/ole32/storage32.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f1706da..a15e3db 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2711,6 +2711,8 @@ static HRESULT StorageImpl_Construct( */ This->prevFreeBlock = 0; + This->firstFreeSmallBlock = 0; + /* * Create the block chain abstractions. */ @@ -5710,7 +5712,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( ULARGE_INTEGER offsetOfBlockInDepot; DWORD buffer; ULONG bytesRead; - ULONG blockIndex = 0; + ULONG blockIndex = This->parentStorage->firstFreeSmallBlock; ULONG nextBlockIndex = BLOCK_END_OF_CHAIN; HRESULT res = S_OK; ULONG smallBlocksPerBigBlock; @@ -5819,6 +5821,8 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( } } + This->parentStorage->firstFreeSmallBlock = blockIndex+1; + smallBlocksPerBigBlock = This->parentStorage->bigBlockSize / This->parentStorage->smallBlockSize; @@ -6117,6 +6121,7 @@ static BOOL SmallBlockChainStream_Shrink( &blockIndex))) return FALSE; SmallBlockChainStream_FreeBlock(This, extraBlock); + This->parentStorage->firstFreeSmallBlock = min(This->parentStorage->firstFreeSmallBlock, extraBlock); extraBlock = blockIndex; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fad5d77..dfa5d1a 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -360,6 +360,9 @@ struct StorageImpl ULONG indexBlockDepotCached; ULONG prevFreeBlock; + /* All small blocks before this one are known to be in use. */ + ULONG firstFreeSmallBlock; + /* * Abstraction of the big block chains for the chains of the header. */

1 0

Alexandre Julliard : makefiles: Define the variables that are used by aclocal macros in aclocal too.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 7d8311551261ad648e371a01c3470bde72efc163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8311551261ad648e371a01c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 15:07:45 2010 +0100 makefiles: Define the variables that are used by aclocal macros in aclocal too. --- aclocal.m4 | 24 +++++++++++++++++++++--- configure | 18 +++++++++--------- configure.ac | 18 ------------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ac03af2..328a345 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -140,7 +140,25 @@ dnl dnl Usage: AC_REQUIRE([WINE_CONFIG_HELPERS]) dnl AC_DEFUN([WINE_CONFIG_HELPERS], -[wine_fn_append_file () +[AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) +AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) + +AC_SUBST(ALL_MAKERULES,"") +AC_SUBST(ALL_SYMLINKS,"") +AC_SUBST(ALL_DIRS,"") +AC_SUBST(ALL_TOP_DIRS,"") +AC_SUBST(ALL_DLL_DIRS,"") +AC_SUBST(ALL_TOOL_DIRS,"") +AC_SUBST(ALL_STATICLIB_DIRS,"") +AC_SUBST(ALL_STATIC_LIBS,"") +AC_SUBST(ALL_IMPORT_LIBS,"") +AC_SUBST(ALL_INSTALL_DIRS,"") +AC_SUBST(ALL_TEST_DIRS,"") +AC_SUBST(ALL_TEST_BINARIES,"") +AC_SUBST(ALL_PROGRAM_DIRS,"") +AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") + +wine_fn_append_file () { AS_VAR_APPEND($[1]," \\$as_nl $[2]") } @@ -318,8 +336,8 @@ dnl **** Create a make rules file from config.status **** dnl dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) dnl -AC_DEFUN([WINE_CONFIG_MAKERULES], -[WINE_APPEND_FILE(ALL_MAKERULES,[$1]) +AC_DEFUN([WINE_CONFIG_MAKERULES],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +WINE_APPEND_FILE(ALL_MAKERULES,[$1]) WINE_APPEND_RULE(ALL_MAKEFILE_DEPENDS,[$1: m4_ifval([$3],[$1.in $3],[$1.in]) config.status]) $2=$1 AC_SUBST_FILE([$2])dnl diff --git a/configure b/configure index 1ee7db2..346ec70 100755 --- a/configure +++ b/configure @@ -608,10 +608,10 @@ ALL_TOOL_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_DIRS -ALL_WINETEST_DEPENDS -ALL_MAKEFILE_DEPENDS ALL_SYMLINKS ALL_MAKERULES +ALL_WINETEST_DEPENDS +ALL_MAKEFILE_DEPENDS LDAPLIBS LIBPOLL LIBDL @@ -13778,15 +13778,20 @@ fi ;; esac -ALL_MAKERULES="" -ALL_SYMLINKS="" + +ac_config_commands="$ac_config_commands include/stamp-h" + ALL_MAKEFILE_DEPENDS="# Makefile dependencies" ALL_WINETEST_DEPENDS="# Test binaries" +ALL_MAKERULES="" + +ALL_SYMLINKS="" + ALL_DIRS="" ALL_TOP_DIRS="" @@ -13812,11 +13817,6 @@ ALL_PROGRAM_DIRS="" ALL_PROGRAM_BIN_INSTALL_DIRS="" - - -ac_config_commands="$ac_config_commands include/stamp-h" - - wine_fn_append_file () { as_fn_append $1 " \\$as_nl $2" diff --git a/configure.ac b/configure.ac index 55edefc..a22b984 100644 --- a/configure.ac +++ b/configure.ac @@ -2118,24 +2118,6 @@ esac dnl **** Generate output files **** -AC_SUBST(ALL_MAKERULES,"") -AC_SUBST(ALL_SYMLINKS,"") -AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) -AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) - -AC_SUBST(ALL_DIRS,"") -AC_SUBST(ALL_TOP_DIRS,"") -AC_SUBST(ALL_DLL_DIRS,"") -AC_SUBST(ALL_TOOL_DIRS,"") -AC_SUBST(ALL_STATICLIB_DIRS,"") -AC_SUBST(ALL_STATIC_LIBS,"") -AC_SUBST(ALL_IMPORT_LIBS,"") -AC_SUBST(ALL_INSTALL_DIRS,"") -AC_SUBST(ALL_TEST_DIRS,"") -AC_SUBST(ALL_TEST_BINARIES,"") -AC_SUBST(ALL_PROGRAM_DIRS,"") -AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") - AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])

1 0

Vincent Povirk : oleaut32: Allow named args to be combined with positional args in fnInvoke.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 8ff7238adeff518fced37159a4b5a17b9551f4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff7238adeff518fced37159a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 19 11:53:26 2010 -0500 oleaut32: Allow named args to be combined with positional args in fnInvoke. --- dlls/oleaut32/tests/tmarshal.c | 26 ++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + dlls/oleaut32/typelib.c | 8 +++++--- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 64b6633..f7df82f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -603,6 +603,15 @@ static HRESULT WINAPI Widget_put_prop_opt_arg( return S_OK; } +static HRESULT WINAPI Widget_put_prop_req_arg( + IWidget* iface, INT req, INT i) +{ + trace("put_prop_req_arg(%08x, %08x)\n", req, i); + ok(req == 0x5678, "got req=%08x\n", req); + ok(i == 0x1234, "got i=%08x\n", i); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -637,6 +646,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_get_prop_uint, Widget_ByRefUInt, Widget_put_prop_opt_arg, + Widget_put_prop_req_arg, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1410,6 +1420,22 @@ static void test_typelibmarshal(void) ok_ole_success(hr, ITypeInfo_Invoke); VariantClear(&varresult); + /* test propput with required argument. */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 0x1234; + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = 0x5678; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidNamed; + dispparams.cArgs = 2; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_REQ_ARG, &IID_NULL, 0x40c, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, ITypeInfo_Invoke); + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 077fb59..7616789 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -143,6 +143,9 @@ library TestTypelib [id(DISPID_TM_PROP_OPT_ARG), propput] HRESULT prop_opt_arg([in,optional] INT opt, [in] INT i); + + [id(DISPID_TM_PROP_REQ_ARG), propput] + HRESULT prop_req_arg([in] INT req, [in] INT i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index a4f467e..376162b 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -39,6 +39,7 @@ #define DISPID_TM_PROP_UINT 20 #define DISPID_TM_BYREF_UINT 21 #define DISPID_TM_PROP_OPT_ARG 22 +#define DISPID_TM_PROP_REQ_ARG 23 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b09f7ab..c1fa321 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6102,10 +6102,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( continue; } + src_arg = NULL; + if (cNamedArgs) { USHORT j; - src_arg = NULL; for (j = 0; j < cNamedArgs; j++) if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) { @@ -6113,9 +6114,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else + + if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) { - src_arg = vargs_converted < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted] : NULL; + src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted]; vargs_converted++; }

1 0

Alexandre Julliard : makefiles: Add a configure macro for tools directories .
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: d81a8f8d47731db79d3d2936cb8b15c97f6fe964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81a8f8d47731db79d3d2936c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 15:02:56 2010 +0100 makefiles: Add a configure macro for tools directories. --- aclocal.m4 | 24 +++++++++++++++++++++ configure | 55 ++++++++++++++++++++++++------------------------- configure.ac | 14 ++++++------ tools/make_makefiles | 3 +- 4 files changed, 60 insertions(+), 36 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f9c0b38..ac03af2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -268,6 +268,23 @@ $ac_dir/__clean__ $ac_dir/__crosstest__ $ac_dir: $ac_dir/Makefile $ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Maketest.rules \$(MAKEDEP) @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" AS_VAR_IF([enable_tests],[no],,[wine_fn_append_file ALL_TEST_DIRS $ac_dir]) +} + +wine_fn_config_tool () +{ + ac_dir=$[1] + ac_deps="Make.rules" + if test "$ac_dir" != tools + then + dnl makedep is in tools so tools makefile cannot depend on it + ac_deps="$ac_deps \$(MAKEDEP)" + fi + wine_fn_append_file ALL_DIRS $ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps + @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + AS_VAR_IF([enable_tools],[no],,[wine_fn_append_file ALL_TOOL_DIRS $ac_dir]) }]) dnl **** Define helper function to append a file to a makefile file list **** @@ -360,6 +377,13 @@ dnl AC_DEFUN([WINE_CONFIG_LIB],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl wine_fn_config_lib $1]) +dnl **** Create a tool makefile from config.status **** +dnl +dnl Usage: WINE_CONFIG_TOOL(name) +dnl +AC_DEFUN([WINE_CONFIG_TOOL],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl +wine_fn_config_tool $1]) + dnl **** Add a message to the list displayed at the end **** dnl dnl Usage: WINE_NOTICE(notice) diff --git a/configure b/configure index 8cfccff..1ee7db2 100755 --- a/configure +++ b/configure @@ -13957,6 +13957,26 @@ else wine_fn_append_file ALL_TEST_DIRS $ac_dir fi } + +wine_fn_config_tool () +{ + ac_dir=$1 + ac_deps="Make.rules" + if test "$ac_dir" != tools + then + ac_deps="$ac_deps \$(MAKEDEP)" + fi + wine_fn_append_file ALL_DIRS $ac_dir + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile +$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps + @./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend" + if test "x$enable_tools" = x""no; then : + +else + wine_fn_append_file ALL_TOOL_DIRS $ac_dir +fi +} ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_append_file ALL_SYMLINKS "dlls/wineps.drv/generic.ppd" ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" @@ -14569,27 +14589,13 @@ wine_fn_config_program xcopy enable_xcopy install wine_fn_config_makefile server "Make.rules \$(MAKEDEP)" test "x$enable_server" != xno && wine_fn_append_file ALL_TOP_DIRS "server" -wine_fn_config_makefile tools Make.rules -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools" - -wine_fn_config_makefile tools/widl "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/widl" - -wine_fn_config_makefile tools/winebuild "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/winebuild" - -wine_fn_config_makefile tools/winedump "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/winedump" - -wine_fn_config_makefile tools/winegcc "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/winegcc" - -wine_fn_config_makefile tools/wmc "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/wmc" - -wine_fn_config_makefile tools/wrc "Make.rules \$(MAKEDEP)" -test "x$enable_tools" != xno && wine_fn_append_file ALL_TOOL_DIRS "tools/wrc" - +wine_fn_config_tool tools +wine_fn_config_tool tools/widl +wine_fn_config_tool tools/winebuild +wine_fn_config_tool tools/winedump +wine_fn_config_tool tools/winegcc +wine_fn_config_tool tools/wmc +wine_fn_config_tool tools/wrc test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -15314,13 +15320,6 @@ do "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; - "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tools/widl/Makefile") CONFIG_FILES="$CONFIG_FILES tools/widl/Makefile" ;; - "tools/winebuild/Makefile") CONFIG_FILES="$CONFIG_FILES tools/winebuild/Makefile" ;; - "tools/winedump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/winedump/Makefile" ;; - "tools/winegcc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/winegcc/Makefile" ;; - "tools/wmc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;; - "tools/wrc/Makefile") CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 4ec7363..55edefc 100644 --- a/configure.ac +++ b/configure.ac @@ -2700,13 +2700,13 @@ WINE_CONFIG_PROGRAM(wordpad,install) WINE_CONFIG_PROGRAM(write,install) WINE_CONFIG_PROGRAM(xcopy,install) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) -WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_TOOL(tools) +WINE_CONFIG_TOOL(tools/widl) +WINE_CONFIG_TOOL(tools/winebuild) +WINE_CONFIG_TOOL(tools/winedump) +WINE_CONFIG_TOOL(tools/winegcc) +WINE_CONFIG_TOOL(tools/wmc) +WINE_CONFIG_TOOL(tools/wrc) dnl End of auto-generated output commands dnl Don't install in bin dir for Windows build diff --git a/tools/make_makefiles b/tools/make_makefiles index ed2278e..33fcbc0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -392,7 +392,8 @@ sub update_makefiles(@) } elsif ($file =~ /^tools.*\/Makefile$/) { - push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[ALL_TOOL_DIRS],enable_tools)\n"; + (my $name = $file) =~ s/^(.*)\/Makefile/$1/; + push @lines, "WINE_CONFIG_TOOL($name)\n"; } elsif ($file =~ /^[^\/]*\/Makefile$/) {

1 0

Alexandre Julliard : makefiles: Generate all the static lib rules inside the corresponding shell function.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: b8fb1d5d9ae3a2debc85f2bdfbacbd717faf6aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb1d5d9ae3a2debc85f2bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:50:53 2010 +0100 makefiles: Generate all the static lib rules inside the corresponding shell function. --- aclocal.m4 | 19 ++++++++++++------- configure | 44 +++++++++++--------------------------------- 2 files changed, 23 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8fb1d5d9ae3a2debc85f…

1 0

Alexandre Julliard : makefiles: Generate all the test rules inside the corresponding shell function.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: dc3afa1fda18db980b7eef4f1e280228f50221a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3afa1fda18db980b7eef4f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 20 14:51:52 2010 +0100 makefiles: Generate all the test rules inside the corresponding shell function. --- aclocal.m4 | 13 ++- configure | 446 ++---------------------------------------------------------- 2 files changed, 21 insertions(+), 438 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc3afa1fda18db980b7ee…

1 0