wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Alexandre Julliard : msvcrt: Implement _invalid_parameter and fix the handler definitions.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 4f3b7f844564c75aa29114d8e6b57070f9be28eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3b7f844564c75aa29114d8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 14:34:27 2010 +0200 msvcrt: Implement _invalid_parameter and fix the handler definitions. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcr90/tests/msvcr90.c | 4 ++-- dlls/msvcrt/errno.c | 29 +++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 5 +++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 4 ++-- include/msvcrt/stdlib.h | 10 ++++++---- 8 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 75c0f3a..ea5e65c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -42,7 +42,7 @@ @ stub ?_ValidateWrite@@YAHPAXI@Z @ cdecl __uncaught_exception() msvcrt.__uncaught_exception @ stub ?_inconsistency@@YAXXZ -@ stub ?_invalid_parameter@@YAXPBG00II@Z +@ cdecl ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @ stub ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z @ varargs ?_open@@YAHPBDHH@Z(str long) msvcrt._open @@ -533,7 +533,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ stub _invalid_parameter +@ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ed5a4bf..3082230 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -42,7 +42,7 @@ @ stub ?_ValidateWrite@@YAHPAXI@Z @ cdecl __uncaught_exception() msvcrt.__uncaught_exception @ stub ?_inconsistency@@YAXXZ -@ stub ?_invalid_parameter@@YAXPBG00II@Z +@ cdecl ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @ stub ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z @ varargs ?_open@@YAHPBDHH@Z(str long) msvcrt._open @@ -521,7 +521,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ stub _invalid_parameter +@ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index e094b1a..2b4fae4 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -46,13 +46,13 @@ int cb_called[4]; void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, - unsigned line, unsigned *res) + unsigned line, uintptr_t arg) { 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); + ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); } static int __cdecl initterm_cb0(void) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 80dcab6..4d97051 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -20,8 +20,14 @@ #include <stdio.h> #include <string.h> +#include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" #include "msvcrt.h" +#include "excpt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -117,7 +123,8 @@ char *MSVCRT__sys_errlist[] = }; unsigned int MSVCRT__sys_nerr = sizeof(MSVCRT__sys_errlist)/sizeof(MSVCRT__sys_errlist[0]) - 1; -MSVCRT_invalid_parameter_handler MSVCRT_invalid_parameter = NULL; + +static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL; /* INTERNAL: Set the crt and dos errno's from the OS error given. */ void msvcrt_set_errno(int err) @@ -287,21 +294,35 @@ void CDECL _seterrormode(int mode) SetErrorMode( mode ); } +/****************************************************************************** + * _invalid_parameter (MSVCRT.@) + */ +void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, + const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg) +{ + if (invalid_parameter_handler) invalid_parameter_handler( expr, func, file, line, arg ); + else + { + ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); + RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); + } +} + /* _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; + return invalid_parameter_handler; } /* _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; + MSVCRT_invalid_parameter_handler old = invalid_parameter_handler; TRACE("(%p)\n", handler); - MSVCRT_invalid_parameter = handler; + invalid_parameter_handler = handler; return old; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c298d3..0318012 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -78,7 +78,7 @@ typedef void (*__cdecl MSVCRT__se_translator_function)(unsigned int code, struct typedef void (*__cdecl MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*__cdecl MSVCRT__onexit_t)(void); -typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); +typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); typedef struct {long double x;} MSVCRT__LDOUBLE; @@ -128,7 +128,6 @@ extern LCID MSVCRT_current_lc_all_lcid; extern WORD MSVCRT__ctype [257]; extern WORD MSVCRT_current_ctype[257]; extern WORD* MSVCRT__pctype; -extern MSVCRT_invalid_parameter_handler MSVCRT_invalid_parameter; void msvcrt_set_errno(int); @@ -825,6 +824,8 @@ int __cdecl MSVCRT__pipe(int *, unsigned int, int); MSVCRT_wchar_t* __cdecl _wgetenv(const MSVCRT_wchar_t*); void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_wchar_t*); MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); +void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, + const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); #endif #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9af243f..d61e250 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 -@ stub _invalid_parameter +@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ extern _iob MSVCRT__iob # stub _isalnum_l # stub _isalpha_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5432a30..a241bab 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -341,7 +341,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); if(!nptr || base<0 || base>36 || base==1) { - MSVCRT_invalid_parameter(NULL, NULL, NULL, 0, NULL); + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); return 0; } @@ -421,7 +421,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); if(!nptr || base<0 || base>36 || base==1) { - MSVCRT_invalid_parameter(NULL, NULL, NULL, 0, NULL); + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); return 0; } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 617bd1c..6633ee9 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -218,6 +218,12 @@ __msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); int __cdecl wctomb(char*,wchar_t); #endif /* _WSTDLIB_DEFINED */ +typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); +_invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); +_invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); +void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, + unsigned int line, uintptr_t arg); + #ifdef __cplusplus } #endif @@ -261,8 +267,4 @@ static inline ldiv_t __wine_msvcrt_ldiv(__msvcrt_long num, __msvcrt_long denom) #include <poppack.h> -typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); -_invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); -_invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); - #endif /* __WINE_STDLIB_H */

