wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Nikolay Sivov : msxml3/tests: Fix leaks and wrong pointer use.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 16785efc27998babbc197f7a9200e279164f7988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16785efc27998babbc197f7a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 17 14:07:14 2010 +0300 msxml3/tests: Fix leaks and wrong pointer use. --- dlls/msxml3/tests/domdoc.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6d4cf18..e7c9008 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1826,6 +1826,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMComment_Release(comment); + SysFreeString(str); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); @@ -1840,6 +1841,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMComment_Release(comment); + SysFreeString(str); /* NODE_TEXT */ V_VT(&var) = VT_I1; @@ -1857,7 +1859,7 @@ static void test_create(void) r = IXMLDOMText_get_data(text, &str); ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); - IXMLDOMText_Release(comment); + IXMLDOMText_Release(text); SysFreeString(str); node = (IXMLDOMNode*)0x1; @@ -1873,6 +1875,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMText_Release(text); + SysFreeString(str); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); @@ -1887,6 +1890,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMText_Release(text); + SysFreeString(str); /* NODE_CDATA_SECTION */ V_VT(&var) = VT_I1; @@ -1920,12 +1924,13 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMCDATASection_Release(cdata); + SysFreeString(str); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); - r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&text); + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&cdata); ok( r == S_OK, "returns %08x\n", r ); IXMLDOMNode_Release(node); @@ -1934,11 +1939,11 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMCDATASection_Release(cdata); + SysFreeString(str); /* NODE_ATTRIBUTE */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szlc ); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); ok( r == E_FAIL, "returns %08x\n", r ); @@ -1957,6 +1962,7 @@ static void test_create(void) r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + SysFreeString(str); /* NODE_PROCESSING_INSTRUCTION */ V_VT(&var) = VT_I1; @@ -1981,7 +1987,6 @@ static void test_create(void) /* NODE_ENTITY_REFERENCE */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ENTITY_REFERENCE; - str = SysAllocString( szlc ); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); ok( r == E_FAIL, "returns %08x\n", r ); @@ -1997,7 +2002,6 @@ static void test_create(void) /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; - str = SysAllocString( szlc ); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); ok( r == E_FAIL, "returns %08x\n", r ); @@ -5263,7 +5267,7 @@ static void test_put_nodeValue(void) V_VT(&data) = VT_BSTR; V_BSTR(&data) = _bstr_("one two three"); - hr = IXMLDOMEntityReference_put_nodeValue(node, data); + hr = IXMLDOMEntityReference_put_nodeValue(entityref, data); ok(hr == E_FAIL, "ret %08x\n", hr ); hr = IXMLDOMEntityReference_QueryInterface(entityref, &IID_IXMLDOMNode, (void**)&node);

1 0

Paul Chitescu : qedit: Always print a TRACE when a SampleGrabber pin gets connected.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 381bd1c0ca250b22a5b77f55c9d4614d606575ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bd1c0ca250b22a5b77f55c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Feb 17 12:52:28 2010 +0200 qedit: Always print a TRACE when a SampleGrabber pin gets connected. --- dlls/qedit/samplegrabber.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 4538004..b4912eb 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1022,8 +1022,8 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE IMemInputPin_Release(This->sg->memOutput); This->sg->memOutput = NULL; } - if (SUCCEEDED(IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput)))) - TRACE("pair IMemInputPin %p\n", This->sg->memOutput); + IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput)); + TRACE("(%p) Accepted IPin %p, IMemInputPin %p\n", This, receiver, This->sg->memOutput); return S_OK; } @@ -1066,6 +1066,7 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M This->sg->mtype.pbFormat = NULL; } This->pair = connector; + TRACE("(%p) Accepted IPin %p\n", This, connector); return S_OK; }

1 0

Alexandre Julliard : kernel32/tests: Fix a test failure on xp64.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: fb950a6da5f2c1be38c185c19b198e94e734e5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb950a6da5f2c1be38c185c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 12:04:42 2010 +0100 kernel32/tests: Fix a test failure on xp64. --- dlls/kernel32/tests/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index edc0a64..43db787 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -554,7 +554,8 @@ static void test_heap_checks( DWORD flags ) ok( p2 == NULL, "HeapReAlloc succeeded\n" ); ret = HeapFree( GetProcessHeap(), 0, p ); - ok( !ret, "HeapFree succeeded\n" ); + ok( !ret || broken(sizeof(void*) == 8), /* not caught on xp64 */ + "HeapFree succeeded\n" ); } p[17] = old;

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 387f050f681f2a9397d599fb68940a77f609b3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=387f050f681f2a9397d599fb6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:59:18 2010 +0100 winspool.drv/tests: Fix a test failure on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 7739a2b..1b552fe 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2448,7 +2448,9 @@ static void test_GetPrinterDriver(void) { ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); - ok(di_2->pDataFile == NULL, "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); + ok(di_2->pDataFile == NULL || + broken(di_2->pDataFile != NULL), /* Win9x/WinMe */ + "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); } }

