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

Stefan Dösinger : wined3d: Check the writemask before activating the oC0 optimization.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 068915a4f128985b0092bd0874f34cf9c88260b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068915a4f128985b0092bd087… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 20 21:29:54 2010 +0200 wined3d: Check the writemask before activating the oC0 optimization. The comment above the code correctly mentions that this optimization does not work if oC0 is written partially, but the code doesn't actually check for this condition. --- dlls/wined3d/shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 66a81fb..209bae4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -661,7 +661,8 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct * COLOROUT 0 is overwritten partially later, the marker is dropped again. */ ps->color0_mov = FALSE; - if (ins.handler_idx == WINED3DSIH_MOV) + if (ins.handler_idx == WINED3DSIH_MOV + && dst_param.write_mask == WINED3DSP_WRITEMASK_ALL) { /* Used later when the source register is read. */ color0_mov = TRUE;

1 0

Davide Pizzetti : winecfg: Italian translation update.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 53db2df4b1513ad0882d9a846a21157dbca2c7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53db2df4b1513ad0882d9a846… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jul 21 23:15:03 2010 +0200 winecfg: Italian translation update. --- programs/winecfg/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index de8f11d..fc0ae91 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -295,7 +295,7 @@ BEGIN IDS_DEVICES_MIDIIN "Dispositivo MIDI In" IDS_DEVICES_AUX "Dispositivo Aux" IDS_DEVICES_MIXER "Dispositivo Mixer" - IDS_UNAVAILABLE_DRIVER "Trovato driver nel registro che non è disponibile!\n\nRimuovere '%s' dal registro?" + IDS_UNAVAILABLE_DRIVER "Trovato driver nel registro non disponibile!\n\nRimuovere '%s' dal registro?" IDS_WARNING "Attenzione" END

1 0

Davide Pizzetti : winedbg: Italian translation update.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: cf96f89ef0a1e680b01cbc26acb3c423e7641343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf96f89ef0a1e680b01cbc26a… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jul 21 23:25:28 2010 +0200 winedbg: Italian translation update. --- programs/winedbg/rsrc_It.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/rsrc_It.rc b/programs/winedbg/rsrc_It.rc index b74c31c..03c1265 100644 --- a/programs/winedbg/rsrc_It.rc +++ b/programs/winedbg/rsrc_It.rc @@ -40,13 +40,13 @@ FONT 8, "Tahoma" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 LTEXT "Il programma %s ha incontrato un errore e deve \ - chiudersi. Siamo spiacenti per l'inconveniente.", + essere chiuso. Siamo spiacenti per l'inconveniente.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "Questo può essere causato da un problema nel programma o da una mancanza in Wine. \ + LTEXT "Ciò può essere causato da un problema nel programma o da una mancanza di Wine. \ Potresti voler consultare http://appdb.winehq.org per consigli su \ questa applicazione.\n\n\ - Se questo problema non è presente sotto Windows e non è stato ancora riportato, \ - puoi riportarlo su http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + Se questo problema non è presente sotto Windows e non è stato ancora segnalato, \ + puoi segnalarlo su http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 DEFPUSHBUTTON "Chiudi", IDOK, 205, 151, 60, 16, WS_TABSTOP END

1 0

