February 2008 - Wine-commits

Rob Shearman : ws2_32: Add a FIXME for WS_SIO_GET_EXTENSION_FUNCTION_POINTER in WSAIoctl.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: dfce00677d38967de81beb73eb1529e92be96db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfce00677d38967de81beb73e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 4 20:18:42 2008 +0000 ws2_32: Add a FIXME for WS_SIO_GET_EXTENSION_FUNCTION_POINTER in WSAIoctl. --- dlls/ws2_32/socket.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 46083c7..5d6eee3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2292,6 +2292,11 @@ INT WINAPI WSAIoctl(SOCKET s, FIXME("SIO_FLUSH: stub.\n"); break; + case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + default: FIXME("unsupported WS_IOCTL cmd (%08x)\n", dwIoControlCode); WSASetLastError(WSAEOPNOTSUPP);

1 0

Rob Shearman : server: Always try return a named pipe server that is listening from find_available_server .
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 44581af935d8111292460fbc4a7df7ad52766cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44581af935d8111292460fbc4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 4 20:18:34 2008 +0000 server: Always try return a named pipe server that is listening from find_available_server. We still fallback to an idle server, but this prevents a client from connecting to a named pipe server that isn't listening. --- server/named_pipe.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 659d680..6db9a7a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -772,11 +772,20 @@ static struct pipe_server *find_available_server( struct named_pipe *pipe ) { struct pipe_server *server; + /* look for pipe servers that are listening */ LIST_FOR_EACH_ENTRY( server, &pipe->servers, struct pipe_server, entry ) { - if (server->state == ps_idle_server || server->state == ps_wait_open) + if (server->state == ps_wait_open) return (struct pipe_server *)grab_object( server ); } + + /* fall back to pipe servers that are idle */ + LIST_FOR_EACH_ENTRY( server, &pipe->servers, struct pipe_server, entry ) + { + if (server->state == ps_idle_server) + return (struct pipe_server *)grab_object( server ); + } + return NULL; }

1 0

Rob Shearman : ntdll: The FileMailslotSetInformation and FileCompletionInformation cases of NtSetInformationFile don 't need the fd.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: e70848ed01496dc16ca92b51f15346b8423b64f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70848ed01496dc16ca92b51f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 4 20:18:27 2008 +0000 ntdll: The FileMailslotSetInformation and FileCompletionInformation cases of NtSetInformationFile don't need the fd. So don't do an extra server call to get the fd to avoid a performance penalty and to make these cases work when an fd isn't available. --- dlls/ntdll/file.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5a99616..843f3f0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1578,9 +1578,6 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, TRACE("(%p,%p,%p,0x%08x,0x%08x)\n", handle, io, ptr, len, class); - if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) - return io->u.Status; - io->u.Status = STATUS_SUCCESS; switch (class) { @@ -1590,6 +1587,9 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, struct stat st; const FILE_BASIC_INFORMATION *info = ptr; + if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return io->u.Status; + if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart) { ULONGLONG sec, nsec; @@ -1641,6 +1641,8 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, if (fchmod( fd, st.st_mode ) == -1) io->u.Status = FILE_GetNtStatus(); } } + + if (needs_close) close( fd ); } else io->u.Status = STATUS_INVALID_PARAMETER_3; break; @@ -1650,8 +1652,13 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, { const FILE_POSITION_INFORMATION *info = ptr; + if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return io->u.Status; + if (lseek( fd, info->CurrentByteOffset.QuadPart, SEEK_SET ) == (off_t)-1) io->u.Status = FILE_GetNtStatus(); + + if (needs_close) close( fd ); } else io->u.Status = STATUS_INVALID_PARAMETER_3; break; @@ -1662,6 +1669,9 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, struct stat st; const FILE_END_OF_FILE_INFORMATION *info = ptr; + if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return io->u.Status; + /* first try normal truncate */ if (ftruncate( fd, (off_t)info->EndOfFile.QuadPart ) != -1) break; @@ -1676,6 +1686,8 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, ftruncate( fd, (off_t)info->EndOfFile.QuadPart ) != -1) break; } io->u.Status = FILE_GetNtStatus(); + + if (needs_close) close( fd ); } else io->u.Status = STATUS_INVALID_PARAMETER_3; break; @@ -1717,7 +1729,6 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, io->u.Status = STATUS_NOT_IMPLEMENTED; break; } - if (needs_close) close( fd ); io->Information = 0; return io->u.Status; }

