February 2013 - Wine-Commits

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

Feb. 28, 2013

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

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

Feb. 28, 2013

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

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

Feb. 28, 2013

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

Jacek Caban : mshtml: Added IHTMLLabelElement stub implementation.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

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

Vincent Povirk : mscoree: Add WINE_MONO_VERBOSE environment setting.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

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

Jacek Caban : urlmon.idl: Added IGetBindHandle declaration.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

Module: wine Branch: master Commit: b48ea4024d046b6e19444b2a58f8e090685214a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48ea4024d046b6e19444b2a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 15:08:28 2013 +0100 urlmon.idl: Added IGetBindHandle declaration. --- include/urlmon.idl | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 53e803e..7407c18 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1998,6 +1998,30 @@ interface IInternetProtocolEx : IInternetProtocol [in] HANDLE *dwReserved); } +/***************************************************************************** + * IGetBindHandle interface + */ +[ + local, + object, + uuid(AF0FF408-129D-4b20-91F0-02BD23D88352), + pointer_default(unique) +] +interface IGetBindHandle : IUnknown +{ + typedef [unique] IGetBindHandle *LPGETBINDHANDLE; + + typedef enum { + BINDHANDLETYPES_APPCACHE = 0x00000000, + BINDHANDLETYPES_DEPENDENCY = 0x00000001, + BINDHANDLETYPES_COUNT + } BINDHANDLETYPES; + + HRESULT GetBindHandle( + [in] BINDHANDLETYPES enumRequestedHandle, + [out] HANDLE *pRetHandle); +} + cpp_quote("#define CONFIRMSAFETYACTION_LOADOBJECT 0x00000001") struct CONFIRMSAFETY

1 0

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

Feb. 28, 2013

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

Huw Davies : riched20: Send WM_CHAR notifications.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

Module: wine Branch: master Commit: 7a59014fa26df8bb02d32ed2d68f383e90ddbcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a59014fa26df8bb02d32ed2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 28 13:52:55 2013 +0000 riched20: Send WM_CHAR notifications. --- dlls/riched20/editor.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 727b632..b9df118 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4050,6 +4050,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; goto do_default; case WM_CHAR: + if ((editor->nEventMask & ENM_KEYEVENTS) && + !ME_FilterEvent(editor, msg, &wParam, &lParam)) + return 0; return ME_Char(editor, wParam, lParam, unicode); case WM_UNICHAR: if (unicode)

1 0

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

Feb. 28, 2013

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

André Hentschel : msvcrt: Fix DISPATCHER_CONTEXT on ARM.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

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

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

Feb. 28, 2013

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/tests: Mark win8 behaviour as broken.
by Alexandre Julliard Feb. 28, 2013

Feb. 28, 2013

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

Piotr Caban : ole32: Don' t pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run .
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: c0a17a4f098ea148e24f4bc802a6739e61b9f515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a17a4f098ea148e24f4bc80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 17:59:38 2013 +0100 ole32: Don't pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run. --- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/tests/defaulthandler.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b4e8203..5e89977 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run( release_delegates(This); - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL, + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER, &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr; diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index 8091bc6..5da7ced 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -36,9 +36,6 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define GET_EXPECT(func) \ - expect_ ## func - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ @@ -184,12 +181,6 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r *ppv = NULL; return E_NOINTERFACE; }else if(IsEqualGUID(riid, &IID_IClassFactory)) { - if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) { - todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory); - *ppv = NULL; - return E_NOINTERFACE; - } - CHECK_EXPECT(CF_QueryInterface_ClassFactory); *ppv = iface; return S_OK; @@ -268,7 +259,7 @@ static void test_default_handler_run(void) IUnknown_Release(unk); hres = IRunnableObject_Run(ro, NULL); - todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); + ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); IRunnableObject_Release(ro); CoRevokeClassObject(class_reg);

1 0

Piotr Caban : ole32: Added more OleCreateDefaultHandler tests.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 0cf2b77aed098a423874324e896de8ffe38e7a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2b77aed098a423874324e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 17:59:26 2013 +0100 ole32: Added more OleCreateDefaultHandler tests. --- dlls/ole32/tests/defaulthandler.c | 196 +++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index a6469b7..8091bc6 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -22,6 +22,7 @@ #define CONST_VTABLE #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -29,6 +30,47 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define GET_EXPECT(func) \ + expect_ ## func + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(CF_QueryInterface_ClassFactory); +DEFINE_EXPECT(CF_CreateInstance); + +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} static HRESULT create_storage(IStorage **stg) { @@ -100,11 +142,165 @@ static void test_olestream(void) IStorage_Release(stg); } +static HRESULT WINAPI test_class_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + }else if(IsEqualGUID(riid, &IID_IOleObject)) { + ok(0, "unexpected query for IOleObject interface\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_class_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI test_class_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl test_class_vtbl = { + test_class_QueryInterface, + test_class_AddRef, + test_class_Release, +}; + +static IUnknown test_class = { &test_class_vtbl }; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + }else if(IsEqualGUID(riid, &IID_IMarshal)) { + *ppv = NULL; + return E_NOINTERFACE; + }else if(IsEqualGUID(riid, &IID_IClassFactory)) { + if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) { + todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory); + *ppv = NULL; + return E_NOINTERFACE; + } + + CHECK_EXPECT(CF_QueryInterface_ClassFactory); + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + CHECK_EXPECT(CF_CreateInstance); + + ok(pUnkOuter == NULL, "pUnkOuter != NULL\n"); + todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + if(IsEqualGUID(riid, &IID_IOleObject)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = &test_class; + return S_OK; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ClassFactory = { &ClassFactoryVtbl }; + +static void test_default_handler_run(void) +{ + const CLSID test_server_clsid = {0x0f77e570,0x80c3,0x11e2,{0x9e,0x96,0x08,0x00,0x20,0x0c,0x9a,0x66}}; + + IUnknown *unk; + IRunnableObject *ro; + DWORD class_reg; + HRESULT hres; + + if(!GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) { + win_skip("skipping OleCreateDefaultHandler tests\n"); + return; + } + + hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, + CLSCTX_INPROC_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); + IUnknown_Release(unk); + + hres = IRunnableObject_Run(ro, NULL); + todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); + IRunnableObject_Release(ro); + + CoRevokeClassObject(class_reg); + + hres = CoRegisterClassObject(&test_server_clsid, (IUnknown*)&ClassFactory, + CLSCTX_LOCAL_SERVER, 0, &class_reg); + ok(hres == S_OK, "CoRegisterClassObject failed: %x\n", hres); + + hres = OleCreateDefaultHandler(&test_server_clsid, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "OleCreateDefaultHandler failed: %x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&ro); + ok(hres == S_OK, "QueryInterface(IRunnableObject) failed: %x\n", hres); + IUnknown_Release(unk); + + SET_EXPECT(CF_QueryInterface_ClassFactory); + SET_EXPECT(CF_CreateInstance); + hres = IRunnableObject_Run(ro, NULL); + todo_wine ok(hres == S_OK, "Run failed: %x\n", hres); + CHECK_CALLED(CF_QueryInterface_ClassFactory); + CHECK_CALLED(CF_CreateInstance); + IRunnableObject_Release(ro); + + CoRevokeClassObject(class_reg); +} + START_TEST(defaulthandler) { OleInitialize(NULL); test_olestream(); + test_default_handler_run(); OleUninitialize(); }

1 0

André Hentschel : msvcrt: Add a new file for the ARM exception handling.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 874d077ca6d60f457dcf79f0604d519a4bee78d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874d077ca6d60f457dcf79f06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:42:33 2013 +0100 msvcrt: Add a new file for the ARM exception handling. --- dlls/crtdll/crtdll.spec | 4 +- dlls/msvcr100/msvcr100.spec | 18 ++-- dlls/msvcr70/msvcr70.spec | 10 +- dlls/msvcr71/msvcr71.spec | 12 ++-- dlls/msvcr80/msvcr80.spec | 16 ++-- dlls/msvcr90/msvcr90.spec | 16 ++-- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm.c | 187 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 17 ++++ dlls/msvcrt/msvcrt.spec | 18 ++-- dlls/msvcrt20/msvcrt20.spec | 6 +- dlls/msvcrt40/msvcrt40.spec | 6 +- dlls/msvcrtd/msvcrtd.spec | 6 +- include/msvcrt/setjmp.h | 22 +++++ include/winnt.h | 39 +++++++++ 15 files changed, 322 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=874d077ca6d60f457dcf7…

1 0

Jacek Caban : secur32: Report SecPkgContext_ConnectionInfo in bits, not bytes.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 64c84ef5c409c03a8d2ccb993552b3eb976e854d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c84ef5c409c03a8d2ccb993… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 15:36:18 2013 +0100 secur32: Report SecPkgContext_ConnectionInfo in bits, not bytes. --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/tests/schannel.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fa68591..b273e96 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -309,9 +309,9 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, info->dwProtocol = schannel_get_protocol(proto); info->aiCipher = schannel_get_cipher_algid(alg); - info->dwCipherStrength = pgnutls_cipher_get_key_size(alg); + info->dwCipherStrength = pgnutls_cipher_get_key_size(alg) * 8; info->aiHash = schannel_get_mac_algid(mac); - info->dwHashStrength = pgnutls_mac_get_key_size(mac); + info->dwHashStrength = pgnutls_mac_get_key_size(mac) * 8; info->aiExch = schannel_get_kx_algid(kx); /* FIXME: info->dwExchStrength? */ info->dwExchStrength = 0; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ddcc87d..7d4c532 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -592,6 +592,7 @@ static void test_communication(void) CredHandle cred_handle; CtxtHandle context; SecPkgContext_StreamSizes sizes; + SecPkgContext_ConnectionInfo conn_info; CERT_CONTEXT *cert; SecBufferDesc buffers[2]; @@ -754,6 +755,13 @@ static void test_communication(void) pCertFreeCertificateContext(cert); } + status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); + if(status == SEC_E_OK) { + ok(conn_info.dwCipherStrength == 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); + } + pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); reset_buffers(&buffers[0]);

1 0