Davide Pizzetti : xcopy: Italian translation update.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: fb4bb588808ff82fb7d348af0d1b13d75eb1aced URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4bb588808ff82fb7d348af0… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jul 21 23:47:36 2010 +0200 xcopy: Italian translation update. --- programs/xcopy/It.rc | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/xcopy/It.rc b/programs/xcopy/It.rc index 258cb3f..a3b742a 100644 --- a/programs/xcopy/It.rc +++ b/programs/xcopy/It.rc @@ -31,10 +31,10 @@ STRINGTABLE STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" STRING_INVPARM, "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" STRING_PAUSE, "Premi Invio per iniziare a copiare\n" - STRING_SIMCOPY, "%d file(s) sarebbero copiati\n" - STRING_COPY, "%d file(s) copiati\n" + STRING_SIMCOPY, "%d file sarebbero copiati\n" + STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' è il nome di un file o una cartella\n" \ - "sull'obiettivo?\n" \ + "nell'obiettivo?\n" \ "(F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (Sì|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n" @@ -56,27 +56,27 @@ XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Dove:\n\ \n\ -[/I] Assumi una cartella se la destinazione non esiste e sono copiati 2 o\n\ -\tpiù files\n\ +[/I] Assume una cartella se la destinazione non esiste e sono copiati 2 o\n\ +\tpiù file\n\ [/S] Copia le cartelle e le sottocartelle\n\ [/E] Copia le cartelle e le sottocartelle, includendo quelle vuote\n\ -[/Q] Non mostrare i nomi durante la copia, modalità silenziosa.\n\ +[/Q] Non mostra i nomi durante la copia, modalità silenziosa.\n\ [/F] Mostra i nomi completi della sorgente e della destinazione durante la copia\n\ [/L] Simula l'operazione, mostrando i nome che sarebbero copiati\n\ -[/W] Prompts before beginning the copy operation\n\ +[/W] Richiede prima di iniziare l'operazione di copia\n\ [/T] Crea la struttura di cartelle vuote ma non copia i files\n\ [/Y] Disabilita le conferme quando sono sovrascritti files\n\ [/-Y] Abilita le conferme quando sono sovrascritti files\n\ [/P] Chiede conferma per ogni file sorgente prima di copiare\n\ -[/N] Copia usando gli short names\n\ +[/N] Copia usando i nomi abbreviati\n\ [/U] Copia solo files che sono già presenti nella destinazione\n\ -[/R] Sovrascrivi ogni file che abbia l'attributo Sola Lettura\n\ -[/H] Includi files nascosti e di sistema nella copia\n\ +[/R] Sovrascrive ogni file che abbia l'attributo Sola Lettura\n\ +[/H] Include i file nascosti e di sistema nella copia\n\ [/C] Continua anche se accade un errore durante la copia\n\ -[/A] Copia solo files che abbiano l'attributo Archivio\n\ -[/M] Copia solo files che abbiano l'attributo Archivio, rimuovendo\n\ +[/A] Copia solo i file che abbiano l'attributo Archivio\n\ +[/M] Copia solo i file che abbiano l'attributo Archivio, rimuovendo\n\ \tl'attributo\n\ -[/D | /D:m-g-a] Copia i nuovi files o quelli modificati dopo la data fornita.\n\ +[/D | /D:m-g-a] Copia i nuovi file o quelli modificati dopo la data fornita.\n\ \t\tSe nessuna data è stata fornita, copia solo se la destinazione è più vecchia\n\ \t\tdella sorgente\n\n"

1 0

Paul Vriens : comdlg32: Add the Serbian (Latin) translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 03a4c6445794f339ba37a9f1bdecb42fb82cf428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a4c6445794f339ba37a9f1b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 21 23:32:06 2010 +0200 comdlg32: Add the Serbian (Latin) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/comdlg32/Makefile.in | 1 + dlls/comdlg32/cdlg_Sr.rc | 481 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 482 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03a4c6445794f339ba37a…

1 0

