December 2011 - Wine-Commits

Jacek Caban : mshtml: Don' t use WINAPI for assembly functions to avoid linker warnings on mingw.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 3284d17ec28382177be1e42dbccf66ae5435d21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3284d17ec28382177be1e42db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 11:09:40 2011 +0100 mshtml: Don't use WINAPI for assembly functions to avoid linker warnings on mingw. --- dlls/mshtml/ifacewrap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/ifacewrap.c b/dlls/mshtml/ifacewrap.c index 006afd2..0e49190 100644 --- a/dlls/mshtml/ifacewrap.c +++ b/dlls/mshtml/ifacewrap.c @@ -88,7 +88,7 @@ static HRESULT WINAPI wrapper_Release(IUnknown *iface) #ifdef __i386__ #define DEFINE_WRAPPER_FUNC(n, off, x) \ - HRESULT WINAPI wrapper_func_##n(IUnknown*); \ + HRESULT wrapper_func_##n(IUnknown*); \ __ASM_GLOBAL_FUNC(wrapper_func_##n, \ "movl 4(%esp), %eax\n\t" \ "movl 4(%eax), %eax\n\t" \

1 0

Alexandre Julliard : winex11: Store the visible region handle directly instead of making a copy.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 649e33de58d9e2cdf28850035d25daabe29b14ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=649e33de58d9e2cdf28850035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:31:46 2011 +0100 winex11: Store the visible region handle directly instead of making a copy. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/init.c | 7 ------- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 4f76a1f..356f7d7e 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -244,7 +244,7 @@ void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) RGNDATA *data; X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - CombineRgn( physDev->region, rgn, 0, RGN_COPY ); + physDev->region = rgn; if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) update_x11_clipping( physDev, data ); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8b3b951..39a57b5 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -126,12 +126,6 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL; - if (!(physDev->region = CreateRectRgn( 0, 0, 0, 0 ))) - { - HeapFree( GetProcessHeap(), 0, physDev ); - return NULL; - } - wine_tsx11_lock(); physDev->drawable = drawable; physDev->gc = XCreateGC( gdi_display, drawable, 0, NULL ); @@ -193,7 +187,6 @@ static BOOL X11DRV_DeleteDC( PHYSDEV dev ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - DeleteObject( physDev->region ); wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); wine_tsx11_unlock();

1 0

Alexandre Julliard : winex11: Allow the visible region to be zero when not clipping.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 8d6354c5b23bc2e5d1b0ebdb03583b1bd0c93353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6354c5b23bc2e5d1b0ebdb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 14:00:14 2011 +0100 winex11: Allow the visible region to be zero when not clipping. --- dlls/winex11.drv/bitblt.c | 5 +-- dlls/winex11.drv/graphics.c | 78 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/text.c | 6 ++-- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 75 +++++++++++++++++++++++++---------------- 5 files changed, 101 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d6354c5b23bc2e5d1b0e…

1 0

