June 2012 - Wine-Commits - list.winehq.org

Huw Davies : wineps: Add the ability to override the ppd file' s default pagesize and duplex settings.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 5b71f7bbbcde36955e0d2f0d49c66cce09f9bb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b71f7bbbcde36955e0d2f0d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:00 2012 +0100 wineps: Add the ability to override the ppd file's default pagesize and duplex settings. --- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/ppd.c | 32 +++++++++++++++++++++++++++++--- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 64a3c74..4beb45a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -612,7 +612,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) ppd_filename = get_ppd_filename( hPrinter ); if (!ppd_filename) goto fail; - pi->ppd = PSDRV_ParsePPD( ppd_filename ); + pi->ppd = PSDRV_ParsePPD( ppd_filename, hPrinter ); if (!pi->ppd) { WARN( "Couldn't parse PPD file '%s'\n", ppd_filename ); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index dc598e8..1cba1b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -611,18 +611,36 @@ static BOOL PSDRV_AddSlot(PPD *ppd, LPCSTR szName, LPCSTR szFullName, return TRUE; } +static char *get_ppd_override( HANDLE printer, const char *value ) +{ + DWORD err, type, needed; + char *data; + + err = GetPrinterDataExA( printer, "PPD Overrides", value, &type, NULL, 0, &needed ); + if (err != ERROR_MORE_DATA || type != REG_SZ || needed == 0) return NULL; + + data = HeapAlloc( PSDRV_Heap, 0, needed ); + if (data) + { + GetPrinterDataExA( printer, "PPD Overrides", value, &type, (BYTE*)data, needed, &needed ); + TRACE( "got override %s: %s\n", value, data ); + } + return data; +} + /*********************************************************************** * * PSDRV_ParsePPD * * */ -PPD *PSDRV_ParsePPD(char *fname) +PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) { FILE *fp; PPD *ppd; PPDTuple tuple; char *default_pagesize = NULL, *default_duplex = NULL; + char *def_pagesize_override = NULL, *def_duplex_override = NULL; PAGESIZE *page, *page_cursor2; TRACE("file '%s'\n", fname); @@ -944,7 +962,10 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultPageSize = NULL; - if (default_pagesize) + def_pagesize_override = get_ppd_override( printer, "DefaultPageSize" ); + if (def_pagesize_override) + ppd->DefaultPageSize = get_pagesize( ppd, def_pagesize_override, FALSE ); + if (!ppd->DefaultPageSize && default_pagesize) ppd->DefaultPageSize = get_pagesize( ppd, default_pagesize, FALSE ); if (!ppd->DefaultPageSize) @@ -955,10 +976,14 @@ PPD *PSDRV_ParsePPD(char *fname) } TRACE( "DefaultPageSize: %s\n", ppd->DefaultPageSize ? ppd->DefaultPageSize->Name : "<not set>" ); + HeapFree( PSDRV_Heap, 0, def_pagesize_override ); HeapFree( PSDRV_Heap, 0, default_pagesize ); ppd->DefaultDuplex = NULL; - if (default_duplex) + def_duplex_override = get_ppd_override( printer, "DefaultDuplex" ); + if (def_duplex_override) + ppd->DefaultDuplex = get_duplex( ppd, def_duplex_override ); + if (!ppd->DefaultDuplex && default_duplex) ppd->DefaultDuplex = get_duplex( ppd, default_duplex ); if (!ppd->DefaultDuplex) @@ -969,6 +994,7 @@ PPD *PSDRV_ParsePPD(char *fname) } TRACE( "DefaultDuplex: %s\n", ppd->DefaultDuplex ? ppd->DefaultDuplex->Name : "<not set>" ); + HeapFree( PSDRV_Heap, 0, def_duplex_override ); HeapFree( PSDRV_Heap, 0, default_duplex ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 309cfee..42ace2d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -458,7 +458,7 @@ extern BOOL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN; -extern PPD *PSDRV_ParsePPD(char *fname) DECLSPEC_HIDDEN; +extern PPD *PSDRV_ParsePPD(char *fname, HANDLE printer) DECLSPEC_HIDDEN; extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) DECLSPEC_HIDDEN; extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name) DECLSPEC_HIDDEN; extern BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm,

1 0

