November 2007 - Wine-Commits

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

Nov. 15, 2007

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 Nov. 15, 2007

Nov. 15, 2007

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

Alexandre Julliard : wine.inf: Register inetcomm.dll.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

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

James Hawkins : msi: Add tests for situations involving missing cabinets.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: 0023759a4bbe5feb2799d130cebeb5b36de21c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0023759a4bbe5feb2799d130c… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 15 02:59:17 2007 -0600 msi: Add tests for situations involving missing cabinets. --- dlls/msi/tests/install.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 871b2c9..fd2ff66 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -530,6 +530,35 @@ static const CHAR mov_move_file_dat[] = "FileKey\tComponent_\tSourceName\tDestNa "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" "singlenodest\taugustus\tb?r\t\tSourceDir\tMSITESTDIR\t1\n"; +static const CHAR mc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" + "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" + "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n" + "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n"; + +static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t500\t\t\t0\t2\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3\n" + "gaius\tgaius\tgaius\t500\t\t\t16384\t4"; + +static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2.cab\tDISK2\t\n" + "3\t3\t\ttest3.cab\tDISK3\t\n" + "4\t4\t\ttest3.cab\tDISK3\t\n"; + +static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" + "s72\ti2\ti4\ti4\ti4\ti4\n" + "MsiFileHash\tFile_\n" + "caesar\t0\t1477005400\t-2141257985\t284379198\t21485139"; + typedef struct _msi_table { const CHAR *filename; @@ -793,6 +822,19 @@ static const msi_table mov_tables[] = ADD_TABLE(registry), }; +static const msi_table mc_tables[] = +{ + ADD_TABLE(mc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cie_feature_comp), + ADD_TABLE(mc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(mc_media), + ADD_TABLE(property), + ADD_TABLE(mc_file_hash), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -3472,6 +3514,57 @@ static void test_movefiles(void) RemoveDirectory("msitest"); DeleteFile(msifile); } + +static void test_missingcab(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + create_file("maximus", 500); + + create_database(msifile, mc_tables, sizeof(mc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + + create_pf("msitest", FALSE); + create_pf("msitest\\caesar", TRUE); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + create_pf("msitest", FALSE); + create_pf("msitest\\caesar", TRUE); + create_pf("msitest\\gaius", TRUE); + + r = MsiInstallProductA(msifile, "GAIUS=1"); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); + } + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); + ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); + DeleteFile("maximus"); + DeleteFile("test1.cab"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -3512,6 +3605,7 @@ START_TEST(install) test_adminprops(); test_removefiles(); test_movefiles(); + test_missingcab(); SetCurrentDirectoryA(prev_path); }

1 0

Andrew Talbot : user32: Constify a variable.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

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

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

Nov. 15, 2007

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

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

Nov. 15, 2007

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 Nov. 15, 2007

Nov. 15, 2007

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

Huw Davies : inetcomm: Add a stub MimeBody implementation.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

Module: wine Branch: master Commit: c396411a5bd4dfd69d0f1c6471fb9214a38013ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c396411a5bd4dfd69d0f1c647… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 14 12:44:19 2007 +0000 inetcomm: Add a stub MimeBody implementation. --- dlls/inetcomm/inetcomm_private.h | 2 + dlls/inetcomm/mimeole.c | 483 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 485 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c396411a5bd4dfd69d0f1…

1 0

Huw Davies : inetcomm: Add a test for MimeBody.
by Alexandre Julliard Nov. 15, 2007

Nov. 15, 2007

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