wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Piotr Caban : msvcp90: Rename num_get_char_ctor__Init function because it' s not a constructor.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 99a7b2262347af8d8d635479bee1af288894b4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a7b2262347af8d8d635479b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:24:33 2012 +0200 msvcp90: Rename num_get_char_ctor__Init function because it's not a constructor. --- dlls/msvcp90/locale.c | 8 ++++---- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9147092..def6a7f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3988,8 +3988,8 @@ extern const vtable_ptr MSVCP_num_get_short_vtable; /* ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */ /* ?_Init@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */ /* ?_Init@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */ -DEFINE_THISCALL_WRAPPER(num_get_wchar_ctor__Init, 8) -void __thiscall num_get_wchar_ctor__Init(num_get *this, const _Locinfo *locinfo) +DEFINE_THISCALL_WRAPPER(num_get_wchar__Init, 8) +void __thiscall num_get_wchar__Init(num_get *this, const _Locinfo *locinfo) { FIXME("(%p %p) stub\n", this, locinfo); } @@ -4402,8 +4402,8 @@ extern const vtable_ptr MSVCP_num_get_char_vtable; /* ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z */ /* ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z */ -DEFINE_THISCALL_WRAPPER(num_get_char_ctor__Init, 8) -void __thiscall num_get_char_ctor__Init(num_get *this, const _Locinfo *locinfo) +DEFINE_THISCALL_WRAPPER(num_get_char__Init, 8) +void __thiscall num_get_char__Init(num_get *this, const _Locinfo *locinfo) { FIXME("(%p %p) stub\n", this, locinfo); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index cd46d9b..62fa495 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2494,12 +2494,12 @@ @ stub -arch=win64 ?_Init@?$money_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z @ stub -arch=win32 ?_Init@?$money_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z @ stub -arch=win64 ?_Init@?$money_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z -@ thiscall -arch=win32 ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) num_get_char_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) num_get_char_ctor__Init -@ thiscall -arch=win32 ?_Init@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ thiscall -arch=win32 ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) num_get_wchar_ctor__Init +@ thiscall -arch=win32 ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) num_get_char__Init +@ cdecl -arch=win64 ?_Init@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) num_get_char__Init +@ thiscall -arch=win32 ?_Init@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) num_get_wchar__Init +@ cdecl -arch=win64 ?_Init@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) num_get_wchar__Init +@ thiscall -arch=win32 ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) num_get_wchar__Init +@ cdecl -arch=win64 ?_Init@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) num_get_wchar__Init @ stub -arch=win32 ?_Init@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z @ stub -arch=win64 ?_Init@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z @ stub -arch=win32 ?_Init@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z

1 0

Jacek Caban : jscript: Moved DISPPARAMS conversion to InvokeEx.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 00b5ba535587e4690d551685b96585e7caf80ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b5ba535587e4690d551685b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:48:36 2012 +0200 jscript: Moved DISPPARAMS conversion to InvokeEx. --- dlls/jscript/dispex.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 86fcd85..37dc9de 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -407,18 +407,11 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { - DISPPARAMS params; - VARIANT buf[6]; - if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; } - hres = convert_params(dp, buf, &params); - if(FAILED(hres)) - return hres; - if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; @@ -426,14 +419,12 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t set_disp(&vthis, jsthis); else set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, dp, retv, ei); vdisp_release(&vthis); }else { /* Function object calls are special case */ - hres = Function_invoke(This, jsthis, flags, &params, retv, ei); + hres = Function_invoke(This, jsthis, flags, dp, retv, ei); } - if(params.rgvarg != buf && params.rgvarg != dp->rgvarg) - heap_free(params.rgvarg); return hres; } case PROP_PROTREF: @@ -738,9 +729,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc wFlags = DISPATCH_METHOD; /* fall through */ case DISPATCH_METHOD: - case DISPATCH_CONSTRUCT: - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, pdp, pvarRes, &jsexcept, pspCaller); + case DISPATCH_CONSTRUCT: { + DISPPARAMS params; + VARIANT buf[6]; + + hres = convert_params(pdp, buf, &params); + if(FAILED(hres)) + return hres; + + hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, &params, pvarRes, &jsexcept, pspCaller); + if(params.rgvarg != buf && params.rgvarg != pdp->rgvarg) + heap_free(params.rgvarg); break; + } case DISPATCH_PROPERTYGET: hres = prop_get(This, prop, pdp, pvarRes, &jsexcept, pspCaller); break;