Jacek Caban : vbscript: Added color constants.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 34bf93fc51c78960a009f87b71c1223bf0edc7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34bf93fc51c78960a009f87b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:32 2013 +0100 vbscript: Added color constants. --- dlls/vbscript/global.c | 64 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 8 +++++ 2 files changed, 16 insertions(+), 56 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab3965e..cba611f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,54 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBlue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCyan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGreen(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMagenta(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbRed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbWhite(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbYellow(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1776,14 +1728,14 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, VT_I2, 3}, {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, VT_I2, 4}, {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, VT_I4, 0x80040000}, - {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, - {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, - {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, - {DISPID_GLOBAL_VBGREEN, Global_vbGreen, BP_GET}, - {DISPID_GLOBAL_VBMAGENTA, Global_vbMagenta, BP_GET}, - {DISPID_GLOBAL_VBRED, Global_vbRed, BP_GET}, - {DISPID_GLOBAL_VBWHITE, Global_vbWhite, BP_GET}, - {DISPID_GLOBAL_VBYELLOW, Global_vbYellow, BP_GET}, + {DISPID_GLOBAL_VBBLACK, NULL, BP_GET, VT_I4, 0x000000}, + {DISPID_GLOBAL_VBBLUE, NULL, BP_GET, VT_I4, 0xff0000}, + {DISPID_GLOBAL_VBCYAN, NULL, BP_GET, VT_I4, 0xffff00}, + {DISPID_GLOBAL_VBGREEN, NULL, BP_GET, VT_I4, 0x00ff00}, + {DISPID_GLOBAL_VBMAGENTA, NULL, BP_GET, VT_I4, 0xff00ff}, + {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, + {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, + {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ee68e9e..fc057d8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -95,6 +95,14 @@ TestConstant "vbShortDate", vbShortDate, 2 TestConstant "vbLongTime", vbLongTime, 3 TestConstant "vbShortTime", vbShortTime, 4 TestConstantI4 "vbObjectError", vbObjectError, &h80040000& +TestConstantI4 "vbBlack", vbBlack, 0 +TestConstantI4 "vbBlue", vbBlue, &hff0000& +TestConstantI4 "vbCyan", vbCyan, &hffff00& +TestConstantI4 "vbGreen", vbGreen, &h00ff00& +TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& +TestConstantI4 "vbRed", vbRed, &h0000ff& +TestConstantI4 "vbWhite", vbWhite, &hffffff& +TestConstantI4 "vbYellow", vbYellow, &h00ffff& Sub TestCStr(arg, exval) dim x

1 0

Hans Leidekker : msi: Don't attempt to patch files from disabled components .
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: b36a26d65a36625af0081024ea3ec041011bb07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36a26d65a36625af0081024e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 12:31:13 2013 +0100 msi: Don't attempt to patch files from disabled components. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 96584df..d53da91 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -466,7 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (temp_folder[0] == '\0') GetTempPathW(MAX_PATH, temp_folder); - if (!(p = get_next_filepatch(package, file))) return FALSE; + if (!(p = get_next_filepatch(package, file)) || !p->File->Component->Enabled) + return FALSE; GetTempFileNameW(temp_folder, NULL, 0, patch_path);

1 0

Alessandro Pignotti : quartz: Make GetClassMediaFile visible in the module.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 916854c5a877ccac95558a0180d9bc006c12674c URL: http://source.winehq.org/git/wine.git/?a=commit;h=916854c5a877ccac95558a018… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:29:55 2013 +0100 quartz: Make GetClassMediaFile visible in the module. --- dlls/quartz/filesource.c | 2 +- dlls/quartz/quartz_private.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e81110f..5bde1e5 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -254,7 +254,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p return hr; } -static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) +HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { HKEY hkeyMediaType = NULL; LONG lRet; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index d8bcdbf..af0300e 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -67,4 +67,6 @@ extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN; +HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter); + #endif /* __QUARTZ_PRIVATE_INCLUDED__ */

1 0

Nikolay Sivov : msxml3: Update refcount in replaceNode().
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 01dd81a78c16130629e97ea8bc598e284363a530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01dd81a78c16130629e97ea8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 15:36:56 2013 +0400 msxml3: Update refcount in replaceNode(). --- dlls/msxml3/node.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8571955..20f9ba9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -511,6 +511,7 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol xmlnode *old_child, *new_child; xmlDocPtr leaving_doc; xmlNode *my_ancestor; + int refcount = 0; /* Do not believe any documentation telling that newChild == NULL means removal. It does certainly *not* apply to msxml3! */ @@ -548,9 +549,13 @@ HRESULT node_replace_child(xmlnode *This, IXMLDOMNode *newChild, IXMLDOMNode *ol WARN("%p is not an orphan of %p\n", new_child->node, new_child->node->doc); leaving_doc = new_child->node->doc; - xmldoc_add_ref(old_child->node->doc); + + if (leaving_doc != old_child->node->doc) + refcount = xmlnode_get_inst_cnt(new_child); + + if (refcount) xmldoc_add_refs(old_child->node->doc, refcount); xmlReplaceNode(old_child->node, new_child->node); - xmldoc_release(leaving_doc); + if (refcount) xmldoc_release_refs(leaving_doc, refcount); new_child->parent = old_child->parent; old_child->parent = NULL;

1 0

Jörg Höhle : mmsystem: Always use CALLBACK_FUNCTION to update MIDI/WAVEHDR.dwFlags.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: f13394f7979d26def92afc2a7399c174147f4c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13394f7979d26def92afc2a7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 23 17:29:59 2013 +0100 mmsystem: Always use CALLBACK_FUNCTION to update MIDI/WAVEHDR.dwFlags. --- dlls/mmsystem.dll16/mmsystem.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index ac9915f..fe8f587 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -734,8 +734,7 @@ UINT16 WINAPI midiOutOpen16(HMIDIOUT16* lphMidiOut, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiOutOpen(&hmo, uDeviceID, (DWORD)thunk, dwInstance, dwFlags); if (ret == MMSYSERR_NOERROR) { @@ -938,8 +937,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16* lphMidiIn, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiInOpen(&hmid, uDeviceID, (DWORD)thunk, dwInstance, dwFlags); if (ret == MMSYSERR_NOERROR) { @@ -1099,8 +1097,7 @@ MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phMidiStrm, LPUINT16 devid, { return MMSYSERR_NOMEM; } - if ((fdwOpen & CALLBACK_TYPEMASK) != CALLBACK_NULL) - fdwOpen = (fdwOpen & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + fdwOpen = (fdwOpen & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; ret = midiStreamOpen(&hMidiStrm32, &devid32, cMidi, (DWORD)thunk, dwInstance, fdwOpen); if (ret == MMSYSERR_NOERROR) { @@ -1233,8 +1230,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly * call the 32 bit version * however, we need to promote correctly the wave mapper id @@ -1243,11 +1239,12 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, ret = waveOutOpen(&hWaveOut, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (lphWaveOut != NULL && ret == MMSYSERR_NOERROR) - *lphWaveOut = HWAVEOUT_16(hWaveOut); if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + { MMSYSTDRV_SetHandle(thunk, (void*)hWaveOut); - else MMSYSTDRV_DeleteThunk(thunk); + if (lphWaveOut != NULL) + *lphWaveOut = HWAVEOUT_16(hWaveOut); + } else MMSYSTDRV_DeleteThunk(thunk); return ret; } @@ -1512,8 +1509,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, { return MMSYSERR_NOMEM; } - if ((dwFlags & CALLBACK_TYPEMASK) != CALLBACK_NULL) - dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; + dwFlags = (dwFlags & ~CALLBACK_TYPEMASK) | CALLBACK_FUNCTION; /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly * call the 32 bit version * however, we need to promote correctly the wave mapper id @@ -1522,11 +1518,12 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, ret = waveInOpen(&hWaveIn, (uDeviceID == (UINT16)-1) ? (UINT)-1 : uDeviceID, lpFormat, (DWORD)thunk, dwInstance, dwFlags); - if (lphWaveIn != NULL && ret == MMSYSERR_NOERROR) - *lphWaveIn = HWAVEIN_16(hWaveIn); if (ret == MMSYSERR_NOERROR && !(dwFlags & WAVE_FORMAT_QUERY)) + { MMSYSTDRV_SetHandle(thunk, (void*)hWaveIn); - else MMSYSTDRV_DeleteThunk(thunk); + if (lphWaveIn != NULL) + *lphWaveIn = HWAVEOUT_16(hWaveIn); + } else MMSYSTDRV_DeleteThunk(thunk); return ret; }

1 0

Hans Leidekker : msi: Handle more than one patch per file.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: aeb7d70ffdbb40c62beede410eefac9c776a2443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb7d70ffdbb40c62beede410… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 12:30:37 2013 +0100 msi: Handle more than one patch per file. --- dlls/msi/action.c | 12 ------------ dlls/msi/files.c | 19 +++++++++++++------ dlls/msi/msipriv.h | 1 - 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d48ecdd..827a0c8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -684,18 +684,6 @@ MSIFILE *msi_get_loaded_file( MSIPACKAGE *package, const WCHAR *key ) return NULL; } -MSIFILEPATCH *msi_get_loaded_filepatch( MSIPACKAGE *package, const WCHAR *key ) -{ - MSIFILEPATCH *patch; - - /* FIXME: There might be more than one patch */ - LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) - { - if (!strcmpW( key, patch->File->File )) return patch; - } - return NULL; -} - MSIFOLDER *msi_get_loaded_folder( MSIPACKAGE *package, const WCHAR *dir ) { MSIFOLDER *folder; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7202fb6..96584df 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -443,6 +443,17 @@ static void unload_mspatch(void) FreeLibrary(hmspatcha); } +static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) +{ + MSIFILEPATCH *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + if (!patch->IsApplied && !strcmpW( key, patch->File->File )) return patch; + } + return NULL; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -455,12 +466,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (temp_folder[0] == '\0') GetTempPathW(MAX_PATH, temp_folder); - p = msi_get_loaded_filepatch(package, file); - if (!p) - { - TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); - return FALSE; - } + if (!(p = get_next_filepatch(package, file))) return FALSE; + GetTempFileNameW(temp_folder, NULL, 0, patch_path); *path = strdupW(patch_path); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c477405..018f405 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1018,7 +1018,6 @@ extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDE extern MSICOMPONENT *msi_get_loaded_component(MSIPACKAGE *package, const WCHAR *Component) DECLSPEC_HIDDEN; extern MSIFEATURE *msi_get_loaded_feature(MSIPACKAGE *package, const WCHAR *Feature) DECLSPEC_HIDDEN; extern MSIFILE *msi_get_loaded_file(MSIPACKAGE *package, const WCHAR *file) DECLSPEC_HIDDEN; -extern MSIFILEPATCH *msi_get_loaded_filepatch(MSIPACKAGE* package, const WCHAR *key) DECLSPEC_HIDDEN; extern MSIFOLDER *msi_get_loaded_folder(MSIPACKAGE *package, const WCHAR *dir) DECLSPEC_HIDDEN; extern int msi_track_tempfile(MSIPACKAGE *package, const WCHAR *path) DECLSPEC_HIDDEN; extern void msi_free_action_script(MSIPACKAGE *package, UINT script) DECLSPEC_HIDDEN;

1 0

Byeongsik Jeon : gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 1c846e70f0edce2908e05a48fb78442a97ac67cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c846e70f0edce2908e05a48f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Feb 26 10:31:20 2013 +0900 gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset. --- dlls/gdi32/font.c | 55 ++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 46 +++++++++++++++++++++++++ dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b274b83..65e09d3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -590,11 +590,66 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, return CreateFontIndirectW( &logfont ); } +#define ASSOC_CHARSET_OEM 1 +#define ASSOC_CHARSET_ANSI 2 +#define ASSOC_CHARSET_SYMBOL 4 + +static DWORD get_associated_charset_info(void) +{ + static DWORD associated_charset = -1; + + if (associated_charset == -1) + { + static const WCHAR assoc_charset_reg_keyW[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','F','o','n','t','A','s','s','o','c','\\', + 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t','\0'}; + static const WCHAR ansiW[] = {'A','N','S','I','(','0','0',')','\0'}; + static const WCHAR oemW[] = {'O','E','M','(','F','F',')','\0'}; + static const WCHAR symbolW[] = {'S','Y','M','B','O','L','(','0','2',')','\0'}; + static const WCHAR yesW[] = {'Y','E','S','\0'}; + HKEY hkey; + WCHAR dataW[32]; + DWORD type, data_len; + + associated_charset = 0; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + assoc_charset_reg_keyW, &hkey) != ERROR_SUCCESS) + return 0; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, ansiW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_ANSI; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, oemW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_OEM; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, symbolW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_SYMBOL; + + RegCloseKey(hkey); + + TRACE("associated_charset = %d\n", associated_charset); + } + + return associated_charset; +} + static void update_font_code_page( DC *dc ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + if (charset == ANSI_CHARSET && + get_associated_charset_info() & ASSOC_CHARSET_ANSI) + charset = DEFAULT_CHARSET; + /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) dc->font_code_page = csi.ciACP; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b977b0d..d7cc777 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3505,6 +3505,46 @@ static void set_value_key(HKEY hkey, const char *name, const char *value) RegDeleteValueA(hkey, name); } +static void update_font_association_info(UINT current_ansi_codepage) +{ + static const char *font_assoc_reg_key = "System\\CurrentControlSet\\Control\\FontAssoc"; + static const char *assoc_charset_subkey = "Associated Charset"; + + if (is_dbcs_ansi_cp(current_ansi_codepage)) + { + HKEY hkey; + if (RegCreateKeyA(HKEY_LOCAL_MACHINE, font_assoc_reg_key, &hkey) == ERROR_SUCCESS) + { + HKEY hsubkey; + if (RegCreateKeyA(hkey, assoc_charset_subkey, &hsubkey) == ERROR_SUCCESS) + { + switch (current_ansi_codepage) + { + case 932: + set_value_key(hsubkey, "ANSI(00)", "NO"); + set_value_key(hsubkey, "OEM(FF)", "NO"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + case 936: + case 949: + case 950: + set_value_key(hsubkey, "ANSI(00)", "YES"); + set_value_key(hsubkey, "OEM(FF)", "YES"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + } + RegCloseKey(hsubkey); + } + + /* TODO: Associated DefaultFonts */ + + RegCloseKey(hkey); + } + } + else + RegDeleteTreeA(HKEY_LOCAL_MACHINE, font_assoc_reg_key); +} + static void update_font_info(void) { static const WCHAR logpixels[] = { 'L','o','g','P','i','x','e','l','s',0 }; @@ -3538,6 +3578,7 @@ static void update_font_info(void) if (is_dbcs_ansi_cp(ansi_cp)) use_default_fallback = TRUE; + buf[0] = 0; len = sizeof(buf); if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) { @@ -3615,6 +3656,11 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); + + /* update locale dependent font association info in registry. + update only when codepages changed, not logpixels. */ + if (strcmp(buf, cpbuf) != 0) + update_font_association_info(ansi_cp); } static BOOL init_freetype(void) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 943f584..b72a423 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2083,6 +2083,90 @@ static void test_font_charset(void) skip("Symbol or Wingdings is not installed\n"); } +static void test_GdiGetCodePage(void) +{ + static const struct _matching_data + { + UINT current_codepage; + LPCSTR lfFaceName; + UCHAR lfCharSet; + UINT expected_codepage; + } matching_data[] = { + {1251, "Arial", ANSI_CHARSET, 1252}, + {1251, "Tahoma", ANSI_CHARSET, 1252}, + + {1252, "Arial", ANSI_CHARSET, 1252}, + {1252, "Tahoma", ANSI_CHARSET, 1252}, + + {1253, "Arial", ANSI_CHARSET, 1252}, + {1253, "Tahoma", ANSI_CHARSET, 1252}, + + { 932, "Arial", ANSI_CHARSET, 1252}, /* Japanese Windows returns 1252, not 932 */ + { 932, "Tahoma", ANSI_CHARSET, 1252}, + { 932, "MS UI Gothic", ANSI_CHARSET, 1252}, + + { 936, "Arial", ANSI_CHARSET, 936}, + { 936, "Tahoma", ANSI_CHARSET, 936}, + { 936, "Simsun", ANSI_CHARSET, 936}, + + { 949, "Arial", ANSI_CHARSET, 949}, + { 949, "Tahoma", ANSI_CHARSET, 949}, + { 949, "Gulim", ANSI_CHARSET, 949}, + + { 950, "Arial", ANSI_CHARSET, 950}, + { 950, "Tahoma", ANSI_CHARSET, 950}, + { 950, "PMingLiU", ANSI_CHARSET, 950}, + }; + HDC hdc; + LOGFONT lf; + HFONT hfont; + UINT charset, acp; + DWORD codepage; + int i; + + if (!pGdiGetCodePage) + { + skip("GdiGetCodePage not available on this platform\n"); + return; + } + + acp = GetACP(); + + for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + { + /* only test data matched current locale codepage */ + if (matching_data[i].current_codepage != acp) + continue; + + if (!is_font_installed(matching_data[i].lfFaceName)) + { + skip("%s is not installed\n", matching_data[i].lfFaceName); + continue; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -16; + lf.lfCharSet = matching_data[i].lfCharSet; + lstrcpyA(lf.lfFaceName, matching_data[i].lfFaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage); + ok(codepage == matching_data[i].expected_codepage, + "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + } +} + static void test_GetFontUnicodeRanges(void) { LOGFONTA lf; @@ -4902,6 +4986,7 @@ START_TEST(font) test_GetOutlineTextMetrics(); test_SetTextJustification(); test_font_charset(); + test_GdiGetCodePage(); test_GetFontUnicodeRanges(); test_nonexistent_font(); test_orientation();

1 0

Jörg Höhle : mmsystem: Do not rewrite input parameters.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 1cc26cba6f7ad86d454b252f41ca93bb1005ddcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc26cba6f7ad86d454b252f4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 19 22:54:17 2013 +0100 mmsystem: Do not rewrite input parameters. --- dlls/mmsystem.dll16/message16.c | 12 ------------ dlls/mmsystem.dll16/mmsystem.c | 38 ++++---------------------------------- 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 0935ca0..24ae6ef 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -188,8 +188,6 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP mh32->dwBytesRecorded = mh16->dwBytesRecorded; mh32->dwUser = mh16->dwUser; mh32->dwFlags = mh16->dwFlags; - /* FIXME: nothing on mh32->lpNext */ - /* could link the mh32->lpNext at this level for memory house keeping */ mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh16->dwOffset : 0; mh16->lpNext = mh32; /* for reuse in unprepare and write */ /* store size of passed MIDIHDR?? structure to know if dwOffset is available or not */ @@ -278,9 +276,6 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp LPMIDIHDR mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); assert(mh16->lpNext == mh32); - mh16->dwBufferLength = mh32->dwBufferLength; - mh16->dwBytesRecorded = mh32->dwBytesRecorded; - mh16->dwUser = mh32->dwUser; mh16->dwFlags = mh32->dwFlags; if (mh16->reserved >= sizeof(MIDIHDR)) mh16->dwOffset = mh32->dwOffset; @@ -501,11 +496,8 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpP LPWAVEHDR wh16 = MapSL(*(SEGPTR*)((LPSTR)wh32 - sizeof(LPWAVEHDR))); assert(wh16->lpNext == wh32); - wh16->dwBufferLength = wh32->dwBufferLength; wh16->dwBytesRecorded = wh32->dwBytesRecorded; - wh16->dwUser = wh32->dwUser; wh16->dwFlags = wh32->dwFlags; - wh16->dwLoops = wh32->dwLoops; if (wMsg == WIDM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)wh32 - sizeof(LPWAVEHDR)); @@ -734,11 +726,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp LPWAVEHDR wh16 = MapSL(*(SEGPTR*)((LPSTR)wh32 - sizeof(LPWAVEHDR))); assert(wh16->lpNext == wh32); - wh16->dwBufferLength = wh32->dwBufferLength; - wh16->dwBytesRecorded = wh32->dwBytesRecorded; - wh16->dwUser = wh32->dwUser; wh16->dwFlags = wh32->dwFlags; - wh16->dwLoops = wh32->dwLoops; if (wMsg == WODM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)wh32 - sizeof(LPWAVEHDR)); diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 58b46d9..ac9915f 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -104,20 +104,6 @@ void MMSYSTEM_MMTIME32to16(LPMMTIME16 mmt16, const MMTIME* mmt32) memcpy(&(mmt16->u), &(mmt32->u), sizeof(mmt16->u)); } -/****************************************************************** - * MMSYSTEM_MMTIME16to32 - * - * - */ -static void MMSYSTEM_MMTIME16to32(LPMMTIME mmt32, const MMTIME16* mmt16) -{ - mmt32->wType = mmt16->wType; - /* layout of rest is the same for 32/16, - * Note: mmt16->u is 2 bytes smaller than mmt32->u, which has padding - */ - memcpy(&(mmt32->u), &(mmt16->u), sizeof(mmt16->u)); -} - /************************************************************************** * timeGetSystemTime [MMSYSTEM.601] */ @@ -1153,7 +1139,7 @@ MMRESULT16 WINAPI midiStreamPosition16(HMIDISTRM16 hMidiStrm, LPMMTIME16 lpmmt16 if (!lpmmt16) return MMSYSERR_INVALPARAM; - MMSYSTEM_MMTIME16to32(&mmt32, lpmmt16); + mmt32.wType = lpmmt16->wType; ret = midiStreamPosition(HMIDISTRM_32(hMidiStrm), &mmt32, sizeof(MMTIME)); MMSYSTEM_MMTIME32to16(lpmmt16, &mmt32); return ret; @@ -1288,24 +1274,11 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - LPWAVEHDR lpWaveOutHdr = MapSL(lpsegWaveOutHdr); - UINT16 result; - TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); - if (lpWaveOutHdr == NULL) return MMSYSERR_INVALPARAM; + if (lpsegWaveOutHdr == 0) return MMSYSERR_INVALPARAM; - if ((result = MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_PREPARE, lpsegWaveOutHdr, - uSize)) != MMSYSERR_NOTSUPPORTED) - return result; - - if (lpWaveOutHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; - - lpWaveOutHdr->dwFlags |= WHDR_PREPARED; - lpWaveOutHdr->dwFlags &= ~WHDR_DONE; - - return MMSYSERR_NOERROR; + return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_PREPARE, lpsegWaveOutHdr, uSize); } /************************************************************************** @@ -1581,15 +1554,12 @@ UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ UINT16 uSize) /* [in] */ { LPWAVEHDR lpWaveInHdr = MapSL(lpsegWaveInHdr); - UINT16 ret; TRACE("(%04X, %p, %u);\n", hWaveIn, lpWaveInHdr, uSize); if (lpWaveInHdr == NULL) return MMSYSERR_INVALHANDLE; - lpWaveInHdr->dwBytesRecorded = 0; - ret = MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_PREPARE, lpsegWaveInHdr, uSize); - return ret; + return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_PREPARE, lpsegWaveInHdr, uSize); } /**************************************************************************

1 0

Jörg Höhle : mmsystem: Use SEGPTR when the . spec says so.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 5155e8011da8c2057d512b974a2ee55f8859b146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5155e8011da8c2057d512b974… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 19 22:06:04 2013 +0100 mmsystem: Use SEGPTR when the .spec says so. --- dlls/mmsystem.dll16/mmio16.c | 8 ++++---- dlls/mmsystem.dll16/mmsystem.c | 32 ++++++++++++++++---------------- include/wine/mmsystem16.h | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index 1db82c2..df28a66 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -424,10 +424,10 @@ MMRESULT16 WINAPI mmioSetInfo16(HMMIO16 hmmio, const MMIOINFO16* lpmmioinfo, UIN /************************************************************************** * mmioSetBuffer [MMSYSTEM.1217] */ -MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, +MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, SEGPTR pchBuffer, LONG cchBuffer, UINT16 uFlags) { - MMRESULT ret = mmioSetBuffer(HMMIO_32(hmmio), MapSL((DWORD)pchBuffer), + MMRESULT ret = mmioSetBuffer(HMMIO_32(hmmio), MapSL(pchBuffer), cchBuffer, uFlags); if (ret == MMSYSERR_NOERROR) @@ -439,10 +439,10 @@ MMRESULT16 WINAPI mmioSetBuffer16(HMMIO16 hmmio, LPSTR pchBuffer, FIXME("really ?\n"); return MMSYSERR_INVALHANDLE; } - MMIO_SetSegmentedBuffer(thunk, (DWORD)pchBuffer, TRUE); + MMIO_SetSegmentedBuffer(thunk, pchBuffer, TRUE); } else - UnMapLS((DWORD)pchBuffer); + UnMapLS(pchBuffer); return ret; } diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 1109ef4..58b46d9 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -814,12 +814,12 @@ UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16 hMidiOut, DWORD dwMsg) * midiOutLongMsg [MMSYSTEM.209] */ UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut, /* [in] */ - LPMIDIHDR16 lpsegMidiOutHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegMidiOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); + TRACE("(%04X, %08x, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); - return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, (DWORD_PTR)lpsegMidiOutHdr, uSize); + return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, lpsegMidiOutHdr, uSize); } /************************************************************************** @@ -895,10 +895,10 @@ DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage, case MODM_GETVOLUME: return midiOutGetVolume16(hMidiOut, MapSL(dwParam1)); + /* lpMidiOutHdr is still a segmented pointer for these functions */ case MODM_LONGDATA: - return midiOutLongMsg16(hMidiOut, MapSL(dwParam1), dwParam2); + return midiOutLongMsg16(hMidiOut, dwParam1, dwParam2); case MODM_PREPARE: - /* lpMidiOutHdr is still a segmented pointer for this function */ return midiOutPrepareHeader16(hMidiOut, dwParam1, dwParam2); case MODM_UNPREPARE: return midiOutUnprepareHeader16(hMidiOut, dwParam1, dwParam2); @@ -1010,12 +1010,12 @@ UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn, /* [in] */ * midiInAddBuffer [MMSYSTEM.308] */ UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn, /* [in] */ - MIDIHDR16* lpsegMidiInHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegMidiInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); + TRACE("(%04X, %08x, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); - return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, (DWORD_PTR)lpsegMidiInHdr, uSize); + return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, lpsegMidiInHdr, uSize); } /************************************************************************** @@ -1077,7 +1077,7 @@ DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage, case MIDM_UNPREPARE: return midiInUnprepareHeader16(hMidiIn, dwParam1, dwParam2); case MIDM_ADDBUFFER: - return midiInAddBuffer16(hMidiIn, MapSL(dwParam1), dwParam2); + return midiInAddBuffer16(hMidiIn, dwParam1, dwParam2); } return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), uMessage, dwParam1, dwParam2); } @@ -1330,12 +1330,12 @@ UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ * waveOutWrite [MMSYSTEM.408] */ UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, /* [in] */ - LPWAVEHDR lpsegWaveOutHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); + TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); - return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, (DWORD_PTR)lpsegWaveOutHdr, uSize); + return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, lpsegWaveOutHdr, uSize); } /************************************************************************** @@ -1616,14 +1616,14 @@ UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ * waveInAddBuffer [MMSYSTEM.508] */ UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn, /* [in] */ - WAVEHDR* lpsegWaveInHdr, /* [???] NOTE: SEGPTR */ + SEGPTR lpsegWaveInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %p, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); + TRACE("(%04X, %08x, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); - if (lpsegWaveInHdr == NULL) return MMSYSERR_INVALPARAM; + if (lpsegWaveInHdr == 0) return MMSYSERR_INVALPARAM; - return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_ADDBUFFER, (DWORD_PTR)lpsegWaveInHdr, uSize); + return MMSYSTDRV_Message(HWAVEIN_32(hWaveIn), WIDM_ADDBUFFER, lpsegWaveInHdr, uSize); } /************************************************************************** diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index d30a1ba..05c11be 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -120,7 +120,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16*,UINT16,const WAVEFORMATEX *,DWORD,DWO UINT16 WINAPI waveOutClose16(HWAVEOUT16); UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16,SEGPTR,UINT16); -UINT16 WINAPI waveOutWrite16(HWAVEOUT16,WAVEHDR*,UINT16); +UINT16 WINAPI waveOutWrite16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutPause16(HWAVEOUT16); UINT16 WINAPI waveOutRestart16(HWAVEOUT16); UINT16 WINAPI waveOutReset16(HWAVEOUT16); @@ -139,7 +139,7 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16*,UINT16,const WAVEFORMATEX *,DWORD,DWORD UINT16 WINAPI waveInClose16(HWAVEIN16); UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16,SEGPTR,UINT16); -UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,WAVEHDR*,UINT16); +UINT16 WINAPI waveInAddBuffer16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInStart16(HWAVEIN16); UINT16 WINAPI waveInStop16(HWAVEIN16); UINT16 WINAPI waveInReset16(HWAVEIN16); @@ -199,7 +199,7 @@ UINT16 WINAPI midiOutClose16(HMIDIOUT16); UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutShortMsg16(HMIDIOUT16,DWORD); -UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,MIDIHDR16*,UINT16); +UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16,SEGPTR,UINT16); UINT16 WINAPI midiOutReset16(HMIDIOUT16); UINT16 WINAPI midiOutCachePatches16(HMIDIOUT16,UINT16,WORD*,UINT16); UINT16 WINAPI midiOutCacheDrumPatches16(HMIDIOUT16,UINT16,WORD*,UINT16); @@ -212,7 +212,7 @@ UINT16 WINAPI midiInOpen16(HMIDIIN16*,UINT16,DWORD,DWORD,DWORD); UINT16 WINAPI midiInClose16(HMIDIIN16); UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16,SEGPTR,UINT16); UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16,SEGPTR,UINT16); -UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,MIDIHDR16*,UINT16); +UINT16 WINAPI midiInAddBuffer16(HMIDIIN16,SEGPTR,UINT16); UINT16 WINAPI midiInStart16(HMIDIIN16); UINT16 WINAPI midiInStop16(HMIDIIN16); UINT16 WINAPI midiInReset16(HMIDIIN16); @@ -440,7 +440,7 @@ LONG WINAPI mmioWrite16(HMMIO16,HPCSTR,LONG); LONG WINAPI mmioSeek16(HMMIO16,LONG,INT16); MMRESULT16 WINAPI mmioGetInfo16(HMMIO16,MMIOINFO16*,UINT16); MMRESULT16 WINAPI mmioSetInfo16(HMMIO16,const MMIOINFO16*,UINT16); -UINT16 WINAPI mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16); +UINT16 WINAPI mmioSetBuffer16(HMMIO16,SEGPTR,LONG,UINT16); UINT16 WINAPI mmioFlush16(HMMIO16,UINT16); UINT16 WINAPI mmioAdvance16(HMMIO16,MMIOINFO16*,UINT16); LRESULT WINAPI mmioSendMessage16(HMMIO16,UINT16,LPARAM,LPARAM);

1 0

Jacek Caban : vbscipt: Added string constants.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 5f3c38ed61d8e062954953ec3a64fba6b19a445d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3c38ed61d8e062954953ec3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:56:05 2013 +0100 vbscipt: Added string constants. --- dlls/vbscript/global.c | 80 ++++++++++--------------------------------- dlls/vbscript/tests/api.vbs | 14 +++++++ dlls/vbscript/vbdisp.c | 12 ++++++ dlls/vbscript/vbscript.h | 7 +++- 4 files changed, 50 insertions(+), 63 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b4af6f..9ff1f76 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,59 +1609,15 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCrLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNewLine(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFormFeed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLf(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullChar(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbNullString(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} +static const string_constant_t vbCr = {1, {'\r'}}; +static const string_constant_t vbCrLf = {2, {'\r','\n'}}; +static const string_constant_t vbNewLine = {2, {'\r','\n'}}; +static const string_constant_t vbFormFeed = {1, {0xc}}; +static const string_constant_t vbLf = {1, {'\n'}}; +static const string_constant_t vbNullChar = {1}; +static const string_constant_t vbNullString = {0}; +static const string_constant_t vbTab = {1, {'\t'}}; +static const string_constant_t vbVerticalTab = {1, {0xb}}; static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, VT_I2, 0}, @@ -1736,15 +1692,15 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, - {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, - {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, - {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, - {DISPID_GLOBAL_VBFORMFEED, Global_vbFormFeed, BP_GET}, - {DISPID_GLOBAL_VBLF, Global_vbLf, BP_GET}, - {DISPID_GLOBAL_VBNULLCHAR, Global_vbNullChar, BP_GET}, - {DISPID_GLOBAL_VBNULLSTRING, Global_vbNullString, BP_GET}, - {DISPID_GLOBAL_VBTAB, Global_vbTab, BP_GET}, - {DISPID_GLOBAL_VBVERTICALTAB, Global_vbVerticalTab, BP_GET}, + {DISPID_GLOBAL_VBCR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCr}, + {DISPID_GLOBAL_VBCRLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbCrLf}, + {DISPID_GLOBAL_VBNEWLINE, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNewLine}, + {DISPID_GLOBAL_VBFORMFEED, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, + {DISPID_GLOBAL_VBLF, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbLf}, + {DISPID_GLOBAL_VBNULLCHAR, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullChar}, + {DISPID_GLOBAL_VBNULLSTRING, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbNullString}, + {DISPID_GLOBAL_VBTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbTab}, + {DISPID_GLOBAL_VBVERTICALTAB, NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {DISPID_GLOBAL_CCUR, Global_CCur, 0, 1}, {DISPID_GLOBAL_CINT, Global_CInt, 0, 1}, {DISPID_GLOBAL_CLNG, Global_CLng, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3e53813..0aaeefb 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -48,6 +48,11 @@ Sub TestConstantI4(name, val, exval) Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantBSTR(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_BSTR*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -103,6 +108,15 @@ TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& TestConstantI4 "vbRed", vbRed, &h0000ff& TestConstantI4 "vbWhite", vbWhite, &hffffff& TestConstantI4 "vbYellow", vbYellow, &h00ffff& +TestConstantBSTR "vbCr", vbCr, Chr(13) +TestConstantBSTR "vbCrLf", vbCrLf, Chr(13)&Chr(10) +TestConstantBSTR "vbNewLine", vbNewLine, Chr(13)&Chr(10) +TestConstantBSTR "vbFormFeed", vbFormFeed, Chr(12) +TestConstantBSTR "vbLf", vbLf, Chr(10) +TestConstantBSTR "vbNullChar", vbNullChar, Chr(0) +TestConstantBSTR "vbNullString", vbNullString, "" +TestConstantBSTR "vbTab", vbTab, chr(9) +TestConstantBSTR "vbVerticalTab", vbVerticalTab, chr(11) Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0c39956..f06a5b6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -160,6 +160,18 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_VT(res) = VT_I4; V_I4(res) = val; break; + case VT_BSTR: { + const string_constant_t *str = (const string_constant_t*)prop->max_args; + BSTR ret; + + ret = SysAllocStringLen(str->buf, str->len); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + break; + } default: assert(0); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index db31b47..e25b524 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -86,7 +86,7 @@ typedef struct { HRESULT (*proc)(vbdisp_t*,VARIANT*,unsigned,VARIANT*); DWORD flags; unsigned min_args; - unsigned max_args; + UINT_PTR max_args; } builtin_prop_t; typedef struct _class_desc_t { @@ -334,6 +334,11 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECL HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; +typedef struct { + UINT16 len; + WCHAR buf[7]; +} string_constant_t; + #define TID_LIST \ XDIID(ErrObj) \ XDIID(GlobalObj)

1 0

Jacek Caban : vbscript: Make constant type explicit.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 6a6c323306681ef2a422f9711bde6271be9c0d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6c323306681ef2a422f9711… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:19 2013 +0100 vbscript: Make constant type explicit. --- dlls/vbscript/global.c | 136 ++++++++++++++++++++++++------------------------ dlls/vbscript/vbdisp.c | 11 +++- 2 files changed, 76 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a6c323306681ef2a422f…

1 0

Alessandro Pignotti : quartz: Check byte patterns in GetFileSourceFilter.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: e583f8806eea8928d845dff1953f706d2c3ea207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e583f8806eea8928d845dff19… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:57:50 2013 +0100 quartz: Check byte patterns in GetFileSourceFilter. The idea is to create a temporary AsyncReader and use it to match a better filter. If no match is found the temporary filter is returned. --- dlls/quartz/filesource.c | 15 ++++- dlls/quartz/filtergraph.c | 133 +++++++++++++++++++++++++++------------------ 2 files changed, 92 insertions(+), 56 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 5bde1e5..95e146d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -295,7 +295,8 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) bFound = TRUE; } - else + /* We need a reader interface to check bytes */ + else if (pReader) { DWORD indexMinor; @@ -305,7 +306,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * WCHAR wszMinorKeyName[CHARS_IN_GUID]; DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; - DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName) / sizeof(wszSourceFilterKeyName[0]); + DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName); DWORD maxValueLen; DWORD indexValue; @@ -370,7 +371,15 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * hr = E_FAIL; } else if (bFound) - TRACE("Found file's class: major = %s, subtype = %s\n", qzdebugstr_guid(majorType), qzdebugstr_guid(minorType)); + { + TRACE("Found file's class:\n"); + if(majorType) + TRACE("\tmajor = %s\n", qzdebugstr_guid(majorType)); + if(minorType) + TRACE("\tsubtype = %s\n", qzdebugstr_guid(minorType)); + if(sourceFilter) + TRACE("\tsource filter = %s\n", qzdebugstr_guid(sourceFilter)); + } return hr; } diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4140d23..985e568 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1556,61 +1556,97 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw return hr; } +static HRESULT CreateFilterInstanceAndLoadFile(GUID* clsid, LPCOLESTR pszFileName, IBaseFilter **filter) +{ + IFileSourceFilter *source = NULL; + HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + TRACE("CLSID: %s\n", debugstr_guid(clsid)); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } + + /* Load the file in the file source filter */ + hr = IFileSourceFilter_Load(source, pszFileName, NULL); + IFileSourceFilter_Release(source); + if (FAILED(hr)) { + WARN("Load (%x)\n", hr); + IBaseFilter_Release(*filter); + return hr; + } + + return hr; +} + /* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) { - static const WCHAR wszReg[] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s',0}; - HRESULT hr = S_OK; - HKEY extkey; - LONG lRet; + HRESULT hr; + GUID clsid; + IAsyncReader * pReader = NULL; + IFileSourceFilter* pSource = NULL; + IPin * pOutputPin = NULL; + static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszReg, 0, KEY_READ, &extkey); - hr = HRESULT_FROM_WIN32(lRet); + /* Try to find a match without reading the file first */ + hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (SUCCEEDED(hr)) + if (!hr) + return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); + + /* Now create a AyncReader instance, to check for signature bytes in the file */ + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + if (FAILED(hr)) + return hr; + + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID *)&pSource); + if (FAILED(hr)) { - static const WCHAR filtersource[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; - WCHAR *ext = PathFindExtensionW(pszFileName); - WCHAR clsid_key[39]; - GUID clsid; - DWORD size = sizeof(clsid_key); - HKEY pathkey; + IBaseFilter_Release(*filter); + return hr; + } - if (!ext) - { - CloseHandle(extkey); - return E_FAIL; - } + hr = IFileSourceFilter_Load(pSource, pszFileName, NULL); + IFileSourceFilter_Release(pSource); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - lRet = RegOpenKeyExW(extkey, ext, 0, KEY_READ, &pathkey); - hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(extkey); - if (FAILED(hr)) - return hr; + hr = IBaseFilter_FindPin(*filter, wszOutputPinName, &pOutputPin); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - lRet = RegQueryValueExW(pathkey, filtersource, NULL, NULL, (LPBYTE)clsid_key, &size); - hr = HRESULT_FROM_WIN32(lRet); - CloseHandle(pathkey); - if (FAILED(hr)) - return hr; + hr = IPin_QueryInterface(pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); + IPin_Release(pOutputPin); + if (FAILED(hr)) + { + IBaseFilter_Release(*filter); + return hr; + } - CLSIDFromString(clsid_key, &clsid); + /* Try again find a match */ + hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); + IAsyncReader_Release(pReader); - TRACE("CLSID: %s\n", debugstr_guid(&clsid)); - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); - if (SUCCEEDED(hr)) - { - IFileSourceFilter *source = NULL; - hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); - if (SUCCEEDED(hr)) - IFileSourceFilter_Release(source); - else - IBaseFilter_Release(*filter); - } + if (!hr) + { + /* Release the AsyncReader filter and create the matching one */ + IBaseFilter_Release(*filter); + return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); } - if (FAILED(hr)) - *filter = NULL; - return hr; + + /* Return the AsyncReader filter */ + return S_OK; } static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, @@ -1627,9 +1663,6 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR /* Try from file name first, then fall back to default asynchronous reader */ hr = GetFileSourceFilter(lpcwstrFileName, &preader); - - if (FAILED(hr)) - hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); if (FAILED(hr)) { WARN("Unable to create file source filter (%x)\n", hr); return hr; @@ -1648,13 +1681,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR goto error; } - /* Load the file in the file source filter */ - hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL); - if (FAILED(hr)) { - WARN("Load (%x)\n", hr); - goto error; - } - + /* The file has been already loaded */ IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { WARN("GetCurFile (%x)\n", hr);

1 0

Alessandro Pignotti : quartz: Modify GetClassMediaFile to also extract the SourceFilter value.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: fb2551c59bb7d3e0205fd668be1a8c531180ad06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2551c59bb7d3e0205fd668b… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 21 16:28:50 2013 +0100 quartz: Modify GetClassMediaFile to also extract the SourceFilter value. --- dlls/quartz/filesource.c | 73 ++++++++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f518ec7..e81110f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -79,8 +79,10 @@ static const WCHAR mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; static const WCHAR subtype_name[] = { 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; +static const WCHAR source_filter_name[] = { + 'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; -static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) +static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { WCHAR *extension; LONG l; @@ -100,17 +102,31 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU if (l) return E_FAIL; - size = sizeof(keying); - l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); - if (!l) - CLSIDFromString(keying, majorType); + if (majorType) + { + size = sizeof(keying); + l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, majorType); + } - size = sizeof(keying); - if (!l) - l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (minorType) + { + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, minorType); + } - if (!l) - CLSIDFromString(keying, minorType); + if (sourceFilter) + { + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, source_filter_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, sourceFilter); + } RegCloseKey(hsub); @@ -238,7 +254,7 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p return hr; } -static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) +static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType, GUID * sourceFilter) { HKEY hkeyMediaType = NULL; LONG lRet; @@ -248,8 +264,12 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType); - *majorType = GUID_NULL; - *minorType = GUID_NULL; + if(majorType) + *majorType = GUID_NULL; + if(minorType) + *minorType = GUID_NULL; + if(sourceFilter) + *sourceFilter = GUID_NULL; lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &hkeyMediaType); hr = HRESULT_FROM_WIN32(lRet); @@ -272,7 +292,7 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, TRACE("%s\n", debugstr_w(wszMajorKeyName)); if (!strcmpW(wszExtensions, wszMajorKeyName)) { - if (process_extensions(hkeyMajor, pszFileName, majorType, minorType) == S_OK) + if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) bFound = TRUE; } else @@ -284,6 +304,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, HKEY hkeyMinor; WCHAR wszMinorKeyName[CHARS_IN_GUID]; DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); + WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; + DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName) / sizeof(wszSourceFilterKeyName[0]); DWORD maxValueLen; DWORD indexValue; @@ -305,7 +327,6 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, LPWSTR wszPatternString = HeapAlloc(GetProcessHeap(), 0, maxValueLen); DWORD dwValueNameLen = sizeof(wszValueName) / sizeof(wszValueName[0]); /* remember this is in chars */ DWORD dwDataLen = maxValueLen; /* remember this is in bytes */ - static const WCHAR wszSourceFilter[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; if (RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen) != ERROR_SUCCESS) { @@ -313,15 +334,25 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, break; } + if (strcmpW(wszValueName, source_filter_name)==0) + continue; + /* if it is not the source filter value */ - if (strcmpW(wszValueName, wszSourceFilter)) + if (process_pattern_string(wszPatternString, pReader) == S_OK) { - if (process_pattern_string(wszPatternString, pReader) == S_OK) + if (majorType && FAILED(CLSIDFromString(wszMajorKeyName, majorType))) + break; + if (minorType && FAILED(CLSIDFromString(wszMinorKeyName, minorType))) + break; + if (sourceFilter) { - if (SUCCEEDED(CLSIDFromString(wszMajorKeyName, majorType)) && - SUCCEEDED(CLSIDFromString(wszMinorKeyName, minorType))) - bFound = TRUE; + /* Look up the source filter key */ + if (RegQueryValueExW(hkeyMinor, source_filter_name, NULL, NULL, (LPBYTE)wszSourceFilterKeyName, &dwSourceFilterKeyNameLen)) + break; + if (FAILED(CLSIDFromString(wszSourceFilterKeyName, sourceFilter))) + break; } + bFound = TRUE; } HeapFree(GetProcessHeap(), 0, wszPatternString); } @@ -605,7 +636,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt->pUnk = NULL; This->pmt->lSampleSize = 0; This->pmt->formattype = FORMAT_None; - hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype); + hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { CoTaskMemFree(This->pmt);

1 0

Nikolay Sivov : msxml3: Update backing docs refcount in put_documentElement ().
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: e5affa70400b67eb2abb66666e5f5eccba17ef5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5affa70400b67eb2abb66666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 10:46:33 2013 +0400 msxml3: Update backing docs refcount in put_documentElement(). --- dlls/msxml3/domdoc.c | 9 +++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fb96ba0..32e9591 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1538,7 +1538,9 @@ static HRESULT WINAPI domdoc_put_documentElement( domdoc *This = impl_from_IXMLDOMDocument3( iface ); IXMLDOMNode *elementNode; xmlNodePtr oldRoot; + xmlDocPtr old_doc; xmlnode *xmlNode; + int refcount = 0; HRESULT hr; TRACE("(%p)->(%p)\n", This, DOMElement); @@ -1554,7 +1556,14 @@ static HRESULT WINAPI domdoc_put_documentElement( if(xmldoc_remove_orphan(xmlNode->node->doc, xmlNode->node) != S_OK) WARN("%p is not an orphan of %p\n", xmlNode->node->doc, xmlNode->node); + old_doc = xmlNode->node->doc; + if (old_doc != get_doc(This)) + refcount = xmlnode_get_inst_cnt(xmlNode); + + /* old root is still orphaned by its document, update refcount from new root */ + if (refcount) xmldoc_add_refs(get_doc(This), refcount); oldRoot = xmlDocSetRootElement( get_doc(This), xmlNode->node); + if (refcount) xmldoc_release_refs(old_doc, refcount); IXMLDOMNode_Release( elementNode ); if(oldRoot) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3109a42..6c24119 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -294,6 +294,7 @@ extern LONG xmldoc_add_ref( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_release( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_add_refs( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; extern LONG xmldoc_release_refs ( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; +extern int xmlnode_get_inst_cnt( xmlnode *node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 20f9ba9..4508609 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -402,7 +402,7 @@ static int node_get_inst_cnt(xmlNodePtr node) return ret; } -static int xmlnode_get_inst_cnt(xmlnode *node) +int xmlnode_get_inst_cnt(xmlnode *node) { return node_get_inst_cnt(node->node); }

1 0

Nikolay Sivov : msxml3: Better handle cross-tree node moves.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: cb9d787be150af96c75a652341622d086f7da1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9d787be150af96c75a65234… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 25 00:30:22 2013 +0400 msxml3: Better handle cross-tree node moves. --- dlls/msxml3/domdoc.c | 24 +++++++++++--- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 75 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f1915a3..fb96ba0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -553,19 +553,28 @@ void xmldoc_init(xmlDocPtr doc, MSXML_VERSION version) priv_from_xmlDocPtr(doc)->properties = create_properties(version); } -LONG xmldoc_add_ref(xmlDocPtr doc) +LONG xmldoc_add_refs(xmlDocPtr doc, LONG refs) { - LONG ref = InterlockedIncrement(&priv_from_xmlDocPtr(doc)->refs); + LONG ref = InterlockedExchangeAdd(&priv_from_xmlDocPtr(doc)->refs, refs) + refs; TRACE("(%p)->(%d)\n", doc, ref); return ref; } -LONG xmldoc_release(xmlDocPtr doc) +LONG xmldoc_add_ref(xmlDocPtr doc) +{ + return xmldoc_add_refs(doc, 1); +} + +LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); - LONG ref = InterlockedDecrement(&priv->refs); + LONG ref = InterlockedExchangeAdd(&priv->refs, -refs) - refs; TRACE("(%p)->(%d)\n", doc, ref); - if(ref == 0) + + if (ref < 0) + WARN("negative refcount, expect troubles\n"); + + if (ref == 0) { orphan_entry *orphan, *orphan2; TRACE("freeing docptr %p\n", doc); @@ -584,6 +593,11 @@ LONG xmldoc_release(xmlDocPtr doc) return ref; } +LONG xmldoc_release(xmlDocPtr doc) +{ + return xmldoc_release_refs(doc, 1); +} + HRESULT xmldoc_add_orphan(xmlDocPtr doc, xmlNodePtr node) { xmldoc_priv *priv = priv_from_xmlDocPtr(doc); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 66baea8..3109a42 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -292,6 +292,8 @@ extern xmlChar *xmlChar_from_wchar( LPCWSTR str ) DECLSPEC_HIDDEN; extern void xmldoc_init( xmlDocPtr doc, MSXML_VERSION version ) DECLSPEC_HIDDEN; extern LONG xmldoc_add_ref( xmlDocPtr doc ) DECLSPEC_HIDDEN; extern LONG xmldoc_release( xmlDocPtr doc ) DECLSPEC_HIDDEN; +extern LONG xmldoc_add_refs( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; +extern LONG xmldoc_release_refs ( xmlDocPtr doc, LONG refs ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ) DECLSPEC_HIDDEN; extern void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 867b890..8571955 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -374,11 +374,45 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) return get_node(This, "next", This->node->next, ret); } +static int node_get_inst_cnt(xmlNodePtr node) +{ + int ret = *(LONG *)&node->_private; + xmlNodePtr child; + + /* add attribute counts */ + if (node->type == XML_ELEMENT_NODE) + { + xmlAttrPtr prop = node->properties; + + while (prop) + { + ret += node_get_inst_cnt((xmlNodePtr)prop); + prop = prop->next; + } + } + + /* add children counts */ + child = node->children; + while (child) + { + ret += node_get_inst_cnt(child); + child = child->next; + } + + return ret; +} + +static int xmlnode_get_inst_cnt(xmlnode *node) +{ + return node_get_inst_cnt(node->node); +} + HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { IXMLDOMNode *before = NULL; xmlnode *node_obj; + int refcount = 0; xmlDocPtr doc; HRESULT hr; @@ -414,6 +448,8 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if(xmldoc_remove_orphan(node_obj->node->doc, node_obj->node) != S_OK) WARN("%p is not an orphan of %p\n", node_obj->node, node_obj->node->doc); + refcount = xmlnode_get_inst_cnt(node_obj); + if(before) { xmlnode *before_node_obj = get_node_obj(before); @@ -426,10 +462,16 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); } + doc = node_obj->node->doc; - xmldoc_add_ref(before_node_obj->node->doc); + + /* refs count including subtree */ + if (doc != before_node_obj->node->doc) + refcount = xmlnode_get_inst_cnt(node_obj); + + if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); xmlAddPrevSibling(before_node_obj->node, node_obj->node); - xmldoc_release(doc); + if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } else @@ -441,11 +483,15 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); } doc = node_obj->node->doc; - xmldoc_add_ref(This->node->doc); + + if (doc != This->node->doc) + refcount = xmlnode_get_inst_cnt(node_obj); + + if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); xmlAddChild(This->node, node_obj->node); - xmldoc_release(doc); + if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -1017,17 +1063,36 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } +/* _private field holds a number of COM instances spawned from this libxml2 node */ +static void xmlnode_add_ref(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedIncrement((LONG*)&node->_private); +} + +static void xmlnode_release(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedDecrement((LONG*)&node->_private); +} + void destroy_xmlnode(xmlnode *This) { if(This->node) + { + xmlnode_release(This->node); xmldoc_release(This->node->doc); + } release_dispex(&This->dispex); } void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) { if(node) - xmldoc_add_ref( node->doc ); + { + xmlnode_add_ref(node); + xmldoc_add_ref(node->doc); + } This->node = node; This->iface = node_iface;

1 0

Jacek Caban : vbscript: Fixed chr(0) implementation.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: b58dadf03b75d703387c6c9a3732a487084d026e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58dadf03b75d703387c6c9a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 27 12:55:43 2013 +0100 vbscript: Fixed chr(0) implementation. --- dlls/vbscript/global.c | 2 +- dlls/vbscript/tests/api.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index cba611f..5b4af6f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1088,7 +1088,7 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA if(FAILED(hres)) return hres; - if(c <= 0 || c >= 0x100) { + if(c < 0 || c >= 0x100) { FIXME("invalid arg\n"); return E_FAIL; } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index fc057d8..3e53813 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -119,6 +119,7 @@ if isEnglishLang then TestCStr true, "True" Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) +Call ok(Chr(0) <> "", "Chr(0) = """"") Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass

1 0

André Hentschel : api-ms-win*: Update spec files.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 91cec0e82af0e3f0e79df1db60b55155905bdd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cec0e82af0e3f0e79df1db6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:41:33 2013 +0100 api-ms-win*: Update spec files. --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 83dc129..e7744a7 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index eacfd60..9d266fa 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall GetAcceptLanguagesW(ptr ptr) shlwapi.GetAcceptLanguagesW @ stdcall HashData(ptr long ptr long) shlwapi.HashData -@ stub IsInternetESCEnabled +@ stdcall IsInternetESCEnabled() shlwapi.IsInternetESCEnabled @ stdcall ParseURLW(wstr ptr) shlwapi.ParseURLW @ stdcall PathAddBackslashA(str) shlwapi.PathAddBackslashA @ stdcall PathAddBackslashW(wstr) shlwapi.PathAddBackslashW diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 9b8ebcf..548ae83 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup of ShellFSFolder.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: a5560ebee68aa6305dc67c3f826aa39b4591821f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5560ebee68aa6305dc67c3f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:56 2013 +0100 shell32: Finish the COM cleanup of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 57 ++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 516750d..a88961c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -63,8 +63,8 @@ typedef struct { LONG ref; IShellFolder2 IShellFolder2_iface; IPersistFolder3 IPersistFolder3_iface; - const IDropTargetVtbl *lpvtblDropTarget; - const ISFHelperVtbl *lpvtblSFHelper; + IDropTarget IDropTarget_iface; + ISFHelper ISFHelper_iface; IUnknown *outer_unk; CLSID *pclsid; @@ -98,23 +98,16 @@ static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } -static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) +static inline IGenericSFImpl *impl_from_IDropTarget(IDropTarget *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblDropTarget)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IDropTarget_iface); } -static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) +static inline IGenericSFImpl *impl_from_ISFHelper(ISFHelper *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblSFHelper)); + return CONTAINING_RECORD(iface, IGenericSFImpl, ISFHelper_iface); } - -/* - converts This to an interface pointer -*/ -#define _IDropTarget_(This) (&(This)->lpvtblDropTarget) -#define _ISFHelper_(This) (&(This)->lpvtblSFHelper) - /************************************************************************** * registers clipboardformat once */ @@ -146,10 +139,10 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) - *ppvObj = _ISFHelper_ (This); + *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { - *ppvObj = _IDropTarget_ (This); - SF_RegisterClipFmt (This); + *ppvObj = &This->IDropTarget_iface; + SF_RegisterClipFmt(This); } if (*ppvObj) { @@ -230,8 +223,8 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->lpvtblDropTarget = &dtvt; - sf->lpvtblSFHelper = &shvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; @@ -1105,31 +1098,24 @@ static const IShellFolder2Vtbl sfvt = * ISFHelper for IShellFolder implementation */ -static HRESULT WINAPI -ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFHelper_fnQueryInterface(ISFHelper *iface, REFIID riid, void **ppvObj) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnAddRef(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnRelease(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); } @@ -1612,31 +1598,24 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static HRESULT WINAPI -ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFDropTarget_QueryInterface(IDropTarget *iface, REFIID riid, void **ppv) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } -static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_AddRef(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_Release(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); }

1 0

Michael Stefaniuc : shell32: Get rid of a helper function.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 00a20667fa3437c851bdf0e46ec5ff08c47d122e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a20667fa3437c851bdf0e46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:00 2013 +0100 shell32: Get rid of a helper function. --- dlls/shell32/shfldr_fs.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index f52c192..516750d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1612,27 +1612,6 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static BOOL -ISFDropTarget_QueryDrop (IDropTarget * iface, DWORD dwKeyState, - LPDWORD pdwEffect) -{ - DWORD dwEffect = *pdwEffect; - - IGenericSFImpl *This = impl_from_IDropTarget(iface); - - *pdwEffect = DROPEFFECT_NONE; - - if (This->fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - static HRESULT WINAPI ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) { @@ -1673,7 +1652,10 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; } @@ -1689,7 +1671,10 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, if (!pdwEffect) return E_INVALIDARG; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; }

1 0

Andrew Talbot : usbd.sys: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: ec128b732482356fb640e25d88dd1ed482524008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec128b732482356fb640e25d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:05 2013 +0000 usbd.sys: Avoid signed-unsigned integer comparisons. --- dlls/usbd.sys/usbd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 485a24c..ff0362c 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -105,7 +105,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( interfaceInfo = &urb->u.UrbSelectConfiguration.Interface; for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) { - int i; + ULONG i; USB_INTERFACE_DESCRIPTOR *currentInterface; USB_ENDPOINT_DESCRIPTOR *endpointDescriptor; interfaceInfo->InterfaceNumber = interfaceEntry->InterfaceDescriptor->bInterfaceNumber;

1 0

Michael Stefaniuc : shell32: Move IFSFolder_Constructor() to avoid forward declarations.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 8a40df9800f874b5dc1fee45f3da133e06a5c8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a40df9800f874b5dc1fee45f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:36:58 2013 +0100 shell32: Move IFSFolder_Constructor() to avoid forward declarations. --- dlls/shell32/shfldr_fs.c | 74 ++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index a88961c..6730733 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -78,11 +78,6 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl pfvt; -static const IDropTargetVtbl dtvt; -static const ISFHelperVtbl shvt; - static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); @@ -199,45 +194,6 @@ static const shvheader GenericSFHeader[] = { #define GENERICSHELLVIEWCOLUMNS 5 /************************************************************************** -* IFSFolder_Constructor -* -* NOTES -* creating undocumented ShellFS_Folder as part of an aggregation -* {F3364BA0-65B9-11CE-A9BA-00AA004AE837} -* -*/ -HRESULT WINAPI -IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IGenericSFImpl *sf; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; - sf = LocalAlloc (LMEM_ZEROINIT, sizeof (IGenericSFImpl)); - if (!sf) - return E_OUTOFMEMORY; - - sf->ref = 0; - sf->IUnknown_inner.lpVtbl = &unkvt; - sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->IDropTarget_iface.lpVtbl = &dtvt; - sf->ISFHelper_iface.lpVtbl = &shvt; - sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - - if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { - IUnknown_Release(&sf->IUnknown_inner); - return E_NOINTERFACE; - } - - TRACE ("--%p\n", *ppv); - return S_OK; -} - -/************************************************************************** * IShellFolder_fnQueryInterface */ static HRESULT WINAPI IShellFolder_fnQueryInterface(IShellFolder2 *iface, REFIID riid, @@ -1689,3 +1645,33 @@ static const IDropTargetVtbl dtvt = { ISFDropTarget_DragLeave, ISFDropTarget_Drop }; + +HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) +{ + IGenericSFImpl *sf; + HRESULT hr; + + TRACE("outer_unk=%p %s\n", outer_unk, shdebugstr_guid(riid)); + + if (outer_unk && !IsEqualIID(riid, &IID_IUnknown)) + return CLASS_E_NOAGGREGATION; + + sf = LocalAlloc(LMEM_ZEROINIT, sizeof(*sf)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->IUnknown_inner.lpVtbl = &unkvt; + sf->IShellFolder2_iface.lpVtbl = &sfvt; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; + sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; + sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner; + + hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv); + IUnknown_Release(&sf->IUnknown_inner); + + TRACE ("--%p\n", *ppv); + return hr; +}

1 0

Michael Stefaniuc : shell32: COM clean up for IPersistFolder3 in ShellFSFolder.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: 90d88de2bfda806ce4d84cbec94d179ee2bc9211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d88de2bfda806ce4d84cbec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:33:53 2013 +0100 shell32: COM clean up for IPersistFolder3 in ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0d52156..f52c192 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -62,7 +62,7 @@ typedef struct { IUnknown IUnknown_inner; LONG ref; IShellFolder2 IShellFolder2_iface; - const IPersistFolder3Vtbl *lpvtblPersistFolder3; + IPersistFolder3 IPersistFolder3_iface; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; IUnknown *outer_unk; @@ -79,7 +79,7 @@ typedef struct { } IGenericSFImpl; static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ +static const IPersistFolder3Vtbl pfvt; static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; @@ -93,9 +93,9 @@ static inline IGenericSFImpl *impl_from_IShellFolder2(IShellFolder2 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IShellFolder2_iface); } -static inline IGenericSFImpl *impl_from_IPersistFolder3( IPersistFolder3 *iface ) +static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblPersistFolder3)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) @@ -112,10 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IPersist_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder3_(This) (&(This)->lpvtblPersistFolder3) #define _IDropTarget_(This) (&(This)->lpvtblDropTarget) #define _ISFHelper_(This) (&(This)->lpvtblSFHelper) @@ -146,14 +142,9 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo *ppvObj = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) *ppvObj = &This->IShellFolder2_iface; - else if (IsEqualIID (riid, &IID_IPersist)) - *ppvObj = _IPersist_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder)) - *ppvObj = _IPersistFolder_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder2)) - *ppvObj = _IPersistFolder2_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder3)) - *ppvObj = _IPersistFolder3_ (This); + else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || + IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) + *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) *ppvObj = _ISFHelper_ (This); else if (IsEqualIID (riid, &IID_IDropTarget)) { @@ -238,7 +229,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->ref = 0; sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; @@ -1427,28 +1418,22 @@ static const ISFHelperVtbl shvt = * IFSFldr_PersistFolder3_QueryInterface * */ -static HRESULT WINAPI -IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, - LPVOID * ppvObj) +static HRESULT WINAPI IFSFldr_PersistFolder3_QueryInterface(IPersistFolder3 *iface, REFIID iid, + void **ppv) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppv); } /************************************************************************ * IFSFldr_PersistFolder3_AddRef * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_AddRef(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } @@ -1456,13 +1441,10 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) * IFSFldr_PersistFolder3_Release * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_Release(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release(This->outer_unk); } @@ -1615,7 +1597,7 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, return E_NOTIMPL; } -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3 = +static const IPersistFolder3Vtbl pfvt = { IFSFldr_PersistFolder3_QueryInterface, IFSFldr_PersistFolder3_AddRef,

1 0

Andrew Talbot : urlmon: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 27, 2013

Feb. 27, 2013

Module: wine Branch: master Commit: bc1a457b1ce4da8ffb0204cf4e3543a9483aa945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1a457b1ce4da8ffb0204cf4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:03 2013 +0000 urlmon: Avoid signed-unsigned integer comparisons. --- dlls/urlmon/uri.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 90113f2..42cfe71 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -891,7 +891,7 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Means we just passed the elision and need to add its values to * 'number' before we do anything else. */ - DWORD j = 0; + INT j; for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; @@ -904,7 +904,8 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Case when the elision appears after the h16 components. */ if(!already_passed_elision && address->elision) { - for(i = 0; i < address->elision_size; i+=2) + INT j; + for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; }

1 0

Huw Davies : riched20: Allow the cursor offset to be equal to the run length - this implies the cursor is at the end of the run , which isn't necessarily the start of the next.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: c5c4d54905b60e44cc1221e51a3d5a07450ebac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c4d54905b60e44cc1221e51… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:50 2013 +0000 riched20: Allow the cursor offset to be equal to the run length - this implies the cursor is at the end of the run, which isn't necessarily the start of the next. --- dlls/riched20/caret.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 82b8e1d..849e500 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -884,14 +884,10 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, } if (x >= run_x && x < run_x+width) { - int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); - if (ch < pNext->member.run.len) - { - cursor->nOffset = ch; - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; - } + cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); + cursor->pRun = pNext; + cursor->pPara = ME_GetParagraph( cursor->pRun ); + return TRUE; } pLastRun = pNext; pNext = ME_FindItemFwd(pNext, diRunOrStartRow);

1 0

Nikolay Sivov : wshom: Implement IWshShell3::Run().
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 5db4741d0b074ca0080adf36c3fdb440bf92f8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db4741d0b074ca0080adf36c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 10:48:00 2013 +0400 wshom: Implement IWshShell3::Run(). --- dlls/wshom.ocx/shell.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-- include/shellapi.h | 1 + 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1973e2d..bc6a839 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -19,6 +19,7 @@ #include "wshom_private.h" #include "wshom.h" +#include "shellapi.h" #include "shlobj.h" #include "wine/debug.h" @@ -665,10 +666,62 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type return E_NOTIMPL; } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) { - FIXME("(%s %s %p): stub\n", debugstr_variant(WindowStyle), debugstr_variant(WaitOnReturn), out_ExitCode); - return E_NOTIMPL; + SHELLEXECUTEINFOW info; + int waitforprocess; + VARIANT s, w; + HRESULT hr; + + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + + VariantInit(&s); + hr = VariantChangeType(&s, style, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert style argument, 0x%08x\n", hr); + return hr; + } + + VariantInit(&w); + hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); + if (FAILED(hr)) + { + ERR("failed to convert wait argument, 0x%08x\n", hr); + return hr; + } + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + + waitforprocess = V_I4(&w); + + info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; + info.lpFile = cmd; + info.nShow = V_I4(&s); + + if (!ShellExecuteExW(&info)) + { + TRACE("ShellExecute failed, %d\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + else + { + if (waitforprocess) + { + if (exit_code) + { + DWORD code; + GetExitCodeProcess(info.hProcess, &code); + *exit_code = code; + } + CloseHandle(info.hProcess); + } + else + if (exit_code) *exit_code = 0; + + return S_OK; + } } static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) diff --git a/include/shellapi.h b/include/shellapi.h index d2b4081..acc345d 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -273,6 +273,7 @@ HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT); #define SE_ERR_DDEBUSY 30 #define SE_ERR_NOASSOC 31 +#define SEE_MASK_DEFAULT 0x00000000 #define SEE_MASK_CLASSNAME 0x00000001 #define SEE_MASK_CLASSKEY 0x00000003 #define SEE_MASK_IDLIST 0x00000004

1 0

Piotr Caban : hlink: Added basic Hlink::Navigate tests.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 0159558560e6823f1390e1a62febc161ebebaac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0159558560e6823f1390e1a62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:21:31 2013 +0100 hlink: Added basic Hlink::Navigate tests. --- dlls/hlink/tests/hlink.c | 303 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 298 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0159558560e6823f1390e…

1 0

Ričardas Barkauskas : wined3d: Make shader buffer dynamic.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: cf12f51b1520546dc855e8e8e43135a06e7a0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf12f51b1520546dc855e8e8e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Feb 25 22:49:38 2013 +0200 wined3d: Make shader buffer dynamic. --- dlls/wined3d/shader.c | 28 +++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0616f0a..6444896 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) ERR("Failed to allocate shader buffer memory.\n"); return FALSE; } + buffer->buffer_size = SHADER_PGMSIZE; shader_buffer_clear(buffer); return TRUE; @@ -265,15 +266,28 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va { char *base = buffer->buffer + buffer->content_size; int rc; + char *new_buffer; - rc = vsnprintf(base, SHADER_PGMSIZE - 1 - buffer->content_size, format, args); - - if (rc < 0 /* C89 */ || (unsigned int)rc > SHADER_PGMSIZE - 1 - buffer->content_size /* C99 */) + while(1) { - ERR("The buffer allocated for the shader program string " - "is too small at %d bytes.\n", SHADER_PGMSIZE); - buffer->content_size = SHADER_PGMSIZE - 1; - return -1; + rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); + if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) + { + new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); + if (!new_buffer) + { + ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); + buffer->content_size = buffer->buffer_size - 1; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; + base = buffer->buffer + buffer->content_size; + } + else + { + break; + } } if (buffer->newline) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9a3a9..b81e018 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -402,11 +402,12 @@ enum wined3d_shader_rel_op * Shader model 3 according to msdn (and for software shaders) */ #define MAX_LABELS 16 -#define SHADER_PGMSIZE 65535 +#define SHADER_PGMSIZE 16384 struct wined3d_shader_buffer { char *buffer; + unsigned int buffer_size; unsigned int content_size; unsigned int lineNo; BOOL newline;

1 0

Piotr Caban : hlink: Return value returned by IHlinkTarget_Navigate in IHlink_fnNavigate.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: e0b7aadb92f98f95982244487f5e9fc8ea5d4359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b7aadb92f98f95982244487… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 26 17:20:56 2013 +0100 hlink: Return value returned by IHlinkTarget_Navigate in IHlink_fnNavigate. --- dlls/hlink/link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 1957cb0..6f4ac12 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -503,7 +503,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (r == S_OK) { IHlinkTarget_SetBrowseContext(target, phbc); - IHlinkTarget_Navigate(target, grfHLNF, This->Location); + r = IHlinkTarget_Navigate(target, grfHLNF, This->Location); IHlinkTarget_Release(target); } else

1 0

Jacek Caban : wininet: Moved dialog-related functions to dialog.c.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 8ca611a598ea63697ea9b890c0bd4ccdb55529eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca611a598ea63697ea9b890c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 15:43:44 2013 +0100 wininet: Moved dialog-related functions to dialog.c. --- dlls/wininet/dialogs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wininet/http.c | 46 ---------------------------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 418610d..4acda13 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -37,6 +37,7 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "cryptuiapi.h" #include "internet.h" @@ -560,3 +561,48 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, WININET_Release(&req->hdr); return res; } + +/*********************************************************************** + * InternetShowSecurityInfoByURLA (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) +{ + FIXME("stub: %s %p\n", url, window); + return FALSE; +} + +/*********************************************************************** + * InternetShowSecurityInfoByURLW (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) +{ + FIXME("stub: %s %p\n", debugstr_w(url), window); + return FALSE; +} + +/*********************************************************************** + * ShowX509EncodedCertificate (@) + */ +DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) +{ + PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, + cert, len); + DWORD ret; + + if (certContext) + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW view; + + memset(&view, 0, sizeof(view)); + view.hwndParent = parent; + view.pCertContext = certContext; + if (CryptUIDlgViewCertificateW(&view, NULL)) + ret = ERROR_SUCCESS; + else + ret = GetLastError(); + CertFreeCertificateContext(certContext); + } + else + ret = GetLastError(); + return ret; +} diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bbbfe97..861288d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -66,7 +66,6 @@ #include "sspi.h" #include "wincrypt.h" #include "winuser.h" -#include "cryptuiapi.h" #include "internet.h" #include "wine/debug.h" @@ -6112,48 +6111,3 @@ BOOL WINAPI IsHostInProxyBypassList(DWORD flags, LPCSTR szHost, DWORD length) FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); return FALSE; } - -/*********************************************************************** - * InternetShowSecurityInfoByURLA (@) - */ -BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) -{ - FIXME("stub: %s %p\n", url, window); - return FALSE; -} - -/*********************************************************************** - * InternetShowSecurityInfoByURLW (@) - */ -BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) -{ - FIXME("stub: %s %p\n", debugstr_w(url), window); - return FALSE; -} - -/*********************************************************************** - * ShowX509EncodedCertificate (@) - */ -DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) -{ - PCCERT_CONTEXT certContext = CertCreateCertificateContext(X509_ASN_ENCODING, - cert, len); - DWORD ret; - - if (certContext) - { - CRYPTUI_VIEWCERTIFICATE_STRUCTW view; - - memset(&view, 0, sizeof(view)); - view.hwndParent = parent; - view.pCertContext = certContext; - if (CryptUIDlgViewCertificateW(&view, NULL)) - ret = ERROR_SUCCESS; - else - ret = GetLastError(); - CertFreeCertificateContext(certContext); - } - else - ret = GetLastError(); - return ret; -}

1 0

Jacek Caban : wininet: Don' t call get_avail_data multiple times in HTTP_ReceiveRequestData.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 376a4f7837c3f50c49ea0704524db13449f9ccbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=376a4f7837c3f50c49ea07045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 15:43:34 2013 +0100 wininet: Don't call get_avail_data multiple times in HTTP_ReceiveRequestData. --- dlls/wininet/http.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 81439ca..bbbfe97 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2774,10 +2774,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD mode = first_notif && req->read_size ? READMODE_NOBLOCK : READMODE_ASYNC; res = refill_read_buffer(req, mode, &read); - if(res == ERROR_SUCCESS && !first_notif) + if(res == ERROR_SUCCESS) avail = get_avail_data(req); - if(ret_size) - *ret_size = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2786,10 +2784,17 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD http_release_netconn(req, FALSE); } - if(res == ERROR_SUCCESS) - send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); - else + if(res != ERROR_SUCCESS) { send_request_complete(req, 0, res); + return; + } + + if(ret_size) + *ret_size = avail; + if(first_notif) + avail = 0; + + send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, avail); } /* read data from the http connection (the read section must be held) */

1 0

Jacek Caban : msctf.idl: Added some missing declarations.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 99421e8c1dff5fdad4b00a68dea33f848e0994ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=99421e8c1dff5fdad4b00a68d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 14:53:05 2013 +0100 msctf.idl: Added some missing declarations. --- include/msctf.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 2ed3866..a1a6f17 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -79,6 +79,9 @@ cpp_quote("#define TF_MOD_LSHIFT 0x0100") cpp_quote("#define TF_MOD_ON_KEYUP 0x0200") cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") +cpp_quote("#define TF_PROFILETYPE_INPUTPROCESSOR 0x0001") +cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs; @@ -99,6 +102,10 @@ interface ITfEditRecord; interface ITfCompositionView; interface ITfKeyEventSink; +cpp_quote("#if 0") +typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; +cpp_quote("#endif") + typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { CLSID clsid; @@ -421,6 +428,105 @@ interface ITfInputProcessorProfiles : IUnknown [in] HKL hKL); }; +typedef [uuid(44d2825a-10e5-43b2-877f-6cb2f43b7e7e)] +struct TF_INPUTPROCESSORPROFILE { + DWORD dwProfileType; + LANGID langid; + CLSID clsid; + GUID guidProfile; + GUID catid; + HKL hklSubstitute; + DWORD dwCaps; + HKL hkl; + DWORD dwFlags; +} TF_INPUTPROCESSORPROFILE; + +[ + object, + uuid(71c6e74d-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface IEnumTfInputProcessorProfiles : IUnknown +{ + HRESULT Clone( + [out] IEnumTfInputProcessorProfiles **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetch)] TF_INPUTPROCESSORPROFILE *pProfile, + [out] ULONG *pcFetch); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(71c6e74c-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface ITfInputProcessorProfileMgr : IUnknown +{ + HRESULT ActivateProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); + + HRESULT DeactivateProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); + + HRESULT GetProfile( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [out] TF_INPUTPROCESSORPROFILE *pProfile); + + + HRESULT EnumProfiles( + [in] LANGID langid, + [out] IEnumTfInputProcessorProfiles **ppEnum); + + HRESULT ReleaseInputProcessor( + [in] REFCLSID rclsid, + [in] DWORD dwFlags); + + HRESULT RegisterProfile( + [in] REFCLSID rclsid, + [in] LANGID langid, + [in] REFGUID guidProfile, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc, + [in, size_is(cchFile)] const WCHAR *pchIconFile, + [in] ULONG cchFile, + [in] ULONG uIconIndex, + [in] HKL hklsubstitute, + [in] DWORD dwPreferredLayout, + [in] BOOL bEnabledByDefault, + [in] DWORD dwFlags); + + HRESULT UnregisterProfile( + [in] REFCLSID rclsid, + [in] LANGID langid, + [in] REFGUID guidProfile, + [in] DWORD dwFlags); + + HRESULT GetActiveProfile( + [in] REFGUID catid, + [out] TF_INPUTPROCESSORPROFILE *pProfile); +} + typedef [uuid(c4cc07f1-80cc-4a7b-bc54-98512782cbe3)] enum { TF_LS_NONE = 0,

1 0

Jacek Caban : widl: Allow shadowing imported types with typedef.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: ed50ce5efe04b65c0fe5648d2c8622b493b074fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed50ce5efe04b65c0fe5648d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 14:52:54 2013 +0100 widl: Allow shadowing imported types with typedef. --- tools/widl/parser.y | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d8435b9..b7fa2f6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1868,7 +1868,17 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at var_t *name; cur = find_type(decl->var->name, 0); - if (cur) + + /* + * MIDL allows shadowing types that are declared in imported files. + * We don't throw an error in this case and instead add a new type + * (which is earlier on the list in hash table, so it will be used + * instead of shadowed type). + * + * FIXME: We may consider string separated type tables for each input + * for cleaner solution. + */ + if (cur && input_name == cur->loc_info.input_name) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, cur->loc_info.line_number);

1 0

Huw Davies : riched20: Don' t assume the the runs in a row are in visual order.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: 5e5301273674c0c118aee70c44e553b9f1712d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5301273674c0c118aee70c4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:51 2013 +0000 riched20: Don't assume the the runs in a row are in visual order. --- dlls/riched20/caret.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 849e500..b41ee9e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -869,6 +869,14 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, int x, ME_Cursor *cursor, int *pbCaretAtEnd) { ME_DisplayItem *pNext, *pLastRun; + ME_Row *row = &pRow->member.row; + BOOL exact = TRUE; + + if (x < row->pt.x) + { + x = row->pt.x; + exact = FALSE; + } pNext = ME_FindItemFwd(pRow, diRunOrStartRow); assert(pNext->type == diRun); if (pbCaretAtEnd) *pbCaretAtEnd = FALSE; @@ -876,18 +884,13 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, do { int run_x = pNext->member.run.pt.x; int width = pNext->member.run.nWidth; - if (x < run_x) - { - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; - } + if (x >= run_x && x < run_x+width) { cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); cursor->pRun = pNext; cursor->pPara = ME_GetParagraph( cursor->pRun ); - return TRUE; + return exact; } pLastRun = pNext; pNext = ME_FindItemFwd(pNext, diRunOrStartRow);

1 0

Huw Davies : riched20: Correctly set the row's x position.
by Alexandre Julliard Feb. 26, 2013

Feb. 26, 2013

Module: wine Branch: master Commit: e68e6ff740211eb9cff1693b1384c7dd979e03bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68e6ff740211eb9cff1693b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 13:19:49 2013 +0000 riched20: Correctly set the row's x position. --- dlls/riched20/wrap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 7c34876..9bebd8a 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -233,6 +233,7 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) shift = max(wc->nAvailWidth-width, 0); + row->member.row.pt.x = row->member.row.nLMargin + shift; for (p = wc->pRowStart; p!=pEnd; p = p->next) { if (p->type==diRun) { /* FIXME add more run types */

1 0