February 2006 - Wine-commits

Michael Jung : winecfg: Support for setting symlinks for 'Desktop' and ' My Stuff' shell folders.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 51a3198748d6b8c6fae182c688e91c980f7ac7b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51a3198748d6b8c6fae182c… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Feb 14 13:09:30 2006 +0100 winecfg: Support for setting symlinks for 'Desktop' and 'My Stuff' shell folders. --- programs/winecfg/Bg.rc | 27 +++- programs/winecfg/De.rc | 29 +++- programs/winecfg/En.rc | 52 +++++-- programs/winecfg/Es.rc | 29 +++- programs/winecfg/Fi.rc | 29 +++- programs/winecfg/Fr.rc | 29 +++- programs/winecfg/Ja.rc | 29 +++- programs/winecfg/Ko.rc | 29 +++- programs/winecfg/Makefile.in | 1 programs/winecfg/Nl.rc | 29 +++- programs/winecfg/No.rc | 31 +++- programs/winecfg/Ru.rc | 29 +++- programs/winecfg/Tr.rc | 27 +++- programs/winecfg/driveui.c | 22 ++- programs/winecfg/main.c | 4 - programs/winecfg/resource.h | 12 +- programs/winecfg/theme.c | 301 ++++++++++++++++++++++++++++++++++++++++-- programs/winecfg/winecfg.h | 1 18 files changed, 558 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=51a3198748d6b8c6fae…

1 0

Eric Pouech : A couple of new valgrind instrumentations for better support.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: c67bc2260c8d58186d424f27e371b9865d7a35b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c67bc2260c8d58186d424f2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Feb 14 13:06:29 2006 +0100 A couple of new valgrind instrumentations for better support. --- dlls/kernel/process.c | 9 +++++++++ dlls/ntdll/signal_i386.c | 7 +++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 417e658..c81ba03 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -46,6 +46,10 @@ #include "wine/unicode.h" #include "wine/debug.h" +#ifdef HAVE_VALGRIND_MEMCHECK_H +#include <valgrind/memcheck.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(process); WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -932,6 +936,11 @@ static void *init_stack(void) NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; +#ifdef VALGRIND_STACK_REGISTER + /* no need to de-register the stack as it's the one of the main thread */ + VALGRIND_STACK_REGISTER(NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase); +#endif + /* setup guard page */ VirtualProtect( base, page_size, PAGE_NOACCESS, NULL ); return NtCurrentTeb()->Tib.StackBase; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 0cacd7a..46f9fa6 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -56,6 +56,10 @@ #include "wine/library.h" #include "ntdll_misc.h" +#ifdef HAVE_VALGRIND_MEMCHECK_H +#include <valgrind/memcheck.h> +#endif + /*********************************************************************** * signal context platform-specific definitions */ @@ -983,6 +987,9 @@ static EXCEPTION_RECORD *setup_exception } stack--; /* push the stack_layout structure */ +#ifdef HAVE_VALGRIND_MEMCHECK_H + VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); +#endif stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ stack->rec_ptr = &stack->rec; stack->context_ptr = &stack->context;

1 0