1 0

Alexandre Julliard : msvcrt: Implement support for version 4 exception tables.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: a1e99f544b40e54d90e4d102186ba526f1489ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e99f544b40e54d90e4d1021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 14:30:46 2010 +0200 msvcrt: Implement support for version 4 exception tables. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/except.c | 121 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- 4 files changed, 127 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2154478..75c0f3a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -379,7 +379,7 @@ @ cdecl _errno() msvcrt._errno @ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 @ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 -@ stub _except_handler4_common +@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) msvcrt._except_handler4_common @ varargs _execl(str str) msvcrt._execl @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @@ -637,7 +637,7 @@ @ stub _lfind_s @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 -@ stub _local_unwind4 +@ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 @ stub _localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1b85a6e..ed5a4bf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -371,7 +371,7 @@ @ cdecl _errno() msvcrt._errno @ cdecl -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2 @ cdecl -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3 -@ stub _except_handler4_common +@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) msvcrt._except_handler4_common @ varargs _execl(str str) msvcrt._execl @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @@ -625,7 +625,7 @@ @ stub _lfind_s @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2 -@ stub _local_unwind4 +@ cdecl -i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 @ cdecl _localtime32(ptr) msvcrt._localtime32 @ stub _localtime32_s @ cdecl _localtime64(ptr) msvcrt._localtime64 diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index fdb1757..494b5af 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -56,6 +56,15 @@ typedef struct _MSVCRT_EXCEPTION_FRAME PEXCEPTION_POINTERS xpointers; } MSVCRT_EXCEPTION_FRAME; +typedef struct +{ + int gs_cookie_offset; + ULONG gs_cookie_xor; + int eh_cookie_offset; + ULONG eh_cookie_xor; + SCOPETABLE entries[1]; +} SCOPETABLE_V4; + #define TRYLEVEL_END (-1) /* End of trylevel list */ #if defined(__GNUC__) && defined(__i386__) @@ -99,6 +108,11 @@ static inline int call_unwind_func( int (*func)(void), void *ebp ) #ifdef __i386__ +static const SCOPETABLE_V4 *get_scopetable_v4( MSVCRT_EXCEPTION_FRAME *frame, ULONG_PTR cookie ) +{ + return (const SCOPETABLE_V4 *)((ULONG_PTR)frame->scopetable ^ cookie); +} + static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, @@ -158,6 +172,33 @@ static void msvcrt_local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel, vo TRACE("unwound OK\n"); } +static void msvcrt_local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, int trylevel, void *ebp ) +{ + EXCEPTION_REGISTRATION_RECORD reg; + const SCOPETABLE_V4 *scopetable = get_scopetable_v4( frame, *cookie ); + + TRACE("(%p,%d,%d)\n",frame, frame->trylevel, trylevel); + + /* Register a handler in case of a nested exception */ + reg.Handler = MSVCRT_nested_handler; + reg.Prev = NtCurrentTeb()->Tib.ExceptionList; + __wine_push_frame(&reg); + + while (frame->trylevel != -2 && frame->trylevel != trylevel) + { + int level = frame->trylevel; + frame->trylevel = scopetable->entries[level].previousTryLevel; + if (!scopetable->entries[level].lpfnFilter) + { + TRACE( "__try block cleanup level %d handler %p ebp %p\n", + level, scopetable->entries[level].lpfnHandler, ebp ); + call_unwind_func( scopetable->entries[level].lpfnHandler, ebp ); + } + } + __wine_pop_frame(&reg); + TRACE("unwound OK\n"); +} + /******************************************************************* * _local_unwind2 (MSVCRT.@) */ @@ -167,6 +208,14 @@ void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel) } /******************************************************************* + * _local_unwind4 (MSVCRT.@) + */ +void CDECL _local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, int trylevel ) +{ + msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); +} + +/******************************************************************* * _global_unwind2 (MSVCRT.@) */ void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame) @@ -259,6 +308,78 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, return ExceptionContinueSearch; } +/********************************************************************* + * _except_handler4_common (MSVCRT.@) + */ +int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), + EXCEPTION_RECORD *rec, MSVCRT_EXCEPTION_FRAME *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + int retval, trylevel; + EXCEPTION_POINTERS exceptPtrs; + const SCOPETABLE_V4 *scope_table = get_scopetable_v4( frame, *cookie ); + + TRACE( "exception %x flags=%x at %p handler=%p %p %p cookie=%x scope table=%p cookies=%d/%x,%d/%x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + frame->handler, context, dispatcher, *cookie, scope_table, + scope_table->gs_cookie_offset, scope_table->gs_cookie_xor, + scope_table->eh_cookie_offset, scope_table->eh_cookie_xor ); + + /* FIXME: no cookie validation yet */ + + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + /* Unwinding the current frame */ + msvcrt_local_unwind4( cookie, frame, -2, &frame->_ebp ); + TRACE("unwound current frame, returning ExceptionContinueSearch\n"); + return ExceptionContinueSearch; + } + else + { + /* Hunting for handler */ + exceptPtrs.ExceptionRecord = rec; + exceptPtrs.ContextRecord = context; + *((DWORD *)frame-1) = (DWORD)&exceptPtrs; + trylevel = frame->trylevel; + + while (trylevel != -2) + { + TRACE( "level %d prev %d filter %p\n", trylevel, + scope_table->entries[trylevel].previousTryLevel, + scope_table->entries[trylevel].lpfnFilter ); + if (scope_table->entries[trylevel].lpfnFilter) + { + retval = call_filter( scope_table->entries[trylevel].lpfnFilter, &exceptPtrs, &frame->_ebp ); + + TRACE("filter returned %s\n", retval == EXCEPTION_CONTINUE_EXECUTION ? + "CONTINUE_EXECUTION" : retval == EXCEPTION_EXECUTE_HANDLER ? + "EXECUTE_HANDLER" : "CONTINUE_SEARCH"); + + if (retval == EXCEPTION_CONTINUE_EXECUTION) + return ExceptionContinueExecution; + + if (retval == EXCEPTION_EXECUTE_HANDLER) + { + /* Unwind all higher frames, this one will handle the exception */ + _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame); + msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); + + /* Set our trylevel to the enclosing block, and call the __finally + * code, which won't return + */ + frame->trylevel = scope_table->entries[trylevel].previousTryLevel; + TRACE("__finally block %p\n",scope_table->entries[trylevel].lpfnHandler); + call_finally_block(scope_table->entries[trylevel].lpfnHandler, &frame->_ebp); + ERR("Returned from __finally block - expect crash!\n"); + } + } + trylevel = scope_table->entries[trylevel].previousTryLevel; + } + } + TRACE("reached -2, returning ExceptionContinueSearch\n"); + return ExceptionContinueSearch; +} + /* * setjmp/longjmp implementation diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8482863..9af243f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -348,7 +348,7 @@ @ cdecl _errno() MSVCRT__errno @ cdecl -i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -# stub _except_handler4_common +@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -578,7 +578,7 @@ # stub _lfind_s @ cdecl _loaddll(str) @ cdecl -i386 _local_unwind2(ptr long) -# stub _local_unwind4 +@ cdecl -i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 # stub _localtime32_s @ cdecl _localtime64(ptr) MSVCRT__localtime64

