December 2009 - Wine-commits

Alexandre Julliard : user32: Move wsprintf16 to user16.c.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 25d7e0b968172a58a9db09ad82d2f26d62a1b632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d7e0b968172a58a9db09ad8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 18:02:00 2009 +0100 user32: Move wsprintf16 to user16.c. --- dlls/user32/user16.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/wsprintf.c | 129 ------------------------------ 2 files changed, 208 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25d7e0b968172a58a9db0…

1 0

Juan Lang : setupapi: Fix a comment typo.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: eba0657bf7f646fb85dc24dd000200e4bcf8c3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba0657bf7f646fb85dc24dd0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 16 15:01:47 2009 -0800 setupapi: Fix a comment typo. --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 89e3cb6..ec586e7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3836,7 +3836,7 @@ static BOOL SETUPDI_DeleteDrvKey(struct DeviceInfo *devInfo) } /*********************************************************************** - * SetupDiOpenDevRegKey (SETUPAPI.@) + * SetupDiDeleteDevRegKey (SETUPAPI.@) */ BOOL WINAPI SetupDiDeleteDevRegKey( HDEVINFO DeviceInfoSet,

1 0

André Hentschel : mapi32: Add German resource.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 79dd01183949ef6aa2ecc4b29ef799072a15879f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dd01183949ef6aa2ecc4b29… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 17 18:56:19 2009 +0100 mapi32: Add German resource. --- dlls/mapi32/De.rc | 30 ++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/De.rc b/dlls/mapi32/De.rc new file mode 100644 index 0000000..2c811d1 --- /dev/null +++ b/dlls/mapi32/De.rc @@ -0,0 +1,30 @@ +/* +* MAPI32 German resources +* +* Copyright 2009 André Hentschel +* +* 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 +* +*/ + +#include "res.h" + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Das senden der E-Mails scheiterte, da Sie keinen MAPI E-Mail Programm installiert haben." + IDS_SEND_MAIL, "E-Mail senden" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index e06b926..4f2ca15 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ util.c RC_SRCS = \ + De.rc \ En.rc \ version.rc

1 0

Jacek Caban : mshtml: Don' t use necko nsIHttpChannelInternal implementation in nsChannel object.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 74c4a73ffb71827e9b09333b2dd71189eafb835a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c4a73ffb71827e9b09333b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 17 21:25:34 2009 +0100 mshtml: Don't use necko nsIHttpChannelInternal implementation in nsChannel object. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsio.c | 38 +++++++++----------------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 98abec2..18bdec3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -435,7 +435,6 @@ typedef struct { nsIChannel *channel; nsIHttpChannel *http_channel; - nsIHttpChannelInternal *http_channel_internal; nsIWineURI *uri; nsIInputStream *post_data_stream; nsILoadGroup *load_group; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e4c5321..4bbfd1f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -221,8 +221,6 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) nsIChannel_Release(This->channel); if(This->http_channel) nsIHttpChannel_Release(This->http_channel); - if(This->http_channel_internal) - nsIHttpChannel_Release(This->http_channel_internal); if(This->owner) nsISupports_Release(This->owner); if(This->post_data_stream) @@ -1293,10 +1291,8 @@ static nsresult NSAPI nsHttpChannelInternal_GetDocumentURI(nsIHttpChannelInterna { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_GetDocumentURI(This->http_channel_internal, aDocumentURI); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1304,10 +1300,8 @@ static nsresult NSAPI nsHttpChannelInternal_SetDocumentURI(nsIHttpChannelInterna { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_SetDocumentURI(This->http_channel_internal, aDocumentURI); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1315,10 +1309,8 @@ static nsresult NSAPI nsHttpChannelInternal_GetRequestVersion(nsIHttpChannelInte { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_GetRequestVersion(This->http_channel_internal, major, minor); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1326,10 +1318,8 @@ static nsresult NSAPI nsHttpChannelInternal_GetResponseVersion(nsIHttpChannelInt { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_GetResponseVersion(This->http_channel_internal, major, minor); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1337,10 +1327,8 @@ static nsresult NSAPI nsHttpChannelInternal_SetCookie(nsIHttpChannelInternal *if { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_SetCookie(This->http_channel_internal, aCookieHeader); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1348,10 +1336,8 @@ static nsresult NSAPI nsHttpChannelInternal_SetupFallbackChannel(nsIHttpChannelI { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_SetupFallbackChannel(This->http_channel_internal, aFallbackKey); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1359,10 +1345,8 @@ static nsresult NSAPI nsHttpChannelInternal_GetForceAllowThirdPartyCookie(nsIHtt { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_GetForceAllowThirdPartyCookie(This->http_channel_internal, aForceThirdPartyCookie); return NS_ERROR_NOT_IMPLEMENTED; } @@ -1370,10 +1354,8 @@ static nsresult NSAPI nsHttpChannelInternal_SetForceAllowThirdPartyCookie(nsIHtt { nsChannel *This = NSHTTPINTERNAL_THIS(iface); - TRACE("(%p)->()\n", This); + FIXME("(%p)->()\n", This); - if(This->http_channel_internal) - return nsIHttpChannelInternal_SetForceAllowThirdPartyCookie(This->http_channel_internal, aForceThirdPartyCookie); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2726,10 +2708,8 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI nsIWineURI_GetWineURL(wine_uri, &url); ret->url_scheme = url && SUCCEEDED(ParseURLW(url, &parsed_url)) ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; - if(channel) { + if(channel) nsIChannel_QueryInterface(channel, &IID_nsIHttpChannel, (void**)&ret->http_channel); - nsIChannel_QueryInterface(channel, &IID_nsIHttpChannelInternal, (void**)&ret->http_channel_internal); - } *_retval = NSCHANNEL(ret); return NS_OK;

1 0

Jeremy White : oleaut32/tests: Adjust new tests to pass on win9x platforms.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 229fbad9ca495bfd7de142f5f0deb6a6dbd655d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=229fbad9ca495bfd7de142f5f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Dec 17 14:54:00 2009 -0600 oleaut32/tests: Adjust new tests to pass on win9x platforms. --- dlls/oleaut32/tests/usrmarshal.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index e9c53e9..b5cdc1e 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -306,7 +306,8 @@ static void test_marshal_LPSAFEARRAY(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); + ok(next - buffer == expected || broken(next - buffer + sizeof(DWORD) == expected), + "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); @@ -335,7 +336,8 @@ static void test_marshal_LPSAFEARRAY(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); + ok(next - buffer == expected || broken(next - buffer + sizeof(DWORD) == expected), + "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); HeapFree(GetProcessHeap(), 0, buffer); SafeArrayDestroyData(lpsa); @@ -445,7 +447,8 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); todo_wine - ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); + ok(next - buffer == expected || broken(next - buffer + sizeof(DWORD) == expected), + "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); lpsa->cbElements = 16; /* VARIANT wire size */ check_safearray(buffer, lpsa); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Huw Davies : oleaut32: Fix several memory leaks in the tests.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 7f175bd47c9d84e30a69764dc83465eab3d8b9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f175bd47c9d84e30a69764dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 17 20:55:00 2009 +0000 oleaut32: Fix several memory leaks in the tests. Found by Valgrind. --- dlls/oleaut32/tests/typelib.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1fdd458..936c497 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -735,8 +735,10 @@ static void test_inheritance(void) if(use_midl_tlb) { ok(pTA->cFuncs == 6, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); +} ITypeInfo_ReleaseTypeAttr(pTI, pTA); +if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); @@ -861,8 +863,10 @@ if(use_midl_tlb) { if(use_midl_tlb) { ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); +} ITypeInfo_ReleaseTypeAttr(pTI, pTA); +if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeOfImplType(pTI, -1, &href); ok(hr == TYPE_E_ELEMENTNOTFOUND, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); @@ -897,8 +901,10 @@ if(use_midl_tlb) { if(use_midl_tlb) { ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); +} ITypeInfo_ReleaseTypeAttr(pTI, pTA); +if(use_midl_tlb) { hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); @@ -942,8 +948,10 @@ if(use_midl_tlb) { if(use_midl_tlb) { ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); +} ITypeInfo_ReleaseTypeAttr(pTI, pTA); +if(use_midl_tlb) { /* Should have one method */ hr = ITypeInfo_GetFuncDesc(pTI, 1, &pFD); ok(hr == TYPE_E_ELEMENTNOTFOUND, "hr %08x\n", hr);

1 0

Vincent Povirk : ole32: Compare upper character values directly in entryNameCmp.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 5d9fd1b716ce497ca072765a771e4fc6c3bc11f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9fd1b716ce497ca072765a7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 17 15:41:57 2009 -0600 ole32: Compare upper character values directly in entryNameCmp. The sort function used by native is not entirely consistent with lstrcmpiW, even on Windows. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2a7e9f0..7d267b6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1350,12 +1350,12 @@ static LONG entryNameCmp( { LONG diff = lstrlenW(name1) - lstrlenW(name2); - if (diff == 0) + while (diff == 0 && *name1 != 0) { /* * We compare the string themselves only when they are of the same length */ - diff = lstrcmpiW( name1, name2); + diff = toupperW(*name1++) - toupperW(*name2++); } return diff;

1 0

Nikolay Sivov : kernel32/tests: Fix few context leaks.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 0fe54088bcc18b5bafa99c0d34ee4d8371d84bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe54088bcc18b5bafa99c0d3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 18 01:36:55 2009 +0300 kernel32/tests: Fix few context leaks. --- dlls/kernel32/tests/actctx.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 4b84c58..8f51dfb 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -869,7 +869,7 @@ static void test_basic_info(HANDLE handle) SIZE_T size; BOOL b; - b = pQueryActCtxW(0, handle, NULL, + b = pQueryActCtxW(QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, ActivationContextBasicInformation, &basic, sizeof(basic), &size); @@ -878,7 +878,8 @@ static void test_basic_info(HANDLE handle) ok (basic.dwFlags == 0, "unexpected flags %x\n",basic.dwFlags); ok (basic.hActCtx == handle, "unexpected handle\n"); - b = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, handle, NULL, + b = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX | + QUERY_ACTCTX_FLAG_NO_ADDREF, handle, NULL, ActivationContextBasicInformation, &basic, sizeof(basic), &size); if (handle)

1 0

Vincent Povirk : ole32: Fix memory leaks in the storage test.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 4f0dfb51b371143b2a0dba3a193ab5b7d9abce34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0dfb51b371143b2a0dba3a1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 17 18:09:22 2009 -0600 ole32: Fix memory leaks in the storage test. --- dlls/ole32/tests/storage32.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index f89a787..12f2504 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -877,6 +877,9 @@ static void test_streamenum(void) ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); ok(count == 1, "count wrong\n"); + if (r == S_OK) + CoTaskMemFree(stat.pwcsName); + r = IEnumSTATSTG_Release(ee); /* second enum... destroy the stream before reading */ @@ -1939,6 +1942,7 @@ static void test_fmtusertypestg(void) found = TRUE; else ok(0, "found unexpected stream or storage\n"); + CoTaskMemFree(statstg.pwcsName); } ok(found == TRUE, "expected storage to contain stream \\0001CompObj\n"); IEnumSTATSTG_Release(stat); @@ -1962,6 +1966,7 @@ static void test_fmtusertypestg(void) found = TRUE; else ok(0, "found unexpected stream or storage\n"); + CoTaskMemFree(statstg.pwcsName); } ok(found == TRUE, "expected storage to contain stream \\0001CompObj\n"); IEnumSTATSTG_Release(stat);

1 0

Vincent Povirk : shell32: Fix a memory leak in SHFileOperationW.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: a18bc73fce4db51d5d56674ca1499b29274446dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18bc73fce4db51d5d56674ca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 17 18:45:53 2009 -0600 shell32: Fix a memory leak in SHFileOperationW. --- dlls/shell32/shlfileop.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b48e46d..a768c15 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1192,6 +1192,14 @@ static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST if (flFrom->dwNumFiles != 1 && !IsAttribDir(fileDest->attributes)) return ERROR_CANCELLED; + /* Free all but the first entry. */ + for (i = 1; i < flTo->dwNumFiles; i++) + { + HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szDirectory); + HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szFilename); + HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szFullPath); + } + flTo->dwNumFiles = 1; } else if (IsAttribDir(fileDest->attributes))

1 0