Jeremy White : twain: Reconcile sane's long names to TWAIN's 32 byte limit.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 63e8d34a42f717897635fa1d6bc39fb805bc1ff2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63e8d34a42f717897635fa1… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Feb 14 13:06:06 2006 +0100 twain: Reconcile sane's long names to TWAIN's 32 byte limit. --- dlls/twain/dsm_ctrl.c | 65 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/twain/dsm_ctrl.c b/dlls/twain/dsm_ctrl.c index f744939..6ebff41 100644 --- a/dlls/twain/dsm_ctrl.c +++ b/dlls/twain/dsm_ctrl.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <stdio.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -83,6 +84,40 @@ TW_UINT16 TWAIN_CloseDS (pTW_IDENTITY pO #endif } +/* Sane returns device names that are longer than the 32 bytes allowed + by TWAIN. However, it colon separates them, and the last bit is + the most interesting. So we use the last bit, and add a signature + to ensure uniqueness */ +#ifdef HAVE_SANE +static void copy_sane_short_name(const char *in, char *out, size_t outsize) +{ + const char *p; + int signature = 0; + + if (strlen(in) <= outsize - 1) + { + strcpy(out, in); + return; + } + + for (p = in; *p; p++) + signature += *p; + + p = strrchr(in, ':'); + if (!p) + p = in; + else + p++; + + if (strlen(p) > outsize - 7 - 1) + p += strlen(p) - (outsize - 7 - 1); + + strcpy(out, p); + sprintf(out + strlen(out), "(%04X)", signature % 0x10000); + +} +#endif + /* DG_CONTROL/DAT_IDENTITY/MSG_GETDEFAULT */ TW_UINT16 TWAIN_IdentityGetDefault (pTW_IDENTITY pOrigin, TW_MEMREF pData) { @@ -109,14 +144,16 @@ TW_UINT16 TWAIN_IdentityGetDefault (pTW_ if (device_list && device_list[0]) { pSourceIdentity->Id = DSM_sourceId ++; - strcpy (pSourceIdentity->ProductName, device_list[0]->name); - strcpy (pSourceIdentity->Manufacturer, device_list[0]->vendor); - strcpy (pSourceIdentity->ProductFamily, device_list[0]->model); + copy_sane_short_name(device_list[0]->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); + TRACE("got: %s (short [%s]), %s, %s\n", device_list[0]->name, pSourceIdentity->ProductName, device_list[0]->vendor, device_list[0]->model); + lstrcpynA (pSourceIdentity->Manufacturer, device_list[0]->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); + lstrcpynA (pSourceIdentity->ProductFamily, device_list[0]->model, sizeof(pSourceIdentity->ProductFamily) - 1); pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; twRC = TWRC_SUCCESS; DSM_twCC = TWCC_SUCCESS; + } else { @@ -146,11 +183,11 @@ TW_UINT16 TWAIN_IdentityGetFirst (pTW_ID { if (device_list[0]) { - TRACE("got: %s, %s, %s\n", device_list[0]->name, device_list[0]->vendor, device_list[0]->model); pSourceIdentity->Id = DSM_sourceId ++; - strcpy (pSourceIdentity->ProductName, device_list[0]->name); - strcpy (pSourceIdentity->Manufacturer, device_list[0]->vendor); - strcpy (pSourceIdentity->ProductFamily, device_list[0]->model); + copy_sane_short_name(device_list[0]->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); + TRACE("got: %s (short [%s]), %s, %s\n", device_list[0]->name, pSourceIdentity->ProductName, device_list[0]->vendor, device_list[0]->model); + lstrcpynA (pSourceIdentity->Manufacturer, device_list[0]->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); + lstrcpynA (pSourceIdentity->ProductFamily, device_list[0]->model, sizeof(pSourceIdentity->ProductFamily) - 1); pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; @@ -199,9 +236,10 @@ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDE device_list[DSM_currentDevice]->model) { pSourceIdentity->Id = DSM_sourceId ++; - strcpy (pSourceIdentity->ProductName, device_list[DSM_currentDevice]->name); - strcpy (pSourceIdentity->Manufacturer, device_list[DSM_currentDevice]->vendor); - strcpy (pSourceIdentity->ProductFamily, device_list[DSM_currentDevice]->model); + copy_sane_short_name(device_list[DSM_currentDevice]->name, pSourceIdentity->ProductName, sizeof(pSourceIdentity->ProductName) - 1); + TRACE("got: %s (short [%s]), %s, %s\n", device_list[DSM_currentDevice]->name, pSourceIdentity->ProductName, device_list[DSM_currentDevice]->vendor, device_list[DSM_currentDevice]->model); + lstrcpynA (pSourceIdentity->Manufacturer, device_list[DSM_currentDevice]->vendor, sizeof(pSourceIdentity->Manufacturer) - 1); + lstrcpynA (pSourceIdentity->ProductFamily, device_list[DSM_currentDevice]->model, sizeof(pSourceIdentity->ProductFamily) - 1); pSourceIdentity->ProtocolMajor = TWON_PROTOCOLMAJOR; pSourceIdentity->ProtocolMinor = TWON_PROTOCOLMINOR; DSM_currentDevice ++; @@ -228,6 +266,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOr #else TW_UINT16 twRC = TWRC_SUCCESS, i = 0; pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; + TW_STR32 shortname; activeDS *newSource; SANE_Status status; @@ -251,9 +290,11 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOr /* Make sure the source to be opened exists in the device list */ for (i = 0; device_list[i]; i ++) { - if (strcmp (device_list[i]->name, pIdentity->ProductName) == 0) + copy_sane_short_name(device_list[i]->name, shortname, sizeof(shortname) - 1); + if (strcmp (shortname, pIdentity->ProductName) == 0) break; } + } if (device_list[i]) @@ -266,7 +307,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOr if (status == SANE_STATUS_GOOD) { /* Assign name and id for the opened data source */ - strcpy (pIdentity->ProductName, device_list[i]->name); + lstrcpynA (pIdentity->ProductName, shortname, sizeof(pIdentity->ProductName) - 1); pIdentity->Id = DSM_sourceId ++; /* add the data source to an internal active source list */ newSource->next = activeSources;

1 0

Jeremy White : twain: Make structures respect 2 byte packing requirements.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 5b04c3ea5aaf514a66bf5d06a606b3ec2b9ac1e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b04c3ea5aaf514a66bf5d0… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Feb 14 12:24:45 2006 +0100 twain: Make structures respect 2 byte packing requirements. --- dlls/twain/twain.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/twain/twain.h b/dlls/twain/twain.h index de29252..b8d2878 100644 --- a/dlls/twain/twain.h +++ b/dlls/twain/twain.h @@ -57,6 +57,9 @@ #include "windef.h" #include "winbase.h" +/* The Twain structures must be packed on 2 byte alignment */ +#include "pshpack2.h" + #undef FAR #define FAR #define huge @@ -1861,4 +1864,7 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDE } #endif /* cplusplus */ +/* The Twain structures must be packed on 2 byte alignment */ +#include "poppack.h" + #endif /* TWAIN */

1 0

Eric Pouech : server: When possible, use tgkill instead of tkill syscall on Linux.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 22357ca388fe6c5f34aedefd9b69bc6992b4b571 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22357ca388fe6c5f34aedef… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Feb 14 12:24:32 2006 +0100 server: When possible, use tgkill instead of tkill syscall on Linux. --- server/context_alpha.c | 2 +- server/context_i386.c | 12 ++++++++++-- server/context_powerpc.c | 2 +- server/context_sparc.c | 2 +- server/context_x86_64.c | 2 +- server/ptrace.c | 2 +- server/thread.h | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/server/context_alpha.c b/server/context_alpha.c index 1f82d8e..41771bf 100644 --- a/server/context_alpha.c +++ b/server/context_alpha.c @@ -341,7 +341,7 @@ int get_thread_single_step( struct threa } /* send a signal to a specific thread */ -int tkill( int pid, int sig ) +int tkill( int tgid, int pid, int sig ) { /* FIXME: should do something here */ errno = ENOSYS; diff --git a/server/context_i386.c b/server/context_i386.c index 52b33aa..cf334cb 100644 --- a/server/context_i386.c +++ b/server/context_i386.c @@ -560,16 +560,24 @@ int get_thread_single_step( struct threa } /* send a signal to a specific thread */ -int tkill( int pid, int sig ) +int tkill( int tgid, int pid, int sig ) { #ifdef __linux__ int ret; + __asm__( "pushl %%ebx\n\t" "movl %2,%%ebx\n\t" "int $0x80\n\t" "popl %%ebx\n\t" : "=a" (ret) - : "0" (238) /*SYS_tkill*/, "r" (pid), "c" (sig) ); + : "0" (270) /*SYS_tgkill*/, "r" (tgid), "c" (pid), "d" (sig) ); + if (ret == -ENOSYS) + __asm__( "pushl %%ebx\n\t" + "movl %2,%%ebx\n\t" + "int $0x80\n\t" + "popl %%ebx\n\t" + : "=a" (ret) + : "0" (238) /*SYS_tkill*/, "r" (pid), "c" (sig) ); if (ret >= 0) return ret; errno = -ret; return -1; diff --git a/server/context_powerpc.c b/server/context_powerpc.c index 72947e0..9a438b9 100644 --- a/server/context_powerpc.c +++ b/server/context_powerpc.c @@ -286,7 +286,7 @@ int get_thread_single_step( struct threa } /* send a signal to a specific thread */ -int tkill( int pid, int sig ) +int tkill( int tgid, int pid, int sig ) { /* FIXME: should do something here */ errno = ENOSYS; diff --git a/server/context_sparc.c b/server/context_sparc.c index b718ff3..39c3dd3 100644 --- a/server/context_sparc.c +++ b/server/context_sparc.c @@ -179,7 +179,7 @@ int get_thread_single_step( struct threa } /* send a signal to a specific thread */ -int tkill( int pid, int sig ) +int tkill( int tgid, int pid, int sig ) { /* FIXME: should do something here */ errno = ENOSYS; diff --git a/server/context_x86_64.c b/server/context_x86_64.c index c102510..ee8bb31 100644 --- a/server/context_x86_64.c +++ b/server/context_x86_64.c @@ -271,7 +271,7 @@ int get_thread_single_step( struct threa } /* send a signal to a specific thread */ -int tkill( int pid, int sig ) +int tkill( int tgid, int pid, int sig ) { #ifdef __linux__ int ret; diff --git a/server/ptrace.c b/server/ptrace.c index e4cf889..d7134f2 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -187,7 +187,7 @@ int send_thread_signal( struct thread *t { if (thread->unix_tid != -1) { - ret = tkill( thread->unix_tid, sig ); + ret = tkill( thread->unix_pid, thread->unix_tid, sig ); if (ret == -1 && errno == ENOSYS) ret = kill( thread->unix_pid, sig ); } else ret = kill( thread->unix_pid, sig ); diff --git a/server/thread.h b/server/thread.h index 01e1218..3bcc576 100644 --- a/server/thread.h +++ b/server/thread.h @@ -132,7 +132,7 @@ extern void *get_thread_ip( struct threa extern int get_thread_single_step( struct thread *thread ); extern void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ); extern void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags ); -extern int tkill( int pid, int sig ); +extern int tkill( int tgid, int pid, int sig ); extern int send_thread_signal( struct thread *thread, int sig ); extern unsigned int global_error; /* global error code for when no thread is current */

1 0

James Hawkins : setupapi: Handle the INFINFO_REVERSE_DEFAULT_SEARCH search flag.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 94515450fac20ad00246b4d1ceeeaa8a7ae35ffa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94515450fac20ad00246b4d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 14 12:23:58 2006 +0100 setupapi: Handle the INFINFO_REVERSE_DEFAULT_SEARCH search flag. --- dlls/setupapi/query.c | 32 ++++++++++++++++++++++++++++++++ dlls/setupapi/tests/query.c | 7 ++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 1f4478e..957cba6 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -60,6 +60,36 @@ static BOOL fill_inf_info(HINF inf, PSP_ return TRUE; } +static HINF search_for_inf(LPCVOID InfSpec, DWORD SearchControl) +{ + HINF hInf = INVALID_HANDLE_VALUE; + WCHAR inf_path[MAX_PATH]; + + static const WCHAR infW[] = {'\\','i','n','f','\\',0}; + static const WCHAR system32W[] = {'\\','s','y','s','t','e','m','3','2','\\',0}; + + if (SearchControl == INFINFO_REVERSE_DEFAULT_SEARCH) + { + GetWindowsDirectoryW(inf_path, MAX_PATH); + lstrcatW(inf_path, system32W); + lstrcatW(inf_path, InfSpec); + + hInf = SetupOpenInfFileW(inf_path, NULL, + INF_STYLE_OLDNT | INF_STYLE_WIN4, NULL); + if (hInf != INVALID_HANDLE_VALUE) + return hInf; + + GetWindowsDirectoryW(inf_path, MAX_PATH); + lstrcpyW(inf_path, infW); + lstrcatW(inf_path, InfSpec); + + return SetupOpenInfFileW(inf_path, NULL, + INF_STYLE_OLDNT | INF_STYLE_WIN4, NULL); + } + + return INVALID_HANDLE_VALUE; +} + /*********************************************************************** * SetupGetInfInformationA (SETUPAPI.@) * @@ -131,6 +161,8 @@ BOOL WINAPI SetupGetInfInformationW(LPCV INF_STYLE_OLDNT | INF_STYLE_WIN4, NULL); break; case INFINFO_REVERSE_DEFAULT_SEARCH: + inf = search_for_inf(InfSpec, SearchControl); + break; case INFINFO_INF_PATH_LIST_SEARCH: FIXME("Unhandled search control: %ld\n", SearchControl); diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index c5581f8..1113aa1 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -231,11 +231,8 @@ static void test_SetupGetInfInformation( /* test the INFINFO_REVERSE_DEFAULT_SEARCH search flag */ ret = pSetupGetInfInformationA("test.inf", INFINFO_REVERSE_DEFAULT_SEARCH, info, size, &size); - todo_wine - { - ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); - ok(check_info_filename(info, inf_two), "Expected returned filename to be equal\n"); - } + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + ok(check_info_filename(info, inf_two), "Expected returned filename to be equal\n"); DeleteFileA(inf_filename); DeleteFileA(inf_one);

1 0

James Hawkins : setupapi: Handle the INFINFO_INF_NAME_IS_ABSOLUTE and
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 202942de611b068c5d6ac884de4164e48e79f37a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=202942de611b068c5d6ac88… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Feb 14 12:23:29 2006 +0100 setupapi: Handle the INFINFO_INF_NAME_IS_ABSOLUTE and INFINFO_DEFAULT_SEARCH search flags. --- dlls/setupapi/query.c | 48 ++++++++++++++++++++++++++++++------------- dlls/setupapi/tests/query.c | 42 +++++++++++--------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 79d068c..1f4478e 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -98,12 +98,13 @@ BOOL WINAPI SetupGetInfInformationW(LPCV PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize) { - HINF inf = (HINF)InfSpec; + HINF inf; + BOOL ret; TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize); - if (!inf) + if (!InfSpec) { if (SearchControl == INFINFO_INF_SPEC_IS_HINF) SetLastError(ERROR_INVALID_HANDLE); @@ -113,30 +114,47 @@ BOOL WINAPI SetupGetInfInformationW(LPCV return FALSE; } - if (inf == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - if (SearchControl < INFINFO_INF_SPEC_IS_HINF || - SearchControl > INFINFO_INF_PATH_LIST_SEARCH) + if (!ReturnBuffer && ReturnBufferSize) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (SearchControl != INFINFO_INF_SPEC_IS_HINF) + switch (SearchControl) { - FIXME("Unhandled search control: %ld\n", SearchControl); + case INFINFO_INF_SPEC_IS_HINF: + inf = (HINF)InfSpec; + break; + case INFINFO_INF_NAME_IS_ABSOLUTE: + case INFINFO_DEFAULT_SEARCH: + inf = SetupOpenInfFileW(InfSpec, NULL, + INF_STYLE_OLDNT | INF_STYLE_WIN4, NULL); + break; + case INFINFO_REVERSE_DEFAULT_SEARCH: + case INFINFO_INF_PATH_LIST_SEARCH: + FIXME("Unhandled search control: %ld\n", SearchControl); - if (RequiredSize) - *RequiredSize = 0; + if (RequiredSize) + *RequiredSize = 0; + + return FALSE; + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (inf == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - return fill_inf_info(inf, ReturnBuffer, ReturnBufferSize, RequiredSize); + ret = fill_inf_info(inf, ReturnBuffer, ReturnBufferSize, RequiredSize); + + if (SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE) + SetupCloseInfFile(inf); + + return ret; } /*********************************************************************** diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index e46177e..c5581f8 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -167,31 +167,22 @@ static void test_SetupGetInfInformation( SetLastError(0xbeefcafe); ret = pSetupGetInfInformationA("idontexist", INFINFO_INF_NAME_IS_ABSOLUTE, NULL, 0, &size); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - todo_wine - { - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); - ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); - } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); + ok(size == 0xdeadbeef, "Expected size to remain unchanged\n"); /* successfully open the inf file */ size = 0xdeadbeef; ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, 0, &size); - todo_wine - { - ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); - } + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(size != 0xdeadbeef, "Expected a valid size on return\n"); /* set ReturnBuffer to NULL and ReturnBufferSize to non-zero */ SetLastError(0xbeefcafe); ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size, &size); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - todo_wine - { - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - } + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); info = HeapAlloc(GetProcessHeap(), 0, size); @@ -199,19 +190,13 @@ static void test_SetupGetInfInformation( SetLastError(0xbeefcafe); ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, info, size - 1, &size); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - todo_wine - { - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); - } + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); /* successfully get the inf information */ ret = pSetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, info, size, &size); - todo_wine - { - ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); - ok(check_info_filename(info, inf_filename), "Expected returned filename to be equal\n"); - } + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + ok(check_info_filename(info, inf_filename), "Expected returned filename to be equal\n"); HeapFree(GetProcessHeap(), 0, info); @@ -238,11 +223,8 @@ static void test_SetupGetInfInformation( /* test the INFINFO_DEFAULT_SEARCH search flag */ ret = pSetupGetInfInformationA("test.inf", INFINFO_DEFAULT_SEARCH, info, size, &size); - todo_wine - { - ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); - ok(check_info_filename(info, inf_one), "Expected returned filename to be equal\n"); - } + ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); + ok(check_info_filename(info, inf_one), "Expected returned filename to be equal\n"); HeapFree(GetProcessHeap(), 0, info); info = alloc_inf_info("test.inf", INFINFO_REVERSE_DEFAULT_SEARCH, &size);

