January 2012 - Wine-Commits

Hans Leidekker : msi: Use the column count specified in the table transform data.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: c8e8f44168bfb6c47674ae06ba2ae1823d52b496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e8f44168bfb6c47674ae06b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 24 10:03:59 2012 +0100 msi: Use the column count specified in the table transform data. It can be smaller than the number of columns found in the table meta data. --- dlls/msi/table.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d3c6714..d37947e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2501,14 +2501,12 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, string_table *st, TRANSFORMDATA *transform, UINT bytes_per_strref ) { - UINT rawsize = 0; BYTE *rawdata = NULL; MSITABLEVIEW *tv = NULL; - UINT r, n, sz, i, mask; + UINT r, n, sz, i, mask, num_cols, colcol = 0, rawsize = 0; MSIRECORD *rec = NULL; - UINT colcol = 0; WCHAR coltable[32]; - LPWSTR name; + const WCHAR *name; if (!transform) return ERROR_SUCCESS; @@ -2539,18 +2537,18 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, debugstr_w(name), tv->num_cols, tv->row_size, rawsize ); /* interpret the data */ - for( n=0; n < rawsize; ) + for (n = 0; n < rawsize;) { - mask = rawdata[n] | (rawdata[n+1] << 8); - - if (mask&1) + mask = rawdata[n] | (rawdata[n + 1] << 8); + if (mask & 1) { /* * if the low bit is set, columns are continuous and * the number of columns is specified in the high byte */ sz = 2; - for( i=0; i<tv->num_cols; i++ ) + num_cols = mask >> 8; + for (i = 0; i < num_cols; i++) { if( (tv->columns[i].type & MSITYPE_STRING) && ! MSITYPE_IS_BINARY(tv->columns[i].type) ) @@ -2570,12 +2568,13 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, * and it means that this row should be deleted. */ sz = 2; - for( i=0; i<tv->num_cols; i++ ) + num_cols = tv->num_cols; + for (i = 0; i < num_cols; i++) { - if( (tv->columns[i].type & MSITYPE_KEY) || ((1<<i)&mask)) + if ((tv->columns[i].type & MSITYPE_KEY) || ((1 << i) & mask)) { - if( (tv->columns[i].type & MSITYPE_STRING) && - ! MSITYPE_IS_BINARY(tv->columns[i].type) ) + if ((tv->columns[i].type & MSITYPE_STRING) && + !MSITYPE_IS_BINARY(tv->columns[i].type)) sz += bytes_per_strref; else sz += bytes_per_column( tv->db, &tv->columns[i], bytes_per_strref ); @@ -2584,7 +2583,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, } /* check we didn't run of the end of the table */ - if ( (n+sz) > rawsize ) + if (n + sz > rawsize) { ERR("borked.\n"); dump_table( st, (USHORT *)rawdata, rawsize );

1 0

Francois Gouget : po: Fix the accelerator key specifications in the Catalan translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: d23a7a4058723b02fe9bdeb015b397753b30f790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23a7a4058723b02fe9bdeb01… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:31:11 2012 +0100 po: Fix the accelerator key specifications in the Catalan translation. --- po/ca.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/ca.po b/po/ca.po index b7e9d79..b871546 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8252,23 +8252,21 @@ msgid "Ma&ximize" msgstr "Mà&ximitza" #: user32.rc:33 -#, fuzzy msgid "&Close\tAlt+F4" -msgstr "&Tanca\tAlt-F4" +msgstr "&Tanca\tAlt+F4" #: user32.rc:35 msgid "&About Wine" msgstr "&Quant al Wine..." #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "&Tanca\tCtrl-F4" +msgstr "&Tanca\tCtrl+F4" #: user32.rc:48 #, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Proper\tC&trl-F6" +msgstr "Proper\tCtrl+F6" #: user32.rc:79 msgid "&Abort" @@ -10357,7 +10355,7 @@ msgstr "&Cerca...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3" -msgstr "&Cerca proper...\tCtrl+F" +msgstr "&Cerca proper\tF3" #: notepad.rc:55 wordpad.rc:52 msgid "&Replace...\tCtrl+H" @@ -11125,7 +11123,7 @@ msgstr "&Copia Nom de Clau" #: regedit.rc:60 regedit.rc:112 wordpad.rc:50 msgid "&Find...\tCtrl+F" -msgstr "&Cerca...\tCtrl+&F" +msgstr "&Cerca...\tCtrl+F" #: regedit.rc:61 msgid "Find Ne&xt\tF3" @@ -13368,8 +13366,9 @@ msgid "Cr&eate Directory..." msgstr "Cr&ear Directori..." #: winefile.rc:38 winemine.rc:46 +#, fuzzy msgid "E&xit\tAlt+X" -msgstr "Sortir\tAlt+&X" +msgstr "Sortir\tAlt+X" #: winefile.rc:44 msgid "&Disk"

1 0

Francois Gouget : po: Fix the accelerator key specifications in the German translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 06b81ee25c89bfa0aeb9ad2a0ce9d6886be82ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b81ee25c89bfa0aeb9ad2a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:31:55 2012 +0100 po: Fix the accelerator key specifications in the German translation. --- po/de.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 1098eb0..ede017d 100644 --- a/po/de.po +++ b/po/de.po @@ -10351,7 +10351,7 @@ msgstr "Erset&zen...\tStrg+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 msgid "&Contents\tF1" -msgstr "&Inhalt" +msgstr "&Inhalt\tF1" #: notepad.rc:59 msgid "&About Notepad" @@ -11101,7 +11101,7 @@ msgstr "&Erweiterbare Zeichenfolge" #: regedit.rc:56 regedit.rc:107 msgid "&Rename\tF2" -msgstr "&Umbenennen" +msgstr "&Umbenennen\tF2" #: regedit.rc:58 regedit.rc:110 msgid "&Copy Key Name" @@ -13381,11 +13381,11 @@ msgstr "Neues &Fenster" #: winefile.rc:78 msgid "Cascading\tCtrl+F5" -msgstr "Über&lappend\tUmschalt+F5" +msgstr "Über&lappend\tStrg+F5" #: winefile.rc:80 msgid "Tile &Vertically\tCtrl+F4" -msgstr "&Nebeneinander\tUmschalt+F4" +msgstr "&Nebeneinander\tStrg+F4" #: winefile.rc:87 msgid "&About Wine File Manager" @@ -13721,7 +13721,6 @@ msgid "R&edo\tCtrl+Y" msgstr "&Wiederholen\tStrg+Y" #: wordpad.rc:47 -#, fuzzy msgid "&Clear\tDel" msgstr "&Löschen\tEntf"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Romanian translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 5023f7402de157133e78b608b429138f34a2693a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5023f7402de157133e78b608b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:34:08 2012 +0100 po: Fix an accelerator key specification in the Romanian translation. --- po/ro.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ro.po b/po/ro.po index e7f33a0..27555f2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11649,7 +11649,7 @@ msgstr "&Copiază numele cheii" #: regedit.rc:60 regedit.rc:112 wordpad.rc:50 msgid "&Find...\tCtrl+F" -msgstr "Cău&tare...\tCrtl+F" +msgstr "Cău&tare...\tCtrl+F" #: regedit.rc:61 msgid "Find Ne&xt\tF3"

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetBoolArray() test.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: a90eacab1ab21fefc17aa213dd90b40d3b4eb95f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90eacab1ab21fefc17aa213d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 24 09:48:32 2012 +0100 d3dx9/tests: Add effect parameter value SetBoolArray() test. --- dlls/d3dx9_36/tests/effect.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6e60e2e..ed08485 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1635,7 +1635,9 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) D3DXHANDLE parameter; D3DXPARAMETER_DESC pdesc; BOOL bvalue; + DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1693,6 +1695,32 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetBoolArray */ + *input_value = 1; + for (l = 1; l < res_desc->Bytes / sizeof(*input_value); ++l) + { + *(input_value + l) = *(input_value + l - 1) + 1; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetBoolArray(effect, parameter, (BOOL *)input_value, res_desc->Bytes / sizeof(*input_value)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < res_desc->Bytes / sizeof(*input_value); ++l) + { + set_number(expected_value + l, res_desc->Type, input_value + l, D3DXPT_BOOL); + } + ok(hr == D3D_OK, "%u - %s: SetBoolArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetBoolArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Francois Gouget : po: Fix the accelerator key specifications in the French translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: a124241fe245b6488c682e0a212efe3f0f23dda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a124241fe245b6488c682e0a2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:33:03 2012 +0100 po: Fix the accelerator key specifications in the French translation. --- po/fr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index f20745a..1d277a1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10329,7 +10329,7 @@ msgstr "Co&ller\tCtrl+V" #: notepad.rc:44 progman.rc:34 regedit.rc:55 regedit.rc:90 regedit.rc:106 #: winefile.rc:29 msgid "&Delete\tDel" -msgstr "&Effacer\tDel" +msgstr "&Effacer\tSuppr" #: notepad.rc:46 msgid "Select &all\tCtrl+A" @@ -13406,7 +13406,7 @@ msgstr "Barre de &lecteur" #: winefile.rc:70 msgid "F&ull Screen\tCtrl+Shift+S" -msgstr "P&lein écran\tCtrl+Shift+S" +msgstr "P&lein écran\tCtrl+Maj+S" #: winefile.rc:77 msgid "New &Window"

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetFloat() test.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 88c996b3c3cc696afa5b3c12998348c90bfa20a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c996b3c3cc696afa5b3c129… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 24 09:48:49 2012 +0100 d3dx9/tests: Add effect parameter value SetFloat() test. --- dlls/d3dx9_36/tests/effect.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8035735..4788517 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1637,6 +1637,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) D3DXPARAMETER_DESC pdesc; BOOL bvalue; INT ivalue; + FLOAT fvalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; UINT l; @@ -1782,6 +1783,23 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetFloat */ + fvalue = 1.33; + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetFloat(effect, parameter, fvalue); + if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) + { + set_number(expected_value, res_desc->Type, &fvalue, D3DXPT_FLOAT); + ok(hr == D3D_OK, "%u - %s: SetFloat failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetFloat failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Francois Gouget : po: Fix an accelerator key specification in the Russian translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: c0c7e6ba1120dbdc3f90ac780c828c9dd0cf0a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c7e6ba1120dbdc3f90ac780… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:35:07 2012 +0100 po: Fix an accelerator key specification in the Russian translation. --- po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2ec0dc9..cdbb2c0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10269,7 +10269,7 @@ msgstr "&Удалить\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Выделить в&сё" +msgstr "Выделить в&сё\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Swedish translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 452ec21da5fe531e7d60a39b59956ba67e1c3711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452ec21da5fe531e7d60a39b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:35:33 2012 +0100 po: Fix an accelerator key specification in the Swedish translation. --- po/sv.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/sv.po b/po/sv.po index d2d5941..2dfc695 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10259,7 +10259,7 @@ msgstr "&Ta bort\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Markera &allt" +msgstr "Markera &all\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix the accelerator key specifications in the Chinese (Taiwan) translation .
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: ca68a40263ca9713e5a4161f349f7b574708efc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca68a40263ca9713e5a4161f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:39:59 2012 +0100 po: Fix the accelerator key specifications in the Chinese (Taiwan) translation. --- po/zh_TW.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3e7127a..2cd0ce5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10197,7 +10197,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "全選(&A)" +msgstr "全選(&A)\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -10209,7 +10209,7 @@ msgstr "自動換行(&W)" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "尋找(&S)..." +msgstr "尋找(&S)...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0