September 2008 - Wine-commits

Rob Shearman : ole32: Fix clipboard test failures on some versions of Windows.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: f16bbf32820388c25b31d3217036e223f83dd131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16bbf32820388c25b31d3217… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Sep 28 17:41:47 2008 +0100 ole32: Fix clipboard test failures on some versions of Windows. Some versions of ole32 don't test that the lindex field of the FORMATETC structure passed into functions is valid. --- dlls/ole32/tests/clipboard.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index ee912ce..e714064 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -359,7 +359,10 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; hr = IDataObject_QueryGetData(data_obj, &fmtetc); - ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + ok(hr == DV_E_FORMATETC || broken(hr == S_OK), + "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + if (hr == S_OK) + ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF; @@ -398,7 +401,13 @@ static void test_get_clipboard(void) fmtetc.lindex = 256; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); todo_wine - ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + ok(hr == DV_E_FORMATETC || broken(hr == S_OK), "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + if (hr == S_OK) + { + /* undo the unexpected success */ + DataObjectImpl_GetData_calls--; + ReleaseStgMedium(&stgmedium); + } InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF;

1 0

Jacek Caban : mshtml: Fixed tests timeout.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: d1ab3b097d8295c6c6f197032b873dd27c6bb75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ab3b097d8295c6c6f197032… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 28 13:35:44 2008 +0200 mshtml: Fixed tests timeout. --- dlls/mshtml/tests/htmldoc.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 00d682c..6655764 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -70,6 +70,7 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; +static BOOL show_fail; DEFINE_EXPECT(LockContainer); DEFINE_EXPECT(SetActiveObject); @@ -1728,6 +1729,14 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = (load_state == LD_COMPLETE ? (LPCOLESTR)0xdeadbeef : NULL); hres = IOleDocumentView_Show(view, TRUE); + if(FAILED(hres)) { + win_skip("Show failed\n"); + if(activeobj) + IOleInPlaceActiveObject_Release(activeobj); + IOleDocument_Release(document); + show_fail = TRUE; + return S_OK; + } ok(hres == S_OK, "Show failed: %08x\n", hres); CHECK_CALLED(CanInPlaceActivate); @@ -3777,7 +3786,7 @@ static void test_HTMLDocument(BOOL do_load) test_OnAmbientPropertyChange2(unk); hres = test_Activate(unk, CLIENTSITE_EXPECTPATH); - if(FAILED(hres)) { + if(FAILED(hres) || show_fail) { IUnknown_Release(unk); return; } @@ -3873,6 +3882,10 @@ static void test_HTMLDocument_hlink(void) test_GetCurMoniker(unk, NULL, NULL); test_Persist(unk); test_Navigate(unk); + if(show_fail) { + IUnknown_Release(unk); + return; + } test_download(FALSE, TRUE, TRUE); @@ -3919,6 +3932,11 @@ static void test_HTMLDocument_StreamLoad(void) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); + if(show_fail) { + IUnknown_Release(unk); + IOleObject_Release(oleobj); + return; + } test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); IOleObject_Release(oleobj); @@ -3994,6 +4012,11 @@ static void test_editing_mode(BOOL do_load) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); + if(show_fail) { + IOleObject_Release(oleobj); + IUnknown_Release(unk); + return; + } test_edit_uiactivate(oleobj); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED);

1 0