1 0

Paul Vriens : winspool.drv/tests: Skip non supported levels on Win9x/WinMe.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 5e3e9e03f2c6c4b71e17fd51309e741f4d37f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3e9e03f2c6c4b71e17fd513… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:50:09 2010 +0100 winspool.drv/tests: Skip non supported levels on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 2ea5f54..7739a2b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2275,6 +2275,13 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); needed = (DWORD)-1; ret = GetPrinter(hprn, level, NULL, 0, &needed); + if (ret) + { + win_skip("Level %d is not supported on Win9x/WinMe\n", level); + ok(GetLastError() == ERROR_SUCCESS, "wrong error %d\n", GetLastError()); + ok(needed == 0,"Expected 0, got %d\n", needed); + continue; + } ok(!ret, "level %d: GetPrinter should fail\n", level); /* Not all levels are supported on all Windows-Versions */ if (GetLastError() == ERROR_INVALID_LEVEL ||

1 0

Paul Vriens : winspool.drv/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: f5d40cb8c5d6f33b7b34c5b0c1943b9dd50e8bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d40cb8c5d6f33b7b34c5b0c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:38:31 2010 +0100 winspool.drv/tests: Fix some test failures on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 712b00b..2ea5f54 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2277,7 +2277,12 @@ static void test_GetPrinter(void) ret = GetPrinter(hprn, level, NULL, 0, &needed); ok(!ret, "level %d: GetPrinter should fail\n", level); /* Not all levels are supported on all Windows-Versions */ - if(GetLastError() == ERROR_INVALID_LEVEL) continue; + if (GetLastError() == ERROR_INVALID_LEVEL || + GetLastError() == ERROR_NOT_SUPPORTED /* Win9x/WinMe */) + { + skip("Level %d not supported\n", level); + continue; + } ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); ok(needed > 0,"not expected needed buffer size %d\n", needed);

1 0

Alexandre Julliard : user32: Don' t overwrite the default button id when creating the dialog structure.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: a64765f673b01944ebf5da44dbcae7b8f4b68ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64765f673b01944ebf5da44d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 11:43:34 2010 +0100 user32: Don't overwrite the default button id when creating the dialog structure. --- dlls/user.exe16/dialog.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 04f2435..ab6cb38 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -446,7 +446,6 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = HMENU_32( hMenu ); dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 373260a..fecd417 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -339,7 +339,7 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->hMenu = 0; dlgInfo->xBaseUnit = 0; dlgInfo->yBaseUnit = 0; - dlgInfo->idResult = 0; + dlgInfo->idResult = IDOK; dlgInfo->flags = 0; wndPtr->dlgInfo = dlgInfo; } diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index d95746b..c7c9409 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -672,7 +672,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, dlgInfo->hMenu = hMenu; dlgInfo->xBaseUnit = xBaseUnit; dlgInfo->yBaseUnit = yBaseUnit; - dlgInfo->idResult = IDOK; dlgInfo->flags = flags; if (template.helpId) SetWindowContextHelpId( hwnd, template.helpId );

1 0

