January 2009 - Wine-Commits

Francois Gouget : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 02ace3613c85a605e1947fc36f0c0435e1bd2684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ace3613c85a605e1947fc36… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 21 20:01:10 2009 +0100 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index cb10be4..f93b485 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -289,7 +289,7 @@ static void TestCallback(void) tvi.pszText = buf; tvi.cchTextMax = sizeof(buf)/sizeof(buf[0]); ret = TreeView_GetItem(hTree, &tvi); - ok(ret == 1, "ret"); + ok(ret == 1, "ret\n"); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Callback item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT);

1 0

Paul Vriens : wintrust/tests: Fix a test failure on W2K.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: e6676ff50e550eb0a928ad3205ca29eb8a2f3030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6676ff50e550eb0a928ad320… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 17:23:48 2009 +0100 wintrust/tests: Fix a test failure on W2K. --- dlls/wintrust/tests/crypt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 882b939..64211f1 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -621,6 +621,11 @@ static void test_catalog_properties(CHAR *catfile, int attributes, int members) ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); hcat = pCryptCATOpen(catalogW, 0, 0, 0, 0); + if (hcat == INVALID_HANDLE_VALUE && members == 0) + { + win_skip("CryptCATOpen on W2K can't handle catalog files with no members\n"); + return; + } ok(hcat != INVALID_HANDLE_VALUE, "CryptCATOpen failed %u\n", GetLastError()); m = pCryptCATEnumerateMember(NULL, NULL);

1 0

