February 2006 - Wine-commits

Alexandre Julliard : configure: Fix previous change to still build all the binaries on
by Alexandre Julliard 18 Feb '06

18 Feb '06

Module: wine Branch: refs/heads/master Commit: 2cdfd4d719c727e2dbb1cb213db652a63143e074 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2cdfd4d719c727e2dbb1cb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 18 15:03:51 2006 +0100 configure: Fix previous change to still build all the binaries on x86_64 in 32-bit mode. --- configure | 23 ++++++++++++++--------- configure.ac | 19 ++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/configure b/configure index b966c82..7a16ba1 100755 --- a/configure +++ b/configure @@ -13115,18 +13115,23 @@ case $host_os in ;; esac -case $host in - *i[3456789]86*-linux* | *i[3456789]86*-k*bsd*-gnu) - MAIN_BINARY="wine-glibc" - - EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader" +case $host_cpu in + *i[3456789]86*) + case $host_os in + linux* | k*bsd*-gnu) + MAIN_BINARY="wine-glibc" - ;; - darwin*) MAIN_BINARY="wine-pthread" + EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader" ;; - *i[3456789]86*) MAIN_BINARY="wine-kthread" + darwin*) + MAIN_BINARY="wine-pthread" ;; - *) MAIN_BINARY="wine-pthread" + *) + MAIN_BINARY="wine-kthread" + ;; + esac + ;; + *) MAIN_BINARY="wine-pthread" ;; esac diff --git a/configure.ac b/configure.ac index 582df4d..be2d693 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,14 +1081,19 @@ case $host_os in ;; esac -case $host in - *i[[3456789]]86*-linux* | *i[[3456789]]86*-k*bsd*-gnu) - AC_SUBST(MAIN_BINARY,"wine-glibc") - AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") +case $host_cpu in + *i[[3456789]]86*) + case $host_os in + linux* | k*bsd*-gnu) + AC_SUBST(MAIN_BINARY,"wine-glibc") + AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader") ;; + darwin*) + AC_SUBST(MAIN_BINARY,"wine-pthread") ;; + *) + AC_SUBST(MAIN_BINARY,"wine-kthread") ;; + esac ;; - darwin*) AC_SUBST(MAIN_BINARY,"wine-pthread") ;; - *i[[3456789]]86*) AC_SUBST(MAIN_BINARY,"wine-kthread") ;; - *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;; + *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;; esac dnl **** Get the soname for libraries that we load dynamically ****

1 0

Phil Krylov : user: Implement scrolling in popup menus.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: dafa5bf46443d3ddcb1ec4ab18df102871c6e873 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dafa5bf46443d3ddcb1ec4a… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Fri Feb 17 18:34:31 2006 +0100 user: Implement scrolling in popup menus. --- dlls/user/menu.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 214 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dafa5bf46443d3ddcb1…

1 0