1 0

Alexandre Julliard : include: Define some more NTSTATUS values.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 3415523044a2167b6f02d9497e106f895d8b21a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3415523044a2167b6f02d9497… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 14:25:56 2010 +0200 include: Define some more NTSTATUS values. --- include/ntstatus.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/include/ntstatus.h b/include/ntstatus.h index 8ce804e..8f4bb18 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -905,6 +905,89 @@ #define STATUS_AUTHENTICATION_FIREWALL_FAILED ((NTSTATUS) 0xC0000413) #define STATUS_VDM_DISALLOWED ((NTSTATUS) 0xC0000414) #define STATUS_HUNG_DISPLAY_DRIVER_THREAD ((NTSTATUS) 0xC0000415) +#define STATUS_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE ((NTSTATUS) 0xC0000416) +#define STATUS_INVALID_CRUNTIME_PARAMETER ((NTSTATUS) 0xC0000417) +#define STATUS_NTLM_BLOCKED ((NTSTATUS) 0xC0000418) +#define STATUS_ASSERTION_FAILURE ((NTSTATUS) 0xC0000420) +#define STATUS_VERIFIER_STOP ((NTSTATUS) 0xC0000421) +#define STATUS_CALLBACK_POP_STACK ((NTSTATUS) 0xC0000423) +#define STATUS_INCOMPATIBLE_DRIVER_BLOCKED ((NTSTATUS) 0xC0000424) +#define STATUS_HIVE_UNLOADED ((NTSTATUS) 0xC0000425) +#define STATUS_COMPRESSION_DISABLED ((NTSTATUS) 0xC0000426) +#define STATUS_FILE_SYSTEM_LIMITATION ((NTSTATUS) 0xC0000427) +#define STATUS_INVALID_IMAGE_HASH ((NTSTATUS) 0xC0000428) +#define STATUS_NOT_CAPABLE ((NTSTATUS) 0xC0000429) +#define STATUS_REQUEST_OUT_OF_SEQUENCE ((NTSTATUS) 0xC000042A) +#define STATUS_IMPLEMENTATION_LIMIT ((NTSTATUS) 0xC000042B) +#define STATUS_ELEVATION_REQUIRED ((NTSTATUS) 0xC000042C) +#define STATUS_BEYOND_VDL ((NTSTATUS) 0xC0000432) +#define STATUS_ENCOUNTERED_WRITE_IN_PROGRESS ((NTSTATUS) 0xC0000433) +#define STATUS_PTE_CHANGED ((NTSTATUS) 0xC0000434) +#define STATUS_PURGE_FAILED ((NTSTATUS) 0xC0000435) +#define STATUS_CRED_REQUIRES_CONFIRMATION ((NTSTATUS) 0xC0000440) +#define STATUS_CS_ENCRYPTION_INVALID_SERVER_RESPONSE ((NTSTATUS) 0xC0000441) +#define STATUS_CS_ENCRYPTION_UNSUPPORTED_SERVER ((NTSTATUS) 0xC0000442) +#define STATUS_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE ((NTSTATUS) 0xC0000443) +#define STATUS_CS_ENCRYPTION_NEW_ENCRYPTED_FILE ((NTSTATUS) 0xC0000444) +#define STATUS_CS_ENCRYPTION_FILE_NOT_CSE ((NTSTATUS) 0xC0000445) +#define STATUS_INVALID_LABEL ((NTSTATUS) 0xC0000446) +#define STATUS_DRIVER_PROCESS_TERMINATED ((NTSTATUS) 0xC0000450) +#define STATUS_AMBIGUOUS_SYSTEM_DEVICE ((NTSTATUS) 0xC0000451) +#define STATUS_SYSTEM_DEVICE_NOT_FOUND ((NTSTATUS) 0xC0000452) +#define STATUS_RESTART_BOOT_APPLICATION ((NTSTATUS) 0xC0000453) +#define STATUS_INVALID_TASK_NAME ((NTSTATUS) 0xC0000500) +#define STATUS_INVALID_TASK_INDEX ((NTSTATUS) 0xC0000501) +#define STATUS_THREAD_ALREADY_IN_TASK ((NTSTATUS) 0xC0000502) +#define STATUS_CALLBACK_BYPASS ((NTSTATUS) 0xC0000503) +#define STATUS_PORT_CLOSED ((NTSTATUS) 0xC0000700) +#define STATUS_MESSAGE_LOST ((NTSTATUS) 0xC0000701) +#define STATUS_INVALID_MESSAGE ((NTSTATUS) 0xC0000702) +#define STATUS_REQUEST_CANCELED ((NTSTATUS) 0xC0000703) +#define STATUS_RECURSIVE_DISPATCH ((NTSTATUS) 0xC0000704) +#define STATUS_LPC_RECEIVE_BUFFER_EXPECTED ((NTSTATUS) 0xC0000705) +#define STATUS_LPC_INVALID_CONNECTION_USAGE ((NTSTATUS) 0xC0000706) +#define STATUS_LPC_REQUESTS_NOT_ALLOWED ((NTSTATUS) 0xC0000707) +#define STATUS_RESOURCE_IN_USE ((NTSTATUS) 0xC0000708) +#define STATUS_HARDWARE_MEMORY_ERROR ((NTSTATUS) 0xC0000709) +#define STATUS_THREADPOOL_HANDLE_EXCEPTION ((NTSTATUS) 0xC000070A) +#define STATUS_THREADPOOL_SET_EVENT_ON_COMPLETION_FAILED ((NTSTATUS) 0xC000070B) +#define STATUS_THREADPOOL_RELEASE_SEMAPHORE_ON_COMPLETION_FAILED ((NTSTATUS) 0xC000070C) +#define STATUS_THREADPOOL_RELEASE_MUTEX_ON_COMPLETION_FAILED ((NTSTATUS) 0xC000070D) +#define STATUS_THREADPOOL_FREE_LIBRARY_ON_COMPLETION_FAILED ((NTSTATUS) 0xC000070E) +#define STATUS_THREADPOOL_RELEASED_DURING_OPERATION ((NTSTATUS) 0xC000070F) +#define STATUS_CALLBACK_RETURNED_WHILE_IMPERSONATING ((NTSTATUS) 0xC0000710) +#define STATUS_APC_RETURNED_WHILE_IMPERSONATING ((NTSTATUS) 0xC0000711) +#define STATUS_PROCESS_IS_PROTECTED ((NTSTATUS) 0xC0000712) +#define STATUS_MCA_EXCEPTION ((NTSTATUS) 0xC0000713) +#define STATUS_CERTIFICATE_MAPPING_NOT_UNIQUE ((NTSTATUS) 0xC0000714) +#define STATUS_SYMLINK_CLASS_DISABLED ((NTSTATUS) 0xC0000715) +#define STATUS_INVALID_IDN_NORMALIZATION ((NTSTATUS) 0xC0000716) +#define STATUS_NO_UNICODE_TRANSLATION ((NTSTATUS) 0xC0000717) +#define STATUS_ALREADY_REGISTERED ((NTSTATUS) 0xC0000718) +#define STATUS_CONTEXT_MISMATCH ((NTSTATUS) 0xC0000719) +#define STATUS_PORT_ALREADY_HAS_COMPLETION_LIST ((NTSTATUS) 0xC000071A) +#define STATUS_CALLBACK_RETURNED_THREAD_PRIORITY ((NTSTATUS) 0xC000071B) +#define STATUS_INVALID_THREAD ((NTSTATUS) 0xC000071C) +#define STATUS_CALLBACK_RETURNED_TRANSACTION ((NTSTATUS) 0xC000071D) +#define STATUS_CALLBACK_RETURNED_LDR_LOCK ((NTSTATUS) 0xC000071E) +#define STATUS_CALLBACK_RETURNED_LANG ((NTSTATUS) 0xC000071F) +#define STATUS_CALLBACK_RETURNED_PRI_BACK ((NTSTATUS) 0xC0000720) +#define STATUS_CALLBACK_RETURNED_THREAD_AFFINITY ((NTSTATUS) 0xC0000721) +#define STATUS_DISK_REPAIR_DISABLED ((NTSTATUS) 0xC0000800) +#define STATUS_DS_DOMAIN_RENAME_IN_PROGRESS ((NTSTATUS) 0xC0000801) +#define STATUS_DISK_QUOTA_EXCEEDED ((NTSTATUS) 0xC0000802) +#define STATUS_CONTENT_BLOCKED ((NTSTATUS) 0xC0000804) +#define STATUS_BAD_CLUSTERS ((NTSTATUS) 0xC0000805) +#define STATUS_VOLUME_DIRTY ((NTSTATUS) 0xC0000806) +#define STATUS_FILE_CHECKED_OUT ((NTSTATUS) 0xC0000901) +#define STATUS_CHECKOUT_REQUIRED ((NTSTATUS) 0xC0000902) +#define STATUS_BAD_FILE_TYPE ((NTSTATUS) 0xC0000903) +#define STATUS_FILE_TOO_LARGE ((NTSTATUS) 0xC0000904) +#define STATUS_FORMS_AUTH_REQUIRED ((NTSTATUS) 0xC0000905) +#define STATUS_VIRUS_INFECTED ((NTSTATUS) 0xC0000906) +#define STATUS_VIRUS_DELETED ((NTSTATUS) 0xC0000907) +#define STATUS_BAD_MCFG_TABLE ((NTSTATUS) 0xC0000908) + #define STATUS_WOW_ASSERTION ((NTSTATUS) 0xC0009898) #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS) 0xC0020001)

