April 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Implement _invalid_parameter and fix the handler definitions.
by Alexandre Julliard April 14, 2010

April 14, 2010

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(a)Z @ cdecl __uncaught_exception() msvcrt.__uncaught_exception @ stub ?_inconsistency@@YAXXZ -@ stub ?_invalid_parameter@@YAXPBG00II(a)Z +@ cdecl ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @ stub ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ varargs ?_open@@YAHPBDHH(a)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(a)Z @ cdecl __uncaught_exception() msvcrt.__uncaught_exception @ stub ?_inconsistency@@YAXXZ -@ stub ?_invalid_parameter@@YAXPBG00II(a)Z +@ cdecl ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z @ stub ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ varargs ?_open@@YAHPBDHH(a)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 : msvcr90: Implement _invalid_parameter_noinfo.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: d8619de7c7ef5cf8dc9555e28126935cc59af4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8619de7c7ef5cf8dc9555e28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 14:35:58 2010 +0200 msvcr90: Implement _invalid_parameter_noinfo. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/Makefile.in | 2 ++ dlls/msvcr90/msvcr90.c | 9 +++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ea5e65c..46e7077 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -534,7 +534,7 @@ @ stub _inpd @ stub _inpw @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter -@ stub _invalid_parameter_noinfo +@ cdecl _invalid_parameter_noinfo() msvcr90._invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @ stub _isalnum_l diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 613edab..6b311f6 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -4,6 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr90.dll IMPORTS = msvcrt kernel32 +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt C_SRCS = \ msvcr90.c diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 0941443..9d03767 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#include "stdlib.h" #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -100,6 +101,14 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) } /********************************************************************* + * _invalid_parameter_noinfo (MSVCR90.@) + */ +void CDECL _invalid_parameter_noinfo(void) +{ + _invalid_parameter( NULL, NULL, NULL, 0, 0 ); +} + +/********************************************************************* * __sys_nerr (MSVCR90.@) */ int* CDECL __sys_nerr(void) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3082230..1d7e139 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -522,7 +522,7 @@ @ stub _inpd @ stub _inpw @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter -@ stub _invalid_parameter_noinfo +@ cdecl _invalid_parameter_noinfo() @ stub _invoke_watson @ extern _iob msvcrt._iob @ stub _isalnum_l

1 0

Joel Holdsworth : notepad: Replaced icon with a Tango compliant icon.
by Alexandre Julliard April 14, 2010

April 14, 2010

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 : include: Define some more NTSTATUS values.
by Alexandre Julliard April 14, 2010

April 14, 2010

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

Alexandre Julliard : msvcrt: Implement support for version 4 exception tables.
by Alexandre Julliard April 14, 2010

April 14, 2010

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

Roderick Colenbrander : wined3d: Move A4L4 conversion to the formats table.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 4c87bc0c410f3d40e8c612fdb7a02aa18d6af667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c87bc0c410f3d40e8c612fdb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 14 14:19:18 2010 +0200 wined3d: Move A4L4 conversion to the formats table. --- dlls/wined3d/surface.c | 27 --------------------------- dlls/wined3d/utils.c | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40921d6..667478d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2223,15 +2223,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_L4A4_UNORM: - /* WINED3DFMT_L4A4_UNORM exists as an internal gl format, but for some reason there is not - * format+type combination to load it. Thus convert it to A8L8, then load it - * with A4L4 internal, but A8L8 format+type - */ - *convert = CONVERT_A4L4; - desc->conv_byte_count = 2; - break; - default: break; } @@ -2475,24 +2466,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case CONVERT_A4L4: - { - unsigned int x, y; - const unsigned char *Source; - unsigned char *Dest; - for(y = 0; y < height; y++) { - Source = src + y * pitch; - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - unsigned char color = (*Source++); - /* A */ Dest[1] = (color & 0xf0) << 0; - /* L */ Dest[0] = (color & 0x0f) << 4; - Dest += 2; - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index abe3770..5ebf92d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -241,6 +241,29 @@ struct wined3d_format_texture_info void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); }; +static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + /* WINED3DFMT_L4A4_UNORM exists as an internal gl format, but for some reason there is not + * format+type combination to load it. Thus convert it to A8L8, then load it + * with A4L4 internal, but A8L8 format+type + */ + unsigned int x, y; + const unsigned char *Source; + unsigned char *Dest; + UINT outpitch = pitch * 2; + + for(y = 0; y < height; y++) { + Source = src + y * pitch; + Dest = dst + y * outpitch; + for (x = 0; x < width; x++ ) { + unsigned char color = (*Source++); + /* A */ Dest[1] = (color & 0xf0) << 0; + /* L */ Dest[0] = (color & 0x0f) << 4; + Dest += 2; + } + } +} + static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -703,9 +726,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_L4A4_UNORM, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE4_ALPHA4, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, + GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 2, 0, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_l4a4_unorm}, /* Bump mapping stuff */ {WINED3DFMT_R8G8_SNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 3,

1 0

Alexandre Julliard : kernel32: Map the new detailed direction information back to the Windows constants.
by Alexandre Julliard April 14, 2010

April 14, 2010

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

Hans Leidekker : msi: Make the string reference count a short.
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: 109ffd0f97e4a17e5369d0c4a8636a6abe46baab URL: http://source.winehq.org/git/wine.git/?a=commit;h=109ffd0f97e4a17e5369d0c4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:08 2010 +0200 msi: Make the string reference count a short. This is safe because the reference count is stored in 2 bytes on disk. (This is commit ff2f894888c0cb465fe08db8e6f22d4848ca5aef reapplied because of incorrect revert in 88214a72cedb182c2324ba096fa55353c6be3374). --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5e699ae..2b7d6ba 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,7 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 3bdc436..84f4e71 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { - UINT persistent_refcount; - UINT nonpersistent_refcount; + USHORT persistent_refcount; + USHORT nonpersistent_refcount; LPWSTR str; } msistring; @@ -188,7 +188,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -237,7 +237,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -288,7 +288,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str;

1 0

Joel Holdsworth : shell32: Replaced ramdisk.ico with a Tango compliant icon .
by Alexandre Julliard April 14, 2010

April 14, 2010

Module: wine Branch: master Commit: c4591aedbb12f5941cce7a53a3cc9573dcae1745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4591aedbb12f5941cce7a53a… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 22:00:02 2010 +0100 shell32: Replaced ramdisk.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/ramdisk.ico | Bin 21838 -> 25470 bytes dlls/shell32/ramdisk.svg | 151 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4591aedbb12f5941cce7…

1 0

Alexandre Julliard : libwine: Store more detailed information about characters direction.
by Alexandre Julliard April 14, 2010

April 14, 2010

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