Rob Shearman : ole32: Create a dummy window for use in the drag and drop API tests.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 7b564cbf17aab7cc75bee836200fe76d87844ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b564cbf17aab7cc75bee8362… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Sep 28 17:27:20 2008 +0100 ole32: Create a dummy window for use in the drag and drop API tests. As a window being registered for drag and drop is a system-global property, the tests could be affected by other processes in the system. --- dlls/ole32/tests/dragdrop.c | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 1561066..ad10a58 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -108,16 +108,40 @@ static const IDropTargetVtbl DropTarget_VTbl = static IDropTarget DropTarget = { &DropTarget_VTbl }; +static ATOM register_dummy_class(void) +{ + WNDCLASS wc = + { + 0, + DefWindowProc, + 0, + 0, + GetModuleHandle(NULL), + NULL, + LoadCursor(NULL, IDC_ARROW), + (HBRUSH)(COLOR_BTNFACE+1), + NULL, + TEXT("WineOleTestClass"), + }; + + return RegisterClass(&wc); +} + START_TEST(dragdrop) { HRESULT hr; + HWND hwnd; + + hwnd = CreateWindow(MAKEINTATOM(register_dummy_class()), "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); - hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); OleInitialize(NULL); - hr = RegisterDragDrop(GetDesktopWindow(), NULL); + hr = RegisterDragDrop(hwnd, NULL); ok(hr == E_INVALIDARG, "RegisterDragDrop with NULL IDropTarget * should return E_INVALIDARG instead of 0x%08x\n", hr); hr = RegisterDragDrop(NULL, &DropTarget); @@ -127,21 +151,23 @@ START_TEST(dragdrop) ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); - hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + hr = RegisterDragDrop(hwnd, &DropTarget); ok_ole_success(hr, "RegisterDragDrop"); ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); - hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); OleUninitialize(); ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); - hr = RevokeDragDrop(GetDesktopWindow()); + hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); + + DestroyWindow(hwnd); }

1 0

Roderick Colenbrander : opengl32: Don't run wgl tests on old gl drivers.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: d269a36a815b1180cf51f4b9e99b8a5fb6cf032c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d269a36a815b1180cf51f4b9e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 28 17:11:34 2008 +0200 opengl32: Don't run wgl tests on old gl drivers. --- dlls/opengl32/tests/opengl.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index e72d1a0..036b058 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -432,6 +432,14 @@ START_TEST(opengl) 0, 0, 0 /* layer masks */ }; + init_functions(); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ + if (!pwglGetExtensionsStringARB) + { + skip("wglGetExtensionsStringARB is not available\n"); + return; + } + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); @@ -462,20 +470,12 @@ START_TEST(opengl) hglrc = wglCreateContext(hdc); res = wglMakeCurrent(hdc, hglrc); ok(res, "wglMakeCurrent failed!\n"); - init_functions(); test_makecurrent(hdc); test_setpixelformat(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); - if (!pwglGetExtensionsStringARB) - { - skip("wglGetExtensionsStringARB is not available\n"); - DestroyWindow(hwnd); - return; - } - wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n");

1 0

James Hawkins : msi: Fix several test failures in win9x.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 3713720351934b545dd20f4e4e72492fa0742c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3713720351934b545dd20f4e4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Sep 28 11:18:51 2008 -0500 msi: Fix several test failures in win9x. --- dlls/msi/tests/package.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2ef86d9..0ed3c5c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7823,7 +7823,8 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD line, idx, ares[idx].gothandle, (hfile != INVALID_HANDLE_VALUE)); - ok(lasterr == ares[idx].lasterr, + ok(lasterr == ares[idx].lasterr || + lasterr == 0xdeadbeef, /* win9x */ "(%d, lasterr, %d): Expected %d, got %d\n", line, idx, ares[idx].lasterr, lasterr);

1 0

James Hawkins : comctl32: Fix a failing test in win9x.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: e1d56fa4bd62e37ae218ee00acecb9b7a08857e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d56fa4bd62e37ae218ee00a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Sep 28 11:15:49 2008 -0500 comctl32: Fix a failing test in win9x. --- dlls/gdi32/tests/brush.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 3d96a34..70d608f 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -52,7 +52,9 @@ static void test_solidbrush(void) if(stock[i].stockobj != -1) { stockBrush = (HBRUSH)GetStockObject(stock[i].stockobj); - ok(stockBrush!=solidBrush, "Stock %s brush equals solid %s brush\n", stock[i].name, stock[i].name); + ok(stockBrush!=solidBrush || + broken(stockBrush==solidBrush), /* win9x does return stock object */ + "Stock %s brush equals solid %s brush\n", stock[i].name, stock[i].name); } else stockBrush = NULL; @@ -70,7 +72,10 @@ static void test_solidbrush(void) } DeleteObject(solidBrush); - ok(GetObject(solidBrush, sizeof(br), &br)==0, "GetObject succeeded on a deleted %s brush\n", stock[i].name); + ret = GetObject(solidBrush, sizeof(br), &br); + ok(ret==0 || + broken(ret!=0), /* win9x */ + "GetObject succeeded on a deleted %s brush\n", stock[i].name); } }

1 0

