December 2009 - Wine-Commits

Juan Lang : winhttp: Set error and fail if a secure connections certificate couldn' t be verified.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 888d1a23230f8bbbb35fdc7fcca401da189ec4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888d1a23230f8bbbb35fdc7fc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 12:45:42 2009 -0800 winhttp: Set error and fail if a secure connections certificate couldn't be verified. --- dlls/winhttp/net.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 588b11b..3faa41c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -94,6 +94,7 @@ static void *libcrypto_handle; static SSL_METHOD *method; static SSL_CTX *ctx; static int hostname_idx; +static int error_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -364,7 +365,7 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) if (err) { - set_last_error( err ); + pSSL_set_ex_data( ssl, error_idx, (void *)err ); ret = FALSE; } } @@ -476,6 +477,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + error_idx = pSSL_get_ex_new_index( 0, (void *)"error index", NULL, NULL, NULL ); + if (error_idx == -1) + { + ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } pSSL_CTX_set_verify( ctx, SSL_VERIFY_PEER, netconn_secure_verify ); pCRYPTO_set_id_callback(ssl_thread_id); @@ -610,8 +619,6 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { #ifdef SONAME_LIBSSL - long res; - if (!(conn->ssl_conn = pSSL_new( ctx ))) { ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); @@ -632,15 +639,14 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) } if (pSSL_connect( conn->ssl_conn ) <= 0) { - ERR("SSL_connect failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); - set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + DWORD err; + + err = (DWORD)pSSL_get_ex_data( conn->ssl_conn, error_idx ); + if (!err) err = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; + ERR("couldn't verify server certificate (%d)\n", err); + set_last_error( err ); goto fail; } - if ((res = pSSL_get_verify_result( conn->ssl_conn )) != X509_V_OK) - { - /* FIXME: we should set an error and return, but we only print an error at the moment */ - ERR("couldn't verify server certificate (%ld)\n", res); - } TRACE("established SSL connection\n"); conn->secure = TRUE; return TRUE;

1 0

Rob Shearman : cabinet: Fix memory leaks on failure in FDICopy.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: eae5b071c23cf5a7c6285201f245faa14b73ef37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae5b071c23cf5a7c6285201f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:13:20 2009 +0000 cabinet: Fix memory leaks on failure in FDICopy. --- dlls/cabinet/fdi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 61dafdb..de64f02 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2519,6 +2519,7 @@ BOOL __cdecl FDICopy( /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { ERR("MAX_PATH exceeded.\n"); + PFDI_FREE(hfdi, decomp_state); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->erfType = ERROR_FILE_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; @@ -2540,6 +2541,7 @@ BOOL __cdecl FDICopy( /* get a handle to the cabfile */ cabhf = PFDI_OPEN(hfdi, fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { + PFDI_FREE(hfdi, decomp_state); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; SetLastError(ERROR_FILE_NOT_FOUND); @@ -2548,6 +2550,7 @@ BOOL __cdecl FDICopy( if (cabhf == 0) { ERR("PFDI_OPEN returned zero for %s.\n", fullpath); + PFDI_FREE(hfdi, decomp_state); PFDI_INT(hfdi)->perf->erfOper = FDIERROR_CABINET_NOT_FOUND; PFDI_INT(hfdi)->perf->erfType = ERROR_FILE_NOT_FOUND; PFDI_INT(hfdi)->perf->fError = TRUE; @@ -2558,6 +2561,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(hfdi, cabhf, &fdici, &(CAB(mii)))) { ERR("FDIIsCabinet failed.\n"); + PFDI_FREE(hfdi, decomp_state); PFDI_CLOSE(hfdi, cabhf); return FALSE; }

1 0

Paul Vriens : kernel32: Add a define for UNICODE_STRING_MAX_CHARS.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 4d6b74758f9ce967e87a9a1d0b67079898e8a5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6b74758f9ce967e87a9a1d0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 14 13:58:24 2009 +0100 kernel32: Add a define for UNICODE_STRING_MAX_CHARS. --- dlls/kernel32/environ.c | 4 ++-- include/winnt.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index aaa9d6e..b11f7bf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -364,8 +364,8 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len ) RtlInitUnicodeString(&us_src, src); /* make sure we don't overflow the maximum UNICODE_STRING size */ - if (len > 0x7fff) - len = 0x7fff; + if (len > UNICODE_STRING_MAX_CHARS) + len = UNICODE_STRING_MAX_CHARS; us_dst.Length = 0; us_dst.MaximumLength = len * sizeof(WCHAR); diff --git a/include/winnt.h b/include/winnt.h index e2d1d1a..28409af 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -617,6 +617,8 @@ typedef struct _MEMORY_BASIC_INFORMATION #define MAXWORD 0xffff #define MAXDWORD 0xffffffff +#define UNICODE_STRING_MAX_CHARS 32767 + #define FIELD_OFFSET(type, field) \ ((LONG)(INT_PTR)&(((type *)0)->field))

1 0

Alexandre Julliard : winex11: Make GetKeyboardLayoutName() use the same default layout as GetKeyboardLayout().
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: d18ad16331d1c68ab72a39f7bba77ca1b9a17cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18ad16331d1c68ab72a39f7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 15:10:24 2009 +0100 winex11: Make GetKeyboardLayoutName() use the same default layout as GetKeyboardLayout(). --- dlls/winex11.drv/keyboard.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7cf0fdc..4d486b0 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1635,16 +1635,11 @@ static HKL get_locale_kbd_layout(void) */ BOOL CDECL X11DRV_GetKeyboardLayoutName(LPWSTR name) { - static const WCHAR formatW[] = {'%','0','8','l','x',0}; + static const WCHAR formatW[] = {'%','0','8','x',0}; DWORD layout; - LANGID langid; - - layout = main_key_tab[kbd_layout].lcid; - /* see comment for get_locale_kbd_layout */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ + layout = HandleToUlong( get_locale_kbd_layout() ); + if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); sprintfW(name, formatW, layout); TRACE("returning %s\n", debugstr_w(name)); return TRUE;

1 0

Rob Shearman : gdi32: Fix memory leaks on EMF_Create_HENHMETAFILE failure.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: eb81fa283b5efbf15dd9360bf1a95ac809374b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb81fa283b5efbf15dd9360bf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:12:58 2009 +0000 gdi32: Fix memory leaks on EMF_Create_HENHMETAFILE failure. --- dlls/gdi32/enhmetafile.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 95e5589..adb19a0 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -466,8 +466,12 @@ UINT WINAPI GetEnhMetaFileDescriptionW( HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) { ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); + HENHMETAFILE hmf; memmove(emh, buf, bufsize); - return EMF_Create_HENHMETAFILE( emh, FALSE ); + hmf = EMF_Create_HENHMETAFILE( emh, FALSE ); + if (!hmf) + HeapFree( GetProcessHeap(), 0, emh ); + return hmf; } /***************************************************************************** @@ -2509,6 +2513,8 @@ HENHMETAFILE WINAPI CopyEnhMetaFileA( emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + if (!hmfDst) + HeapFree( GetProcessHeap(), 0, emrDst ); } else { HANDLE hFile; DWORD w; @@ -2549,6 +2555,8 @@ HENHMETAFILE WINAPI CopyEnhMetaFileW( emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + if (!hmfDst) + HeapFree( GetProcessHeap(), 0, emrDst ); } else { HANDLE hFile; DWORD w;

1 0

Rob Shearman : ntdll: Ignore the hole in the FILE_PIPE_WAIT_FOR_BUFFER structure passed into NtFsControlFile before writing the structure to the server .
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 052873350df26c5add3a36a010b5910131bd0917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052873350df26c5add3a36a01… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:32:50 2009 +0000 ntdll: Ignore the hole in the FILE_PIPE_WAIT_FOR_BUFFER structure passed into NtFsControlFile before writing the structure to the server. --- dlls/ntdll/file.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 00c54c2..b81d38c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -69,6 +69,9 @@ #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif +#ifdef HAVE_VALGRIND_MEMCHECK_H +# include <valgrind/memcheck.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -1257,6 +1260,30 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, return status; } +/* Tell Valgrind to ignore any holes in structs we will be passing to the + * server */ +static void ignore_server_ioctl_struct_holes (ULONG code, const void *in_buffer, + ULONG in_size) +{ +#ifdef VALGRIND_MAKE_MEM_DEFINED +# define IGNORE_STRUCT_HOLE(buf, size, t, f1, f2) \ + do { \ + if ((size) >= FIELD_OFFSET(t, f2) && \ + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1) < FIELD_OFFSET(t, f2)) \ + VALGRIND_MAKE_MEM_DEFINED( \ + (const char *)(buf) + FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1), \ + FIELD_OFFSET(t, f2) - FIELD_OFFSET(t, f1) + sizeof(((t *)0)->f1)); \ + } while (0) + + switch (code) + { + case FSCTL_PIPE_WAIT: + IGNORE_STRUCT_HOLE(in_buffer, in_size, FILE_PIPE_WAIT_FOR_BUFFER, TimeoutSpecified, Name); + break; + } +#endif +} + /************************************************************************** * NtDeviceIoControlFile [NTDLL.@] @@ -1356,6 +1383,8 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!io) return STATUS_INVALID_PARAMETER; + ignore_server_ioctl_struct_holes( code, in_buffer, in_size ); + switch(code) { case FSCTL_DISMOUNT_VOLUME:

1 0

Rob Shearman : msvcrt: Free memory allocated in TLS slot on module unload as well as thread exit.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: c20868e0a2f7af909cf8af2877ae8b024fa6d11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20868e0a2f7af909cf8af287… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 14 14:13:57 2009 +0000 msvcrt: Free memory allocated in TLS slot on module unload as well as thread exit. --- dlls/msvcrt/main.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index b42b64a..e64f0ba 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -60,13 +60,24 @@ static inline BOOL msvcrt_free_tls(void) return TRUE; } +static inline void msvcrt_free_tls_mem(void) +{ + thread_data_t *tls = TlsGetValue(msvcrt_tls_index); + if (tls) + { + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->asctime_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + HeapFree(GetProcessHeap(),0,tls->strerror_buffer); + } + HeapFree(GetProcessHeap(), 0, tls); +} + /********************************************************************* * Init */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - thread_data_t *tls; - TRACE("(%p, %s, %p) pid(%x), tid(%x), tls(%u)\n", hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved, GetCurrentProcessId(), GetCurrentThreadId(), @@ -94,21 +105,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_free_console(); msvcrt_free_args(); msvcrt_free_signals(); + msvcrt_free_tls_mem(); if (!msvcrt_free_tls()) return FALSE; TRACE("finished process free\n"); break; case DLL_THREAD_DETACH: - /* Free TLS */ - tls = TlsGetValue(msvcrt_tls_index); - if (tls) - { - HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); - HeapFree(GetProcessHeap(),0,tls->asctime_buffer); - HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); - HeapFree(GetProcessHeap(),0,tls->strerror_buffer); - } - HeapFree(GetProcessHeap(), 0, tls); + msvcrt_free_tls_mem(); TRACE("finished thread free\n"); break; }

1 0

Alexandre Julliard : gdiplus/tests: Fix parentheses in the expect() macro.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 8d8544fa157ae92a61d7bf298a92551fe16f9227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8544fa157ae92a61d7bf298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 14:55:05 2009 +0100 gdiplus/tests: Fix parentheses in the expect() macro. --- dlls/gdiplus/tests/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 66c6410..2b08ef8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -27,7 +27,7 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) +#define expect(expected, got) ok((UINT)(got) == (UINT)(expected), "Expected %.8x, got %.8x\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo)

1 0

Stefan Leichter : setupapi: Implement SetupGetInfFileListW.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 9db754fe10469ee558e32598a43c01589f1199c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db754fe10469ee558e32598a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Dec 10 20:55:09 2009 +0100 setupapi: Implement SetupGetInfFileListW. --- dlls/setupapi/install.c | 131 ++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/tests/install.c | 13 +---- 2 files changed, 129 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 2064315..54eff1d 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1454,8 +1454,133 @@ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DW BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, DWORD insize, PDWORD outsize) { - FIXME("(%s %d %p %d %p) stub\n", debugstr_w(dir), style, buffer, insize, outsize); - if(buffer) buffer[0] = 0; - if(outsize) *outsize = 1; + static WCHAR inf[] = {'\\','*','.','i','n','f',0 }; + WCHAR *filter, *fullname = NULL, *ptr = buffer; + DWORD dir_len, name_len = 20, size ; + WIN32_FIND_DATAW finddata; + HANDLE hdl; + if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | + INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) + { + FIXME( "unknown inf_style(s) 0x%x\n", + style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | + INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )); + if( outsize ) *outsize = 1; + return TRUE; + } + if ((style & ( INF_STYLE_OLDNT | INF_STYLE_WIN4 )) == INF_STYLE_NONE) + { + FIXME( "inf_style INF_STYLE_NONE not handled\n" ); + if( outsize ) *outsize = 1; + return TRUE; + } + if (style & ( INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) + FIXME("ignored inf_style(s) %s %s\n", + ( style & INF_STYLE_CACHE_ENABLE ) ? "INF_STYLE_CACHE_ENABLE" : "", + ( style & INF_STYLE_CACHE_DISABLE ) ? "INF_STYLE_CACHE_DISABLE" : ""); + if( dir ) + { + DWORD att; + DWORD msize; + dir_len = strlenW( dir ); + if ( !dir_len ) return FALSE; + msize = ( 7 + dir_len ) * sizeof( WCHAR ); /* \\*.inf\0 */ + filter = HeapAlloc( GetProcessHeap(), 0, msize ); + if( !filter ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( filter, dir ); + if ( '\\' == filter[dir_len - 1] ) + filter[--dir_len] = 0; + + att = GetFileAttributesW( filter ); + if (att != INVALID_FILE_ATTRIBUTES && !(att & FILE_ATTRIBUTE_DIRECTORY)) + { + HeapFree( GetProcessHeap(), 0, filter ); + SetLastError( ERROR_DIRECTORY ); + return FALSE; + } + } + else + { + WCHAR infdir[] = {'\\','i','n','f',0 }; + DWORD msize; + dir_len = GetWindowsDirectoryW( NULL, 0 ); + msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR ); + filter = HeapAlloc( GetProcessHeap(), 0, msize ); + if( !filter ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + GetWindowsDirectoryW( filter, msize ); + strcatW( filter, infdir ); + } + strcatW( filter, inf ); + + hdl = FindFirstFileW( filter , &finddata ); + if ( hdl == INVALID_HANDLE_VALUE ) + { + if( outsize ) *outsize = 1; + HeapFree( GetProcessHeap(), 0, filter ); + return TRUE; + } + size = 1; + do + { + static const WCHAR key[] = + {'S','i','g','n','a','t','u','r','e',0 }; + static const WCHAR section[] = + {'V','e','r','s','i','o','n',0 }; + static const WCHAR sig_win4_1[] = + {'$','C','h','i','c','a','g','o','$',0 }; + static const WCHAR sig_win4_2[] = + {'$','W','I','N','D','O','W','S',' ','N','T','$',0 }; + WCHAR signature[ MAX_PATH ]; + BOOL valid = FALSE; + DWORD len = strlenW( finddata.cFileName ); + if (!fullname || ( name_len < len )) + { + name_len = ( name_len < len ) ? len : name_len; + HeapFree( GetProcessHeap(), 0, fullname ); + fullname = HeapAlloc( GetProcessHeap(), 0, + ( 2 + dir_len + name_len) * sizeof( WCHAR )); + if( !fullname ) + { + HeapFree( GetProcessHeap(), 0, filter ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( fullname, filter ); + } + fullname[ dir_len + 1] = 0; /* keep '\\' */ + strcatW( fullname, finddata.cFileName ); + if (!GetPrivateProfileStringW( section, key, NULL, signature, MAX_PATH, fullname )) + signature[0] = 0; + if( INF_STYLE_OLDNT & style ) + valid = strcmpiW( sig_win4_1, signature ) && + strcmpiW( sig_win4_2, signature ); + if( INF_STYLE_WIN4 & style ) + valid = valid || !strcmpiW( sig_win4_1, signature ) || + !strcmpiW( sig_win4_2, signature ); + if( valid ) + { + size += 1 + strlenW( finddata.cFileName ); + if( ptr && insize >= size ) + { + strcpyW( ptr, finddata.cFileName ); + ptr += 1 + strlenW( finddata.cFileName ); + *ptr = 0; + } + } + } + while( FindNextFileW( hdl, &finddata )); + FindClose( hdl ); + + HeapFree( GetProcessHeap(), 0, fullname ); + HeapFree( GetProcessHeap(), 0, filter ); + if( outsize ) *outsize = size; return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 9aed163..668b2c2 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -515,7 +515,6 @@ static void test_inffilelist(void) outsize = 0; SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); - todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); /* create a private directory, the temp directory may contain some @@ -528,7 +527,7 @@ static void test_inffilelist(void) } if (!CreateDirectoryA(dirA, NULL )) { - win_skip("CreateDirectoryA failed with error %d\n", GetLastError()); + win_skip("CreateDirectoryA(%s) failed with error %d\n", dirA, GetLastError()); return; } if (!SetCurrentDirectoryA(dirA)) @@ -548,7 +547,6 @@ static void test_inffilelist(void) ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(outsize == 1, "expected required buffersize to be 1, got %d\n", outsize); - todo_wine ok(ERROR_PATH_NOT_FOUND == GetLastError(), "expected error ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); @@ -563,9 +561,7 @@ static void test_inffilelist(void) outsize = 0xffffffff; SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); - todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); - todo_wine ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); @@ -575,9 +571,7 @@ static void test_inffilelist(void) dir[lstrlenW(dir)] = '\\'; SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); - todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); - todo_wine ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); @@ -587,7 +581,6 @@ static void test_inffilelist(void) expected = 3 + strlen(inffile) + strlen(inffile2); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -599,7 +592,6 @@ static void test_inffilelist(void) create_inf_file(inffile2, inf2); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -612,7 +604,6 @@ static void test_inffilelist(void) expected = 3 + strlen(inffile) + strlen(inffile2); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -624,7 +615,6 @@ static void test_inffilelist(void) expected = 2 + strlen(invalid_inf); ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -636,7 +626,6 @@ static void test_inffilelist(void) ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1)

1 0

Maarten Lankhorst : mmdevapi: Add some initial tests.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: c38de04e45bc43c04e2ee8fe4a1a2d5a9ad4303a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38de04e45bc43c04e2ee8fe4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 10:09:34 2009 +0100 mmdevapi: Add some initial tests. --- configure | 9 +++ configure.ac | 1 + dlls/mmdevapi/tests/Makefile.in | 13 ++++ dlls/mmdevapi/tests/mmdevenum.c | 134 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2dee390..555bc0b 100755 --- a/configure +++ b/configure @@ -15417,6 +15417,14 @@ dlls/mmdevapi/Makefile: dlls/mmdevapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mmdevapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/mmdevapi/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mmdevapi/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mmdevapi/tests/Makefile: dlls/mmdevapi/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/mmdevapi/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mmdevldr.vxd/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mmdevldr.vxd" @@ -19049,6 +19057,7 @@ do "dlls/mlang/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/Makefile" ;; "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;; "dlls/mmdevapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevapi/Makefile" ;; + "dlls/mmdevapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevapi/tests/Makefile" ;; "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;; "dlls/mmsystem.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmsystem.dll16/Makefile" ;; "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;; diff --git a/configure.ac b/configure.ac index d4b13cb..e966142 100644 --- a/configure.ac +++ b/configure.ac @@ -2312,6 +2312,7 @@ WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mmdevapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mmdevapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/mmsystem.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in new file mode 100644 index 0000000..4ac467c --- /dev/null +++ b/dlls/mmdevapi/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = mmdevapi.dll +IMPORTS = ole32 version user32 kernel32 + +CTESTS = \ + mmdevenum.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c new file mode 100644 index 0000000..5ebd32a --- /dev/null +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -0,0 +1,134 @@ +/* + * Copyright 2009 Maarten Lankhorst + * + * 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 "wine/test.h" + +#define CINTERFACE +#define COBJMACROS + +#include "initguid.h" +#include "mmdeviceapi.h" +#include "dshow.h" +#include "dsound.h" + +/* Some of the QueryInterface tests are really just to check if I got the IID's right :) */ + +/* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ +static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) +{ + IMMDeviceCollection *col2; + IMMDeviceEnumerator *mme2; + IUnknown *unk; + HRESULT hr; + ULONG ref; + UINT numdev; + IMMDevice *dev; + + ref = IUnknown_AddRef(col); + IUnknown_Release(col); + ok(ref == 2, "Invalid reference count %u on collection\n", ref); + + hr = IUnknown_QueryInterface(col, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08x\n", hr); + if (hr == S_OK) + { + ok((LONG_PTR)col == (LONG_PTR)unk, "Pointers are not identical %p/%p/%p\n", col, unk, mme); + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(col, &IID_IMMDeviceCollection, (void**)&col2); + ok(hr == S_OK, "Cannot query for IID_IMMDeviceCollection: 0x%08x\n", hr); + if (hr == S_OK) + IUnknown_Release(col2); + + hr = IUnknown_QueryInterface(col, &IID_IMMDeviceEnumerator, (void**)&mme2); + ok(hr == E_NOINTERFACE, "Query for IID_IMMDeviceEnumerator returned: 0x%08x\n", hr); + if (hr == S_OK) + IUnknown_Release(mme2); + + hr = IMMDeviceCollection_GetCount(col, NULL); + ok(hr == E_POINTER, "GetCount returned 0x%08x\n", hr); + + hr = IMMDeviceCollection_GetCount(col, &numdev); + ok(hr == S_OK, "GetCount returned 0x%08x\n", hr); + + dev = (void*)(LONG_PTR)0x12345678; + hr = IMMDeviceCollection_Item(col, numdev, &dev); + ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); + ok(dev == NULL, "Returned non-null device\n"); + + if (!numdev) return; + hr = IMMDeviceCollection_Item(col, 0, NULL); + ok(hr == E_POINTER, "Query with null pointer returned 0x%08x\n", hr); + + hr = IMMDeviceCollection_Item(col, 0, &dev); + ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); + ok(dev != NULL, "Device is null!\n"); + if (dev) IUnknown_Release(dev); +} + +START_TEST(mmdevenum) +{ + HRESULT hr; + IUnknown *unk = NULL; + IMMDeviceEnumerator *mme; + ULONG ref; + IMMDeviceCollection *col; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); + if (FAILED(hr)) + { + skip("mmdevapi not available: 0x%08x\n", hr); + return; + } + + /* Odd behavior.. bug? */ + ref = IUnknown_AddRef(mme); + ok(ref == 3, "Invalid reference count after incrementing: %u\n", ref); + IUnknown_Release(mme); + + hr = IUnknown_QueryInterface(mme, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "returned 0x%08x\n", hr); + if (hr != S_OK) return; + + ok( (LONG_PTR)mme == (LONG_PTR)unk, "Pointers are unequal %p/%p\n", unk, mme); + IUnknown_Release(unk); + + col = (void*)(LONG_PTR)0x12345678; + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); + ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr); + ok(col == NULL, "Collection pointer non-null on failure\n"); + + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL+1, &col); + ok(hr == E_INVALIDARG, "Setting invalid mask returned 0x%08x\n", hr); + + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, NULL); + ok(hr == E_POINTER, "Invalid pointer returned: 0x%08x\n", hr); + + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, &col); + ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); + if (hr == S_OK) + { + ok(!!col, "Returned null pointer\n"); + if (col) + test_collection(mme, col); + } + + IUnknown_Release(mme); +}

1 0