February 2013 - Wine-commits

Petr Kočandrle : po: Small improvement of Czech translation.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 9abd1485b3ba20e4b21f4c2ab811855421e02c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abd1485b3ba20e4b21f4c2ab… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Wed Feb 27 21:39:01 2013 +0100 po: Small improvement of Czech translation. --- po/cs.po | 54 +++++++++++++++--------------------------------------- 1 files changed, 15 insertions(+), 39 deletions(-) diff --git a/po/cs.po b/po/cs.po index 421abce..cc63ae6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -157,21 +157,10 @@ msgid "Cancel" msgstr "Storno" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Instalátor Wine Gecko" +msgstr "Instalátor Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -180,13 +169,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine se nepodařilo najít balíček Gecko potřebný pro správnou funkčnost " -"aplikací využívajících HTML. Wine ho pro Vás může automaticky stáhnout a " -"nainstalovat.\n" +"Wine se nepodařilo najít balíček Mono potřebný pro správnou funkčnost .NET " +"aplikací. Wine ho pro Vás může automaticky stáhnout a nainstalovat.\n" "\n" "Poznámka: Je doporučeno využít namísto toho balíček Vaší distribuce. Pro " -"více detailů čtěte <a href=\"http://wiki.winehq.org/Gecko\">http://wiki." -"winehq.org/Gecko</a>." +"více detailů čtěte <a href=\"http://wiki.winehq.org/Mono\">http://wiki." +"winehq.org/Mono</a>." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -822,14 +810,12 @@ msgid "&Open" msgstr "&Otevřít" #: comdlg32.rc:482 -#, fuzzy msgid "File name:" -msgstr "&Název souboru:" +msgstr "Název souboru:" #: comdlg32.rc:485 -#, fuzzy msgid "Files of type:" -msgstr "Soubory &typu:" +msgstr "Soubory typu:" #: comdlg32.rc:29 msgid "File not found" @@ -1024,13 +1010,8 @@ msgid "Cannot find the printer." msgstr "Nemohu najít tiskárnu." #: comdlg32.rc:66 progman.rc:73 -#, fuzzy msgid "Out of memory." -msgstr "" -"#-#-#-#-# cs.po (Wine) #-#-#-#-#\n" -"Došla paměť.\n" -"#-#-#-#-# cs.po (Wine) #-#-#-#-#\n" -"Dostupná paměť byla vyčerpána." +msgstr "Nedostatek paměti." #: comdlg32.rc:67 msgid "An error occurred." @@ -2215,12 +2196,11 @@ msgstr "" #: cryptui.rc:277 cryptui.rc:288 cryptui.rc:305 cryptui.rc:319 cryptui.rc:68 msgid "Certificate Import Wizard" -msgstr "" +msgstr "Průvodce importem certifikátu" #: cryptui.rc:280 -#, fuzzy msgid "Welcome to the Certificate Import Wizard" -msgstr "Ukazatel na zařízení je neplatný." +msgstr "Vítejte v průvodci importem certifikátu" #: cryptui.rc:283 msgid "" @@ -2345,12 +2325,11 @@ msgstr "&Vlastnosti" #: cryptui.rc:367 cryptui.rc:378 cryptui.rc:391 cryptui.rc:401 cryptui.rc:424 #: cryptui.rc:433 cryptui.rc:147 msgid "Certificate Export Wizard" -msgstr "" +msgstr "Průvodce exportem certifikátu" #: cryptui.rc:370 -#, fuzzy msgid "Welcome to the Certificate Export Wizard" -msgstr "Ukazatel na zařízení je neplatný." +msgstr "Vítejte v průvodci exportem certifikátu." #: cryptui.rc:373 msgid "" @@ -2436,9 +2415,8 @@ msgid "Certificate" msgstr "" #: cryptui.rc:28 -#, fuzzy msgid "Certificate Information" -msgstr "Informace" +msgstr "Informace o certifikátu" #: cryptui.rc:29 msgid "" @@ -2457,9 +2435,8 @@ msgid "This certificate could not be validated to a trusted root certificate." msgstr "" #: cryptui.rc:32 -#, fuzzy msgid "This certificate's issuer could not be found." -msgstr "'%s' nebyl nalezen." +msgstr "Vydavatele certifikátu se nepodařilo najít." #: cryptui.rc:33 msgid "All the intended purposes of this certificate could not be verified." @@ -2583,9 +2560,8 @@ msgid "Description" msgstr "" #: cryptui.rc:63 -#, fuzzy msgid "Certificate Properties" -msgstr "&Vlastnosti" +msgstr "Vlastnosti certifikátu" #: cryptui.rc:64 msgid "Please enter an OID in the form 1.2.3.4"