Francois Gouget : comctl32/tests: FreeMRUList(NULL) crashes on Win98 OSR0.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 17d798eae96cbb586602d9595c104e36e89fde03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d798eae96cbb586602d9595… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 18:09:58 2008 +0200 comctl32/tests: FreeMRUList(NULL) crashes on Win98 OSR0. --- dlls/comctl32/tests/mru.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 1e55425..8ebec86 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -410,8 +410,7 @@ static void test_MRUListA(void) pFreeMRUList(hMRU); } - /* Free (NULL list) - Doesn't crash */ - pFreeMRUList(NULL); + /* FreeMRUList(NULL) crashes on Win98 OSR0 */ } START_TEST(mru)

1 0

Juan Lang : inetmib1: Skip tests if a portion of inetmib1 isn't implemented .
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: e2a8da9e860f785b104cbaf8cba8aef4ee683cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a8da9e860f785b104cbaf8c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Sep 28 09:05:20 2008 -0700 inetmib1: Skip tests if a portion of inetmib1 isn't implemented. This fixes a hang (and sometimes a system hang) on MacOSX when running the inetmib1 tests. Spotted by Owen Rudge. --- dlls/inetmib1/tests/main.c | 52 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 6eead89..d4d6f16 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -53,7 +53,7 @@ static void testQuery(void) { BOOL (WINAPI *pQuery)(BYTE, SnmpVarBindList *, AsnInteger32 *, AsnInteger32 *); - BOOL ret, moreData; + BOOL ret, moreData, noChange; SnmpVarBindList list; AsnInteger32 error, index; UINT bogus[] = { 1,2,3,4 }; @@ -157,6 +157,7 @@ static void testQuery(void) SnmpUtilOidCpy(&vars2[2].name, &vars[2].name); list.list = vars2; moreData = TRUE; + noChange = FALSE; entry = 0; do { SetLastError(0xdeadbeef); @@ -180,6 +181,15 @@ static void testQuery(void) else if (SnmpUtilOidNCmp(&vars2[2].name, &vars[2].name, vars[2].name.idLength)) moreData = FALSE; + else if (!SnmpUtilOidCmp(&vars[0].name, &vars2[0].name) || + !SnmpUtilOidCmp(&vars[0].name, &vars2[0].name) || + !SnmpUtilOidCmp(&vars[0].name, &vars2[0].name)) + { + /* If the OID isn't modified, the function isn't implemented on this + * platform, skip the remaining tests. + */ + noChange = TRUE; + } if (moreData) { UINT lastID; @@ -224,7 +234,9 @@ static void testQuery(void) "expected a value of 0, 1, or 2, got %u\n", vars2[2].value.asnValue.unsigned32); } - } while (moreData); + else if (noChange) + skip("no change in OID, no MIB2 IF table implementation\n"); + } while (moreData && !noChange); SnmpUtilVarBindFree(&vars2[0]); SnmpUtilVarBindFree(&vars2[1]); SnmpUtilVarBindFree(&vars2[2]); @@ -240,6 +252,7 @@ static void testQuery(void) list.len = 1; list.list = vars2; moreData = TRUE; + noChange = FALSE; ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); ok(error == SNMP_ERRORSTATUS_NOERROR, @@ -272,6 +285,13 @@ static void testQuery(void) else if (SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength)) moreData = FALSE; + else if (!SnmpUtilOidCmp(&vars2[0].name, &vars[0].name)) + { + /* If the OID isn't modified, the function isn't implemented on this + * platform, skip the remaining tests. + */ + noChange = TRUE; + } if (moreData) { /* Make sure the size of the OID is right. @@ -304,7 +324,9 @@ static void testQuery(void) } } } - } while (moreData); + else if (noChange) + skip("no change in OID, no MIB2 IP address table implementation\n"); + } while (moreData && !noChange); SnmpUtilVarBindFree(&vars2[0]); /* Check the type and OIDs of the IP route table */ @@ -315,6 +337,7 @@ static void testQuery(void) list.len = 1; list.list = vars2; moreData = TRUE; + noChange = FALSE; do { ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); @@ -328,6 +351,13 @@ static void testQuery(void) else if (SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength)) moreData = FALSE; + else if (!SnmpUtilOidCmp(&vars2[0].name, &vars[0].name)) + { + /* If the OID isn't modified, the function isn't implemented on this + * platform, skip the remaining tests. + */ + noChange = TRUE; + } if (moreData) { /* Make sure the size of the OID is right. @@ -360,7 +390,9 @@ static void testQuery(void) } } } - } while (moreData); + else if (noChange) + skip("no change in OID, no MIB2 IP route table implementation\n"); + } while (moreData && !noChange); SnmpUtilVarBindFree(&vars2[0]); /* Check the type and OIDs of the UDP table */ @@ -371,6 +403,7 @@ static void testQuery(void) list.len = 1; list.list = vars2; moreData = TRUE; + noChange = FALSE; do { ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d\n", GetLastError()); @@ -392,6 +425,13 @@ static void testQuery(void) else if (SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength)) moreData = FALSE; + else if (!SnmpUtilOidCmp(&vars2[0].name, &vars[0].name)) + { + /* If the OID isn't modified, the function isn't implemented on this + * platform, skip the remaining tests. + */ + noChange = TRUE; + } if (moreData) { /* Make sure the size of the OID is right. */ @@ -422,7 +462,9 @@ static void testQuery(void) } } } - } while (moreData); + else if (noChange) + skip("no change in OID, no MIB2 UDP table implementation\n"); + } while (moreData && !noChange); SnmpUtilVarBindFree(&vars2[0]); }

