wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Francois Gouget : mscoree: Make assembly_rva_to_va() and parse_headers() static.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: bde73d8dfc7e65a080a0a250deb65295969e4538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde73d8dfc7e65a080a0a250d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 4 16:25:58 2012 +0200 mscoree: Make assembly_rva_to_va() and parse_headers() static. --- dlls/mscoree/assembly.c | 4 ++-- dlls/mscoree/mscoree_private.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index a1e3dc7..13e7f03 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -92,7 +92,7 @@ static inline LPWSTR strdupW(LPCWSTR src) return dest; } -void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) +static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) { if (assembly->is_mapped_file) return ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); @@ -190,7 +190,7 @@ static HRESULT parse_pe_header(ASSEMBLY *assembly) return S_OK; } -HRESULT parse_headers(ASSEMBLY *assembly) +static HRESULT parse_headers(ASSEMBLY *assembly) { HRESULT hr; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 357914f..69f285c 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -35,7 +35,6 @@ typedef struct _VTableFixup { typedef struct tagASSEMBLY ASSEMBLY; -extern void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) DECLSPEC_HIDDEN; extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN;

1 0

Francois Gouget : strmbase: The strmbase debug channel is unused in a couple of files so remove it.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: fcda2bd929831ccf244301178b4af435d3f8ea6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcda2bd929831ccf244301178… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 4 16:25:50 2012 +0200 strmbase: The strmbase debug channel is unused in a couple of files so remove it. --- dlls/strmbase/audio.c | 2 -- dlls/strmbase/dispatch.c | 3 --- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index be99583..e167a79 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -24,11 +24,9 @@ #include "dshow.h" #include "uuids.h" #include "vfwmsgs.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) { diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 59ac99d3..8f7aa05 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -21,15 +21,12 @@ #define COBJMACROS #include "dshow.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" #include <assert.h> -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); - HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { HRESULT hr = E_FAIL;

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 8036abe4da7f760517b230e8b7500e9242971acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8036abe4da7f760517b230e8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 4 16:25:41 2012 +0200 d3dx9_36/tests: Add a trailing '\n' to an ok() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index b8123ab..563c759 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10173,7 +10173,7 @@ static void test_optimize_faces(void) tc[i].num_vertices, tc[i].indices_are_32bit, face_remap); ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " - "Got %x\n, expected D3D_OK", i, hr); + "Got %x\n, expected D3D_OK\n", i, hr); /* Compare face remap with expected face remap */ for (j = 0; j < tc[i].num_faces; j++)

1 0

Jacek Caban : mshtml: Fixed tests on old IEs.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 1767fafa009d49dbb4bdb6eb58b04699032d8efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1767fafa009d49dbb4bdb6eb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 4 17:24:46 2012 +0200 mshtml: Fixed tests on old IEs. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f095cc2..14d91cc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4487,7 +4487,7 @@ static void test_history(IHTMLWindow2 *window) ok(hres == S_OK, "get_history failed: %08x\n", hres); ok(history != NULL, "history = NULL\n"); - test_disp((IUnknown*)history, &DIID_DispHTMLHistory, "[object]"); + test_disp2((IUnknown*)history, &DIID_DispHTMLHistory, &IID_IOmHistory, "[object]"); history2 = NULL; hres = IHTMLWindow2_get_history(window, &history2);

1 0

