wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Eric Pouech : dbghelp: Store delta used for re-locating a module.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 34ef8d21131ff2396e3ae432c403d546385a820f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ef8d21131ff2396e3ae432c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 1 21:24:14 2010 +0200 dbghelp: Store delta used for re-locating a module. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 1 + dlls/dbghelp/module.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a341b03..de764ae 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -353,6 +353,7 @@ struct module struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; + DWORD64 reloc_delta; /* specific information for debug types */ struct module_format* format_info[DFI_LAST]; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e0fab9c..132e40c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1080,6 +1080,7 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, HeapFree(GetProcessHeap(), 0, modfmt); goto leave; } + elf_info->module->reloc_delta = elf_info->module->module.BaseOfImage - fmap.u.elf.elf_start; elf_module_info = (void*)(modfmt + 1); elf_info->module->format_info[DFI_ELF] = modfmt; modfmt->module = elf_info->module; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8f12fef..e99bd7f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -167,6 +167,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; + module->reloc_delta = 0; module->type = type; module->is_virtual = virtual ? TRUE : FALSE; for (i = 0; i < DFI_LAST; i++) module->format_info[i] = NULL;

1 0

Eric Pouech : dbghelp: Implement the new register methods for x86.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 51bce9b049aa6f7fe96212bb5788a0cf28e985e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bce9b049aa6f7fe96212bb5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 1 21:24:07 2010 +0200 dbghelp: Implement the new register methods for x86. --- dlls/dbghelp/cpu_i386.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 094b241..7a951f7 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -452,12 +452,73 @@ reg: fop 31 static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) { - FIXME("NIY\n"); +#ifdef __i386__ + switch (regno) + { + case CV_REG_EAX: *size = sizeof(ctx->Eax); return &ctx->Eax; + case CV_REG_EDX: *size = sizeof(ctx->Edx); return &ctx->Edx; + case CV_REG_ECX: *size = sizeof(ctx->Ecx); return &ctx->Ecx; + case CV_REG_EBX: *size = sizeof(ctx->Ebx); return &ctx->Ebx; + case CV_REG_ESI: *size = sizeof(ctx->Esi); return &ctx->Esi; + case CV_REG_EDI: *size = sizeof(ctx->Edi); return &ctx->Edi; + case CV_REG_EBP: *size = sizeof(ctx->Ebp); return &ctx->Ebp; + case CV_REG_ESP: *size = sizeof(ctx->Esp); return &ctx->Esp; + case CV_REG_EIP: *size = sizeof(ctx->Eip); return &ctx->Eip; + + case CV_REG_ST0 + 0: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[0*sizeof(long double)]; + case CV_REG_ST0 + 1: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[1*sizeof(long double)]; + case CV_REG_ST0 + 2: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[2*sizeof(long double)]; + case CV_REG_ST0 + 3: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[3*sizeof(long double)]; + case CV_REG_ST0 + 4: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[4*sizeof(long double)]; + case CV_REG_ST0 + 5: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[5*sizeof(long double)]; + case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; + case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + + case CV_REG_EFLAGS: *size = sizeof(ctx->EFlags); return &ctx->EFlags; + case CV_REG_ES: *size = sizeof(ctx->SegEs); return &ctx->SegEs; + case CV_REG_CS: *size = sizeof(ctx->SegCs); return &ctx->SegCs; + case CV_REG_SS: *size = sizeof(ctx->SegSs); return &ctx->SegSs; + case CV_REG_DS: *size = sizeof(ctx->SegDs); return &ctx->SegDs; + case CV_REG_FS: *size = sizeof(ctx->SegFs); return &ctx->SegFs; + case CV_REG_GS: *size = sizeof(ctx->SegGs); return &ctx->SegGs; + + } +#endif + FIXME("Unknown register %x\n", regno); return NULL; } static const char* i386_fetch_regname(unsigned regno) { + switch (regno) + { + case CV_REG_EAX: return "eax"; + case CV_REG_EDX: return "edx"; + case CV_REG_ECX: return "ecx"; + case CV_REG_EBX: return "ebx"; + case CV_REG_ESI: return "esi"; + case CV_REG_EDI: return "edi"; + case CV_REG_EBP: return "ebp"; + case CV_REG_ESP: return "esp"; + case CV_REG_EIP: return "eip"; + + case CV_REG_ST0 + 0: return "st0"; + case CV_REG_ST0 + 1: return "st1"; + case CV_REG_ST0 + 2: return "st2"; + case CV_REG_ST0 + 3: return "st3"; + case CV_REG_ST0 + 4: return "st4"; + case CV_REG_ST0 + 5: return "st5"; + case CV_REG_ST0 + 6: return "st6"; + case CV_REG_ST0 + 7: return "st7"; + + case CV_REG_EFLAGS: return "eflags"; + case CV_REG_ES: return "es"; + case CV_REG_CS: return "cs"; + case CV_REG_SS: return "ss"; + case CV_REG_DS: return "ds"; + case CV_REG_FS: return "fs"; + case CV_REG_GS: return "gs"; + } FIXME("Unknown register %x\n", regno); return NULL; }

1 0

Alexandre Julliard : server: Update trace for new error codes.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 45e0e3df47d14b8274051f3a2c391d42cdcecaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e0e3df47d14b8274051f3a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 20:30:49 2010 +0200 server: Update trace for new error codes. --- server/trace.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/trace.c b/server/trace.c index 914d8f1..7958781 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4564,6 +4564,7 @@ static const struct { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, + { "ADDRESS_ALREADY_ASSOCIATED", STATUS_ADDRESS_ALREADY_ASSOCIATED }, { "ALERTED", STATUS_ALERTED }, { "ALIAS_EXISTS", STATUS_ALIAS_EXISTS }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, @@ -4574,7 +4575,12 @@ static const struct { "CANCELLED", STATUS_CANCELLED }, { "CANNOT_DELETE", STATUS_CANNOT_DELETE }, { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, + { "CANT_WAIT", STATUS_CANT_WAIT }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, + { "CONNECTION_ABORTED", STATUS_CONNECTION_ABORTED }, + { "CONNECTION_DISCONNECTED", STATUS_CONNECTION_DISCONNECTED }, + { "CONNECTION_REFUSED", STATUS_CONNECTION_REFUSED }, + { "CONNECTION_RESET", STATUS_CONNECTION_RESET }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, { "DEVICE_BUSY", STATUS_DEVICE_BUSY }, { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, @@ -4607,6 +4613,8 @@ static const struct { "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO }, { "MUTANT_NOT_OWNED", STATUS_MUTANT_NOT_OWNED }, { "NAME_TOO_LONG", STATUS_NAME_TOO_LONG }, + { "NETWORK_BUSY", STATUS_NETWORK_BUSY }, + { "NETWORK_UNREACHABLE", STATUS_NETWORK_UNREACHABLE }, { "NOTIFY_ENUM_DIR", STATUS_NOTIFY_ENUM_DIR }, { "NOT_ALL_ASSIGNED", STATUS_NOT_ALL_ASSIGNED }, { "NOT_A_DIRECTORY", STATUS_NOT_A_DIRECTORY },

1 0

Alexandre Julliard : server: Fix 64-bit alignment of the context structure.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 27f2a35742d481f1c90287e5c4968ba91c15f165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f2a35742d481f1c90287e5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 19:56:09 2010 +0200 server: Fix 64-bit alignment of the context structure. --- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1a20438..edb2d9d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -142,10 +142,10 @@ typedef struct { struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; - unsigned int cs, ss, flags; } x86_64_regs; + unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned __int64 fir; - unsigned int psr; } alpha_regs; - struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs; + unsigned int psr, __pad; } alpha_regs; + struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union @@ -5418,6 +5418,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 397 +#define SERVER_PROTOCOL_VERSION 398 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0aa8f6c..4aaff10 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -158,10 +158,10 @@ typedef struct { struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; - unsigned int cs, ss, flags; } x86_64_regs; + unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned __int64 fir; - unsigned int psr; } alpha_regs; - struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs; + unsigned int psr, __pad; } alpha_regs; + struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union

1 0

Huw Davies : oleaut32: Only unregister those types that were registered.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: fbaaedd967d041a1d395dc427b24b651a60df5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbaaedd967d041a1d395dc427… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 1 13:07:58 2010 +0100 oleaut32: Only unregister those types that were registered. --- dlls/oleaut32/typelib.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cbf68b5..468f001 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -835,19 +835,23 @@ HRESULT WINAPI UnRegisterTypeLib( goto enddeleteloop; } - /* the path to the type */ - get_interface_key( &typeAttr->guid, subKeyName ); + if ((kind == TKIND_INTERFACE && (typeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || + kind == TKIND_DISPATCH) + { + /* the path to the type */ + get_interface_key( &typeAttr->guid, subKeyName ); - /* Delete its bits */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) { - goto enddeleteloop; + /* Delete its bits */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) + goto enddeleteloop; + + RegDeleteKeyW(subKey, ProxyStubClsidW); + RegDeleteKeyW(subKey, ProxyStubClsid32W); + RegDeleteKeyW(subKey, TypeLibW); + RegCloseKey(subKey); + subKey = NULL; + RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); } - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); - RegCloseKey(subKey); - subKey = NULL; - RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); enddeleteloop: if (typeAttr) ITypeInfo_ReleaseTypeAttr(typeInfo, typeAttr);

1 0

Huw Davies : oleaut32: Only oleautomation interfaces as well as all dispinterfaces should be registered .
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: adeba6ee8058f4b21256c175ceff76c30af95257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adeba6ee8058f4b21256c175c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 1 13:02:17 2010 +0100 oleaut32: Only oleautomation interfaces as well as all dispinterfaces should be registered. --- .gitignore | 3 + dlls/oleaut32/tests/Makefile.in | 5 +- dlls/oleaut32/tests/test_reg.idl | 130 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.rc | 3 + dlls/oleaut32/tests/typelib.c | 115 ++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 5 +- 6 files changed, 256 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adeba6ee8058f4b21256c…

1 0

Alexandre Julliard : server: Set a proper error code when dup_fd_object fails.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 7d1d002d4c547570e0835a9c5714363b58203490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1d002d4c547570e0835a9c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 15:40:23 2010 +0200 server: Set a proper error code when dup_fd_object fails. --- server/fd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index e26ce04..ca317c4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1628,6 +1628,7 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha if (!closed) goto failed; if ((fd->unix_fd = dup( orig->unix_fd )) == -1) { + file_set_error(); free( closed ); goto failed; } @@ -1637,8 +1638,11 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha fd->inode = (struct inode *)grab_object( orig->inode ); list_add_head( &fd->inode->open, &fd->inode_entry ); } - else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) goto failed; - + else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) + { + file_set_error(); + goto failed; + } return fd; failed:

