wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

James Hawkins : msi: Simplify ready_media.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: bb747e4fbe6619fa0e862102cc26456118355c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb747e4fbe6619fa0e862102c… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 15 02:58:21 2007 -0600 msi: Simplify ready_media. --- dlls/msi/files.c | 54 ++++++++++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 0c27a90..5375641 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -596,9 +596,7 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { - UINT rc = ERROR_SUCCESS, type; - BOOL found = TRUE; - LPWSTR source_dir; + UINT rc = ERROR_SUCCESS; /* media info for continuous cabinet is already loaded */ if (mi->is_continuous) @@ -611,41 +609,41 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m return ERROR_FUNCTION_FAILED; } - if (mi->volume_label && mi->disk_id > 1) + /* package should be downloaded */ + if (file->IsCompressed && + GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && + package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { - source_dir = msi_dup_property(package, cszSourceDir); - PathStripToRootW(source_dir); - type = GetDriveTypeW(source_dir); - - if (type == DRIVE_CDROM || type == DRIVE_REMOVABLE) - found = source_matches_volume(mi, source_dir); - - if (!found) - found = GetFileAttributesW(mi->cabinet) != INVALID_FILE_ATTRIBUTES; - - msi_free(source_dir); + return download_remote_cabinet(package, mi); } - if (file->IsCompressed && - GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + /* check volume matches, change media if not */ + if (mi->volume_label && mi->disk_id > 1) { - found = FALSE; + LPWSTR source = msi_dup_property(package, cszSourceDir); + BOOL matches; + UINT type; - if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + PathStripToRootW(source); + type = GetDriveTypeW(source); + matches = source_matches_volume(mi, source); + msi_free(source); + + if ((type == DRIVE_CDROM || type == DRIVE_REMOVABLE) && !matches) { - rc = download_remote_cabinet(package, mi); - if (rc == ERROR_SUCCESS && - GetFileAttributesW(mi->source) != INVALID_FILE_ATTRIBUTES) - { - found = TRUE; - } + rc = msi_change_media(package, mi); + if (rc != ERROR_SUCCESS) + return rc; } } - if (!found) - rc = msi_change_media(package, mi); + if (mi->cabinet && GetFileAttributesW(mi->cabinet) == INVALID_FILE_ATTRIBUTES) + { + ERR("Cabinet not found: %s\n", debugstr_w(mi->cabinet)); + return ERROR_INSTALL_FAILURE; + } - return rc; + return ERROR_SUCCESS; } static UINT get_file_target(MSIPACKAGE *package, LPCWSTR file_key,

1 0

Alexandre Julliard : wine.inf: Register inetcomm.dll.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: a97d6556a42ed3119aaf3f312a6a436a59db9fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97d6556a42ed3119aaf3f312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 11:31:17 2007 +0100 wine.inf: Register inetcomm.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 36f9847..e4afa30 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2182,6 +2182,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,hhctrl.ocx,1 11,,hlink.dll,1 11,,iexplore.exe,1 +11,,inetcomm.dll,1 11,,infosoft.dll,1 11,,inseng.dll,1 11,,itss.dll,1

1 0

Alexandre Julliard : wine.inf: Some dlls need to be registered before the others.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 75b7ddaa3ca61f3511cc173eaf01d6ebe3deb476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b7ddaa3ca61f3511cc173ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 11:30:15 2007 +0100 wine.inf: Some dlls need to be registered before the others. --- tools/wine.inf | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 338dbd2..36f9847 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2148,6 +2148,11 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"Name",,"Uzbekistan" HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] +;;some dlls have to be registered first +11,,ole32.dll,1 +11,,oleaut32.dll,1 +11,,shell32.dll,1 + 11,,amstream.dll,1 11,,atl.dll,1 11,,avifil32.dll,1 @@ -2187,13 +2192,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msimtf.dll,1 11,,msxml3.dll,1 11,,objsel.dll,1 -11,,ole32.dll,1 -11,,oleaut32.dll,1 11,,qcap.dll,1 11,,quartz.dll,1 11,,rsaenh.dll,1 11,,shdocvw.dll,1 -11,,shell32.dll,1 11,,urlmon.dll,1 11,,wintrust.dll,1

1 0

Alistair Leslie-Hughes : msxml: Test for insertBefore with a NULL output parameter.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 9c657b26af7b171dc311a49723e138bc218354d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c657b26af7b171dc311a4972… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 14 16:07:14 2007 +1100 msxml: Test for insertBefore with a NULL output parameter. --- dlls/msxml3/tests/domdoc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ecedf06..60d7acf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1038,9 +1038,14 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( node == child, "%p %p\n", node, child ); IXMLDOMNode_Release( child ); - IXMLDOMNode_Release( node ); + V_VT(&var) = VT_NULL; + V_DISPATCH(&var) = (IDispatch*)node; + r = IXMLDOMNode_insertBefore( root, node, var, NULL ); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMNode_Release( node ); + r = IXMLDOMNode_QueryInterface( root, &IID_IXMLDOMElement, (LPVOID*)&element ); ok( r == S_OK, "returns %08x\n", r );

1 0

Alistair Leslie-Hughes : msxml: Allow insertBefore to have a NULL output parameter.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 7fbf828afa36500c5294262dde5ae5d34f7f9b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf828afa36500c5294262dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 14 16:05:17 2007 +1100 msxml: Allow insertBefore to have a NULL output parameter. --- dlls/msxml3/node.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 61d5ab2..298deff 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -373,7 +373,7 @@ static HRESULT WINAPI xmlnode_insertBefore( TRACE("(%p)->(%p,var,%p)\n",This,newChild,outNewChild); - if (!(newChild && outNewChild)) + if (!newChild) return E_INVALIDARG; switch(V_VT(&refChild)) @@ -414,7 +414,9 @@ static HRESULT WINAPI xmlnode_insertBefore( IXMLDOMNode_Release(new); IXMLDOMNode_AddRef(newChild); - *outNewChild = newChild; + if(outNewChild) + *outNewChild = newChild; + TRACE("ret S_OK\n"); return S_OK; }

1 0

Andrew Talbot : user32: Constify a variable.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 0a7513328f7d09f7ddfc4f5ec22a3607e273ee03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7513328f7d09f7ddfc4f5ec… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 14 21:48:17 2007 +0000 user32: Constify a variable. --- dlls/user32/dde_misc.c | 2 +- dlls/user32/dde_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 16f36d5..1f4915f 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -864,7 +864,7 @@ ATOM WDML_MakeAtomFromHsz(HSZ hsz) * Generally used while receiving a global atom and transforming it * into an HSZ */ -HSZ WDML_MakeHszFromAtom(WDML_INSTANCE* pInstance, ATOM atom) +HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) { WCHAR nameBuffer[MAX_BUFFER_LEN]; diff --git a/dlls/user32/dde_private.h b/dlls/user32/dde_private.h index 4ee93fb..56c2024 100644 --- a/dlls/user32/dde_private.h +++ b/dlls/user32/dde_private.h @@ -223,7 +223,7 @@ extern void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) DECLSPEC_HIDDEN; extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; extern ATOM WDML_MakeAtomFromHsz(HSZ hsz) DECLSPEC_HIDDEN; -extern HSZ WDML_MakeHszFromAtom(WDML_INSTANCE* pInstance, ATOM atom) DECLSPEC_HIDDEN; +extern HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) DECLSPEC_HIDDEN; /* client calls these */ extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem) DECLSPEC_HIDDEN; extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN;