1 0

Joel Holdsworth : notepad: Replaced icon with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 3e6b07756f6096b0f7085ff6925c3e32d4d30ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6b07756f6096b0f7085ff69… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 23:12:08 2010 +0100 notepad: Replaced icon with a Tango compliant icon. --- programs/notepad/notepad.ico | Bin 15086 -> 25214 bytes programs/notepad/notepad.svg | 708 +++++++++++++++++------------------------- 2 files changed, 290 insertions(+), 418 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e6b07756f6096b0f7085…

1 0

Alexandre Julliard : usp10: Use the more detailed libwine information to classify bidi chars.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 65ad39903268177a08ecf32767b4dfb8f1bc4f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ad39903268177a08ecf3276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:38:59 2010 +0200 usp10: Use the more detailed libwine information to classify bidi chars. --- dlls/usp10/bidi.c | 131 +++++++++++++++++++---------------------------------- 1 files changed, 46 insertions(+), 85 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2763453..8af28e7 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -49,6 +49,7 @@ #include "wingdi.h" #include "winnls.h" #include "usp10.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "usp10_internal.h" @@ -107,97 +108,57 @@ enum directions /* HELPER FUNCTIONS */ -/* grep -r ';BN;' data.txt | grep -v [0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F] | sed -e s@\;.*@@ -e s/^..../0x\&,\ / | xargs echo */ -static const WCHAR BNs[] = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, - 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, - 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x007F, 0x0080, 0x0081, 0x0082, - 0x0083, 0x0084, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, - 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, - 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, - 0x009F, 0x00AD, 0x070F, 0x200B, 0x200C, 0x200D, 0x2060, 0x2061, 0x2062, - 0x2063, 0x206A, 0x206B, 0x206C, 0x206D, 0x206E, 0x206F, 0xFEFF -}; - -/* Idem, but with ';R;' instead of ';BN;' */ -static const WCHAR Rs[] = { - 0x05BE, 0x05C0, 0x05C3, 0x05C6, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, - 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, - 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, - 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, - 0x07C0, 0x07C1, 0x07C2, 0x07C3, 0x07C4, 0x07C5, 0x07C6, 0x07C7, 0x07C8, - 0x07C9, 0x07CA, 0x07CB, 0x07CC, 0x07CD, 0x07CE, 0x07CF, 0x07D0, 0x07D1, - 0x07D2, 0x07D3, 0x07D4, 0x07D5, 0x07D6, 0x07D7, 0x07D8, 0x07D9, 0x07DA, - 0x07DB, 0x07DC, 0x07DD, 0x07DE, 0x07DF, 0x07E0, 0x07E1, 0x07E2, 0x07E3, - 0x07E4, 0x07E5, 0x07E6, 0x07E7, 0x07E8, 0x07E9, 0x07EA, 0x07F4, 0x07F5, - 0x07FA, 0x200F, 0xFB1D, 0xFB1F, 0xFB20, 0xFB21, 0xFB22, 0xFB23, 0xFB24, - 0xFB25, 0xFB26, 0xFB27, 0xFB28, 0xFB2A, 0xFB2B, 0xFB2C, 0xFB2D, 0xFB2E, - 0xFB2F, 0xFB30, 0xFB31, 0xFB32, 0xFB33, 0xFB34, 0xFB35, 0xFB36, 0xFB38, - 0xFB39, 0xFB3A, 0xFB3B, 0xFB3C, 0xFB3E, 0xFB40, 0xFB41, 0xFB43, 0xFB44, - 0xFB46, 0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E, - 0xFB4F -}; - -/* Convert the incomplete win32 table to some slightly more useful data */ +/* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount, const SCRIPT_CONTROL *c) { - unsigned i, j; - GetStringTypeW(CT_CTYPE2, lpString, uCount, chartype); + static const enum directions dir_map[16] = + { + L, /* unassigned defaults to L */ + L, + R, + EN, + ES, + ET, + AN, + CS, + B, + S, + WS, + ON, + AL, + NSM, + BN, + PDF /* also LRE, LRO, RLE, RLO */ + }; + + unsigned i; + for (i = 0; i < uCount; ++i) + { + chartype[i] = dir_map[get_char_typeW(lpString[i]) >> 12]; switch (chartype[i]) { - case C2_LEFTTORIGHT: chartype[i] = L; break; - case C2_RIGHTTOLEFT: - chartype[i] = AL; - for (j = 0; j < sizeof(Rs)/sizeof(WCHAR); ++j) - if (Rs[j] == lpString[i]) - { - chartype[i] = R; - break; - } - break; - - case C2_EUROPENUMBER: chartype[i] = EN; break; - case C2_EUROPESEPARATOR: - if (c->fLegacyBidiClass && (lpString[i] == '-' || lpString[i] =='+')) - chartype[i] = N; - else if (c->fLegacyBidiClass && lpString[i] == '/') - chartype[i] = CS; - else - chartype[i] = ES; break; - case C2_EUROPETERMINATOR: chartype[i] = ET; break; - case C2_ARABICNUMBER: chartype[i] = AN; break; - case C2_COMMONSEPARATOR: chartype[i] = CS; break; - case C2_BLOCKSEPARATOR: chartype[i] = B; break; - case C2_SEGMENTSEPARATOR: chartype[i] = S; break; - case C2_WHITESPACE: chartype[i] = WS; break; - case C2_OTHERNEUTRAL: - switch (lpString[i]) - { - case 0x202A: chartype[i] = LRE; break; - case 0x202B: chartype[i] = RLE; break; - case 0x202C: chartype[i] = PDF; break; - case 0x202D: chartype[i] = LRO; break; - case 0x202E: chartype[i] = RLO; break; - default: chartype[i] = ON; break; - } - break; - case C2_NOTAPPLICABLE: - chartype[i] = NSM; - for (j = 0; j < sizeof(BNs)/sizeof(WCHAR); ++j) - if (BNs[j] == lpString[i]) - { - chartype[i] = BN; - break; - } - break; - - default: - /* According to BiDi spec, unassigned characters default to L */ - FIXME("Unhandled character type: %04x\n", chartype[i]); - chartype[i] = L; - break; + case ES: + if (!c->fLegacyBidiClass) break; + switch (lpString[i]) + { + case '-': + case '+': chartype[i] = N; break; + case '/': chartype[i] = CS; break; + } + break; + case PDF: + switch (lpString[i]) + { + case 0x202A: chartype[i] = LRE; break; + case 0x202B: chartype[i] = RLE; break; + case 0x202C: chartype[i] = PDF; break; + case 0x202D: chartype[i] = LRO; break; + case 0x202E: chartype[i] = RLO; break; + } + break; } + } } /* Set a run of cval values at locations all prior to, but not including */