1 0

Jacek Caban : jscript: Pass jsthis internally without using DISPPARAMS.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 1dd4cbc49110c1133270004e4a408610c3f6f066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd4cbc49110c1133270004e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:48:10 2012 +0200 jscript: Pass jsthis internally without using DISPPARAMS. --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 135 +++++++++++++++++++++++++++++++++++++---------- dlls/jscript/engine.c | 5 +- dlls/jscript/function.c | 8 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 5 +- dlls/jscript/string.c | 2 +- 7 files changed, 119 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1dd4cbc49110c11332700…

1 0

Jacek Caban : jscript: Make Function object invocation a special case in IDispatchEx implementation .
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 17ff7829d3f4d4a8ac3cabf2c0afb54dcb2dccbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ff7829d3f4d4a8ac3cabf2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:47:36 2012 +0200 jscript: Make Function object invocation a special case in IDispatchEx implementation. --- dlls/jscript/dispex.c | 14 ++++++++++---- dlls/jscript/function.c | 21 +++++++++++++++++++++ dlls/jscript/jscript.h | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dd4b081..7763512 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -391,7 +391,6 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t case PROP_BUILTIN: { DISPPARAMS params; VARIANT buf[6]; - vdisp_t vthis; if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); @@ -402,9 +401,16 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t if(FAILED(hres)) return hres; - set_jsdisp(&vthis, jsthis); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); - vdisp_release(&vthis); + if(prop->name || jsthis->builtin_info->class != JSCLASS_FUNCTION) { + vdisp_t vthis; + + set_jsdisp(&vthis, jsthis); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); + vdisp_release(&vthis); + }else { + /* Function object calls are special case */ + hres = Function_invoke(This, flags, &params, retv, ei); + } if(params.rgvarg != buf && params.rgvarg != dp->rgvarg) heap_free(params.rgvarg); return hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index cfd57a7..9643195 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "jscript.h" #include "engine.h" @@ -305,6 +307,25 @@ static HRESULT function_to_string(FunctionInstance *function, BSTR *ret) return S_OK; } +HRESULT Function_invoke(jsdisp_t *func_this, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) +{ + FunctionInstance *function; + + TRACE("\n"); + + assert(is_class(func_this, JSCLASS_FUNCTION)); + function = (FunctionInstance*)func_this; + + if(function->value_proc) + return invoke_value_proc(function->dispex.ctx, function, get_this(dp), flags, dp, retv, ei); + + if(flags == DISPATCH_CONSTRUCT) + return invoke_constructor(function->dispex.ctx, function, dp, retv, ei); + + assert(flags == DISPATCH_METHOD); + return invoke_source(function->dispex.ctx, function, get_this(dp), dp, retv, ei); +} + static HRESULT Function_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 571d6e1..f278b6a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -225,6 +225,7 @@ VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; +HRESULT Function_invoke(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*); HRESULT throw_eval_error(script_ctx_t*,jsexcept_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_generic_error(script_ctx_t*,jsexcept_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Use INFINITY macro instead of num_set_inf().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 4a335142f9eb7be10fdc838a6ab738a073fac6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a335142f9eb7be10fdc838a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 21 10:47:19 2012 +0200 jscript: Use INFINITY macro instead of num_set_inf(). --- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 12 ------------ dlls/jscript/math.c | 4 ++-- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index c01b082..ae43285 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1283,7 +1283,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - num_set_inf(&var, TRUE); + num_set_val(&var, INFINITY); hres = jsdisp_propput_name(ctx->global, InfinityW, &var, NULL/*FIXME*/); return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index e27b829..571d6e1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -435,18 +435,6 @@ static inline void num_set_val(VARIANT *v, DOUBLE d) } } -static inline void num_set_inf(VARIANT *v, BOOL positive) -{ - V_VT(v) = VT_R8; -#ifdef INFINITY - V_R8(v) = positive ? INFINITY : -INFINITY; -#else - V_UI8(v) = (ULONGLONG)0x7ff00000<<32; - if(!positive) - V_R8(v) = -V_R8(v); -#endif -} - static inline void var_set_jsdisp(VARIANT *v, jsdisp_t *jsdisp) { V_VT(v) = VT_DISPATCH; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index d30e464..d0eab57 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -295,7 +295,7 @@ static HRESULT Math_max(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_inf(retv, FALSE); + num_set_val(retv, -INFINITY); return S_OK; } @@ -329,7 +329,7 @@ static HRESULT Math_min(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA if(!arg_cnt(dp)) { if(retv) - num_set_inf(retv, TRUE); + num_set_val(retv, INFINITY); return S_OK; }

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_GetVersion.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: ebef43e50d896f463ada156ebd42bfcad2c25a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebef43e50d896f463ada156eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 13:30:50 2012 +0900 windowscodecs: Implement MetadataReaderInfo_GetVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index a777276..b67eddd 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1417,8 +1417,12 @@ static HRESULT WINAPI MetadataReaderInfo_GetVendorGUID(IWICMetadataReaderInfo *i static HRESULT WINAPI MetadataReaderInfo_GetVersion(IWICMetadataReaderInfo *iface, UINT length, WCHAR *version, UINT *actual_length) { - FIXME("(%p,%u,%p,%p): stub\n", iface, length, version, actual_length); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, length, version, actual_length); + + return ComponentInfo_GetStringValue(This->classkey, version_valuename, + length, version, actual_length); } static HRESULT WINAPI MetadataReaderInfo_GetSpecVersion(IWICMetadataReaderInfo *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_GetFriendlyName.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: ae610ef37e7b0970ba4c2acb83e468ca95027b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae610ef37e7b0970ba4c2acb8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 13:30:43 2012 +0900 windowscodecs: Implement MetadataReaderInfo_GetFriendlyName. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 5b81702..a777276 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1431,8 +1431,12 @@ static HRESULT WINAPI MetadataReaderInfo_GetSpecVersion(IWICMetadataReaderInfo * static HRESULT WINAPI MetadataReaderInfo_GetFriendlyName(IWICMetadataReaderInfo *iface, UINT length, WCHAR *name, UINT *actual_length) { - FIXME("(%p,%u,%p,%p): stub\n", iface, length, name, actual_length); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, length, name, actual_length); + + return ComponentInfo_GetStringValue(This->classkey, friendlyname_valuename, + length, name, actual_length); } static HRESULT WINAPI MetadataReaderInfo_GetMetadataFormat(IWICMetadataReaderInfo *iface,

1 0

Gerald Pfeifer : ntdll: Omit unused typedef in test_query_process.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 0016d8a2ddb9732d928b57c398f44773297d7437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0016d8a2ddb9732d928b57c39… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jun 20 22:19:43 2012 +0200 ntdll: Omit unused typedef in test_query_process. --- dlls/ntdll/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 148da91..18b8fce 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -278,7 +278,7 @@ static void test_query_process(void) VM_COUNTERS vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; - } SYSTEM_PROCESS_INFORMATION_PRIVATE, *PSYSTEM_PROCESS_INFORMATION_PRIVATE; + } SYSTEM_PROCESS_INFORMATION_PRIVATE; ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength);