1 0

Nozomi Kodama : d3dx9: Explicit computations in D3DXMatrixDeterminant to speed them up.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: c66d9eb2fe55049ad3c220507dccf86cef863ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66d9eb2fe55049ad3c220507… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Feb 26 19:23:51 2013 -1000 d3dx9: Explicit computations in D3DXMatrixDeterminant to speed them up. --- dlls/d3dx9_36/math.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 43c0c78..cdb9e86 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -255,17 +255,24 @@ HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutr FLOAT WINAPI D3DXMatrixDeterminant(const D3DXMATRIX *pm) { - D3DXVECTOR4 minor, v1, v2, v3; - FLOAT det; + FLOAT t[3], v[4]; TRACE("pm %p\n", pm); - v1.x = pm->u.m[0][0]; v1.y = pm->u.m[1][0]; v1.z = pm->u.m[2][0]; v1.w = pm->u.m[3][0]; - v2.x = pm->u.m[0][1]; v2.y = pm->u.m[1][1]; v2.z = pm->u.m[2][1]; v2.w = pm->u.m[3][1]; - v3.x = pm->u.m[0][2]; v3.y = pm->u.m[1][2]; v3.z = pm->u.m[2][2]; v3.w = pm->u.m[3][2]; - D3DXVec4Cross(&minor, &v1, &v2, &v3); - det = - (pm->u.m[0][3] * minor.x + pm->u.m[1][3] * minor.y + pm->u.m[2][3] * minor.z + pm->u.m[3][3] * minor.w); - return det; + t[0] = pm->u.m[2][2] * pm->u.m[3][3] - pm->u.m[2][3] * pm->u.m[3][2]; + t[1] = pm->u.m[1][2] * pm->u.m[3][3] - pm->u.m[1][3] * pm->u.m[3][2]; + t[2] = pm->u.m[1][2] * pm->u.m[2][3] - pm->u.m[1][3] * pm->u.m[2][2]; + v[0] = pm->u.m[1][1] * t[0] - pm->u.m[2][1] * t[1] + pm->u.m[3][1] * t[2]; + v[1] = -pm->u.m[1][0] * t[0] + pm->u.m[2][0] * t[1] - pm->u.m[3][0] * t[2]; + + t[0] = pm->u.m[1][0] * pm->u.m[2][1] - pm->u.m[2][0] * pm->u.m[1][1]; + t[1] = pm->u.m[1][0] * pm->u.m[3][1] - pm->u.m[3][0] * pm->u.m[1][1]; + t[2] = pm->u.m[2][0] * pm->u.m[3][1] - pm->u.m[3][0] * pm->u.m[2][1]; + v[2] = pm->u.m[3][3] * t[0] - pm->u.m[2][3] * t[1] + pm->u.m[1][3] * t[2]; + v[3] = -pm->u.m[3][2] * t[0] + pm->u.m[2][2] * t[1] - pm->u.m[1][2] * t[2]; + + return pm->u.m[0][0] * v[0] + pm->u.m[0][1] * v[1] + + pm->u.m[0][2] * v[2] + pm->u.m[0][3] * v[3]; } D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, const D3DXMATRIX *pm)

1 0