1 0

Marcus Meissner : msi/tests: Fix explicit C:\\Program Files\\ references.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: dd142bf5a737f16822e3012aad417317ba4a76eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd142bf5a737f16822e3012aa… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Sep 28 17:50:28 2008 +0200 msi/tests: Fix explicit C:\\Program Files\\ references. --- dlls/msi/tests/install.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3f2b0fc..410ac93 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3068,6 +3068,7 @@ static void test_publish_processcomponents(void) LPSTR usersid; CHAR val[MAX_PATH]; CHAR keypath[MAX_PATH]; + CHAR program_files_maximus[MAX_PATH]; static const CHAR keyfmt[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" @@ -3104,8 +3105,12 @@ static void test_publish_processcomponents(void) res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!lstrcmpA(val, "C:\\Program Files\\msitest\\maximus"), - "Expected \"%s\", got \"%s\"\n", "C:\\Program Files\\msitest\\maximus", val); + + lstrcpyA(program_files_maximus,PROG_FILES_DIR); + lstrcatA(program_files_maximus,"\\msitest\\maximus"); + + ok(!lstrcmpA(val, program_files_maximus), + "Expected \"%s\", got \"%s\"\n", program_files_maximus, val); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); @@ -3148,8 +3153,8 @@ static void test_publish_processcomponents(void) res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(!lstrcmpA(val, "C:\\Program Files\\msitest\\maximus"), - "Expected \"%s\", got \"%s\"\n", "C:\\Program Files\\msitest\\maximus", val); + ok(!lstrcmpA(val, program_files_maximus), + "Expected \"%s\", got \"%s\"\n", program_files_maximus, val); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);

1 0

Kai Blin : secur32: Make GetComputerObjectName(A|W) tests work on win2k3 domains.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: ab05d35c6dbbfecf450ee1e6cf9dfaa5c42ba38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab05d35c6dbbfecf450ee1e6c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Sep 28 17:59:03 2008 +0200 secur32: Make GetComputerObjectName(A|W) tests work on win2k3 domains. --- dlls/secur32/tests/secur32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 955d7bf..5bdb914 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -56,6 +56,8 @@ static void testGetComputerObjectNameA(void) (GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || (GetLastError() == ERROR_NO_SUCH_DOMAIN) || + (GetLastError() == ERROR_NO_SUCH_USER) || + (GetLastError() == ERROR_NONE_MAPPED) || (GetLastError() == ERROR_ACCESS_DENIED), "GetComputerObjectNameA(%d) failed: %d\n", formats[i], GetLastError()); @@ -79,6 +81,8 @@ static void testGetComputerObjectNameW(void) (GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || (GetLastError() == ERROR_NO_SUCH_DOMAIN) || + (GetLastError() == ERROR_NO_SUCH_USER) || + (GetLastError() == ERROR_NONE_MAPPED) || (GetLastError() == ERROR_ACCESS_DENIED), "GetComputerObjectNameW(%d) failed: %d\n", formats[i], GetLastError());

1 0