Hwang YunSong : jscript: Add Korean translation.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 1442a18e3aebd80bd24fd196d29c971f5c1d7d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1442a18e3aebd80bd24fd196d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Feb 16 09:25:44 2010 +0900 jscript: Add Korean translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Ko.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 587825a..e185bc7 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -9,6 +9,7 @@ RC_SRCS = \ jscript_De.rc \ jscript_En.rc \ jscript_Fr.rc \ + jscript_Ko.rc \ jscript_Lt.rc \ jscript_Nl.rc \ jscript_Pt.rc \ diff --git a/dlls/jscript/jscript_Ko.rc b/dlls/jscript/jscript_Ko.rc new file mode 100644 index 0000000..164d6be --- /dev/null +++ b/dlls/jscript/jscript_Ko.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 YunSong Hwang + * + * 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 "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "객페를 기본 형식으로 변환하는 중에 에러 발생" + IDS_INVALID_CALL_ARG "올바르지 않은 프로시져 호출이나 인수" + IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없습니다" + IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않습니다" + IDS_ARG_NOT_OPT "인수는 옵션이 아닙니다" + IDS_SYNTAX_ERROR "문법 에러" + IDS_SEMICOLON "';' 가 필요합니다" + IDS_LBRACKET "'(' 가 필요합니다" + IDS_RBRACKET "')' 가 필요합니다" + IDS_UNTERMINATED_STR "띁나지 않은 문자열 상수" + IDS_NOT_FUNC "함수가 필요합니다" + IDS_NOT_DATE "'[객체]' 는 날짜 객체가 아닙니다" + IDS_NOT_NUM "숫자가 필요합니다" + IDS_OBJECT_EXPECTED "객체가 필요합니다" + IDS_ILLEGAL_ASSIGN "잘못된 할당" + IDS_UNDEFINED "'|' 는 정의되지 않았습니다" + IDS_NOT_BOOL "볼린 객제가 필요합니다" + IDS_JSCRIPT_EXPECTED "JScript 객체가 필요합니다" + IDS_REGEXP_SYNTAX_ERROR "정규 표현식에 문법에러가 있습니다" + IDS_URI_INVALID_CHAR "URI 는 올바르지 않은 문자를 포함해서 인코딩되었습니다" + IDS_INVALID_LENGTH "배열 길이는 반드시 한정된 양의 정수이어야 합니다" + IDS_ARRAY_EXPECTED "배열 객체가 필요합니다" +}

1 0

Hans Leidekker : winhttp/tests: Wait for a handle closing notification.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 33e522eec677ab4101ccd4b7c99fc3e3e229845a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e522eec677ab4101ccd4b7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:56:19 2010 +0100 winhttp/tests: Wait for a handle closing notification. Fixes a Valgrind warning. --- dlls/winhttp/tests/notification.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 60e1595..bd6db58 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -88,7 +88,10 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW } } if (status_ok) info->index++; - if (status & WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS) SetEvent( info->wait ); + if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) + { + SetEvent( info->wait ); + } } static const struct notification cache_test[] = @@ -380,6 +383,8 @@ static void test_async( void ) WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); + + WaitForSingleObject( info.wait, INFINITE ); CloseHandle( info.wait ); }

1 0

Hans Leidekker : msi: Add tests for publishing and unpublishing components.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 7b660bb3d8fbb94b7067be07656cf7c0c7b7bb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b660bb3d8fbb94b7067be076… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:55:54 2010 +0100 msi: Add tests for publishing and unpublishing components. --- 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 44eec8e..70013e5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1408,6 +1408,50 @@ static const CHAR crs_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR pub_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "english.txt\tpublish\tenglish.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR pub_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "publish\t\t\tpublish feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR pub_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "publish\tpublish\n"; + +static const CHAR pub_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "publish\t{B4EA0ACF-6238-426E-9C6D-7869F0F9C768}\tMSITESTDIR\t0\t\tenglish.txt\n"; + +static const CHAR pub_publish_component_dat[] = "ComponentId\tQualifier\tComponent_\tAppData\tFeature_\n" + "s38\ts255\ts72\tL255\ts38\n" + "PublishComponent\tComponentId\tQualifier\tComponent_\n" + "{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}\tenglish.txt\tpublish\t\tpublish\n"; + +static const CHAR pub_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "PublishComponents\t\t3000\n" + "UnpublishComponents\t\t3100\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2245,6 +2289,19 @@ static const msi_table crs_tables[] = ADD_TABLE(property) }; +static const msi_table pub_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(pub_component), + ADD_TABLE(pub_feature), + ADD_TABLE(pub_feature_comp), + ADD_TABLE(pub_file), + ADD_TABLE(pub_publish_component), + ADD_TABLE(pub_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8209,6 +8266,42 @@ static void test_create_remove_shortcut(void) delete_test_files(); } +static void test_publish_components(void) +{ + static char keypath[] = + "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; + + UINT r; + LONG res; + HKEY key; + + create_test_files(); + create_file("msitest\\english.txt", 1000); + create_database(msifile, pub_tables, sizeof(pub_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); + ok(res == ERROR_SUCCESS, "components key not created %d\n", res); + + res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); + ok(res == ERROR_SUCCESS, "value not found %d\n", res); + RegCloseKey(key); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); + ok(res == ERROR_FILE_NOT_FOUND, "unexpected result %d\n", res); + + ok(!delete_pf("msitest\\english.txt", TRUE), "file not removed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8310,6 +8403,7 @@ START_TEST(install) test_install_remove_odbc(); test_register_typelib(); test_create_remove_shortcut(); + test_publish_components(); DeleteFileA(log_file);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
79
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 February 2010