1 0

James Hawkins : msi: Return ERROR_MORE_DATA if the size is too small.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: ffc251f5dd370113e7ac86f56ebea43976aa1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc251f5dd370113e7ac86f56… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:38:00 2008 -0600 msi: Return ERROR_MORE_DATA if the size is too small. --- dlls/msi/msi.c | 8 ++++++++ dlls/msi/tests/msi.c | 10 ++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index de9dc4f..643f9cc 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1621,6 +1621,10 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); + + if (lstrlenW(tmp) >= *pcchVersionBuf) + ret = ERROR_MORE_DATA; + *pcchVersionBuf = lstrlenW(tmp); } else @@ -1637,6 +1641,10 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, FIXME("Retrieve language from file\n"); wsprintfW(tmp, szLangFormat, lang); if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); + + if (lstrlenW(tmp) >= *pcchLangBuf) + ret = ERROR_MORE_DATA; + *pcchLangBuf = lstrlenW(tmp); } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index dfe91db..520f0e7 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2024,25 +2024,19 @@ static void test_MsiGetFileVersion(void) versz = 5; lstrcpyA(version, "version"); r = MsiGetFileVersionA(path, version, &versz, NULL, NULL); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(version, vercheck, 4), "Expected first 4 characters of %s, got %s\n", vercheck, version); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - todo_wine - { - ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - } /* pcchLangBuf not big enough */ langsz = 3; lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(lang, langcheck, 2), "Expected first character of %s, got %s\n", langcheck, lang); ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); - todo_wine - { - ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - } HeapFree(GetProcessHeap(), 0, vercheck); HeapFree(GetProcessHeap(), 0, langcheck);

1 0

James Hawkins : msi: Return the string length even if the string is NULL.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: dc8f714ade869864dc8d5a4a64e3c66eed49ba2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8f714ade869864dc8d5a4a6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:37:19 2008 -0600 msi: Return the string length even if the string is NULL. --- dlls/msi/msi.c | 15 ++++++++------- dlls/msi/tests/msi.c | 14 ++++---------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 593a46f..de9dc4f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1611,7 +1611,8 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, ret = GetLastError(); goto end; } - if( lpVersionBuf && pcchVersionBuf && *pcchVersionBuf ) + + if (pcchVersionBuf) { if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) && (puLen > 0) ) @@ -1619,24 +1620,24 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, wsprintfW(tmp, szVersionFormat, HIWORD(ffi->dwFileVersionMS), LOWORD(ffi->dwFileVersionMS), HIWORD(ffi->dwFileVersionLS), LOWORD(ffi->dwFileVersionLS)); - lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); - *pcchVersionBuf = lstrlenW(lpVersionBuf); + if (lpVersionBuf) lstrcpynW(lpVersionBuf, tmp, *pcchVersionBuf); + *pcchVersionBuf = lstrlenW(tmp); } else { - *lpVersionBuf = 0; + if (lpVersionBuf) *lpVersionBuf = 0; *pcchVersionBuf = 0; } } - if( lpLangBuf && pcchLangBuf && *pcchLangBuf ) + if (pcchLangBuf) { DWORD lang = GetUserDefaultLangID(); FIXME("Retrieve language from file\n"); wsprintfW(tmp, szLangFormat, lang); - lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); - *pcchLangBuf = lstrlenW(lpLangBuf); + if (lpLangBuf) lstrcpynW(lpLangBuf, tmp, *pcchLangBuf); + *pcchLangBuf = lstrlenW(tmp); } end: diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 4cc193d..dfe91db 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2012,19 +2012,13 @@ static void test_MsiGetFileVersion(void) versz = MAX_PATH; r = MsiGetFileVersionA(path, NULL, &versz, NULL, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - } + ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); /* get pcchLangBuf */ langsz = MAX_PATH; r = MsiGetFileVersionA(path, NULL, NULL, NULL, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); - } + ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); /* pcchVersionBuf not big enough */ versz = 5; @@ -2032,10 +2026,10 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, NULL, NULL); ok(!strncmp(version, vercheck, 4), "Expected first 4 characters of %s, got %s\n", vercheck, version); + ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); todo_wine { ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); } /* pcchLangBuf not big enough */ @@ -2044,10 +2038,10 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(!strncmp(lang, langcheck, 2), "Expected first character of %s, got %s\n", langcheck, lang); + ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); todo_wine { ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); - ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); } HeapFree(GetProcessHeap(), 0, vercheck);