Alexandre Julliard : rpcrt4: Don' t align the buffer after reading the conformance, we need to read the variance first.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ee5cada23580f4df61c9e88cd209821c43f63865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5cada23580f4df61c9e88cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 20:31:53 2010 +0200 rpcrt4: Don't align the buffer after reading the conformance, we need to read the variance first. --- dlls/rpcrt4/ndr_marshall.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3ad55aa..db8be60 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2062,7 +2062,6 @@ static inline ULONG array_read_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD def, esize; - unsigned char alignment; switch (fc) { @@ -2087,7 +2086,6 @@ static inline ULONG array_read_conformance( ReadConformance(pStubMsg, NULL); return safe_multiply(esize, pStubMsg->MaxCount); case RPC_FC_BOGUS_ARRAY: - alignment = pFormat[1] + 1; def = *(const WORD *)(pFormat + 2); pFormat += 4; if (IsConformanceOrVariancePresent(pFormat)) pFormat = ReadConformance(pStubMsg, pFormat); @@ -2098,7 +2096,6 @@ static inline ULONG array_read_conformance( } pFormat = SkipVariance( pStubMsg, pFormat ); - align_pointer(&pStubMsg->Buffer, alignment); esize = ComplexStructSize(pStubMsg, pFormat); return safe_multiply(pStubMsg->MaxCount, esize); default:

1 0

Matteo Bruni : d3dx9: Fix dst register handling in ps_1_4.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 383a7fe3b12832bee9abae767e433c25ff6ddfc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383a7fe3b12832bee9abae767… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Fix dst register handling in ps_1_4. --- dlls/d3dx9_36/asmparser.c | 2 +- dlls/d3dx9_36/tests/asm.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 10188a0..dfa8362 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -838,7 +838,7 @@ static void asmparser_dstreg_ps_1_4(struct asm_parser *This, debug_print_dstreg(dst)); set_parse_status(This, PARSE_ERR); } - reg = map_oldps_register(dst, FALSE); + reg = map_oldps_register(dst, TRUE); memcpy(&instr->dst, &reg, sizeof(reg)); instr->has_dst = TRUE; } diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index fe3eee0..7d7d211 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -583,11 +583,21 @@ static void ps_1_4_test(void) { "texdepth_x2 r5\n", {0xffff0104, 0x00000057, 0x810f0005, 0x0000ffff} }, - { /* shader 18 */ + { /* shader 19 */ "ps_1_4\n" "bem_d2 r1, c0, r0\n", {0xffff0104, 0x00000059, 0x8f0f0001, 0xa0e40000, 0x80e40000, 0x0000ffff} }, + { /* shader 20 */ + "ps_1_4\n" + "texkill t0\n", + {0xffff0104, 0x00000041, 0xb00f0000, 0x0000ffff} + }, + { /* shader 21 */ + "ps_1_4\n" + "texkill r0\n", + {0xffff0104, 0x00000041, 0x800f0000, 0x0000ffff} + }, }; exec_tests("ps_1_4", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Matteo Bruni : d3dx9: Add <= ps_1_3 instruction parsing to the shader assembler.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 8ce3ecea0d9f1f999edf1ba369190b355cb9502a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce3ecea0d9f1f999edf1ba36… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Add <= ps_1_3 instruction parsing to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 17 ++++++ dlls/d3dx9_36/asmshader.y | 102 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 30 +++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 15 ++++++ 4 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce3ecea0d9f1f999edf1…

1 0

Matteo Bruni : d3dx9: Shader assembler <= ps_1_3 support.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d567a030ecfbb68f2f61f969040cd837339b136d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d567a030ecfbb68f2f61f9690… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Shader assembler <= ps_1_3 support. --- dlls/d3dx9_36/asmparser.c | 381 ++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/asmshader.y | 12 +- dlls/d3dx9_36/bytecodewriter.c | 314 ++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 10 + dlls/d3dx9_36/tests/asm.c | 46 +++++- 5 files changed, 713 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d567a030ecfbb68f2f61f…

1 0

André Hentschel : ws2_32: Fix test message.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6c144d06fe8ee504db1244926c71ad63faada2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c144d06fe8ee504db1244926… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 21 17:24:17 2010 +0200 ws2_32: Fix test message. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9217913..19d29bf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3190,7 +3190,7 @@ static void test_events(int useMessages) bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE); ok((bret && bytesReturned == 1) || broken(!bret && GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */, "Got %d instead of 1 (%d - %d)\n", bytesReturned, bret, GetLastError()); - ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[1]); + ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[0]); } else if (dwRet == WAIT_TIMEOUT) {

1 0