1 0

Alexandre Julliard : gdi32: Use the more detailed libwine information to classify bidi chars.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: b0beb46aa847dca0b25294e231059ee12fecc3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0beb46aa847dca0b25294e23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:35:29 2010 +0200 gdi32: Use the more detailed libwine information to classify bidi chars. --- dlls/gdi32/bidi.c | 116 ++++++++++++++++------------------------------------ 1 files changed, 36 insertions(+), 80 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 60fff3e..d488153 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -49,6 +49,7 @@ #include "wingdi.h" #include "winnls.h" #include "usp10.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "gdi_private.h" @@ -105,91 +106,46 @@ enum directions /* HELPER FUNCTIONS */ -/* grep -r ';BN;' data.txt | grep -v [0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F] | sed -e s@\;.*@@ -e s/^..../0x\&,\ / | xargs echo */ -static const WCHAR BNs[] = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, - 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, - 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x007F, 0x0080, 0x0081, 0x0082, - 0x0083, 0x0084, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, - 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, - 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, - 0x009F, 0x00AD, 0x070F, 0x200B, 0x200C, 0x200D, 0x2060, 0x2061, 0x2062, - 0x2063, 0x206A, 0x206B, 0x206C, 0x206D, 0x206E, 0x206F, 0xFEFF -}; - -/* Idem, but with ';R;' instead of ';BN;' */ -static const WCHAR Rs[] = { - 0x05BE, 0x05C0, 0x05C3, 0x05C6, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, - 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, - 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, - 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, - 0x07C0, 0x07C1, 0x07C2, 0x07C3, 0x07C4, 0x07C5, 0x07C6, 0x07C7, 0x07C8, - 0x07C9, 0x07CA, 0x07CB, 0x07CC, 0x07CD, 0x07CE, 0x07CF, 0x07D0, 0x07D1, - 0x07D2, 0x07D3, 0x07D4, 0x07D5, 0x07D6, 0x07D7, 0x07D8, 0x07D9, 0x07DA, - 0x07DB, 0x07DC, 0x07DD, 0x07DE, 0x07DF, 0x07E0, 0x07E1, 0x07E2, 0x07E3, - 0x07E4, 0x07E5, 0x07E6, 0x07E7, 0x07E8, 0x07E9, 0x07EA, 0x07F4, 0x07F5, - 0x07FA, 0x200F, 0xFB1D, 0xFB1F, 0xFB20, 0xFB21, 0xFB22, 0xFB23, 0xFB24, - 0xFB25, 0xFB26, 0xFB27, 0xFB28, 0xFB2A, 0xFB2B, 0xFB2C, 0xFB2D, 0xFB2E, - 0xFB2F, 0xFB30, 0xFB31, 0xFB32, 0xFB33, 0xFB34, 0xFB35, 0xFB36, 0xFB38, - 0xFB39, 0xFB3A, 0xFB3B, 0xFB3C, 0xFB3E, 0xFB40, 0xFB41, 0xFB43, 0xFB44, - 0xFB46, 0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E, - 0xFB4F -}; - -/* Convert the incomplete win32 table to some slightly more useful data */ +/* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount) { - unsigned i, j; - GetStringTypeW(CT_CTYPE2, lpString, uCount, chartype); + static const enum directions dir_map[16] = + { + L, /* unassigned defaults to L */ + L, + R, + EN, + ES, + ET, + AN, + CS, + B, + S, + WS, + ON, + AL, + NSM, + BN, + PDF /* also LRE, LRO, RLE, RLO */ + }; + + unsigned i; + for (i = 0; i < uCount; ++i) - switch (chartype[i]) + { + chartype[i] = dir_map[get_char_typeW(lpString[i]) >> 12]; + if (chartype[i] == PDF) { - case C2_LEFTTORIGHT: chartype[i] = L; break; - case C2_RIGHTTOLEFT: - chartype[i] = AL; - for (j = 0; j < sizeof(Rs)/sizeof(WCHAR); ++j) - if (Rs[j] == lpString[i]) - { - chartype[i] = R; - break; - } - break; - - case C2_EUROPENUMBER: chartype[i] = EN; break; - case C2_EUROPESEPARATOR: chartype[i] = ES; break; - case C2_EUROPETERMINATOR: chartype[i] = ET; break; - case C2_ARABICNUMBER: chartype[i] = AN; break; - case C2_COMMONSEPARATOR: chartype[i] = CS; break; - case C2_BLOCKSEPARATOR: chartype[i] = B; break; - case C2_SEGMENTSEPARATOR: chartype[i] = S; break; - case C2_WHITESPACE: chartype[i] = WS; break; - case C2_OTHERNEUTRAL: - switch (lpString[i]) - { - case 0x202A: chartype[i] = LRE; break; - case 0x202B: chartype[i] = RLE; break; - case 0x202C: chartype[i] = PDF; break; - case 0x202D: chartype[i] = LRO; break; - case 0x202E: chartype[i] = RLO; break; - default: chartype[i] = ON; break; - } - break; - case C2_NOTAPPLICABLE: - chartype[i] = NSM; - for (j = 0; j < sizeof(BNs)/sizeof(WCHAR); ++j) - if (BNs[j] == lpString[i]) - { - chartype[i] = BN; - break; - } - break; - - default: - /* According to BiDi spec, unassigned characters default to L */ - FIXME("Unhandled character type: %04x\n", chartype[i]); - chartype[i] = L; - break; + switch (lpString[i]) + { + case 0x202A: chartype[i] = LRE; break; + case 0x202B: chartype[i] = RLE; break; + case 0x202C: chartype[i] = PDF; break; + case 0x202D: chartype[i] = LRO; break; + case 0x202E: chartype[i] = RLO; break; + } } + } } /* Set a run of cval values at locations all prior to, but not including */