1 0

James Hawkins : msi: Leave room for the NULL terminator.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 40841946f586962b56dbdfdfa8ab5bfa754737d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40841946f586962b56dbdfdfa… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:36:37 2008 -0600 msi: Leave room for the NULL terminator. --- dlls/msi/msi.c | 4 ++-- dlls/msi/tests/msi.c | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a5b9d10..593a46f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1549,10 +1549,10 @@ UINT WINAPI MsiGetFileVersionA(LPCSTR szFilePath, LPSTR lpVersionBuf, if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwVersionBuff ) WideCharToMultiByte(CP_ACP, 0, lpwVersionBuff, -1, - lpVersionBuf, *pcchVersionBuf, NULL, NULL); + lpVersionBuf, *pcchVersionBuf + 1, NULL, NULL); if( (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && lpwLangBuff ) WideCharToMultiByte(CP_ACP, 0, lpwLangBuff, -1, - lpLangBuf, *pcchLangBuf, NULL, NULL); + lpLangBuf, *pcchLangBuf + 1, NULL, NULL); end: msi_free(szwFilePath); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index cc2adb5..4cc193d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1988,11 +1988,8 @@ static void test_MsiGetFileVersion(void) ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); ok(!lstrcmpA(lang, langcheck), "Expected %s, got %s\n", langcheck, lang); ok(langsz == langchecksz, "Expected %d, got %d\n", langchecksz, langsz); - todo_wine - { - ok(!lstrcmpA(version, vercheck), - "Expected %s, got %s\n", vercheck, version); - } + ok(!lstrcmpA(version, vercheck), + "Expected %s, got %s\n", vercheck, version); /* only check version */ versz = MAX_PATH; @@ -2000,11 +1997,8 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, NULL, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - todo_wine - { - ok(!lstrcmpA(version, vercheck), - "Expected %s, got %s\n", vercheck, version); - } + ok(!lstrcmpA(version, vercheck), + "Expected %s, got %s\n", vercheck, version); /* only check language */ langsz = MAX_PATH;

1 0

James Hawkins : msi: Return ERROR_FILE_INVALID if the file has no version information.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: d1654350483de252ff93365cd6533170a98248e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1654350483de252ff93365cd… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:35:53 2008 -0600 msi: Return ERROR_FILE_INVALID if the file has no version information. --- dlls/msi/msi.c | 2 ++ dlls/msi/tests/msi.c | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 774c53f..a5b9d10 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1593,6 +1593,8 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, gle = GetLastError(); if (gle == ERROR_BAD_PATHNAME) return ERROR_FILE_NOT_FOUND; + else if (gle == ERROR_RESOURCE_DATA_NOT_FOUND) + return ERROR_FILE_INVALID; return gle; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3bd6181..cc2adb5 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1950,11 +1950,8 @@ static void test_MsiGetFileVersion(void) ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz); ok(!lstrcmpA(lang, "lang"), "Expected lang to be unchanged, got %s\n", lang); - todo_wine - { - ok(r == ERROR_FILE_INVALID, - "Expected ERROR_FILE_INVALID, got %d\n", r); - } + ok(r == ERROR_FILE_INVALID, + "Expected ERROR_FILE_INVALID, got %d\n", r); DeleteFileA("ver.txt");

1 0