Piotr Caban : include: Update msvcrt/locale.h.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: f4518b9a543d0f87b7303e918fb04d2f7758a04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4518b9a543d0f87b7303e918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:31 2011 +0100 include: Update msvcrt/locale.h. --- include/msvcrt/locale.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index 2b97c54..5e0dd35 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -63,6 +63,10 @@ extern "C" { char* __cdecl setlocale(int,const char*); struct lconv* __cdecl localeconv(void); +int __cdecl _configthreadlocale(int); +_locale_t __cdecl _get_current_locale(void); +_locale_t __cdecl _create_locale(int, const char*); +void __cdecl _free_locale(_locale_t); #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED

1 0

Piotr Caban : msvcp90: Added _Getctype implementation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: c56c74331c337e7ec2ba0142d328b577b274375c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56c74331c337e7ec2ba0142d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:52 2011 +0100 msvcp90: Added _Getctype implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++---- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a319d12..2fd3bd1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -68,7 +68,7 @@ typedef struct { typedef struct { LCID handle; unsigned page; - const short *table; + short *table; int delfl; } _Ctypevec; @@ -868,14 +868,33 @@ _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) return _Getcoll(); } +/* _Getctype */ +_Ctypevec __cdecl _Getctype(void) +{ + _Ctypevec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_codepage; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret.delfl = TRUE; + ret.table = malloc(sizeof(short[256])); + if(!ret.table) { + _free_locale(locale); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy(ret.table, locale->locinfo->pctype, sizeof(short[256])); + _free_locale(locale); + return ret; +} + /* ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ /* ?_Getctype(a)_Locinfo@std@@QEBA?AU_Ctypevec@@XZ */ DEFINE_THISCALL_WRAPPER_RETPTR(_Locinfo__Getctype, 4) _Ctypevec __thiscall _Locinfo__Getctype(const _Locinfo *this) { - _Ctypevec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getctype(); } /* ?_Getcvt(a)_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2464328..bcaaa1c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5751,7 +5751,7 @@ @ extern _FSnan # extern _FXbig @ cdecl _Getcoll() -@ stub _Getctype +@ cdecl _Getctype() @ stub _Getcvt @ stub _Getdateorder @ stub _Getwctype diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 069c935..221edf1 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -17,12 +17,22 @@ */ #include <stdio.h> +#include <locale.h> #include <windef.h> #include <winbase.h> #include "wine/test.h" +typedef struct { + LCID handle; + unsigned page; + short *table; + int delfl; +} MSVCP__Ctypevec; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); +static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); static void (__cdecl *p_wchar_assign)(void*, const void*); @@ -35,6 +45,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); +static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); #ifdef __i386__ #define __thiscall __stdcall @@ -119,7 +130,9 @@ static BOOL init(void) } p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); - if(!p_set_invalid_parameter_handler) { + p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p_free = (void*)GetProcAddress(msvcr, "free"); + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -127,6 +140,7 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); SET(p_wctype, "wctype"); + SET(p__Getctype, "_Getctype"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -291,6 +305,26 @@ static void test_wctype(void) } } +static void test__Getctype(void) +{ + MSVCP__Ctypevec ret; + + ret = p__Getctype(); + ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); + ok(ret.page == 0, "ret.page = %d\n", ret.page); + ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); + ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); + p_free(ret.table); + + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + ret = p__Getctype(); + ok(ret.handle == 1, "ret.handle = %d\n", ret.handle); + ok(ret.page == 0, "ret.page = %d\n", ret.page); + ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); + ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); + p_free(ret.table); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -331,6 +365,7 @@ START_TEST(misc) test_equal(); test_Copy_s(); test_wctype(); + test__Getctype(); test_allocator_char();

1 0

Jacek Caban : jscript: Use bytecode for '^=' expression implementation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 9749de29bcd39e39bb9b29f33c2529d88999d97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9749de29bcd39e39bb9b29f33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:42:30 2011 +0100 jscript: Use bytecode for '^=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ----------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 22d5a5f..645217a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -501,6 +501,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_ASSIGNOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); + case EXPR_ASSIGNXOR: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9816b64..8e5e5f1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2170,25 +2170,6 @@ static HRESULT interp_or(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.10 */ -static HRESULT xor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - INT li, ri; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_int32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li^ri; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.10 */ static HRESULT interp_xor(exec_ctx_t *ctx) { INT l, r; @@ -3365,16 +3346,6 @@ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret); -} - static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 49c7aa8..d613267 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -577,7 +577,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0192eff..bf3732d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1351,7 +1351,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, assign_and_expression_eval, compiled_expression_eval, - assign_xor_expression_eval, + compiled_expression_eval, compiled_expression_eval, array_expression_eval, member_expression_eval,

1 0

Frédéric Delanoy : po: Use non-breaking space before double punctuation in the French translation .
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 099e7f09ecd1e0634bf32b6deb54be67e1c4f563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099e7f09ecd1e0634bf32b6de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 6 01:57:16 2011 +0100 po: Use non-breaking space before double punctuation in the French translation. --- po/fr.po | 76 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/po/fr.po b/po/fr.po index c295f02..fc673ab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -76,11 +76,11 @@ msgstr "OK" msgid "The following information can be used to get technical support for %s:" msgstr "" "Les informations suivantes peuvent être utilisées pour obtenir du support " -"technique pour %s :" +"technique pour %s :" #: appwiz.rc:77 msgid "Publisher:" -msgstr "Éditeur :" +msgstr "Éditeur :" #: appwiz.rc:78 winefile.rc:172 msgid "Version:" @@ -88,27 +88,27 @@ msgstr "Version :" #: appwiz.rc:79 msgid "Contact:" -msgstr "Contact :" +msgstr "Contact :" #: appwiz.rc:80 msgid "Support Information:" -msgstr "Support :" +msgstr "Support :" #: appwiz.rc:81 msgid "Support Telephone:" -msgstr "Téléphone :" +msgstr "Téléphone :" #: appwiz.rc:82 msgid "Readme:" -msgstr "Lisez-moi :" +msgstr "Lisez-moi :" #: appwiz.rc:83 msgid "Product Updates:" -msgstr "Mises à jour :" +msgstr "Mises à jour :" #: appwiz.rc:84 msgid "Comments:" -msgstr "Commentaires :" +msgstr "Commentaires :" #: appwiz.rc:97 msgid "Wine Gecko Installer" @@ -1901,11 +1901,11 @@ msgstr "" #: cryptui.rc:74 msgid "X.509 Certificate (*.cer; *.crt)" -msgstr "Certificat X.509 (*.cer ; *.crt)" +msgstr "Certificat X.509 (*.cer ; *.crt)" #: cryptui.rc:75 msgid "Personal Information Exchange (*.pfx; *.p12)" -msgstr "Échange d'informations personnelles (*.pfx ; *.p12)" +msgstr "Échange d'informations personnelles (*.pfx ; *.p12)" #: cryptui.rc:76 cryptui.rc:155 msgid "Certificate Revocation List (*.crl)" @@ -1921,7 +1921,7 @@ msgstr "Magasin de certificats sérialisés Microsoft (*.sst)" #: cryptui.rc:79 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" -msgstr "Messages CMS/PKCS #7 (*.spc ; *.p7b)" +msgstr "Messages CMS/PKCS #7 (*.spc ; *.p7b)" #: cryptui.rc:81 msgid "Please select a file." @@ -5932,7 +5932,7 @@ msgstr "Informations sur l'hyperlien" #: mshtml.rc:41 winecfg.rc:247 msgid "&Type:" -msgstr "&Type :" +msgstr "&Type :" #: mshtml.rc:43 msgid "&URL:" @@ -6387,7 +6387,7 @@ msgstr "Insérer objet" #: oledlg.rc:54 msgid "Object Type:" -msgstr "Type d'objet :" +msgstr "Type d'objet :" #: oledlg.rc:57 oledlg.rc:95 msgid "Result" @@ -6419,7 +6419,7 @@ msgstr "Parcourir..." #: oledlg.rc:69 msgid "File:" -msgstr "Fichier :" +msgstr "Fichier :" #: oledlg.rc:75 msgid "Paste Special" @@ -7681,7 +7681,7 @@ msgstr "Le certificat pour ce site pose problème." #: wininet.rc:79 msgid "Do you want to continue anyway?" -msgstr "Voulez-vous tout de même continuer ?" +msgstr "Voulez-vous tout de même continuer ?" #: wininet.rc:25 msgid "LAN Connection" @@ -9039,7 +9039,7 @@ msgid "" msgstr "" "SHIFT est utilisé dans un fichier batch pour enlever le premier paramètre de " "la\n" -"liste ; ainsi, le paramètre 2 devient paramètre 1 et ainsi de suite. Il est " +"liste ; ainsi, le paramètre 2 devient paramètre 1 et ainsi de suite. Il est " "sans effet\n" "s'il est appelé depuis la ligne de commande.\n" @@ -9050,7 +9050,7 @@ msgstr "TIME règle ou affiche l'heure système courante.\n" #: cmd.rc:187 msgid "Sets the window title for the cmd window, syntax TITLE [string]\n" msgstr "" -"Définit le titre de la fenêtre pour la session cmd ; syntaxe : TITLE " +"Définit le titre de la fenêtre pour la session cmd ; syntaxe : TITLE " "[chaîne]\n" #: cmd.rc:191 @@ -9329,7 +9329,7 @@ msgstr "Erreur de syntaxe\n" #: cmd.rc:302 msgid "%s: File Not Found\n" -msgstr "%s : fichier non trouvé\n" +msgstr "%s : fichier non trouvé\n" #: cmd.rc:303 msgid "No help available for %s\n" @@ -9436,7 +9436,7 @@ msgstr "Outil de diagnostic DirectX" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "Usage : dxdiag [/whql:off | /whql:on] [/t fichier | /x fichier]" +msgstr "Usage : dxdiag [/whql:off | /whql:on] [/t fichier | /x fichier]" #: explorer.rc:28 msgid "Wine Explorer" @@ -9448,7 +9448,7 @@ msgstr "Emplacement :" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "Usage : hostname\n" +msgstr "Usage : hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" @@ -9459,17 +9459,17 @@ msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" -"Erreur : impossible de spécifier le nom d'hôte système avec l'utilitaire " +"Erreur : impossible de spécifier le nom d'hôte système avec l'utilitaire " "hostname.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "Usage : ipconfig [ /? | /all ]\n" +msgstr "Usage : ipconfig [ /? | /all ]\n" #: ipconfig.rc:28 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Erreur : les paramètres de ligne de commande spécifiés sont inconnus ou " +"Erreur : les paramètres de ligne de commande spécifiés sont inconnus ou " "invalides\n" #: ipconfig.rc:29 @@ -10839,7 +10839,7 @@ msgstr "Occurrence de « %s » non trouvée" #: regedit.rc:183 msgid "Are you sure you want to delete these values?" -msgstr "Voulez-vous réellement supprimer ces valeurs ?" +msgstr "Voulez-vous réellement supprimer ces valeurs ?" #: regedit.rc:184 msgid "New Key #%d" @@ -10969,27 +10969,27 @@ msgstr "" #: taskkill.rc:27 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "Usage : taskkill [/?] [/f] [/im NomProcessus | /pid IdProcessus]\n" +msgstr "Usage : taskkill [/?] [/f] [/im NomProcessus | /pid IdProcessus]\n" #: taskkill.rc:28 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "Erreur : option de ligne de commande inconnue ou invalide.\n" +msgstr "Erreur : option de ligne de commande inconnue ou invalide.\n" #: taskkill.rc:29 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Erreur : paramètre de ligne de commande invalide.\n" +msgstr "Erreur : paramètre de ligne de commande invalide.\n" #: taskkill.rc:30 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "Erreur : une des options /im ou /pid doit être spécifiée.\n" +msgstr "Erreur : une des options /im ou /pid doit être spécifiée.\n" #: taskkill.rc:31 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Erreur : l'option %1 requiert un paramètre de ligne de commande.\n" +msgstr "Erreur : l'option %1 requiert un paramètre de ligne de commande.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "Erreur : les options /im et /pid sont incompatibles.\n" +msgstr "Erreur : les options /im et /pid sont incompatibles.\n" #: taskkill.rc:33 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -11923,7 +11923,7 @@ msgstr "Wine" #: wineboot.rc:43 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"La configuration de Wine est en cours de mise à jour dans %s ; veuillez " +"La configuration de Wine est en cours de mise à jour dans %s ; veuillez " "patienter..." #: winecfg.rc:138 @@ -12093,7 +12093,7 @@ msgid "" "Failed to connect to the mount manager, the drive configuration cannot be " "edited." msgstr "" -"N'a pu se connecter au gestionnaire de montage : la configuration du lecteur " +"N'a pu se connecter au gestionnaire de montage : la configuration du lecteur " "n'a pu être éditée." #: winecfg.rc:238 @@ -12286,11 +12286,11 @@ msgid "" "Are you sure you want to do this?" msgstr "" "Modifier l'ordre de chargement de cette bibliothèque n'est pas recommandé.\n" -"Êtes-vous sûr de vouloir le faire ?" +"Êtes-vous sûr de vouloir le faire ?" #: winecfg.rc:52 msgid "Warning: system library" -msgstr "Attention : bibliothèque système" +msgstr "Attention : bibliothèque système" #: winecfg.rc:53 msgid "native" @@ -12697,15 +12697,15 @@ msgstr "Ceci est un test" #: wineconsole.rc:41 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" +msgstr "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" #: wineconsole.rc:42 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole : moteur de traitement invalide\n" +msgstr "wineconsole : moteur de traitement invalide\n" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole : option de ligne de commande non reconnue\n" +msgstr "wineconsole : option de ligne de commande non reconnue\n" #: wineconsole.rc:44 msgid "Starts a program in a Wine console\n" @@ -12716,7 +12716,7 @@ msgid "" "wineconsole: Starting program %s failed.\n" "The command is invalid.\n" msgstr "" -"wineconsole : impossible de démarrer le programme %s.\n" +"wineconsole : impossible de démarrer le programme %s.\n" "La commande est invalide.\n" #: wineconsole.rc:47

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DLOCKED_BOX typedef.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 2fa5a22100731277d06cdc74d383b22ec8d6834d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa5a22100731277d06cdc74d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:57 2011 +0100 wined3d: Get rid of the WINED3DLOCKED_BOX typedef. --- dlls/d3d10core/texture.c | 8 ++++---- dlls/d3d8/volume.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/volume.c | 20 ++++++++++---------- include/wine/wined3d.h | 12 ++++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index bd9b63a..f6e6d3b 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -363,8 +363,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + struct wined3d_mapped_box wined3d_map_desc; struct wined3d_resource *sub_resource; - WINED3DLOCKED_BOX wined3d_map_desc; HRESULT hr; TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", @@ -380,9 +380,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN else if (SUCCEEDED(hr = wined3d_volume_map(wined3d_volume_from_resource(sub_resource), &wined3d_map_desc, NULL, 0))) { - mapped_texture->pData = wined3d_map_desc.pBits; - mapped_texture->RowPitch = wined3d_map_desc.RowPitch; - mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; + mapped_texture->pData = wined3d_map_desc.data; + mapped_texture->RowPitch = wined3d_map_desc.row_pitch; + mapped_texture->DepthPitch = wined3d_map_desc.slice_pitch; } return hr; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index f3d1132..069b64f 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -227,7 +227,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface, iface, pLockedVolume, pBox, Flags); wined3d_mutex_lock(); - hr = wined3d_volume_map(This->wined3d_volume, (WINED3DLOCKED_BOX *)pLockedVolume, + hr = wined3d_volume_map(This->wined3d_volume, (struct wined3d_mapped_box *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 5e430b9..dfd27fe 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -225,7 +225,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(IDirect3DVolume9 *iface, iface, pLockedVolume, pBox, Flags); wined3d_mutex_lock(); - hr = wined3d_volume_map(This->wined3d_volume, (WINED3DLOCKED_BOX *)pLockedVolume, + hr = wined3d_volume_map(This->wined3d_volume, (struct wined3d_mapped_box *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 987d540..068fb7f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4301,8 +4301,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic static HRESULT device_update_volume(struct wined3d_device *device, struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) { - WINED3DLOCKED_BOX src; - WINED3DLOCKED_BOX dst; + struct wined3d_mapped_box src; + struct wined3d_mapped_box dst; HRESULT hr; TRACE("device %p, src_volume %p, dst_volume %p.\n", @@ -4319,7 +4319,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, return hr; } - memcpy(dst.pBits, src.pBits, dst_volume->resource.size); + memcpy(dst.data, src.data, dst_volume->resource.size); hr = wined3d_volume_unmap(dst_volume); if (FAILED(hr)) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d36d6c3..d00cc4d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -185,23 +185,23 @@ struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volum } HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, - WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) + struct wined3d_mapped_box *mapped_box, const WINED3DBOX *box, DWORD flags) { - TRACE("volume %p, locked_box %p, box %p, flags %#x.\n", - volume, locked_box, box, flags); + TRACE("volume %p, mapped_box %p, box %p, flags %#x.\n", + volume, mapped_box, box, flags); if (!volume->resource.allocatedMemory) volume->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, volume->resource.size); TRACE("allocatedMemory %p.\n", volume->resource.allocatedMemory); - locked_box->RowPitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ - locked_box->SlicePitch = volume->resource.format->byte_count + mapped_box->row_pitch = volume->resource.format->byte_count * volume->resource.width; /* Bytes / row */ + mapped_box->slice_pitch = volume->resource.format->byte_count * volume->resource.width * volume->resource.height; /* Bytes / slice */ if (!box) { TRACE("No box supplied - all is ok\n"); - locked_box->pBits = volume->resource.allocatedMemory; + mapped_box->data = volume->resource.allocatedMemory; volume->lockedBox.Left = 0; volume->lockedBox.Top = 0; volume->lockedBox.Front = 0; @@ -213,9 +213,9 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, { TRACE("Lock Box (%p) = l %d, t %d, r %d, b %d, fr %d, ba %d\n", box, box->Left, box->Top, box->Right, box->Bottom, box->Front, box->Back); - locked_box->pBits = volume->resource.allocatedMemory - + (locked_box->SlicePitch * box->Front) /* FIXME: is front < back or vica versa? */ - + (locked_box->RowPitch * box->Top) + mapped_box->data = volume->resource.allocatedMemory + + (mapped_box->slice_pitch * box->Front) /* FIXME: is front < back or vica versa? */ + + (mapped_box->row_pitch * box->Top) + (box->Left * volume->resource.format->byte_count); volume->lockedBox.Left = box->Left; volume->lockedBox.Top = box->Top; @@ -234,7 +234,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, volume->locked = TRUE; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", - locked_box->pBits, locked_box->RowPitch, locked_box->SlicePitch); + mapped_box->data, mapped_box->row_pitch, mapped_box->slice_pitch); return WINED3D_OK; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 91d73b6..a0356a2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1708,12 +1708,12 @@ struct wined3d_mapped_rect void *data; }; -typedef struct _WINED3DLOCKED_BOX +struct wined3d_mapped_box { - INT RowPitch; - INT SlicePitch; - void *pBits; -} WINED3DLOCKED_BOX; + UINT row_pitch; + UINT slice_pitch; + void *data; +}; typedef struct _WINED3DBOX { @@ -2452,7 +2452,7 @@ DWORD __cdecl wined3d_volume_get_priority(const struct wined3d_volume *volume); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, - WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags); + struct wined3d_mapped_box *mapped_box, const WINED3DBOX *box, DWORD flags); void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); DWORD __cdecl wined3d_volume_set_priority(struct wined3d_volume *volume, DWORD new_priority); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume);

1 0

Henri Verbeet : wined3d: Disable client storage in upload_palette().
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 107369d018cb9d6426538ed0a011e7518eacece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107369d018cb9d6426538ed0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:54 2011 +0100 wined3d: Disable client storage in upload_palette(). Stack pointers don't work so well with client storage. --- dlls/wined3d/arb_program_shader.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 86eb5f1..ecb2c03 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6950,6 +6950,13 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d d3dfmt_p8_init_palette(surface, table, colorkey); ENTER_GL(); + + if (gl_info->supported[APPLE_CLIENT_STORAGE]) + { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } + if (!priv->palette_texture) glGenTextures(1, &priv->palette_texture); @@ -6966,6 +6973,12 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d /* TODO: avoid unneeded uploads in the future by adding some SFLAG_PALETTE_DIRTY mechanism */ glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, table); + if (gl_info->supported[APPLE_CLIENT_STORAGE]) + { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + } + /* Switch back to unit 0 in which the 2D texture will be stored. */ context_active_texture(context, gl_info, 0); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Don' t declare more varyings than required by the shader model.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 66d453ce5c77fe1bfa044f65c5f956a0d4cdd0ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d453ce5c77fe1bfa044f65c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:53 2011 +0100 wined3d: Don't declare more varyings than required by the shader model. --- dlls/wined3d/glsl_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b746139..47d2e66 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1129,16 +1129,15 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont */ if (pshader && reg_maps->shader_version.major >= 3) { + UINT in_count = min(vec4_varyings(reg_maps->shader_version.major, gl_info), shader->limits.packed_input); + if (use_vs(state)) - { - shader_addline(buffer, "varying vec4 IN[%u];\n", vec4_varyings(reg_maps->shader_version.major, gl_info)); - } else { + shader_addline(buffer, "varying vec4 IN[%u];\n", in_count); + else /* TODO: Write a replacement shader for the fixed function vertex pipeline, so this isn't needed. * For fixed function vertex processing + 3.0 pixel shader we need a separate function in the - * pixel shader that reads the fixed function color into the packed input registers. - */ - shader_addline(buffer, "vec4 IN[%u];\n", vec4_varyings(reg_maps->shader_version.major, gl_info)); - } + * pixel shader that reads the fixed function color into the packed input registers. */ + shader_addline(buffer, "vec4 IN[%u];\n", in_count); } /* Declare output register temporaries */ @@ -3916,8 +3915,9 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else { + UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits.packed_input); /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ - shader_addline(buffer, "varying vec4 IN[%u];\n", vec4_varyings(3, gl_info)); + shader_addline(buffer, "varying vec4 IN[%u];\n", in_count); shader_addline(buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); /* First, sort out position and point size. Those are not passed to the pixel shader */

1 0