Paul Vriens : shell32/tests: Fix a test on Win9x, WinME and W2K.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: bbd4e078c6689a9124fd6d468ead127949d8e71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd4e078c6689a9124fd6d468… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 16:56:14 2009 +0100 shell32/tests: Fix a test on Win9x, WinME and W2K. --- dlls/shell32/tests/shlfolder.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8a3ce81..cc32a00 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -421,12 +421,19 @@ static void test_GetDisplayName(void) return; } - /* WinXP stores the filenames as both ANSI and UNICODE in the pidls */ pidlLast = pILFindLastID(pidlTestFile); - ok(pidlLast->mkid.cb >=76, "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb); + ok(pidlLast->mkid.cb >=76 || + broken(pidlLast->mkid.cb == 28) || /* W2K */ + broken(pidlLast->mkid.cb == 40), /* Win9x, WinME */ + "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb); + if (pidlLast->mkid.cb >= 28) { + ok(!lstrcmpA((CHAR*)&pidlLast->mkid.abID[12], szFileName), + "Filename should be stored as ansi-string at this position!\n"); + } + /* WinXP and up store the filenames as both ANSI and UNICODE in the pidls */ if (pidlLast->mkid.cb >= 76) { ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName), - "WinXP stores the filename as a wchar-string at this position!\n"); + "Filename should be stored as wchar-string at this position!\n"); } /* It seems as if we cannot bind to regular files on windows, but only directories.

1 0

Paul Vriens : shell32/tests: Fix a test failure on Win9x and W2K.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: b03a434fb4f439a4fd9d74de75f09816b5589a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03a434fb4f439a4fd9d74de7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 16:50:11 2009 +0100 shell32/tests: Fix a test failure on Win9x and W2K. --- dlls/shell32/tests/shlfolder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index bad4bba..8a3ce81 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -432,7 +432,10 @@ static void test_GetDisplayName(void) /* It seems as if we cannot bind to regular files on windows, but only directories. */ hr = IShellFolder_BindToObject(psfDesktop, pidlTestFile, NULL, &IID_IUnknown, (VOID**)&psfFile); - todo_wine { ok (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hr = %08x\n", hr); } + todo_wine + ok (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + broken(SUCCEEDED(hr)), /* Win9x, W2K */ + "hr = %08x\n", hr); if (SUCCEEDED(hr)) { IShellFolder_Release(psfFile); }

1 0

Paul Vriens : shell32/tests: Use A-functions to test on Win9x.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: a0164a1e641b3d423e5748321a11ac71da1c6bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0164a1e641b3d423e5748321… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 16:44:10 2009 +0100 shell32/tests: Use A-functions to test on Win9x. --- dlls/shell32/tests/shlfolder.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a396cf0..bad4bba 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -46,6 +46,7 @@ static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEM static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); +static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); @@ -62,6 +63,7 @@ static void init_function_pointers(void) pSHGetFolderPathA = (void*)GetProcAddress(hmod, "SHGetFolderPathA"); pSHGetFolderPathAndSubDirA = (void*)GetProcAddress(hmod, "SHGetFolderPathAndSubDirA"); pSHGetPathFromIDListW = (void*)GetProcAddress(hmod, "SHGetPathFromIDListW"); + pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); pSHGetSpecialFolderPathW = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathW"); pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); pILFree = (void*)GetProcAddress(hmod, (LPSTR)155); @@ -356,7 +358,7 @@ static void test_GetDisplayName(void) BOOL result; HRESULT hr; HANDLE hTestFile; - WCHAR wszTestFile[MAX_PATH], wszTestFile2[MAX_PATH], wszTestDir[MAX_PATH]; + WCHAR wszTestFile[MAX_PATH], wszTestFile2[MAX_PATH]; char szTestFile[MAX_PATH], szTestDir[MAX_PATH]; DWORD attr; STRRET strret; @@ -365,6 +367,7 @@ static void test_GetDisplayName(void) SHITEMID emptyitem = { 0, { 0 } }; LPITEMIDLIST pidlTestFile, pidlEmpty = (LPITEMIDLIST)&emptyitem; LPCITEMIDLIST pidlLast; + static const CHAR szFileName[] = "winetest.foo"; static const WCHAR wszFileName[] = { 'w','i','n','e','t','e','s','t','.','f','o','o',0 }; static const WCHAR wszDirName[] = { 'w','i','n','e','t','e','s','t',0 }; @@ -376,17 +379,18 @@ static void test_GetDisplayName(void) * no functional difference in this respect. */ - if(!pSHGetSpecialFolderPathW) return; + if(!pSHGetSpecialFolderPathA) { + win_skip("SHGetSpecialFolderPathA is not available\n"); + return; + } /* First creating a directory in MyDocuments and a file in this directory. */ - result = pSHGetSpecialFolderPathW(NULL, wszTestDir, CSIDL_PERSONAL, FALSE); - ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); + result = pSHGetSpecialFolderPathA(NULL, szTestDir, CSIDL_PERSONAL, FALSE); + ok(result, "SHGetSpecialFolderPathA failed! Last error: %u\n", GetLastError()); if (!result) return; - myPathAddBackslashW(wszTestDir); - lstrcatW(wszTestDir, wszDirName); /* Use ANSI file functions so this works on Windows 9x */ - WideCharToMultiByte(CP_ACP, 0, wszTestDir, -1, szTestDir, MAX_PATH, 0, 0); + lstrcatA(szTestDir, "\\winetest"); CreateDirectoryA(szTestDir, NULL); attr=GetFileAttributesA(szTestDir); if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) @@ -395,11 +399,9 @@ static void test_GetDisplayName(void) return; } - lstrcpyW(wszTestFile, wszTestDir); - myPathAddBackslashW(wszTestFile); - lstrcatW(wszTestFile, wszFileName); - WideCharToMultiByte(CP_ACP, 0, wszTestFile, -1, szTestFile, MAX_PATH, 0, 0); - + lstrcpyA(szTestFile, szTestDir); + lstrcatA(szTestFile, "\\"); + lstrcatA(szTestFile, szFileName); hTestFile = CreateFileA(szTestFile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok((hTestFile != INVALID_HANDLE_VALUE), "CreateFileA failed! Last error: %u\n", GetLastError()); if (hTestFile == INVALID_HANDLE_VALUE) return; @@ -410,6 +412,8 @@ static void test_GetDisplayName(void) ok(SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08x\n", hr); if (FAILED(hr)) return; + MultiByteToWideChar(CP_ACP, 0, szTestFile, -1, wszTestFile, MAX_PATH); + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszTestFile, NULL, &pidlTestFile, NULL); ok(SUCCEEDED(hr), "Desktop->ParseDisplayName failed! hr = %08x\n", hr); if (FAILED(hr)) { @@ -435,7 +439,9 @@ static void test_GetDisplayName(void) if(!pSHBindToParent) { - skip("SHBindToParent is missing\n"); + win_skip("SHBindToParent is missing\n"); + DeleteFileA(szTestFile); + RemoveDirectoryA(szTestDir); return; }

1 0

Alexandre Julliard : advapi32: Fix GetServiceDisplayNameW behavior to pass the tests.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 05a840dfc90f03b5ccd7f9504d7707035b8dda46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a840dfc90f03b5ccd7f9504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 21 23:35:35 2009 +0100 advapi32: Fix GetServiceDisplayNameW behavior to pass the tests. --- dlls/advapi32/service.c | 13 ++++++++++++- dlls/advapi32/tests/service.c | 12 ++++++------ include/wine/svcctl.idl | 2 +- programs/services/rpc.c | 3 --- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 050efc8..a107397 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1680,6 +1680,7 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, LPWSTR lpDisplayName, LPDWORD lpcchBuffer) { DWORD err; + WCHAR buffer[2]; TRACE("%p %s %p %p\n", hSCManager, debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); @@ -1690,10 +1691,20 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return 0; } + /* provide a buffer if the caller didn't */ + if (!lpDisplayName || *lpcchBuffer < 2) + { + lpDisplayName = buffer; + /* A size of 1 would be enough, but tests show that Windows returns 2, + * probably because of a WCHAR/bytes mismatch in their code. + */ + *lpcchBuffer = 2; + } + __TRY { err = svcctl_GetServiceDisplayNameW(hSCManager, lpServiceName, lpDisplayName, - lpDisplayName ? *lpcchBuffer : 0, lpcchBuffer); + *lpcchBuffer, lpcchBuffer); } __EXCEPT(rpc_filter) { diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 625aff3..451a21b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -476,7 +476,7 @@ static void test_get_displayname(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); - todo_wine ok(displaysize == 15, "Service size expected 15, got %d\n", displaysize); + ok(displaysize == 15, "Service size expected 15, got %d\n", displaysize); ok(displaynameW[0] == 0, "Service name not empty\n"); displaysize = 0; @@ -492,7 +492,7 @@ static void test_get_displayname(void) lstrcpyW( displaynameW, abcW ); ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); ok(displaynameW[0] == 'A', "Service name changed\n"); @@ -510,10 +510,10 @@ static void test_get_displayname(void) lstrcpyW( displaynameW, abcW ); ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); - todo_wine ok(displaynameW[0] == 'A', "Service name changed\n"); + ok(displaynameW[0] == 'A', "Service name changed\n"); displaysize = 2; strcpy(displayname, "ABC"); @@ -521,14 +521,14 @@ static void test_get_displayname(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); - ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); ok(displayname[0] == 0, "Service name not empty\n"); displaysize = 2; lstrcpyW( displaynameW, abcW ); ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); ok(!ret, "Expected failure\n"); - todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); ok(displaynameW[0] == 0, "Service name not empty\n"); diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 918c80e..36bf476 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -232,7 +232,7 @@ typedef [switch_type(DWORD)] union [in] LPCWSTR lpServiceName, [out,size_is(cchBufSize)] WCHAR lpBuffer[], [in] DWORD cchBufSize, - [out] DWORD *cchLength); + [in,out] DWORD *cchLength); /* Compatible with Windows function 0x15 */ DWORD svcctl_GetServiceKeyNameW( diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d88e148..cbb825e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -215,10 +215,7 @@ DWORD svcctl_GetServiceDisplayNameW( service_unlock(entry); } else - { - *cchLength = 1; err = ERROR_SERVICE_DOES_NOT_EXIST; - } scmdatabase_unlock(manager->db);

1 0

Alistair Leslie-Hughes : riched20: Return a long in fnGetObjectCount.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 689675273b68b57a0e81a963de8f8f37727a450e URL: http://source.winehq.org/git/wine.git/?a=commit;h=689675273b68b57a0e81a963d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 21 08:44:04 2009 +1100 riched20: Return a long in fnGetObjectCount. --- dlls/riched20/richole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a5f79c7..658f0d3 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -348,7 +348,7 @@ IRichEditOle_fnGetObjectCount(IRichEditOle *me) { IRichEditOleImpl *This = impl_from_IRichEditOle(me); FIXME("stub %p\n",This); - return E_NOTIMPL; + return 0; } static HRESULT WINAPI

1 0

Ben Klein : winecfg: Fix a typo in autodetect_drives.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 8df74a0edb3304dfc26bd524327f9128f63de47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df74a0edb3304dfc26bd5243… Author: Ben Klein <shacklein(a)gmail.com> Date: Wed Jan 21 21:02:12 2009 +1100 winecfg: Fix a typo in autodetect_drives. --- programs/winecfg/drivedetect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 1c03b6f..178520b 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -349,7 +349,7 @@ int autodetect_drives(void) /* allocate a drive for it */ letter = allocate_letter(type); - if (letter == ']') + if (letter == 'Z' + 1) { report_error(NO_MORE_LETTERS); fclose(fstab);

1 0

Alexandre Julliard : advapi32/tests: Add some more tests for GetServiceDisplayName.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: a882bb6a2cbcb18d97c561156b885ce20a42f535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a882bb6a2cbcb18d97c561156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 21 23:31:12 2009 +0100 advapi32/tests: Add some more tests for GetServiceDisplayName. --- dlls/advapi32/tests/service.c | 81 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c198cd7..936978a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -416,6 +416,8 @@ static void test_get_displayname(void) DWORD displaysize, tempsize, tempsizeW; static const CHAR deadbeef[] = "Deadbeef"; static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; + static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0}; + static const WCHAR abcW[] = {'A','B','C',0}; static const CHAR servicename[] = "Winetest"; static const CHAR pathname[] = "we_dont_care.exe"; @@ -452,6 +454,85 @@ static void test_get_displayname(void) ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(displaysize == 1, "Service size expected 1, got %d\n", displaysize); + + displaysize = 15; + strcpy(displayname, "ABC"); + ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(displaysize == 15, "Service size expected 15, got %d\n", displaysize); + ok(displayname[0] == 0, "Service name not empty\n"); + + displaysize = 15; + lstrcpyW( displaynameW, abcW ); + ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(displaysize == 15, "Service size expected 15, got %d\n", displaysize); + ok(displaynameW[0] == 0, "Service name not empty\n"); + + displaysize = 0; + strcpy(displayname, "ABC"); + ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(displaysize == 1, "Service size expected 1, got %d\n", displaysize); + ok(displayname[0] == 'A', "Service name changed\n"); + + displaysize = 0; + lstrcpyW( displaynameW, abcW ); + ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + ok(displaynameW[0] == 'A', "Service name changed\n"); + + displaysize = 1; + strcpy(displayname, "ABC"); + ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(displaysize == 1, "Service size expected 1, got %d\n", displaysize); + ok(displayname[0] == 0, "Service name not empty\n"); + + displaysize = 1; + lstrcpyW( displaynameW, abcW ); + ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(displaynameW[0] == 'A', "Service name changed\n"); + + displaysize = 2; + strcpy(displayname, "ABC"); + ret = GetServiceDisplayNameA(scm_handle, deadbeef, displayname, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(displayname[0] == 0, "Service name not empty\n"); + + displaysize = 2; + lstrcpyW( displaynameW, abcW ); + ret = GetServiceDisplayNameW(scm_handle, deadbeefW, displaynameW, &displaysize); + ok(!ret, "Expected failure\n"); + todo_wine ok(displaysize == 2, "Service size expected 2, got %d\n", displaysize); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + ok(displaynameW[0] == 0, "Service name not empty\n"); + /* Check if 'Spooler' exists */ svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_READ); if (!svc_handle)

1 0

Alexandre Julliard : advapi32: Fix GetServiceKeyNameW behavior to pass the tests.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: c795150932017ef121eaff727395c6aaed50f6e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c795150932017ef121eaff727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 21 23:32:29 2009 +0100 advapi32: Fix GetServiceKeyNameW behavior to pass the tests. --- dlls/advapi32/service.c | 13 ++++++++++++- dlls/advapi32/tests/service.c | 12 ++++++------ include/wine/svcctl.idl | 2 +- programs/services/rpc.c | 3 --- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f3ed2e5..050efc8 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1565,6 +1565,7 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, LPWSTR lpServiceName, LPDWORD lpcchBuffer ) { DWORD err; + WCHAR buffer[2]; TRACE("%p %s %p %p\n", hSCManager, debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); @@ -1575,10 +1576,20 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, return 0; } + /* provide a buffer if the caller didn't */ + if (!lpServiceName || *lpcchBuffer < 2) + { + lpServiceName = buffer; + /* A size of 1 would be enough, but tests show that Windows returns 2, + * probably because of a WCHAR/bytes mismatch in their code. + */ + *lpcchBuffer = 2; + } + __TRY { err = svcctl_GetServiceKeyNameW(hSCManager, lpDisplayName, lpServiceName, - lpServiceName ? *lpcchBuffer : 0, lpcchBuffer); + *lpcchBuffer, lpcchBuffer); } __EXCEPT(rpc_filter) { diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 936978a..625aff3 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -760,7 +760,7 @@ static void test_get_servicekeyname(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); - todo_wine ok(servicesize == 15, "Service size expected 15, got %d\n", servicesize); + ok(servicesize == 15, "Service size expected 15, got %d\n", servicesize); ok(servicenameW[0] == 0, "Service name not empty\n"); servicesize = 0; @@ -776,7 +776,7 @@ static void test_get_servicekeyname(void) lstrcpyW( servicenameW, abcW ); ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); ok(!ret, "Expected failure\n"); - todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); ok(servicenameW[0] == 'A', "Service name changed\n"); @@ -794,10 +794,10 @@ static void test_get_servicekeyname(void) lstrcpyW( servicenameW, abcW ); ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); ok(!ret, "Expected failure\n"); - todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); - todo_wine ok(servicenameW[0] == 'A', "Service name changed\n"); + ok(servicenameW[0] == 'A', "Service name changed\n"); servicesize = 2; strcpy(servicename, "ABC"); @@ -805,14 +805,14 @@ static void test_get_servicekeyname(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); - ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); ok(servicename[0] == 0, "Service name not empty\n"); servicesize = 2; lstrcpyW( servicenameW, abcW ); ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); ok(!ret, "Expected failure\n"); - todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); ok(servicenameW[0] == 0, "Service name not empty\n"); diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index d04da08..918c80e 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -240,7 +240,7 @@ typedef [switch_type(DWORD)] union [in] LPCWSTR lpServiceDisplayName, [out,size_is(cchBufSize)] WCHAR lpBuffer[], [in] DWORD cchBufSize, - [out] DWORD *cchLength); + [in,out] DWORD *cchLength); /* Not compatible with Windows function 0x16 */ DWORD svcctl_SCSetServiceBitsA(/* FIXME */); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index b6014aa..d88e148 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -261,10 +261,7 @@ DWORD svcctl_GetServiceKeyNameW( service_unlock(entry); } else - { - *cchLength = 1; err = ERROR_SERVICE_DOES_NOT_EXIST; - } scmdatabase_unlock(manager->db);

1 0