Nozomi Kodama : d3dx9: Explicit computations in D3DXMatrixInverse to speed them up.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: bb3549fc2f08eed4837ceeecf0cee545d4eb30f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3549fc2f08eed4837ceeecf… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Feb 26 20:56:57 2013 -1000 d3dx9: Explicit computations in D3DXMatrixInverse to speed them up. --- dlls/d3dx9_36/math.c | 96 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 66 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index cdb9e86..e166f6f 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -277,39 +277,75 @@ FLOAT WINAPI D3DXMatrixDeterminant(const D3DXMATRIX *pm) D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, const D3DXMATRIX *pm) { - int a, i, j; - D3DXMATRIX out; - D3DXVECTOR4 v, vec[3]; - FLOAT det; + FLOAT det, t[3], v[16]; + UINT i, j; TRACE("pout %p, pdeterminant %p, pm %p\n", pout, pdeterminant, pm); - det = D3DXMatrixDeterminant(pm); - if ( !det ) return NULL; - if ( pdeterminant ) *pdeterminant = det; - for (i=0; i<4; i++) - { - for (j=0; j<4; j++) - { - if (j != i ) - { - a = j; - if ( j > i ) a = a-1; - vec[a].x = pm->u.m[j][0]; - vec[a].y = pm->u.m[j][1]; - vec[a].z = pm->u.m[j][2]; - vec[a].w = pm->u.m[j][3]; - } - } - D3DXVec4Cross(&v, &vec[0], &vec[1], &vec[2]); - out.u.m[0][i] = pow(-1.0f, i) * v.x / det; - out.u.m[1][i] = pow(-1.0f, i) * v.y / det; - out.u.m[2][i] = pow(-1.0f, i) * v.z / det; - out.u.m[3][i] = pow(-1.0f, i) * v.w / det; - } - - *pout = out; - return pout; + t[0] = pm->u.m[2][2] * pm->u.m[3][3] - pm->u.m[2][3] * pm->u.m[3][2]; + t[1] = pm->u.m[1][2] * pm->u.m[3][3] - pm->u.m[1][3] * pm->u.m[3][2]; + t[2] = pm->u.m[1][2] * pm->u.m[2][3] - pm->u.m[1][3] * pm->u.m[2][2]; + v[0] = pm->u.m[1][1] * t[0] - pm->u.m[2][1] * t[1] + pm->u.m[3][1] * t[2]; + v[4] = -pm->u.m[1][0] * t[0] + pm->u.m[2][0] * t[1] - pm->u.m[3][0] * t[2]; + + t[0] = pm->u.m[1][0] * pm->u.m[2][1] - pm->u.m[2][0] * pm->u.m[1][1]; + t[1] = pm->u.m[1][0] * pm->u.m[3][1] - pm->u.m[3][0] * pm->u.m[1][1]; + t[2] = pm->u.m[2][0] * pm->u.m[3][1] - pm->u.m[3][0] * pm->u.m[2][1]; + v[8] = pm->u.m[3][3] * t[0] - pm->u.m[2][3] * t[1] + pm->u.m[1][3] * t[2]; + v[12] = -pm->u.m[3][2] * t[0] + pm->u.m[2][2] * t[1] - pm->u.m[1][2] * t[2]; + + det = pm->u.m[0][0] * v[0] + pm->u.m[0][1] * v[4] + + pm->u.m[0][2] * v[8] + pm->u.m[0][3] * v[12]; + if (det == 0.0f) + return NULL; + if (pdeterminant) + *pdeterminant = det; + + t[0] = pm->u.m[2][2] * pm->u.m[3][3] - pm->u.m[2][3] * pm->u.m[3][2]; + t[1] = pm->u.m[0][2] * pm->u.m[3][3] - pm->u.m[0][3] * pm->u.m[3][2]; + t[2] = pm->u.m[0][2] * pm->u.m[2][3] - pm->u.m[0][3] * pm->u.m[2][2]; + v[1] = -pm->u.m[0][1] * t[0] + pm->u.m[2][1] * t[1] - pm->u.m[3][1] * t[2]; + v[5] = pm->u.m[0][0] * t[0] - pm->u.m[2][0] * t[1] + pm->u.m[3][0] * t[2]; + + t[0] = pm->u.m[0][0] * pm->u.m[2][1] - pm->u.m[2][0] * pm->u.m[0][1]; + t[1] = pm->u.m[3][0] * pm->u.m[0][1] - pm->u.m[0][0] * pm->u.m[3][1]; + t[2] = pm->u.m[2][0] * pm->u.m[3][1] - pm->u.m[3][0] * pm->u.m[2][1]; + v[9] = -pm->u.m[3][3] * t[0] - pm->u.m[2][3] * t[1]- pm->u.m[0][3] * t[2]; + v[13] = pm->u.m[3][2] * t[0] + pm->u.m[2][2] * t[1] + pm->u.m[0][2] * t[2]; + + t[0] = pm->u.m[1][2] * pm->u.m[3][3] - pm->u.m[1][3] * pm->u.m[3][2]; + t[1] = pm->u.m[0][2] * pm->u.m[3][3] - pm->u.m[0][3] * pm->u.m[3][2]; + t[2] = pm->u.m[0][2] * pm->u.m[1][3] - pm->u.m[0][3] * pm->u.m[1][2]; + v[2] = pm->u.m[0][1] * t[0] - pm->u.m[1][1] * t[1] + pm->u.m[3][1] * t[2]; + v[6] = -pm->u.m[0][0] * t[0] + pm->u.m[1][0] * t[1] - pm->u.m[3][0] * t[2]; + + t[0] = pm->u.m[0][0] * pm->u.m[1][1] - pm->u.m[1][0] * pm->u.m[0][1]; + t[1] = pm->u.m[3][0] * pm->u.m[0][1] - pm->u.m[0][0] * pm->u.m[3][1]; + t[2] = pm->u.m[1][0] * pm->u.m[3][1] - pm->u.m[3][0] * pm->u.m[1][1]; + v[10] = pm->u.m[3][3] * t[0] + pm->u.m[1][3] * t[1] + pm->u.m[0][3] * t[2]; + v[14] = -pm->u.m[3][2] * t[0] - pm->u.m[1][2] * t[1] - pm->u.m[0][2] * t[2]; + + t[0] = pm->u.m[1][2] * pm->u.m[2][3] - pm->u.m[1][3] * pm->u.m[2][2]; + t[1] = pm->u.m[0][2] * pm->u.m[2][3] - pm->u.m[0][3] * pm->u.m[2][2]; + t[2] = pm->u.m[0][2] * pm->u.m[1][3] - pm->u.m[0][3] * pm->u.m[1][2]; + v[3] = -pm->u.m[0][1] * t[0] + pm->u.m[1][1] * t[1] - pm->u.m[2][1] * t[2]; + v[7] = pm->u.m[0][0] * t[0] - pm->u.m[1][0] * t[1] + pm->u.m[2][0] * t[2]; + + v[11] = -pm->u.m[0][0] * (pm->u.m[1][1] * pm->u.m[2][3] - pm->u.m[1][3] * pm->u.m[2][1]) + + pm->u.m[1][0] * (pm->u.m[0][1] * pm->u.m[2][3] - pm->u.m[0][3] * pm->u.m[2][1]) - + pm->u.m[2][0] * (pm->u.m[0][1] * pm->u.m[1][3] - pm->u.m[0][3] * pm->u.m[1][1]); + + v[15] = pm->u.m[0][0] * (pm->u.m[1][1] * pm->u.m[2][2] - pm->u.m[1][2] * pm->u.m[2][1]) - + pm->u.m[1][0] * (pm->u.m[0][1] * pm->u.m[2][2] - pm->u.m[0][2] * pm->u.m[2][1]) + + pm->u.m[2][0] * (pm->u.m[0][1] * pm->u.m[1][2] - pm->u.m[0][2] * pm->u.m[1][1]); + + det = 1.0f / det; + + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++) + pout->u.m[i][j] = v[4 * i + j] * det; + + return pout; } D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup)