Thomas Faber : include/httprequest.idl: Use widl-specific attributes only with widl.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 55ee48af4cdec79531f6506e27a45753e92e2d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ee48af4cdec79531f6506e2… Author: Thomas Faber <thfabba(a)gmx.de> Date: Thu Jun 21 17:18:30 2012 +0200 include/httprequest.idl: Use widl-specific attributes only with widl. --- include/httprequest.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/httprequest.idl b/include/httprequest.idl index caa1238..838ce26 100644 --- a/include/httprequest.idl +++ b/include/httprequest.idl @@ -20,6 +20,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(662901fc-6951-4854-9eb2-d9a2570f2b2e), helpstring("Microsoft WinHTTP Services, version 5.1"),

1 0

Huw Davies : winspool: Update the devmode when we update the driver.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 0c31766c882478cf78fb05d4a9156b66858d3fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c31766c882478cf78fb05d4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:02 2012 +0100 winspool: Update the devmode when we update the driver. --- dlls/winspool.drv/info.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d1afe56..a8d245f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -974,6 +974,10 @@ static BOOL update_driver( HANDLE printer ) HeapFree( GetProcessHeap(), 0, ppd_dir ); HeapFree( GetProcessHeap(), 0, ppd ); HeapFree( GetProcessHeap(), 0, queue_name ); + + /* call into the driver to update the devmode */ + DocumentPropertiesW( 0, printer, NULL, NULL, NULL, 0 ); + return ret; } @@ -2369,7 +2373,6 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); - WaitForSingleObject( init_mutex, INFINITE ); if (*phPrinter) { HKEY key; @@ -2377,15 +2380,14 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU DWORD status; WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ); RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&deleting, &size ); + WaitForSingleObject( init_mutex, INFINITE ); status = get_dword_from_reg( key, StatusW ); + set_reg_DWORD( key, StatusW, status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + ReleaseMutex( init_mutex ); if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) - { update_driver( *phPrinter ); - set_reg_DWORD( key, StatusW, status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); - } RegCloseKey( key ); } - ReleaseMutex( init_mutex ); TRACE("returning %d with %u and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); return (*phPrinter != 0);

1 0

Jacek Caban : jscript: Use INFINITY macro instead of num_set_inf().
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Jacek Caban : jscript: Make Function object invocation a special case in IDispatchEx implementation .
by Alexandre Julliard June 21, 2012

June 21, 2012

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: Pass jsthis internally without using DISPPARAMS.
by Alexandre Julliard June 21, 2012

June 21, 2012

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: Moved DISPPARAMS conversion to InvokeEx.
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Piotr Caban : msvcp90: Rename num_get_char_ctor__Init function because it' s not a constructor.
by Alexandre Julliard June 21, 2012

June 21, 2012

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(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z */ /* ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z */ /* ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)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(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z */ /* ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)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(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z @ stub -arch=win32 ?_Init@?$money_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z @ stub -arch=win64 ?_Init@?$money_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z -@ thiscall -arch=win32 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_char_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_char_ctor__Init -@ thiscall -arch=win32 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ thiscall -arch=win32 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init -@ cdecl -arch=win64 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar_ctor__Init +@ thiscall -arch=win32 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_char__Init +@ cdecl -arch=win64 ?_Init@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_char__Init +@ thiscall -arch=win32 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init +@ cdecl -arch=win64 ?_Init@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init +@ thiscall -arch=win32 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init +@ cdecl -arch=win64 ?_Init@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z(ptr ptr) num_get_wchar__Init @ stub -arch=win32 ?_Init@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z @ stub -arch=win64 ?_Init@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAAXAEBV_Locinfo(a)2@@Z @ stub -arch=win32 ?_Init@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@IAEXABV_Locinfo(a)2@@Z

1 0

Piotr Caban : msvcp90: Separate num_get::get(long double) and num_get::get( double) functions.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 95ec1f07fcc43b75ec2979056f3c05ee7ba7f09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ec1f07fcc43b75ec2979056… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:09 2012 +0200 msvcp90: Separate num_get::get(long double) and num_get::get(double) functions. --- dlls/msvcp90/locale.c | 20 ++++++++++++++++++-- dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95ec1f07fcc43b75ec297…

1 0

Piotr Caban : msvcp90: Define ios_base structure globally.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 05a70c3d19a7fc4b4da13abebf6c98f0895d7ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a70c3d19a7fc4b4da13abeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:25:23 2012 +0200 msvcp90: Define ios_base structure globally. --- dlls/msvcp90/ios.c | 86 ---------------------------------------------- dlls/msvcp90/locale.c | 89 +++++++++++++++++++++++------------------------ dlls/msvcp90/msvcp90.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05a70c3d19a7fc4b4da13…

1 0