1 0

Dmitry Timoshkov : gdiplus: Make some data const.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 450e09c8c69942ed0c7baad4b958c3e07dbdab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=450e09c8c69942ed0c7baad4b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 13:30:57 2012 +0900 gdiplus: Make some data const. --- dlls/gdiplus/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 52b3750..351160b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2462,7 +2462,7 @@ struct image_format_dimension const GUID *dimension; }; -static struct image_format_dimension image_format_dimensions[] = +static const struct image_format_dimension image_format_dimensions[] = { {&ImageFormatGIF, &FrameDimensionTime}, {&ImageFormatIcon, &FrameDimensionResolution}, @@ -2563,7 +2563,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * return GdipLoadImageFromFile(filename, image); } -static const WICPixelFormatGUID *wic_pixel_formats[] = { +static const WICPixelFormatGUID * const wic_pixel_formats[] = { &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR,

1 0

Thomas Faber : imagehlp: Do not pass NULL to WriteFile as lpNumberOfBytesWritten.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: fd181c4937634c59502e548d1d65008b7c937e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd181c4937634c59502e548d1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jun 20 23:48:44 2012 +0200 imagehlp: Do not pass NULL to WriteFile as lpNumberOfBytesWritten. --- dlls/imagehlp/integrity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index c6d490c..d86ec11 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -461,7 +461,7 @@ BOOL WINAPI ImageAddCertificate( char null[8]; ZeroMemory(null, 8); - WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), NULL, NULL); + WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), &count, NULL); size += 8 - (Certificate->dwLength % 8); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
83
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 June 2012