1 0

Alex Villacís Lasso : user32: Conformance tests for DlgDirList and DlgDirSelectEx.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 00bba190aa87a7ce381a93a96db6894cdb6ed735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bba190aa87a7ce381a93a96… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Nov 10 18:09:45 2007 -0500 user32: Conformance tests for DlgDirList and DlgDirSelectEx. --- dlls/user32/tests/listbox.c | 403 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 403 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00bba190aa87a7ce381a9…

1 0

Alex Villacís Lasso : user32: DlgDirList converts path specification to uppercase.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: bee9fbfd436bb07e109ab4d9f8463bc858889d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee9fbfd436bb07e109ab4d9f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Nov 14 14:17:46 2007 -0500 user32: DlgDirList converts path specification to uppercase. --- dlls/user32/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index e7f55de..d04226b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1793,6 +1793,9 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, } } + /* Convert path specification to uppercase */ + if (spec) CharUpperW(spec); + if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0)) { WCHAR temp[MAX_PATH];

1 0

Rob Shearman : ole32: Intialise some out parameters in ProxyCliSec_QueryBlanket.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 33abd94d35338b64588ee9ebeae52642b419dfe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33abd94d35338b64588ee9ebe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 14 17:23:24 2007 +0000 ole32: Intialise some out parameters in ProxyCliSec_QueryBlanket. --- dlls/ole32/marshal.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d918347..fcfbd64 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -511,15 +511,31 @@ static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, IUnknown *pProxy, DWORD *pAuthnSvc, DWORD *pAuthzSvc, - OLECHAR **pServerPrincName, + OLECHAR **ppServerPrincName, DWORD *pAuthnLevel, DWORD *pImpLevel, void **pAuthInfo, DWORD *pCapabilities) { FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc, - pAuthzSvc, pServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, + pAuthzSvc, ppServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, pCapabilities); + + if (pAuthnSvc) + *pAuthnSvc = 0; + if (pAuthzSvc) + *pAuthzSvc = 0; + if (ppServerPrincName) + *ppServerPrincName = NULL; + if (pAuthnLevel) + *pAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT; + if (pImpLevel) + *pImpLevel = RPC_C_IMP_LEVEL_DEFAULT; + if (pAuthInfo) + *pAuthInfo = NULL; + if (pCapabilities) + *pCapabilities = EOAC_NONE; + return E_NOTIMPL; }

1 0

Huw Davies : inetcomm: Add a test for MimeBody.
by Alexandre Julliard 15 Nov '07

15 Nov '07

Module: wine Branch: master Commit: 288196a49aa8dc5d9e0752c49c0432a2346af6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288196a49aa8dc5d9e0752c49… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 16:39:50 2007 +0000 inetcomm: Add a test for MimeBody. --- dlls/inetcomm/tests/mimeole.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index eebb783..156884e 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -22,6 +22,9 @@ #include "windows.h" #include "ole2.h" +#include "ocidl.h" + +#include "initguid.h" #include "mimeole.h" #include <stdio.h> @@ -52,10 +55,27 @@ static void test_CreateSecurity(void) IMimeSecurity_Release(sec); } +static void test_CreateBody(void) +{ + HRESULT hr; + IMimeBody *body; + HBODY handle = (void *)0xdeadbeef; + + hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetHandle(body, &handle); + ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); + ok(handle == NULL, "handle %p\n", handle); + + IMimeBody_Release(body); +} + START_TEST(mimeole) { OleInitialize(NULL); test_CreateVirtualStream(); test_CreateSecurity(); + test_CreateBody(); OleUninitialize(); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007