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

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 : 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(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 14 Apr '10

14 Apr '10

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

Roderick Colenbrander : wined3d: Move G16R16/ R16G16F conversion to the formats table.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: cda78c01e62bea533bcfdedee8a68663c67f2050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda78c01e62bea533bcfdedee… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 14 14:19:17 2010 +0200 wined3d: Move G16R16/R16G16F conversion to the formats table. --- dlls/wined3d/surface.c | 37 ------------------------------------- dlls/wined3d/utils.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1dbbeeb..40921d6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2134,7 +2134,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT); IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; RECT rect = {0, 0, This->pow2Width, This->pow2Height}; @@ -2233,17 +2232,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->conv_byte_count = 2; break; - case WINED3DFMT_R16G16_UNORM: - *convert = CONVERT_G16R16; - desc->conv_byte_count = 6; - break; - - case WINED3DFMT_R16G16_FLOAT: - if (gl_info->supported[ARB_TEXTURE_RG]) break; - *convert = CONVERT_R16G16F; - desc->conv_byte_count = 6; - break; - default: break; } @@ -2505,31 +2493,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_G16R16: - case CONVERT_R16G16F: - { - unsigned int x, y; - const WORD *Source; - WORD *Dest; - - for(y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD green = (*Source++); - WORD red = (*Source++); - Dest[0] = green; - Dest[1] = red; - /* Strictly speaking not correct for R16G16F, but it doesn't matter because the - * shader overwrites it anyway - */ - Dest[2] = 0xffff; - Dest += 3; - } - } - break; - } - default: ERR("Unsupported conversion type %#x.\n", convert); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b2a35c6..abe3770 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -417,6 +417,32 @@ static void convert_r16g16_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT wi } } +static void convert_r16g16(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const WORD *Source; + WORD *Dest; + UINT outpitch = (pitch * 3)/2; + + for(y = 0; y < height; y++) + { + Source = (const WORD *)(src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) + { + WORD green = (*Source++); + WORD red = (*Source++); + Dest[0] = green; + Dest[1] = red; + /* Strictly speaking not correct for R16G16F, but it doesn't matter because the + * shader overwrites it anyway + */ + Dest[2] = 0xffff; + Dest += 3; + } + } +} + static void convert_r32g32_float(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -582,9 +608,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16G16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, - GL_RGB, GL_HALF_FLOAT_ARB, 0, + GL_RGB, GL_HALF_FLOAT_ARB, 6, WINED3DFMT_FLAG_RENDERTARGET, - ARB_TEXTURE_FLOAT, NULL}, + ARB_TEXTURE_FLOAT, &convert_r16g16}, {WINED3DFMT_R16G16_FLOAT, GL_RG16F, GL_RG16F, 0, GL_RG, GL_HALF_FLOAT_ARB, 0, WINED3DFMT_FLAG_RENDERTARGET, @@ -656,9 +682,9 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R16G16_UNORM, GL_RGB16, GL_RGB16, GL_RGBA16, - GL_RGB, GL_UNSIGNED_SHORT, 0, + GL_RGB, GL_UNSIGNED_SHORT, 6, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_r16g16}, {WINED3DFMT_B10G10R10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,

1 0

Roderick Colenbrander : wined3d: Move A4L4 conversion to the formats table.
by Alexandre Julliard 14 Apr '10

14 Apr '10

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

Roderick Colenbrander : wined3d: Separate detection of D3D10+ and D3D9 Nvidia GPUs.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: bf73d23d950ab5f185f4a875f48809b2b857e74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf73d23d950ab5f185f4a875f… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Apr 14 14:19:19 2010 +0200 wined3d: Separate detection of D3D10+ and D3D9 Nvidia GPUs. --- dlls/wined3d/directx.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 67b2bd2..6498859 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1251,10 +1251,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, unsigned int *vidmem) { - /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more - * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. - */ - if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (WINE_D3D10_CAPABLE(gl_info)) { /* Geforce 200 - highend */ if (strstr(gl_renderer, "GTX 280") @@ -1360,6 +1357,16 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_8300GS; } + /* Geforce8-compatible fall back if the GPU is not in the list yet */ + *vidmem = 128; + return CARD_NVIDIA_GEFORCE_8300GS; + } + + /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more + * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. + */ + if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + { /* Geforce7 - highend */ if (strstr(gl_renderer, "7800") || strstr(gl_renderer, "7900") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 981f580..00d4c48 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1234,6 +1234,7 @@ void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl #define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) #define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) #define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) +#define WINE_D3D10_CAPABLE(gl_info) WINE_D3D9_CAPABLE(gl_info) && (gl_info->supported[EXT_GPU_SHADER4]) /***************************************************************************** * Internal representation of a light

1 0

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

14 Apr '10

Module: wine Branch: master Commit: 6b31e1ca71a15cfb04ac6b6df19be74b7e1fb6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b31e1ca71a15cfb04ac6b6df… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:59:58 2010 +0100 shell32: Replaced printer.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/printer.ico | Bin 1078 -> 25214 bytes dlls/shell32/printer.svg | 155 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b31e1ca71a15cfb04ac6…

1 0

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

14 Apr '10

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

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

14 Apr '10

Module: wine Branch: master Commit: 0e0426b5570aac94d2f2789b9836da6c4985f3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0426b5570aac94d2f2789b9… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 22:00:06 2010 +0100 shell32: Replaced shortcut.ico with a Tango compliant icon. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shortcut.ico | Bin 2550 -> 25214 bytes dlls/shell32/shortcut.svg | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index a275d4f..5e4a0c8 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -103,6 +103,7 @@ SVG_SRCS = \ netdrive2.svg \ printer.svg \ ramdisk.svg \ + shortcut.svg \ trash_file.svg EXTRA_OBJS = authors.o diff --git a/dlls/shell32/shortcut.ico b/dlls/shell32/shortcut.ico index 994ee0e..5c295f6 100644 Binary files a/dlls/shell32/shortcut.ico and b/dlls/shell32/shortcut.ico differ diff --git a/dlls/shell32/shortcut.svg b/dlls/shell32/shortcut.svg new file mode 100644 index 0000000..d75a99b --- /dev/null +++ b/dlls/shell32/shortcut.svg @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg xmlns="http://www.w3.org/2000/svg" height="64" width="368" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs id="defs4"> + <radialGradient id="radialGradient2947" gradientUnits="userSpaceOnUse" cx="24.446" cy="35.878" r="20.531" gradientTransform="matrix(1.344582,0,0,1.344583,-74.869249,150.06458)"> + <stop id="stop11522" stop-color="#FFF" offset="0"/> + <stop id="stop11524" stop-color="#dcdcdc" offset="1"/> + </radialGradient> + <radialGradient id="radialGradient2991" gradientUnits="userSpaceOnUse" cx="24.446" cy="35.878" r="20.531" gradientTransform="matrix(1.344582,0,0,1.344583,-74.86925,-17.93542)"> + <stop id="stop11522-7" stop-color="#FFF" offset="0"/> + <stop id="stop11524-7" stop-color="#dcdcdc" offset="1"/> + </radialGradient> + </defs> + <image id="icon:16-4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IArs4c6QAAADBQTFRFAAAA fwAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////HPn1FAAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVDgcyZPqb tgAAACpJREFUCNdjYKASqOjoaAcz+v///wFhfC+HMv7DGN+/wxgwNf/rf6BoBwB+XxeNA6C4+gAA AABJRU5ErkJggg== " height="16" width="16" y="40" x="344"/> + <image id="icon:16-8" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAADlQTFRFAAAB iIqFpKWiqquorq+tsrOws7Wytre04+Pj5eXk6Ojo6enp6urq7Ozs7e3t7u7u8fHx8/Pz9fX1wrHV 7QAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH 2QsVDDMS5zqc5wAAADtJREFUGNNjYBgkgIkRDFjhAoxcvPwCgkKMCAEeXmZmZlQBThYUAW5eZg50 AT5BVAEuZmQBNoi17DA+AH3XAcG60TT+AAAAAElFTkSuQmCC " height="16" width="16" y="40" x="320"/> + <image id="icon:16-32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kJFA8AN5hvp8wAAACwSURBVDjL Y2AYBaOAgYFxydJFl588fayDTVJLU/udn2+AMD4DWJ48fayTEJfMwMLCwsDExMTAzMzMwMTExMDE xMQweeoEIUIuYGFgYGBgYmJiYGBgYNizdxdcwtvLlygvMCFzrK1sGFhYWEkKAyYGBgaG////MzAw MDAcPXaEwdTEjHQDkAEXFxeDp4c3eQbY2Tow7N23m7Ro3Lx109erVy9zYZPU09X/4uXpw4vPAAD9 RiOslp+cywAAAABJRU5ErkJggg== " height="16" width="16" y="40" x="296"/> + <image id="icon:32-4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAAXNSR0IArs4c6QAAADBQTFRFAAAA fwAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////HPn1FAAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVDDIi2Pid CgAAADdJREFUKM9jYBgFKICjAwwa4AL9/8HgB0kC38vL61FVEBT4jinwHVUAKI8mgGEthsPqSXQ6 uvcBlUBmf3b+p/kAAAAASUVORK5CYII= " height="32" width="32" y="24" x="256"/> + <image id="icon:32-8" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAANJQTFRFAAAA iIqFqquotre0v8C+wMG/wcLAx8jG4+Pj5OPk5OTk5OTl5OXk5eXl5ebl5ubm5ufm5+fm6Ojo6Ojp 6ejo6Onp6enp6enq6unp6urq6+rq6uvq6uvr6+vr7Ovs7Ozr7Ozs7e3t7e3u7e7t7u7u7+7v7+/u 7+/v7/Dv8PDw8fHx8vHx8vHy8fLx8vLx8vLy8/Pz8/P09PT09PX19fX09fX19vX29fb29vb29/b2 +Pj4+fn5+fr5+vr6+/r7+/v7/Pv7/Pz8/f38/f39/v7+////luqVlQAAAAF0Uk5TAEDm2GYAAAAB YktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVDDEy7mLerQAAAKxJREFU OMvt0VsXgUAUhuEap5FDzkJJxJCQnDJhJP7/X8Jcaa3ZF+57b/ezvpstSWlpv8mJBPdXHMeM0YDw ZAHAGJfr3aE1nRMSiEFR7Zj2Yul5GwCUEO942gGg2uYgDOlVDFQt/wX36AKAWo4vPJ43aOFz9RBi LIzEoILQbOUjSs8AUDI9i6y3+4MPAJxtGRZxXNeBgFJo6qOxbU8ggBW1oQ0MvS8EieS/3/0G8lca MRjfviYAAAAASUVORK5CYII= " height="32" width="32" y="24" x="216"/> + <image id="icon:48-4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAADBQTFRFAAAA fwAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////HPn1FAAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsVDDEEIdhL NAAAAE1JREFUOMtjYBgFo2Cogg4oQBfn+A8FDWgS/TCJH9SQ+F5eXo5dB06J76TqwGlHeXk9Lon/ 37FL1OPwR/l/UiW+4wyrepICEWdE4YpaABWMpBlfH0NpAAAAAElFTkSuQmCC " height="48" width="48" y="8" x="120"/> + <image id="icon:48-8" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c6QAAASlQTFRFAAAh hYeCh4mEiIqFn6Gdqquorq+tr7CtsrOwu7y6wMC/wcLAw8TCxMXDy8zKzM3Lzc3M1dXU1dbV4+Pj 5OPk4+Tj5OTk5OTl5eTk5OXk5OXl5eXl5uXl5uXm5ebl5ubm5+bm5+bn5ufm5ufn5+fm5+fn6Ofn 5+jn5+jo6Ojn6Ojo6Ojp6Ono6Onp6eno6enp6unp6unq6erp6erq6urq6urr6+rr6+vr7Ovr7Ovs 6+zs7Ozr7Ozs7Ozt7ezs7O3s7e3t7e7t7e7u7u7t7u7u7u7v7+7u7+7v7+/v7+/w8O/v8O/w7/Dv 7/Dw8PDw8fDw8fDx8fHw8fHx8fLx8vLy8/Ly8vPz8/Pz9PP09PT09PT19PX19fX19fX29vX19vX2 9vb29/f2////bxPruAAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEA mpwYAAAAB3RJTUUH2QsVDC4rR1N48wAAAStJREFUSMftk1tbgkAQhi0j7XygzPIA2VK2WphRa0SJ uRVlbagQatqB//8jWuWqLpy86I73+nt3ZvaZiURCQkJCQv6B6C+g/Azyf4DiwPtoMyEpuKSRi2uz Tim9QVPjBT+RkvaPNGKYtVur8fxk+VFIyCpY5fm6xV7sVpOBQkrCx6dCgOM4bVBIy3lVuwwEz/Ne QSEj4xLvaCT0+v0u3JJSUEl1YSQMPt/f4JYQnznIC4Ovjx4oSHv4ZJhfbf+xJV6hLMSElYbtCN1O x4NnyGE1Nrtcs1jTcV3XAYUd6aA4t2iY1GJ2iwMKycxufn6dfyy9e2CPDF6NjS1eYumcVE2+etY9 BQVxO507LKydkcqVOQQSkCgms3K+WNY0vaIbOkHT4w8iPuEBTXqi31KgR3Z1OKytAAAAAElFTkSu QmCC " height="48" width="48" y="8" x="64"/> + <g id="g2949"> + <rect id="rect11518" stroke-linejoin="bevel" style="color:#000000;stroke-dasharray:none;" transform="matrix(0,-1,1,0,0,0)" fill-rule="evenodd" stroke-dashoffset="0" rx="1" ry="1" height="15" width="15" stroke="#9b9b9b" stroke-linecap="butt" stroke-miterlimit="10" y="176.5" x="-55.5" stroke-width="1" fill="url(#radialGradient2947)"/> + <rect id="rect11528" stroke-linejoin="round" style="color:#000000;stroke-dasharray:none;" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="0" ry="0" height="13" width="13" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="10" y="177.5" x="-54.5" stroke-width="1" fill="none"/> + <path id="path2177" opacity="0.69886361" style="color:#000000;" d="m183,53c-2-0.5-3.9701-4.595,0-7.0735l-1.8894-1.9189c0,0.001,5.89-0.007,5.89-0.007l-0.009,5.834s-1.9311-1.8906-1.9311-1.8906c-3.38,1.706-3.06,4.057-2.06,5.057z" fill-rule="nonzero" display="block" fill="#888a85"/> + </g> + <rect id="icon:32-32" height="32" width="32" y="24" x="176" fill="none"/> + <g id="g2993"> + <rect id="rect11518-1" stroke-linejoin="bevel" style="color:#000000;stroke-dasharray:none;" transform="matrix(0,-1,1,0,0,0)" fill-rule="evenodd" stroke-dashoffset="0" rx="3" ry="3" height="19" width="19" stroke="#9b9b9b" stroke-linecap="butt" stroke-miterlimit="10" y="8.5" x="-55.5" stroke-width="1" fill="url(#radialGradient2991)"/> + <rect id="rect11528-1" stroke-linejoin="round" style="color:#000000;stroke-dasharray:none;" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="2" ry="2" height="17" width="17" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="10" y="9.5" x="-54.5" stroke-width="1" fill="none"/> + <path id="path2177-5" opacity="0.69886361" style="color:#000000;" d="m16.887,53c-2.5265-0.66352-4.8868-5.5,0-9.3869l-2.387-2.613h7.5v8c0,0.000066-2.5107-2.7103-2.5107-2.7103-3.489,2.71-3.865,5.383-2.602,6.71z" fill-rule="nonzero" display="block" fill="#888a85"/> + </g> + <rect id="icon:48-32" height="48" width="48" y="8" x="8" fill="none"/> +</svg>

1 0

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

14 Apr '10

Module: wine Branch: master Commit: e1eaa4132a09c57ccb7d75666ff3a57eff9b3474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1eaa4132a09c57ccb7d75666… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 22:00:10 2010 +0100 shell32: Replaced trash_file.ico with a Tango compliant icon. --- dlls/shell32/trash_file.ico | Bin 15086 -> 25214 bytes dlls/shell32/trash_file.svg | 622 +++++++++---------------------------------- 2 files changed, 132 insertions(+), 490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1eaa4132a09c57ccb7d7…

1 0