Jacek Caban : jscript: Added support for VT_INT.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: c8a28a9671986be9d1ee5345461c11379bc0ed39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a28a9671986be9d1ee53454… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 4 15:59:43 2012 +0200 jscript: Added support for VT_INT. --- dlls/jscript/dispex.c | 14 ++++++++++++-- dlls/jscript/jsutils.c | 2 ++ dlls/jscript/tests/run.c | 33 ++++++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 96c17c8..dd4b081 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -342,8 +342,10 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *re *ret = *dp; - for(i = 0; i < ret->cArgs; i++) { - if(V_VT(get_arg(dp, i)) == VT_I2) { + for(i = 0; i < ret->cArgs && !need_conversion; i++) { + switch(V_VT(get_arg(dp, i))) { + case VT_I2: + case VT_INT: need_conversion = TRUE; break; } @@ -368,6 +370,10 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *re V_VT(d) = VT_I4; V_I4(d) = V_I2(s); break; + case VT_INT: + V_VT(d) = VT_I4; + V_I4(d) = V_INT(s); + break; default: *d = *s; } @@ -1015,6 +1021,10 @@ static void ensure_retval_type(VARIANT *v) case VT_I2: V_VT(v) = VT_I4; V_I4(v) = V_I2(v); + break; + case VT_INT: + V_VT(v) = VT_I4; + V_I4(v) = V_INT(v); } } diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c3924b7..d19d71b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -263,6 +263,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret return throw_type_error(ctx, ei, JS_E_TO_PRIMITIVE, NULL); } case VT_I2: + case VT_INT: assert(0); default: FIXME("Unimplemented for vt %d\n", V_VT(v)); @@ -447,6 +448,7 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) *ret = V_BOOL(v) ? 1 : 0; break; case VT_I2: + case VT_INT: assert(0); default: FIXME("unimplemented for vt %d\n", V_VT(v)); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 332b125..f9de734 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -97,12 +97,14 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_OBJECT_FLAG 0x100e #define DISPID_GLOBAL_ISWIN64 0x100f #define DISPID_GLOBAL_PUREDISP 0x1010 -#define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_GLOBAL_PROPARGPUT 0x1012 #define DISPID_GLOBAL_SHORTPROP 0x1013 #define DISPID_GLOBAL_GETSHORT 0x1014 #define DISPID_GLOBAL_TESTARGTYPES 0x1015 +#define DISPID_GLOBAL_INTPROP 0x1016 + +#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -538,6 +540,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "intProp")) { + *pid = DISPID_GLOBAL_INTPROP; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -928,16 +935,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_I2(pvarRes) = 10; return S_OK; + case DISPID_GLOBAL_INTPROP: + V_VT(pvarRes) = VT_INT; + V_INT(pvarRes) = 22; + return S_OK; + case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[1]; - DISPPARAMS dp = {args, NULL, 1, 0}; + VARIANT args[2]; + DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; CHECK_EXPECT(global_testargtypes_i); ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); - ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cArgs == 5, "cArgs = %d\n", pdp->cArgs); ok(!pvarRes, "pvarRes != NULL\n"); ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); @@ -946,10 +958,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+1)); ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+3) == VT_I4, "V_VT(psp->rgvargs+3) = %d\n", V_VT(pdp->rgvarg+3)); + ok(V_I4(pdp->rgvarg+3) == 22, "V_I4(psp->rgvargs+3) = %d\n", V_I4(pdp->rgvarg+3)); + + ok(V_VT(pdp->rgvarg+4) == VT_I4, "V_VT(psp->rgvargs+4) = %d\n", V_VT(pdp->rgvarg+4)); + ok(V_I4(pdp->rgvarg+4) == 22, "V_I4(psp->rgvargs+4) = %d\n", V_I4(pdp->rgvarg+4)); + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); V_VT(args) = VT_I2; V_I2(args) = 2; + V_VT(args+1) = VT_INT; + V_INT(args+1) = 22; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -1712,7 +1732,10 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(getShort(), shortProp, function(s) {ok(getVT(s) === 'VT_I4', 'not VT_I4');});"); + parse_script_a("testArgTypes(intProp(), intProp, getShort(), shortProp, function(i,s) {" + " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" + " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" + "});"); CHECK_CALLED(global_testargtypes_i); run_from_res("lang.js");

1 0

Jacek Caban : jscript: Skip failing tests on old jscript versions.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: c61af66c5bd0d3beea713af6ef3f458caa1100cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61af66c5bd0d3beea713af6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 4 15:59:30 2012 +0200 jscript: Skip failing tests on old jscript versions. --- dlls/jscript/tests/api.js | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b25f0ae..4366aa1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1016,15 +1016,17 @@ tmp = arr.splice(-bigInt); ok(tmp.toString() == "", "arr.splice(-bigInt) returned " + tmp.toString()); ok(arr.toString() == "1,2,3,4,5", "arr.splice(-bigInt) is " + arr.toString()); -arr = [1,2,3,4,5]; -tmp = arr.splice(2, bigInt); -ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString()); -ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString()); +if(invokeVersion >= 2) { + arr = [1,2,3,4,5]; + tmp = arr.splice(2, bigInt); + ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString()); + ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString()); +} arr = [1,2,3,4,5]; tmp = arr.splice(2, -bigInt); -ok(tmp.toString() == "", "arr.splice(2, bigInt) returned " + tmp.toString()); -ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, bigInt) is " + arr.toString()); +ok(tmp.toString() == "", "arr.splice(2, -bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, -bigInt) is " + arr.toString()); obj = new Object(); obj.length = 3;

1 0

Francois Gouget : regedit: An English (United States) spelling fix.
by Alexandre Julliard 04 May '12

04 May '12

1 0

Francois Gouget : comdlg32: An English (United States) spelling fix.
by Alexandre Julliard 04 May '12

04 May '12

1 0

Francois Gouget : wldap32: An English (United States) spelling fix.
by Alexandre Julliard 04 May '12

04 May '12

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 3839d224b7ad16836503307671651521208ca44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3839d224b7ad1683650330767… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri May 4 07:36:57 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 36 +++--------------------------------- 1 files changed, 3 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 30873bf..c494807 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-04-19 22:52+0300\n" +"PO-Revision-Date: 2012-05-04 07:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6650,37 +6650,6 @@ msgid "insert disk %s" msgstr "įdėkite diską %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6731,7 +6700,8 @@ msgstr "" "Pritaikyti pataisą:\n" "\t/p pataisos_paketas [savybė]\n" "\t/p pataisos_paketas /a paketas [savybė]\n" -"Žurnalo ir sąsajos modifikatoriai aukščiau išvardintoms komandoms:\n" +"Žurnalo ir naudotojo sąsajos modifikatoriai aukščiau išvardintoms " +"komandoms:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] žurnalo_failas\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" "Registruoti MSI tarnybą:\n"

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012