1 0

Vincent Povirk : mscoree: Add WINE_MONO_VERBOSE environment setting.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: ad5c4671a5442917aaf16a1565132f2ad6ad4278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5c4671a5442917aaf16a156… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 27 09:46:43 2013 -0600 mscoree: Add WINE_MONO_VERBOSE environment setting. --- dlls/mscoree/metahost.c | 10 ++++++++++ dlls/mscoree/mscoree_private.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index eb3bc93..143494c 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -138,6 +138,8 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; int trace_size; char trace_setting[256]; + int verbose_size; + char verbose_setting[256]; if (This->mono_abi_version <= 0 || This->mono_abi_version > NUM_ABI_VERSIONS) { @@ -204,6 +206,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_runtime_object_init); LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); + LOAD_MONO_FUNCTION(mono_set_verbose_level); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); @@ -254,6 +257,13 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) { (*result)->mono_jit_set_trace_options(trace_setting); } + + verbose_size = GetEnvironmentVariableA("WINE_MONO_VERBOSE", verbose_setting, sizeof(verbose_setting)); + + if (verbose_size) + { + (*result)->mono_set_verbose_level(verbose_setting[0] - '0'); + } } return S_OK; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f7e9c11..4677921 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -171,6 +171,7 @@ struct loaded_mono void (CDECL *mono_runtime_quit)(void); void (CDECL *mono_runtime_set_shutting_down)(void); void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); + void (CDECL *mono_set_verbose_level)(DWORD level); char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); void (CDECL *mono_thread_pool_cleanup)(void); void (CDECL *mono_thread_suspend_all_other_threads)(void);

1 0