1 0

Dmitry Timoshkov : winmm: Protect drivers list by a critical section.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: f29d4af34b4ef88838d545788de0d5f107ff6375 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f29d4af34b4ef88838d5457… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 14 12:22:57 2006 +0100 winmm: Protect drivers list by a critical section. --- dlls/winmm/driver.c | 152 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 112 insertions(+), 40 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index f1a5ea0..9e3696f 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -40,6 +40,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); +static CRITICAL_SECTION mmdriver_lock; +static CRITICAL_SECTION_DEBUG mmdriver_lock_debug = +{ + 0, 0, &mmdriver_lock, + { &mmdriver_lock_debug.ProcessLocksList, &mmdriver_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": mmdriver_lock") } +}; +static CRITICAL_SECTION mmdriver_lock = { &mmdriver_lock_debug, -1, 0, 0, 0, 0 }; + static LPWINE_DRIVER lpDrvItemList /* = NULL */; static const WCHAR HKLM_BASE[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; @@ -49,6 +58,24 @@ LPWINE_DRIVER (*pFnOpenDriver16)(LPCWS LRESULT (*pFnCloseDriver16)(UINT16,LPARAM,LPARAM) /* = NULL */; LRESULT (*pFnSendMessage16)(UINT16,UINT,LPARAM,LPARAM) /* = NULL */; +static void DRIVER_Dump(const char *comment) +{ +#if 0 + LPWINE_DRIVER lpDrv; + + TRACE("%s\n", comment); + + EnterCriticalSection( &mmdriver_lock ); + + for (lpDrv = lpDrvItemList; lpDrv != NULL; lpDrv = lpDrv->lpNextItem) + { + TRACE("%p, magic %04lx, id %p, next %p\n", lpDrv, lpDrv->dwMagic, (void *)lpDrv->d.d32.dwDriverID, lpDrv->lpNextItem); + } + + LeaveCriticalSection( &mmdriver_lock ); +#endif +} + /************************************************************************** * DRIVER_GetNumberOfModuleRefs [internal] * @@ -59,6 +86,8 @@ static unsigned DRIVER_GetNumberOfModule LPWINE_DRIVER lpDrv; unsigned count = 0; + EnterCriticalSection( &mmdriver_lock ); + if (found) *found = NULL; for (lpDrv = lpDrvItemList; lpDrv; lpDrv = lpDrv->lpNextItem) { @@ -68,6 +97,8 @@ static unsigned DRIVER_GetNumberOfModule count++; } } + + LeaveCriticalSection( &mmdriver_lock ); return count; } @@ -91,6 +122,9 @@ LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR } __ENDTRY; + if (d) TRACE("%p -> %p, %p\n", hDrvr, d->d.d32.lpDrvProc, (void *)d->d.d32.dwDriverID); + else TRACE("%p -> NULL\n", hDrvr); + return d; } @@ -155,6 +189,8 @@ static BOOL DRIVER_RemoveFromList(LPWINE } } + EnterCriticalSection( &mmdriver_lock ); + if (lpDrv->lpPrevItem) lpDrv->lpPrevItem->lpNextItem = lpDrv->lpNextItem; else @@ -163,6 +199,11 @@ static BOOL DRIVER_RemoveFromList(LPWINE lpDrv->lpNextItem->lpPrevItem = lpDrv->lpPrevItem; /* trash magic number */ lpDrv->dwMagic ^= 0xa5a5a5a5; + lpDrv->d.d32.lpDrvProc = NULL; + lpDrv->d.d32.dwDriverID = 0; + lpDrv->d.d16.hDriver16 = 0; + + LeaveCriticalSection( &mmdriver_lock ); return TRUE; } @@ -187,8 +228,19 @@ static BOOL DRIVER_AddToList(LPWINE_DRIV /* returned value is not checked */ DRIVER_SendMessage(lpNewDrv, DRV_ENABLE, 0L, 0L); } + + /* Now just open a new instance of a driver on this module */ + lpNewDrv->d.d32.dwDriverID = DRIVER_SendMessage(lpNewDrv, DRV_OPEN, lParam1, lParam2); + + if (lpNewDrv->d.d32.dwDriverID == 0) + { + TRACE("DRV_OPEN failed on driver %p\n", lpNewDrv); + return FALSE; + } } + EnterCriticalSection( &mmdriver_lock ); + lpNewDrv->lpNextItem = NULL; if (lpDrvItemList == NULL) { lpDrvItemList = lpNewDrv; @@ -202,16 +254,7 @@ static BOOL DRIVER_AddToList(LPWINE_DRIV lpNewDrv->lpPrevItem = lpDrv; } - if (!(lpNewDrv->dwFlags & WINE_GDF_16BIT)) { - /* Now just open a new instance of a driver on this module */ - lpNewDrv->d.d32.dwDriverID = DRIVER_SendMessage(lpNewDrv, DRV_OPEN, lParam1, lParam2); - - if (lpNewDrv->d.d32.dwDriverID == 0) { - TRACE("DRV_OPEN failed on driver %p\n", lpNewDrv); - DRIVER_RemoveFromList(lpNewDrv); - return FALSE; - } - } + LeaveCriticalSection( &mmdriver_lock ); return TRUE; } @@ -226,6 +269,8 @@ BOOL DRIVER_GetLibName(LPCWSTR keyName, static const WCHAR wszSystemIni[] = {'S','Y','S','T','E','M','.','I','N','I',0}; WCHAR wsznull = '\0'; + TRACE("registry: %s, %s, %p, %d\n", debugstr_w(keyName), debugstr_w(sectName), buf, sz); + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, HKLM_BASE, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { lRet = RegOpenKeyExW(hKey, sectName, 0, KEY_QUERY_VALUE, &hSecKey); @@ -237,8 +282,10 @@ BOOL DRIVER_GetLibName(LPCWSTR keyName, RegCloseKey( hKey ); } if (lRet == ERROR_SUCCESS) return TRUE; + /* default to system.ini if we can't find it in the registry, * to support native installations where system.ini is still used */ + TRACE("system.ini: %s, %s, %p, %d\n", debugstr_w(keyName), debugstr_w(sectName), buf, sz); return GetPrivateProfileStringW(sectName, keyName, &wsznull, buf, sz / sizeof(WCHAR), wszSystemIni); } @@ -355,12 +402,14 @@ done: HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam) { LPWINE_DRIVER lpDrv = NULL; - WCHAR libName[128]; + WCHAR libName[MAX_PATH + 1]; LPCWSTR lsn = lpSectionName; TRACE("(%s, %s, 0x%08lx);\n", debugstr_w(lpDriverName), debugstr_w(lpSectionName), lParam); + DRIVER_Dump("BEFORE:"); + if (lsn == NULL) { static const WCHAR wszDrivers32[] = {'D','r','i','v','e','r','s','3','2',0}; lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR)); @@ -386,10 +435,12 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriver } TRACE("Failed to open driver %s from system.ini file, section %s\n", debugstr_w(lpDriverName), debugstr_w(lpSectionName)); - return 0; - the_end: - if (lpDrv) TRACE("=> %p\n", lpDrv); +the_end: + TRACE("=> %p\n", lpDrv); + + DRIVER_Dump("AFTER:"); + return (HDRVR)lpDrv; } @@ -399,10 +450,13 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriver */ LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2) { + BOOL ret; LPWINE_DRIVER lpDrv; TRACE("(%p, %08lX, %08lX);\n", hDrvr, lParam1, lParam2); + DRIVER_Dump("BEFORE:"); + if ((lpDrv = DRIVER_FindFromHDrvr(hDrvr)) != NULL) { if (lpDrv->dwFlags & WINE_GDF_16BIT) @@ -411,35 +465,39 @@ LRESULT WINAPI CloseDriver(HDRVR hDrvr, pFnCloseDriver16(lpDrv->d.d16.hDriver16, lParam1, lParam2); } else - { DRIVER_SendMessage(lpDrv, DRV_CLOSE, lParam1, lParam2); - lpDrv->d.d32.dwDriverID = 0; - } - if (DRIVER_RemoveFromList(lpDrv)) { - if (!(lpDrv->dwFlags & WINE_GDF_16BIT)) - { - LPWINE_DRIVER lpDrv0; - if (lpDrv->dwFlags & WINE_GDF_SESSION) - FIXME("Shouldn't happen (%p)\n", lpDrv); - /* if driver has an opened session instance, we have to close it too */ - if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1 && - (lpDrv0->dwFlags & WINE_GDF_SESSION)) - { - DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0L, 0L); - lpDrv0->d.d32.dwDriverID = 0; - DRIVER_RemoveFromList(lpDrv0); - FreeLibrary(lpDrv0->d.d32.hModule); - HeapFree(GetProcessHeap(), 0, lpDrv0); - } - FreeLibrary(lpDrv->d.d32.hModule); + DRIVER_RemoveFromList(lpDrv); + + if (!(lpDrv->dwFlags & WINE_GDF_16BIT)) + { + LPWINE_DRIVER lpDrv0; + + if (lpDrv->dwFlags & WINE_GDF_SESSION) + FIXME("WINE_GDF_SESSION: Shouldn't happen (%p)\n", lpDrv); + /* if driver has an opened session instance, we have to close it too */ + if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1 && + (lpDrv0->dwFlags & WINE_GDF_SESSION)) + { + DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0, 0); + DRIVER_RemoveFromList(lpDrv0); + FreeLibrary(lpDrv0->d.d32.hModule); + HeapFree(GetProcessHeap(), 0, lpDrv0); } - HeapFree(GetProcessHeap(), 0, lpDrv); - return TRUE; + FreeLibrary(lpDrv->d.d32.hModule); } + HeapFree(GetProcessHeap(), 0, lpDrv); + ret = TRUE; } - WARN("Failed to close driver\n"); - return FALSE; + else + { + WARN("Failed to close driver\n"); + ret = FALSE; + } + + DRIVER_Dump("AFTER:"); + + return ret; } /************************************************************************** @@ -580,11 +638,25 @@ void DRIVER_UnloadAll(void) LPWINE_DRIVER lpNextDrv = NULL; unsigned count = 0; +restart: + EnterCriticalSection( &mmdriver_lock ); + for (lpDrv = lpDrvItemList; lpDrv != NULL; lpDrv = lpNextDrv) { lpNextDrv = lpDrv->lpNextItem; - CloseDriver((HDRVR)lpDrv, 0, 0); - count++; + + /* session instances will be unloaded automatically */ + if (!(lpDrv->dwFlags & WINE_GDF_SESSION)) + { + LeaveCriticalSection( &mmdriver_lock ); + CloseDriver((HDRVR)lpDrv, 0, 0); + count++; + /* restart from the beginning of the list */ + goto restart; + } } + + LeaveCriticalSection( &mmdriver_lock ); + TRACE("Unloaded %u drivers\n", count); }

1 0

Eric Pouech : tests: Fixed test framework against environment modifications .
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: ca777c090f3e0b69c354482a19ccbc38caa585ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca777c090f3e0b69c354482… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Feb 14 11:38:26 2006 +0100 tests: Fixed test framework against environment modifications. --- include/wine/test.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 279d5bd..01a9035 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -383,7 +383,7 @@ int main( int argc, char **argv ) winetest_argc = argc; winetest_argv = argv; - if ((p = getenv( "WINETEST_PLATFORM" ))) winetest_platform = p; + if ((p = getenv( "WINETEST_PLATFORM" ))) winetest_platform = strdup(p); if ((p = getenv( "WINETEST_DEBUG" ))) winetest_debug = atoi(p); if ((p = getenv( "WINETEST_INTERACTIVE" ))) winetest_interactive = atoi(p); if ((p = getenv( "WINETEST_REPORT_SUCCESS"))) report_success = atoi(p);

1 0

Troy Rollo : user: Fix argument type of IsDlgButtonChecked.
by Alexandre Julliard 14 Feb '06

14 Feb '06

Module: wine Branch: refs/heads/master Commit: 8818880b43e36497d06beda4e25a1a1038eaa540 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8818880b43e36497d06beda… Author: Troy Rollo <wine(a)troy.rollo.name> Date: Tue Feb 14 11:38:15 2006 +0100 user: Fix argument type of IsDlgButtonChecked. --- dlls/user/dialog.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index c7b4abb..fa73cf6 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -1344,7 +1344,7 @@ BOOL WINAPI CheckDlgButton( HWND hwnd, I /*********************************************************************** * IsDlgButtonChecked (USER32.@) */ -UINT WINAPI IsDlgButtonChecked( HWND hwnd, UINT id ) +UINT WINAPI IsDlgButtonChecked( HWND hwnd, int id ) { return (UINT)SendDlgItemMessageW( hwnd, id, BM_GETCHECK, 0, 0 ); } diff --git a/include/winuser.h b/include/winuser.h index de09afe..56cc5e3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4482,7 +4482,7 @@ BOOL WINAPI IsClipboardFormatAvaila BOOL WINAPI IsDialogMessageA(HWND,LPMSG); BOOL WINAPI IsDialogMessageW(HWND,LPMSG); #define IsDialogMessage WINELIB_NAME_AW(IsDialogMessage) -UINT WINAPI IsDlgButtonChecked(HWND,UINT); +UINT WINAPI IsDlgButtonChecked(HWND,int); BOOL WINAPI IsHungAppWindow(HWND); BOOL WINAPI IsIconic(HWND); BOOL WINAPI IsMenu(HMENU);

1 0