1 0

Alexandre Julliard : kernel32: Map the new detailed direction information back to the Windows constants.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: d0578c080a360f5f8d8ce7c0bb2921f35ac43fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0578c080a360f5f8d8ce7c0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:31:59 2010 +0200 kernel32: Map the new detailed direction information back to the Windows constants. --- dlls/kernel32/locale.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7a141b2..76076ea 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2261,6 +2261,26 @@ DWORD WINAPI VerLanguageNameW( DWORD wLang, LPWSTR szLang, DWORD nSize ) */ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype ) { + static const unsigned char type2_map[16] = + { + C2_NOTAPPLICABLE, /* unassigned */ + C2_LEFTTORIGHT, /* L */ + C2_RIGHTTOLEFT, /* R */ + C2_EUROPENUMBER, /* EN */ + C2_EUROPESEPARATOR, /* ES */ + C2_EUROPETERMINATOR, /* ET */ + C2_ARABICNUMBER, /* AN */ + C2_COMMONSEPARATOR, /* CS */ + C2_BLOCKSEPARATOR, /* B */ + C2_SEGMENTSEPARATOR, /* S */ + C2_WHITESPACE, /* WS */ + C2_OTHERNEUTRAL, /* ON */ + C2_RIGHTTOLEFT, /* AL */ + C2_NOTAPPLICABLE, /* NSM */ + C2_NOTAPPLICABLE, /* BN */ + C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ + }; + if (count == -1) count = strlenW(src) + 1; switch(type) { @@ -2268,7 +2288,7 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype while (count--) *chartype++ = get_char_typeW( *src++ ) & 0xfff; break; case CT_CTYPE2: - while (count--) *chartype++ = get_char_typeW( *src++ ) >> 12; + while (count--) *chartype++ = type2_map[get_char_typeW( *src++ ) >> 12]; break; case CT_CTYPE3: {

1 0

Alexandre Julliard : libwine: Store more detailed information about characters direction.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: dc0e712d1062d494ce4b1d2ffc27cb4600c1a456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0e712d1062d494ce4b1d2ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 12:31:30 2010 +0200 libwine: Store more detailed information about characters direction. --- libs/wine/cpmap.pl | 16 +- libs/wine/wctype.c | 600 ++++++++++++++++++++++++++-------------------------- 2 files changed, 308 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc0e712d1062d494ce4b1…

1 0

Aric Stewart : ups10: Reimplement ScriptLayout to properly handle mixed runs.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: b9c30445c70d828d92833333ca54afb46c884447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c30445c70d828d92833333c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 13 14:49:20 2010 -0500 ups10: Reimplement ScriptLayout to properly handle mixed runs. --- dlls/gdi32/bidi.c | 105 +++++++++--------------------------------- dlls/usp10/bidi.c | 95 ++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 59 +++++++++++++++++++----- dlls/usp10/usp10.c | 45 +++++++++++++------ dlls/usp10/usp10_internal.h | 3 + 5 files changed, 199 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9c30445c70d828d92833…

1 0

Aric Stewart : usp10: Improve ScriptItemize with a SCRIPT_CONTROL and SCRIPT_STATE set.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 6c3659c3d42dc8a7f26b4f73a4d1716dd75f7ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3659c3d42dc8a7f26b4f73a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 13 14:49:07 2010 -0500 usp10: Improve ScriptItemize with a SCRIPT_CONTROL and SCRIPT_STATE set. Reduce bidi duplications from gdi32 by using the newly corrected usp10 functions. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bidi.c | 675 +++++------------------------------ dlls/usp10/Makefile.in | 1 + dlls/usp10/bidi.c | 829 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 286 ++++++++++++++-- dlls/usp10/usp10.c | 60 +++- dlls/usp10/usp10_internal.h | 25 ++ 7 files changed, 1253 insertions(+), 624 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c3659c3d42dc8a7f26b4…

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
90
Older →

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