1 0

Piotr Caban : msvcrt: Added implementation of _controlfp_s.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: bfd0866be888d4f4e5e731615bad14aaa8a83616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd0866be888d4f4e5e731615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:41:06 2010 +0200 msvcrt: Added implementation of _controlfp_s. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 21 +++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b48656e..b8876a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -327,7 +327,7 @@ @ stub _configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp -@ stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign( double double ) msvcrt._copysign @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fd6c8df..dfb951c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -319,7 +319,7 @@ @ stub _configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp -@ stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign( double double ) msvcrt._copysign @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 317c8eb..fb2cd86 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -702,6 +702,27 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) } /********************************************************************* + * _controlfp_s (MSVCRT.@) + */ +int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) +{ + unsigned int flags; +#ifdef __i386__ + FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); + + flags = _control87( newval, mask & ~MSVCRT__EM_DENORMAL ); + + if(cur) + *cur = flags; + + return 0; +#else + FIXME(":Not Implemented!\n"); + return 0; +#endif +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL _copysign(double num, double sign) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 762563e..7205bd6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -299,7 +299,7 @@ @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -# stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) # stub _cprintf_l

1 0

Piotr Caban : msvcrt: Fix _get/ _set_invalid_parameter_handler implementation.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: abb746002b8b0f60fe7e5b865aedd97a770a0086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb746002b8b0f60fe7e5b865… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:40:22 2010 +0200 msvcrt: Fix _get/_set_invalid_parameter_handler implementation. --- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.c | 25 ------------------------- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/errno.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++++- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 541cf68..b48656e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -470,7 +470,7 @@ @ stub _get_errno @ stub _get_fmode @ stub _get_heap_handle -@ cdecl _get_invalid_parameter_handler() msvcr90._get_invalid_parameter_handler +@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ stub _get_osplatform @ stub _get_osver @@ -533,7 +533,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ extern _invalid_parameter msvcrt._invalid_parameter +@ stub _invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -873,7 +873,7 @@ @ stub _set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode -@ cdecl _set_invalid_parameter_handler(ptr) msvcr90._set_invalid_parameter_handler +@ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index a1994d8..c3515ee 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); typedef int (CDECL *_INITTERM_E_FN)(void); -typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); /********************************************************************* * DllMain (MSVCR90.@) @@ -78,30 +77,6 @@ void * CDECL _encoded_null(void) } /********************************************************************* - * _get_invalid_parameter_handler (MSVCR90.@) - */ -_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) -{ - TRACE("\n"); - return *((_invalid_parameter_handler*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_invalid_parameter")); -} - -/********************************************************************* - * _set_invalid_parameter_handler (MSVCR90.@) - */ -_invalid_parameter_handler CDECL _set_invalid_parameter_handler(_invalid_parameter_handler handler) -{ - _invalid_parameter_handler *ptr = (_invalid_parameter_handler*)GetProcAddress( - GetModuleHandleA("msvcrt.dll"), "_invalid_parameter"); - _invalid_parameter_handler old = *ptr; - - TRACE("(%p)\n", handler); - - *ptr = handler; - return old; -} - -/********************************************************************* * _initterm_e (MSVCR90.@) * * call an array of application initialization functions and report the return value diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 296466a..fd6c8df 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -462,7 +462,7 @@ @ stub _get_errno @ stub _get_fmode @ stub _get_heap_handle -@ cdecl _get_invalid_parameter_handler() +@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ stub _get_output_format @ stub _get_pgmptr @@ -521,7 +521,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ extern _invalid_parameter msvcrt._invalid_parameter +@ stub _invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -859,7 +859,7 @@ @ stub _set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode -@ cdecl _set_invalid_parameter_handler(ptr) +@ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index c4c8618..80dcab6 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -286,3 +286,22 @@ void CDECL _seterrormode(int mode) { SetErrorMode( mode ); } + +/* _get_invalid_parameter_handler - not exported in native msvcrt, added in msvcr80 */ +MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) +{ + TRACE("\n"); + return MSVCRT_invalid_parameter; +} + +/* _set_invalid_parameter_handler - not exproted in native msvcrt, added in msvcr80 */ +MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( + MSVCRT_invalid_parameter_handler handler) +{ + MSVCRT_invalid_parameter_handler old = MSVCRT_invalid_parameter; + + TRACE("(%p)\n", handler); + + MSVCRT_invalid_parameter = handler; + return old; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b6be16..762563e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -479,7 +479,7 @@ @ stub _inp #(long) -i386 @ stub _inpd #(long) -i386 @ stub _inpw #(long) -i386 -@ extern _invalid_parameter MSVCRT_invalid_parameter +@ stub _invalid_parameter @ extern _iob MSVCRT__iob # stub _isalnum_l # stub _isalpha_l @@ -1409,3 +1409,7 @@ # stub wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf # stub wscanf_s + +# Functions not exported in native dll: +@ cdecl _get_invalid_parameter_handler() +@ cdecl _set_invalid_parameter_handler(ptr)

1 0

Piotr Caban : msvcrt: Move invalid parameter tests to msvcr90.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: f377e4be6b97db27d58a6da96d4867cd39fa2188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f377e4be6b97db27d58a6da96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:39:50 2010 +0200 msvcrt: Move invalid parameter tests to msvcr90. --- dlls/msvcr90/tests/msvcr90.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 32 -------------------------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 5fe00b2..3ff7135 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -35,6 +35,8 @@ static int *p_sys_nerr; static int* (__cdecl *p__sys_nerr)(void); static char **p_sys_errlist; static char** (__cdecl *p__sys_errlist)(void); +static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); +static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); int cb_called[4]; @@ -193,6 +195,37 @@ static void test_error_messages(void) ok(*p_sys_errlist == *(p__sys_errlist()), "p_sys_errlist != p__sys_errlist()\n"); } +static void test__strtoi64(void) +{ + __int64 res; + unsigned __int64 ures; + + if(!p_strtoi64 || !p_strtoui64) { + win_skip("_strtoi64 or _strtoui64 not found\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + errno = 0xdeadbeef; + res = p_strtoi64(NULL, NULL, 10); + ok(res == 0, "res != 0\n"); + res = p_strtoi64("123", NULL, 1); + ok(res == 0, "res != 0\n"); + res = p_strtoi64("123", NULL, 37); + ok(res == 0, "res != 0\n"); + ures = p_strtoui64(NULL, NULL, 10); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64("123", NULL, 1); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64("123", NULL, 37); + ok(ures == 0, "res = %d\n", (int)ures); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); +} + /* ########## */ START_TEST(msvcr90) @@ -219,8 +252,11 @@ START_TEST(msvcr90) p__sys_nerr = (void *) GetProcAddress(hcrt, "__sys_nerr"); p_sys_errlist = (void *) GetProcAddress(hcrt, "_sys_errlist"); p__sys_errlist = (void *) GetProcAddress(hcrt, "__sys_errlist"); + p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); + p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); test__initterm_e(); test__encode_pointer(); test_error_messages(); + test__strtoi64(); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a4926d9..c873d18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,7 +56,6 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); -static _invalid_parameter_handler *p_invalid_parameter; static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -65,17 +64,6 @@ static unsigned char *p_mbctype; HMODULE hMsvcrt; -void __cdecl test_invalid_parameter_handler(const wchar_t *expression, - const wchar_t *function, const wchar_t *file, - unsigned line, unsigned *res) -{ - ok(expression == NULL, "expression is not NULL\n"); - ok(function == NULL, "function is not NULL\n"); - ok(file == NULL, "file is not NULL\n"); - ok(line == 0, "line = %u\n", line); - ok(res == NULL, "res = %p\n", res); -} - static void test_swab( void ) { char original[] = "BADCFEHGJILKNMPORQTSVUXWZY@#"; char expected1[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ@#"; @@ -968,23 +956,6 @@ static void test__strtoi64(void) return; } - if(p_invalid_parameter) { - errno = 0xdeadbeef; - res = p_strtoi64(NULL, NULL, 10); - ok(res == 0, "res != 0\n"); - res = p_strtoi64(no1, NULL, 1); - ok(res == 0, "res != 0\n"); - res = p_strtoi64(no1, NULL, 37); - ok(res == 0, "res != 0\n"); - ures = p_strtoui64(NULL, NULL, 10); - ok(ures == 0, "res = %d\n", (int)ures); - ures = p_strtoui64(no1, NULL, 1); - ok(ures == 0, "res = %d\n", (int)ures); - ures = p_strtoui64(no1, NULL, 37); - ok(ures == 0, "res = %d\n", (int)ures); - ok(errno == 0xdeadbeef, "errno = %x\n", errno); - } - errno = 0xdeadbeef; res = p_strtoi64(no1, NULL, 10); ok(res == 31923, "res != 31923\n"); @@ -1123,9 +1094,6 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); - p_invalid_parameter = (void *)GetProcAddress( hMsvcrt,"_invalid_parameter"); - if(p_invalid_parameter) - *p_invalid_parameter = test_invalid_parameter_handler; pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010