André Hentschel : msvcrt/tests: Mark win8 behaviour as broken.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 43bdfce43666392fb3fcfacba02c8a6a5a0d5395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bdfce43666392fb3fcfacba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 27 21:42:57 2013 +0100 msvcrt/tests: Mark win8 behaviour as broken. --- dlls/msvcrt/tests/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 30d9fa7..729e359 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -181,8 +181,8 @@ static void test_gmtime(void) errno = 0; gmt = -1; err = p_gmtime32_s(&gmt_tm_s, &gmt); - ok(gmt_tm_s.tm_year==-1 || broken(gmt_tm_s.tm_year==70 && gmt_tm->tm_sec<0), - "tm_year = %d\n", gmt_tm_s.tm_year); + ok(gmt_tm_s.tm_year == -1 || broken(gmt_tm_s.tm_year == 70 && gmt_tm_s.tm_sec < 0), + "tm_year = %d, tm_sec = %d\n", gmt_tm_s.tm_year, gmt_tm_s.tm_sec); if(gmt_tm_s.tm_year == -1) { ok(err==EINVAL, "err = %d\n", err); ok(errno==EINVAL, "errno = %d\n", errno);

1 0

Andrew Talbot : usp10: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 4ef6a9689051f4d4d6260fcdf431db99f530878b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6a9689051f4d4d6260fcdf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 27 21:13:06 2013 +0000 usp10: Avoid signed-unsigned integer comparisons. --- dlls/usp10/bidi.c | 3 ++- dlls/usp10/usp10.c | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 3b1823f..74ca70b 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -749,7 +749,8 @@ BOOL BIDI_DetermineLevels( ) { WORD *chartype; - unsigned baselevel = 0,j; + unsigned baselevel = 0; + INT j; TRACE("%s, %d\n", debugstr_wn(lpString, uCount), uCount); chartype = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5287556..bc48ecd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1017,13 +1017,14 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) if (psc && *psc) { unsigned int i; + INT n; for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { heap_free(((ScriptCache *)*psc)->widths[i]); } for (i = 0; i < 0x10; i++) { - int j; + unsigned int j; if (((ScriptCache *)*psc)->page[i]) for (j = 0; j < GLYPH_MAX / GLYPH_BLOCK_SIZE; j++) heap_free(((ScriptCache *)*psc)->page[i]->glyphs[j]); @@ -1033,20 +1034,20 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); heap_free(((ScriptCache *)*psc)->GPOS_Table); - for (i = 0; i < ((ScriptCache *)*psc)->script_count; i++) + for (n = 0; n < ((ScriptCache *)*psc)->script_count; n++) { int j; - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].language_count; j++) + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].language_count; j++) { int k; - for (k = 0; k < ((ScriptCache *)*psc)->scripts[i].languages[j].feature_count; k++) - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); + for (k = 0; k < ((ScriptCache *)*psc)->scripts[n].languages[j].feature_count; k++) + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features[k].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].languages[j].features); } - for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); - heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); - heap_free(((ScriptCache *)*psc)->scripts[i].languages); + for (j = 0; j < ((ScriptCache *)*psc)->scripts[n].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[n].default_language.features); + heap_free(((ScriptCache *)*psc)->scripts[n].languages); } heap_free(((ScriptCache *)*psc)->scripts); heap_free(((ScriptCache *)*psc)->otm); @@ -2843,7 +2844,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; - unsigned int i,g; + int i; + unsigned int g; BOOL rtl; int cluster;

1 0

André Hentschel : msvcrt: Fix DISPATCHER_CONTEXT on ARM.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: a5c86d35e3d6d9147d0daee9bce22292c4e5273b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c86d35e3d6d9147d0daee9b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 27 21:57:44 2013 +0100 msvcrt: Fix DISPATCHER_CONTEXT on ARM. --- dlls/msvcrt/except_arm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 247728d..465f310 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -53,7 +53,7 @@ typedef struct _DISPATCHER_CONTEXT DWORD ImageBase; PRUNTIME_FUNCTION FunctionEntry; DWORD EstablisherFrame; - DWORD TargetIp; + DWORD TargetPc; PCONTEXT ContextRecord; PEXCEPTION_ROUTINE LanguageHandler; PVOID HandlerData; @@ -61,7 +61,7 @@ typedef struct _DISPATCHER_CONTEXT DWORD ScopeIndex; BOOLEAN ControlPcIsUnwound; PBYTE NonVolatileRegisters; - DWORD Reserved; + DWORD VirtualVfpHead; } DISPATCHER_CONTEXT;

1 0