James Hawkins : msi: Return ERROR_INVALID_PARAMETER if a string pointer is non-NULL and the size pointer is NULL .
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 03335de8d0961e9880f07a179b0496cf0e6f363a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03335de8d0961e9880f07a179… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:34:59 2008 -0600 msi: Return ERROR_INVALID_PARAMETER if a string pointer is non-NULL and the size pointer is NULL. --- dlls/msi/msi.c | 8 ++++++++ dlls/msi/tests/msi.c | 14 ++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f4ee66c..774c53f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1519,6 +1519,10 @@ UINT WINAPI MsiGetFileVersionA(LPCSTR szFilePath, LPSTR lpVersionBuf, LPWSTR szwFilePath = NULL, lpwVersionBuff = NULL, lpwLangBuff = NULL; UINT ret = ERROR_OUTOFMEMORY; + if ((lpVersionBuf && !pcchVersionBuf) || + (lpLangBuf && !pcchLangBuf)) + return ERROR_INVALID_PARAMETER; + if( szFilePath ) { szwFilePath = strdupAtoW( szFilePath ); @@ -1579,6 +1583,10 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0, lpLangBuf, pcchLangBuf?*pcchLangBuf:0); + if ((lpVersionBuf && !pcchVersionBuf) || + (lpLangBuf && !pcchLangBuf)) + return ERROR_INVALID_PARAMETER; + dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); if( !dwVerLen ) { diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 79652a1..3bd6181 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1877,17 +1877,14 @@ static void test_MsiGetFileVersion(void) lstrcpyA(version, "version"); lstrcpyA(lang, "lang"); r = MsiGetFileVersionA("nonexistent", version, NULL, lang, &langsz); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(version, "version"), "Expected version to be unchanged, got %s\n", version); ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz); ok(!lstrcmpA(lang, "lang"), "Expected lang to be unchanged, got %s\n", lang); ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } /* nonexistent szFilePath, valid lpLangBuf, NULL pcchLangBuf */ versz = MAX_PATH; @@ -1895,17 +1892,14 @@ static void test_MsiGetFileVersion(void) lstrcpyA(version, "version"); lstrcpyA(lang, "lang"); r = MsiGetFileVersionA("nonexistent", version, &versz, lang, NULL); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(version, "version"), "Expected version to be unchanged, got %s\n", version); ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz); ok(!lstrcmpA(lang, "lang"), "Expected lang to be unchanged, got %s\n", lang); ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } /* nonexistent szFilePath, valid lpVersionBuf, pcchVersionBuf is zero */ versz = 0;

1 0

James Hawkins : msi: Translate ERROR_BAD_PATHNAME into ERROR_FILE_NOT_FOUND .
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 856800c84be11cb525ce4d7a296f7efe102aa037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856800c84be11cb525ce4d7a2… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:34:10 2008 -0600 msi: Translate ERROR_BAD_PATHNAME into ERROR_FILE_NOT_FOUND. --- dlls/msi/msi.c | 10 ++++++++-- dlls/msi/tests/msi.c | 7 ++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c1478b3..f4ee66c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1569,7 +1569,7 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, '%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; UINT ret = 0; - DWORD dwVerLen; + DWORD dwVerLen, gle; LPVOID lpVer = NULL; VS_FIXEDFILEINFO *ffi; UINT puLen; @@ -1581,7 +1581,13 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL); if( !dwVerLen ) - return GetLastError(); + { + gle = GetLastError(); + if (gle == ERROR_BAD_PATHNAME) + return ERROR_FILE_NOT_FOUND; + + return gle; + } lpVer = msi_alloc(dwVerLen); if( !lpVer ) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 57fe405..79652a1 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1847,17 +1847,14 @@ static void test_MsiGetFileVersion(void) lstrcpyA(version, "version"); lstrcpyA(lang, "lang"); r = MsiGetFileVersionA("", version, &versz, lang, &langsz); + ok(r == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); ok(!lstrcmpA(version, "version"), "Expected version to be unchanged, got %s\n", version); ok(versz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, versz); ok(!lstrcmpA(lang, "lang"), "Expected lang to be unchanged, got %s\n", lang); ok(langsz == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, langsz); - todo_wine - { - ok(r == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - } /* nonexistent szFilePath */ versz = MAX_PATH;

1 0

James Hawkins : msi: Add tests for MsiGetFileVersion.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 8079d9f2abfc4abf94cc2d850d37b26b5c1b9bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8079d9f2abfc4abf94cc2d850… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 11:32:31 2008 -0600 msi: Add tests for MsiGetFileVersion. --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/msi.c | 296 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8079d9f2abfc4abf94cc2…

1 0