Alexandre Julliard : libwine: Add the runtime library path to the front of the dll paths list.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: 1269f43c5a68e03b526098fb18dd0edd42858ceb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1269f43c5a68e03b526098f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 17:39:44 2006 +0100 libwine: Add the runtime library path to the front of the dll paths list. --- libs/wine/config.c | 5 +++-- libs/wine/loader.c | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 65f2857..ca1080a 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -162,9 +162,10 @@ static void init_server_dir( dev_t dev, } /* retrieve the default dll dir */ -const char *get_default_dlldir(void) +const char *get_dlldir( const char **default_dlldir ) { - return dlldir ? dlldir : DLLDIR; + *default_dlldir = DLLDIR; + return dlldir; } /* initialize all the paths values */ diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 9b1eaf2..b659694 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -81,13 +81,14 @@ static int dll_path_maxlen; extern void mmap_init(void); extern void debug_init(void); -extern const char *get_default_dlldir(void); +extern const char *get_dlldir( const char **default_dlldir ); /* build the dll load path from the WINEDLLPATH variable */ static void build_dll_path(void) { int len, count = 0; char *p, *path = getenv( "WINEDLLPATH" ); + const char *dlldir = get_dlldir( &default_dlldir ); if (path) { @@ -103,12 +104,18 @@ static void build_dll_path(void) } } - dll_paths = malloc( (count+1) * sizeof(*dll_paths) ); + dll_paths = malloc( (count+2) * sizeof(*dll_paths) ); + nb_dll_paths = 0; + + if (dlldir) + { + dll_path_maxlen = strlen(dlldir); + dll_paths[nb_dll_paths++] = dlldir; + } if (count) { p = path; - nb_dll_paths = 0; while (*p) { while (*p == ':') *p++ = 0; @@ -122,7 +129,6 @@ static void build_dll_path(void) } /* append default dll dir (if not empty) to path */ - default_dlldir = get_default_dlldir(); if ((len = strlen(default_dlldir)) > 0) { if (len > dll_path_maxlen) dll_path_maxlen = len; @@ -570,8 +576,8 @@ void wine_init( int argc, char *argv[], void *ntdll = NULL; void (*init_func)(void); - build_dll_path(); wine_init_argv0_path( argv[0] ); + build_dll_path(); __wine_main_argc = argc; __wine_main_argv = argv; __wine_main_environ = environ; @@ -583,7 +589,7 @@ void wine_init( int argc, char *argv[], if ((ntdll = wine_dlopen( path, RTLD_NOW, error, error_size ))) { /* if we didn't use the default dll dir, remove it from the search path */ - if (sizeof(default_dlldir) > 1 && context.index < nb_dll_paths) nb_dll_paths--; + if (default_dlldir[0] && context.index < nb_dll_paths) nb_dll_paths--; break; } }

1 0

Alexandre Julliard : dbghelp: Use wine_dll_enum_load_path to search the dll load path.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: 133b3069bb7641ffe130586ae762f7314c1cf763 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=133b3069bb7641ffe130586… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 17:38:28 2006 +0100 dbghelp: Use wine_dll_enum_load_path to search the dll load path. --- dlls/dbghelp/elf_module.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 6331b57..92bb3f1 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -69,6 +69,7 @@ # include <sys/link.h> #endif +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -1160,6 +1161,33 @@ static BOOL elf_load_file_from_path(HAND } /****************************************************************** + * elf_load_file_from_dll_path + * + * Tries to load an ELF file from the dll path + */ +static BOOL elf_load_file_from_dll_path(HANDLE hProcess, + const char* filename, + unsigned long load_offset, + struct elf_info* elf_info) +{ + BOOL ret = FALSE; + unsigned int index = 0; + const char *path; + + while (!ret && (path = wine_dll_enum_load_path( index++ ))) + { + char *name = HeapAlloc( GetProcessHeap(), 0, strlen(path) + strlen(filename) + 2 ); + if (!name) break; + strcpy( name, path ); + strcat( name, "/" ); + strcat( name, filename ); + ret = elf_load_file(hProcess, name, load_offset, elf_info); + HeapFree( GetProcessHeap(), 0, name ); + } + return ret; +} + +/****************************************************************** * elf_search_and_load_file * * lookup a file in standard ELF locations, and if found, load it @@ -1187,9 +1215,8 @@ static BOOL elf_search_and_load_file(str ret = elf_load_file_from_path(pcs, filename, load_offset, getenv("PATH"), elf_info) || elf_load_file_from_path(pcs, filename, load_offset, - getenv("LD_LIBRARY_PATH"), elf_info) || - elf_load_file_from_path(pcs, filename, load_offset, - getenv("WINEDLLPATH"), elf_info); + getenv("LD_LIBRARY_PATH"), elf_info); + if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, load_offset, elf_info); } return ret;

1 0

Peter Beutner : msvcrt: Correctly set EOF flag in fread().
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: 72017cc9ab31382b8d47005c5e843b635e96d208 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72017cc9ab31382b8d47005… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Feb 17 17:38:03 2006 +0100 msvcrt: Correctly set EOF flag in fread(). Setting the EOF flag only if _read() returns zero is not enough as we could also read something AND hit the end of file. _read() already sets another internal EOF flag, so just use this too. Removing todo_wine from the test case. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 14e786a..9162ee7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2503,7 +2503,7 @@ MSVCRT_size_t MSVCRT_fread(void *ptr, MS /* expose feof condition in the flags * MFC tests file->_flag for feof, and doesn't not call feof()) */ - if (pread == 0) + if ( MSVCRT_fdesc[file->_file].wxflag & WX_ATEOF) file->_flag |= MSVCRT__IOEOF; else if (pread == -1) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 086c37f..bcc60fd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -125,7 +125,7 @@ static void test_fileops( void ) /* sizeof(buffer) > content of file */ ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); /* feof should be set now */ - todo_wine ok(feof(file), "feof after fread failed\n"); + ok(feof(file), "feof after fread failed\n"); fclose (file); unlink ("fdopen.tst");

1 0

Peter Beutner : msvcrt: Add test for fread/feof.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: b786ea588c88f2ebef8e1fb84d5f00c5ad539988 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b786ea588c88f2ebef8e1fb… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Feb 17 17:37:40 2006 +0100 msvcrt: Add test for fread/feof. When calling fread() with a large enough buffer to reach the end of the file a subsequent feof() should return true; (marked as todo_wine because it doesn't work atm). --- dlls/msvcrt/tests/file.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 6041e0b..086c37f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -119,6 +119,15 @@ static void test_fileops( void ) ok(fgetws(wbuffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected\n"); ok(lstrlenW(wbuffer) == 1,"fgets dropped chars\n"); fclose (file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + todo_wine ok(feof(file), "feof after fread failed\n"); + fclose (file); + unlink ("fdopen.tst"); }

1 0

Peter Beutner : msvcrt: Remove bogus code.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: 916c4b6b8c2e32645b652299b9461b565e9a1de3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=916c4b6b8c2e32645b65229… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Feb 17 17:37:26 2006 +0100 msvcrt: Remove bogus code. We can't just pop a exception record from the exception handler list which we haven't put there. --- dlls/msvcrt/cppexcept.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 29d7b58..073674a 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -259,7 +259,7 @@ inline static void call_catch_block( PEX { UINT i; int j; - void *addr, *prev_frame, *object = (void *)rec->ExceptionInformation[1]; + void *addr, *object = (void *)rec->ExceptionInformation[1]; struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; thread_data_t *thread_data = msvcrt_get_thread_data(); @@ -318,8 +318,7 @@ inline static void call_catch_block( PEX if (info && info->destructor) call_dtor( info->destructor, object ); TRACE( "done, continuing at %p\n", addr ); - prev_frame = NtCurrentTeb()->Tib.ExceptionList; - __wine_pop_frame( prev_frame ); + continue_after_catch( frame, addr ); } }

1 0

Peter Beutner : msvcrt: Fix use of uninitialized variable.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: 58d3f145147974c01d0f97f2c288315aa2174256 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58d3f145147974c01d0f97f… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Feb 17 17:37:14 2006 +0100 msvcrt: Fix use of uninitialized variable. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7c7df8f..14e786a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -803,7 +803,7 @@ __int64 _lseeki64(int fd, __int64 offset } TRACE(":fd (%d) to %s pos %s\n", - fd,wine_dbgstr_longlong(ofs.QuadPart), + fd,wine_dbgstr_longlong(offset), (whence==SEEK_SET)?"SEEK_SET": (whence==SEEK_CUR)?"SEEK_CUR": (whence==SEEK_END)?"SEEK_END":"UNKNOWN");

1 0

Juan Lang : crypt32: Move certificate store functions to their own file.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: 2002e227cfe46c08f0c765f7160fd58dba9d5c44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2002e227cfe46c08f0c765f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Feb 17 17:36:52 2006 +0100 crypt32: Move certificate store functions to their own file. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/cert.c | 3200 ---------------------------------------- dlls/crypt32/store.c | 3225 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/.gitignore | 1 dlls/crypt32/tests/Makefile.in | 1 dlls/crypt32/tests/cert.c | 1395 ----------------- dlls/crypt32/tests/store.c | 1423 ++++++++++++++++++ 7 files changed, 4654 insertions(+), 4592 deletions(-) create mode 100644 dlls/crypt32/store.c create mode 100644 dlls/crypt32/tests/store.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2002e227cfe46c08f0c…

1 0

Detlef Riekenberg : winspool/tests: Add tests for EnumMonitors.
by Alexandre Julliard 17 Feb '06

17 Feb '06

Module: wine Branch: refs/heads/master Commit: ec24e38ed15cdc7ad727eaeb2ee8250dc743813f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec24e38ed15cdc7ad727eae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 17 17:37:04 2006 +0100 winspool/tests: Add tests for EnumMonitors. --- dlls/winspool/tests/info.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 62989ba..bc04934 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -105,6 +105,116 @@ static LPSTR find_default_printer(VOID) return default_printer; } +/* ########################### */ + +static void test_EnumMonitors(void) +{ + DWORD res; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + DWORD level; + + /* valid levels are 1 and 2 */ + for(level = 0; level < 4; level++) { + cbBuf = MAGIC_DEAD; + pcReturned = MAGIC_DEAD; + SetLastError(MAGIC_DEAD); + res = EnumMonitorsA(NULL, level, NULL, 0, &cbBuf, &pcReturned); + + RETURN_ON_DEACTIVATED_SPOOLER(res) + + /* not implemented yet in wine */ + if (!res && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) continue; + + + /* use only a short test, when we test with an invalid level */ + if(!level || (level > 2)) { + ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || + (res && (pcReturned == 0)), + "(%ld) returned %ld with %ld and 0x%08lx (expected '0' with " \ + "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", + level, res, GetLastError(), pcReturned); + continue; + } + + /* Level 2 is not supported on win9x */ + if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { + trace("Level %ld not supported, skipping tests\n", level); + continue; + } + + ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%ld) returned %ld with %ld (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); + + if (!cbBuf) { + trace("no valid buffer size returned, skipping tests\n"); + continue; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf *2); + if (buffer == NULL) continue; + + SetLastError(MAGIC_DEAD); + pcbNeeded = MAGIC_DEAD; + res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", + level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", + level, pcbNeeded, cbBuf); + /* We can validate the returned Data with the Registry here */ + + + SetLastError(MAGIC_DEAD); + pcReturned = MAGIC_DEAD; + pcbNeeded = MAGIC_DEAD; + res = EnumMonitorsA(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, + res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, + pcbNeeded, cbBuf); + + SetLastError(MAGIC_DEAD); + pcbNeeded = MAGIC_DEAD; + res = EnumMonitorsA(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%ld) returned %ld with %ld (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); + + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, + pcbNeeded, cbBuf); + +/* + Do not add the next test: + w2k+: RPC_X_NULL_REF_POINTER + NT3.5: ERROR_INVALID_USER_BUFFER + win9x: crash in winspool.drv + + res = EnumMonitorsA(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); +*/ + + SetLastError(MAGIC_DEAD); + pcbNeeded = MAGIC_DEAD; + pcReturned = MAGIC_DEAD; + res = EnumMonitorsA(NULL, level, buffer, cbBuf, NULL, &pcReturned); + ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + "(%ld) returned %ld with %ld (expected '!=0' or '0' with "\ + "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); + + pcbNeeded = MAGIC_DEAD; + pcReturned = MAGIC_DEAD; + SetLastError(MAGIC_DEAD); + res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + "(%ld) returned %ld with %ld (expected '!=0' or '0' with "\ + "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + } /* for(level ... */ +} + static void test_GetDefaultPrinter(void) { @@ -481,6 +591,7 @@ START_TEST(info) find_default_printer(); + test_EnumMonitors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_OpenPrinter();

1 0