Jacek Caban : mshtml.idl: Added IHTMLLabelElement* interfaces declarations.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 0f9885448e69a205d6f91985e4e5028f703bbee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9885448e69a205d6f91985e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 13:14:57 2013 +0100 mshtml.idl: Added IHTMLLabelElement* interfaces declarations. --- include/mshtmdid.h | 7 ++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index d885ee3..08dd25d 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2377,6 +2377,13 @@ #define DISPID_IHTMLANCHORELEMENT3_IE8_COORDS DISPID_IE8_ANCHOR+2 #define DISPID_IHTMLANCHORELEMENT3_IE8_HREF DISPID_IE8_ANCHOR+3 +/* IHTMLLabelElement */ +#define DISPID_IHTMLLABELELEMENT_HTMLFOR DISPID_LABEL +#define DISPID_IHTMLLABELELEMENT_ACCESSKEY DISPID_SITE+5 + +/* IHTMLLabelElement2 */ +#define DISPID_IHTMLLABELELEMENT2_FORM DISPID_LABEL+2 + /* IHTMLTxtRange */ #define DISPID_IHTMLTXTRANGE_HTMLTEXT DISPID_RANGE+3 #define DISPID_IHTMLTXTRANGE_TEXT DISPID_RANGE+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index 502b286..e1caea4 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -8968,6 +8968,68 @@ methods: } /***************************************************************************** + * IHTMLLabelElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f32a-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLabelElement : IDispatch +{ + [propput, id(DISPID_IHTMLLABELELEMENT_HTMLFOR), displaybind, bindable] + HRESULT htmlFor([in] BSTR v); + + [propget, id(DISPID_IHTMLLABELELEMENT_HTMLFOR), displaybind, bindable] + HRESULT htmlFor([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLLABELELEMENT_ACCESSKEY), displaybind, bindable] + HRESULT accessKey([in] BSTR v); + + [propget, id(DISPID_IHTMLLABELELEMENT_ACCESSKEY), displaybind, bindable] + HRESULT accessKey([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLLabelElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f832-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLLabelElement2 : IDispatch +{ + [propget, id(DISPID_IHTMLLABELELEMENT2_FORM)] + HRESULT form([out, retval] IHTMLFormElement **p); +} + +/***************************************************************************** + * DispHTMLLabelElement dispinterface + */ +[ + hidden, + uuid(3050f522-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLLabelElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLLABELELEMENT_HTMLFOR), displaybind, bindable] + void htmlFor(BSTR v); + + [propget, id(DISPID_IHTMLLABELELEMENT_HTMLFOR), displaybind, bindable] + BSTR htmlFor(); + + [propget, id(DISPID_IHTMLLABELELEMENT2_FORM)] + IHTMLFormElement *form(); +} + +/***************************************************************************** * IHTMLElementCollection interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLLabelElement stub implementation.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 99a86766a019fbdad9678e4bffb42a0d87760b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a86766a019fbdad9678e4bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 13:15:15 2013 +0100 mshtml: Added IHTMLLabelElement stub implementation. --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlinput.c | 171 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 +++- 4 files changed, 189 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99a86766a019fbdad9678…

1 0

Jacek Caban : ieframe: Fixed QI tests on IE10, where IStdMarshalInfo is supported by WebBrowser object.
by Alexandre Julliard 28 Feb '13

28 Feb '13

Module: wine Branch: master Commit: 5ed0ddd93c4c514174ef3dbd7e3a355408f8f1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed0ddd93c4c514174ef3dbd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 13:38:50 2013 +0100 ieframe: Fixed QI tests on IE10, where IStdMarshalInfo is supported by WebBrowser object. --- dlls/ieframe/tests/webbrowser.c | 5 ----- dlls/ieframe/webbrowser.c | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1915876..43f761b 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2951,7 +2951,6 @@ static void test_QueryInterface(IWebBrowser2 *wb) IViewObjectEx *viewex = (void*)0xdeadbeef; IOleLink *link = (void*)0xdeadbeef; IMarshal *marshal = (void*)0xdeadbeef; - IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef; IUnknown *unk = (IUnknown*)wb; HRESULT hres; @@ -2991,10 +2990,6 @@ static void test_QueryInterface(IWebBrowser2 *wb) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(marshal == NULL, "marshal=%p, expected NULL\n", marshal); - hres = IUnknown_QueryInterface(unk, &IID_IStdMarshalInfo, (void**)&marshalinfo); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(marshalinfo == NULL, "marshalinfo=%p, expected NULL\n", marshalinfo); - } static void test_UIActivate(IWebBrowser2 *unk, BOOL activate) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index dda957a..0a9f2a5 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -135,7 +135,8 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); return E_NOINTERFACE; }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) { - TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); + /* This is implemented since IE10 */ + WARN("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK;

1 0