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

Alexandre Julliard : ntdll: Fix the initial FPU control word on 32-bit too.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 0db65fd36ee8399e08635eec8a038919e3b029bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db65fd36ee8399e08635eec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 11:19:02 2010 +0200 ntdll: Fix the initial FPU control word on 32-bit too. --- dlls/kernel32/tests/thread.c | 7 ++++--- dlls/ntdll/signal_i386.c | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 1d3931f..3da29a2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1329,6 +1329,8 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } +void _fpreset(void) {} /* override the mingw fpu init code */ + static inline void set_fpu_cw(WORD cw) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) @@ -1387,11 +1389,10 @@ static WORD get_thread_fpu_cw(void) static void test_thread_fpu_cw(void) { - WORD initial_cw, cw, expect; + WORD initial_cw, cw; initial_cw = get_fpu_cw(); - expect = sizeof(void *) > sizeof(int) ? 0x27f : 0x37f; - ok(initial_cw == expect, "Expected FPU control word expect, got %#x.\n", initial_cw); + ok(initial_cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", initial_cw); cw = get_thread_fpu_cw(); ok(cw == 0x27f, "Expected FPU control word 0x27f, got %#x.\n", cw); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b003436..c08693e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2155,6 +2155,7 @@ void signal_free_thread( TEB *teb ) */ void signal_init_thread( TEB *teb ) { + const WORD fpu_cw = 0x27f; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1; LDT_ENTRY fs_entry; stack_t ss; @@ -2178,15 +2179,11 @@ void signal_init_thread( TEB *teb ) wine_ldt_init_fs( thread_data->fs, &fs_entry ); thread_data->gs = wine_get_gs(); - if (teb->Peb->ProcessHeap) /* Not for the inital thread. */ - { - const WORD fpu_cw = 0x27f; #ifdef __GNUC__ - __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); + __asm__ volatile ("fninit; fldcw %0" : : "m" (fpu_cw)); #else - FIXME("FPU setup not implemented for this platform.\n"); + FIXME("FPU setup not implemented for this platform.\n"); #endif - } } /**********************************************************************

1 0

Michael Stefaniuc : cmd: Don't treat all command lines with '/?' as builtin commands.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 71e647fe5188c8ab7f5e4df6cbb0f04f23ff46c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e647fe5188c8ab7f5e4df6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 22 00:44:15 2010 +0200 cmd: Don't treat all command lines with '/?' as builtin commands. --- programs/cmd/wcmdmain.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b86801c..b50512e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1405,15 +1405,14 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, } for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - whichcmd, count, inbuilt[i], -1) == 2) break; + whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break; } p = WCMD_strtrim_leading_spaces (&whichcmd[count]); WCMD_parse (p, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2)); - if((p[0] == '/') && (p[1] == '?')) { - - /*this is a help request for a program*/ + if (i <= WCMD_EXIT && (p[0] == '/') && (p[1] == '?')) { + /* this is a help request for a builtin program */ i = WCMD_HELP; memcpy(p, whichcmd, count * sizeof(WCHAR)); p[count] = '\0';

1 0

Frédéric Delanoy : cmd: Update French translation .
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 2030b8c0c84bb66a3eebe8504c0d0f17823cafc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2030b8c0c84bb66a3eebe8504… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 21 19:23:56 2010 +0200 cmd: Update French translation. --- programs/cmd/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index 6ee1e1d..ba86eed 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -114,8 +114,8 @@ MOVE échoue si l'ancien et le nouvel emplacement sont sur des lecteurs DOS diff WCMD_PATH, "PATH affiche ou change le chemin de recherche de cmd.\n\ \n\ -Entrer PATH seul affiche le réglage courant de PATH (initialement\n\ -c'est la valeur donnée dans le fichier wine.conf). Pour changer\n\ +Entrer PATH seul affiche le réglage courant de PATH (dont la valeur\n\ +initiale provient de la base de registre). Pour changer\n\ le réglage, faites suivre la commande PATH par la nouvelle valeur.\n\ Il est aussi possible de modifier le PATH en utilisant la variable\n\ d'environnement PATH, par exemple :\n\

1 0

Aurimas Fišeras : cmd: Update Lithuanian translation.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: e554c4575f4858b4f6f06a5e52aaa22ff987704a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e554c4575f4858b4f6f06a5e5… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 21 19:23:46 2010 +0300 cmd: Update Lithuanian translation. --- programs/cmd/Lt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Lt.rc b/programs/cmd/Lt.rc index d3eccb9..9f5ca81 100644 --- a/programs/cmd/Lt.rc +++ b/programs/cmd/Lt.rc @@ -113,8 +113,8 @@ MOVE nepavyksta jei sena ir nauja vietos yra su skirtingomis DOS raidėmis.\n" WCMD_PATH, "PATH parodo ar pakeičia paieškos kelią.\n\ \n\ -Įvedus PATH bus parodyta dabartinė PATH reikšmė (iš pradžių tai reikšmė\n\ -nurodyta jūsų wine.conf faile). Norėdami pakeisti nuostatą nurodykite PATH\n\ +Įvedus PATH bus parodyta dabartinė PATH reikšmė (iš pradžių reikšmė\n\ +paimama iš registro). Norėdami pakeisti nuostatą nurodykite PATH\n\ komandai naują reikšmę kaip parametrą.\n\ \n\ PATH modifikuoti taip pat galima naudojant PATH aplinkos kintamąjį,\n\

1 0

Matteo Bruni : wined3d: Check for error conditions in GL call.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 6585bec5ac0a2793badcac8a4fc9fb267341ed2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6585bec5ac0a2793badcac8a4… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Jun 21 22:14:58 2010 +0200 wined3d: Check for error conditions in GL call. --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d363feb..73c5aff 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -848,6 +848,7 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win { GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, internal, width, height, 0, This->resource.size, mem)); + checkGLcall("glCompressedTexImage2DARB"); } else {

1 0

Andrew Nguyen : ddraw/tests: Add an observation regarding device color model criteria for IDirect3D3:: FindDevice.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: bdc29f83bc6fcd3c550fdb710d634e48c9b1739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc29f83bc6fcd3c550fdb710… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 21 10:15:18 2010 -0500 ddraw/tests: Add an observation regarding device color model criteria for IDirect3D3::FindDevice. --- dlls/ddraw/tests/d3d.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 7f47d20..069bc96 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3487,6 +3487,17 @@ static void FindDevice(void) "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); } } + + /* Curiously the color model criteria seem to be ignored. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_COLORMODEL; + search.dcmColorModel = 0xdeadbeef; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + todo_wine + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); } START_TEST(d3d)

1 0

Andrew Nguyen : ddraw: Validate structure pointers and sizes in IDirect3D3: :FindDevice.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 10a076ad8d653db5d626310464033c9c1a6929e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a076ad8d653db5d62631046… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 21 10:14:51 2010 -0500 ddraw: Validate structure pointers and sizes in IDirect3D3::FindDevice. --- dlls/ddraw/direct3d.c | 7 +++++++ dlls/ddraw/tests/d3d.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 3f2410f..f919860 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -666,6 +666,13 @@ IDirect3DImpl_3_FindDevice(IDirect3D3 *iface, TRACE("(%p)->(%p,%p)\n", This, D3DDFS, D3DFDR); + if (!D3DDFS || !D3DFDR) + return DDERR_INVALIDPARAMS; + + if (D3DDFS->dwSize != sizeof(D3DFINDDEVICESEARCH) || + D3DFDR->dwSize != sizeof(D3DFINDDEVICERESULT)) + return DDERR_INVALIDPARAMS; + if ((D3DDFS->dwFlags & D3DFDS_COLORMODEL) && (D3DDFS->dcmColorModel != D3DCOLOR_RGB)) { diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 26dc1cf..e74fb79 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3391,6 +3391,40 @@ static void VertexBufferLockRest(void) IDirect3DVertexBuffer7_Release(buffer); } +static void FindDevice(void) +{ + D3DFINDDEVICESEARCH search = {0}; + D3DFINDDEVICERESULT result = {0}; + HRESULT hr; + + /* Test invalid parameters. */ + hr = IDirect3D_FindDevice(Direct3D1, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + hr = IDirect3D_FindDevice(Direct3D1, NULL, &result); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + hr = IDirect3D_FindDevice(Direct3D1, &search, NULL); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + search.dwSize = 0; + result.dwSize = 0; + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); + + search.dwSize = sizeof(search) + 1; + result.dwSize = sizeof(result) + 1; + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + ok(hr == DDERR_INVALIDPARAMS, + "Expected IDirect3D1::FindDevice to return DDERR_INVALIDPARAMS, got 0x%08x\n", hr); +} + START_TEST(d3d) { init_function_pointers(); @@ -3425,6 +3459,7 @@ START_TEST(d3d) Direct3D1Test(); TextureLoadTest(); ViewportTest(); + FindDevice(); D3D1_releaseObjects(); }

1 0

Michael Stefaniuc : xcopy: Update the English resource.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: 1d7f820f17d76e71f5b8b945a07eb1ef5dd9f19f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7f820f17d76e71f5b8b945a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 22 00:44:05 2010 +0200 xcopy: Update the English resource. --- programs/xcopy/En.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/xcopy/En.rc b/programs/xcopy/En.rc index 83ef291..6fb299c 100644 --- a/programs/xcopy/En.rc +++ b/programs/xcopy/En.rc @@ -53,8 +53,8 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Where:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or\n\ -\tmore files\n\ +[/I] Assume directory if destination does not exist and copying two or\n\ +\ more files\n\ [/S] Copy directories and subdirectories\n\ [/E] Copy directories and subdirectories, including any empty ones\n\ [/Q] Do not list names during copy, ie quiet.\n\ @@ -72,7 +72,7 @@ Where:\n\ [/C] Continue even if an error occurs during the copy\n\ [/A] Only copy files with archive attribute set\n\ [/M] Only copy files with archive attribute set, removes\n\ -\tarchive attribute\n\ +\ archive attribute\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source\n\n"

1 0

Michael Stefaniuc : xcopy: Add the Romanian translation.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: a2b2d6adeb71bc7c9caf0f2cf68ef0b585e2804a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b2d6adeb71bc7c9caf0f2cf… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Tue Jun 22 00:43:57 2010 +0200 xcopy: Add the Romanian translation. Translation by Claudia Cotună. --- programs/xcopy/Makefile.in | 1 + programs/xcopy/Ro.rc | 80 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index ea98eba..8d8e9e7 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Uk.rc diff --git a/programs/xcopy/Ro.rc b/programs/xcopy/Ro.rc new file mode 100644 index 0000000..3e8a655 --- /dev/null +++ b/programs/xcopy/Ro.rc @@ -0,0 +1,80 @@ +/* + * XCOPY - Wine-compatible xcopy program + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2010 Claudia Cotună + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + STRING_INVPARMS, "Număr de parametri nevalid - Utilizați xcopy /? pentru ajutor\n" + STRING_INVPARM, "Parametru nevalid „%s” - Utilizați xcopy /? pentru ajutor\n" + STRING_PAUSE, "Apăsați pe <enter> pentru a începe copierea\n" + STRING_SIMCOPY, "%d fișier(e) ar fi copiat(e)\n" + STRING_COPY, "%d fișier(e) copiat(e)\n" + STRING_QISDIR, "„%s” este un nume de fișier sau un director\ndin destinație?\n(F - Fișier, D - Director)\n" + STRING_SRCPROMPT,"%s? (Da|Nu)\n" + STRING_OVERWRITE,"Se suprascrie %s? (Da|Nu|Toate)\n" + STRING_COPYFAIL, "Copierea „%s” în „%s” a eșuat cu cod de retur %d\n" + STRING_OPENFAIL, "Deschiderea „%s” a eșuat\n" + STRING_READFAIL, "Citirea „%s” a eșuat\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copiază fișiere sau arbori de directoare sursă într-o destinație\n\ +\n\ +Sintaxă:\n\ +XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\ [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\nCu:\n\ +\n\ +[/I] Creează director dacă destinația nu există și se copiază două sau\n\ +\ mai multe fișiere\n\ +[/S] Copiază directoarele și subdirectoarele\n\ +[/E] Copiază directoarele și subdirectoarele, inclusiv pe cele goale\n\ +[/Q] Nu afișa numele în timpul copierii.\n\ +[/F] Arată numele întreg pentru sursă și destinație în timpul copierii\n\ +[/L] Simulează operațiunea, afișând numele care ar fi copiate\n\ +[/W] Solicită confirmarea înainte de a începe copierea\n\ +[/T] Creează o structură de directoare goale, dar nu copiază fișiere\n\ +[/Y] Nu solicita confirmarea la suprascrierea fișierelor\n\ +[/-Y] Solicită confirmarea la suprascrierea fișierelor\n\ +[/P] Solicită confirmarea înainte de copierea fiecărui fișier sursă \n\ +[/N] Copiază utilizând prescurtări de nume\n\ +[/U] Copiază numai fișierele care există deja în destinație\n\ +[/R] Suprascrie orice fișiere cu protecție la modificări\n\ +[/H] Include în copie fișierele ascunse și de sistem\n\ +[/C] Continuă chiar dacă apare o eroare în timpul copierii\n\ +[/A] Copiază numai fișierele cu atributul de arhivă activat\n\ +[/M] Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\ +\ apoi atributul\n\ +[/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\ +\t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\ +\t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\ +\t\tsursă\n\n" +}

1 0

Gustavo Henrique Milaré : winecfg: Update Portuguese translation.
by Alexandre Julliard June 22, 2010

June 22, 2010

Module: wine Branch: master Commit: cdad4e4af2fbcaad6b082abefbd98be47af6ac4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdad4e4af2fbcaad6b082abef… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Mon Jun 21 21:07:29 2010 -0300 winecfg: Update Portuguese translation. --- programs/winecfg/Pt.rc | 320 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 248 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdad4e4af2fbcaad6b082…

1 0