wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Jacek Caban : jscript: Added ParseProcedureText tests.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 1d542e3aa4dc5ebbae24e0d645583fdf6b29b934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d542e3aa4dc5ebbae24e0d64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 14:57:46 2012 +0200 jscript: Added ParseProcedureText tests. --- dlls/jscript/tests/run.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 30a1f9c..e360515 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -33,6 +33,8 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_64_ParseProcedureText #else @@ -40,6 +42,8 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_32_ParseProcedureText #endif @@ -134,6 +138,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; static const CHAR test_valA[] = "testVal"; +static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check; static const char *test_name = "(null)"; @@ -1255,6 +1260,62 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) return hres; } +static HRESULT invoke_procedure(const char *argsa, const char *sourcea, DISPPARAMS *dp) +{ + IActiveScriptParseProcedure2 *parse_proc; + IActiveScriptParse *parser; + IActiveScript *engine; + IDispatchEx *dispex; + EXCEPINFO ei = {0}; + BSTR source, args; + IDispatch *disp; + VARIANT res; + HRESULT hres; + + engine = create_script(); + if(!engine) + return S_OK; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + source = a2bstr(sourcea); + args = argsa ? a2bstr(argsa) : NULL; + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, source, args, emptyW, NULL, NULL, NULL, 0, 0, + SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + SysFreeString(source); + SysFreeString(args); + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + IDispatch_Release(disp); + + V_VT(&res) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, 0, DISPATCH_METHOD, dp, &res, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&res) == VT_BOOL && V_BOOL(&res), "InvokeEx returned vt %d (%x)\n", V_VT(&res), V_I4(&res)); + IDispatchEx_Release(dispex); + + IActiveScriptParseProcedure2_Release(parse_proc); + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + + return hres; +} + static HRESULT parse_htmlscript(BSTR script_str) { IActiveScriptParse *parser; @@ -1855,6 +1916,19 @@ static BOOL run_tests(void) return TRUE; } +static void test_parse_proc(void) +{ + VARIANT args[2]; + DISPPARAMS dp = {args}; + + dp.cArgs = 0; + invoke_procedure(NULL, "return true;", &dp); + + dp.cArgs = 1; + V_VT(args) = VT_EMPTY; + invoke_procedure(NULL, "return arguments.length == 1;", &dp); +} + static void run_encoded_tests(void) { BSTR src; @@ -1963,6 +2037,8 @@ START_TEST(run) if(run_tests()) { trace("JSctipt.Encode tests...\n"); run_encoded_tests(); + trace("ParseProcedureText tests...\n"); + test_parse_proc(); } }

1 0

Henri Verbeet : winex11: Don' t send SC_RESTORE when a maximized window switches to fullscreen.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 32125fe65ec9f6fe9386ac657c03e73422338dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32125fe65ec9f6fe9386ac657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:29 2012 +0200 winex11: Don't send SC_RESTORE when a maximized window switches to fullscreen. --- dlls/winex11.drv/event.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 9eedbc5..f908413 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1065,19 +1065,19 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) data->window_rect.bottom - data->window_rect.top, cx, cy ); style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if ((style & WS_CAPTION) == WS_CAPTION && is_net_wm_state_maximized( event->display, data )) + if ((style & WS_CAPTION) == WS_CAPTION) { - if (!(style & WS_MAXIMIZE)) + if (is_net_wm_state_maximized( event->display, data )) { - TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); - release_win_data( data ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); - return; + if (!(style & WS_MAXIMIZE)) + { + TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); + release_win_data( data ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + return; + } } - } - else - { - if (style & WS_MAXIMIZE) + else if (style & WS_MAXIMIZE) { TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); release_win_data( data );

1 0

Henri Verbeet : wined3d: wined3d_swapchain_get_desc() never fails.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: adddf10cd8002eec3af2aa9316734a7e35eb2c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adddf10cd8002eec3af2aa931… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:28 2012 +0200 wined3d: wined3d_swapchain_get_desc() never fails. --- dlls/d3d9/swapchain.c | 5 ++--- dlls/ddraw/ddraw.c | 8 +------- dlls/dxgi/swapchain.c | 12 ++---------- dlls/wined3d/swapchain.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 67ef566..57d355a 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -210,16 +210,15 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); struct wined3d_swapchain_desc desc; - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); wined3d_mutex_unlock(); present_parameters_from_wined3d_swapchain_desc(parameters, &desc); - return hr; + return D3D_OK; } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e83091e..e7d9302 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2900,13 +2900,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { struct wined3d_swapchain_desc swapchain_desc; - hr = wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); - if (FAILED(hr)) - { - ERR("Failed to get present parameters.\n"); - return hr; - } - + wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fc6f0a0..65b89c2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -192,7 +192,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D { struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); struct wined3d_swapchain_desc wined3d_desc; - HRESULT hr; FIXME("iface %p, desc %p partial stub!\n", iface, desc); @@ -200,14 +199,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D return E_INVALIDARG; EnterCriticalSection(&dxgi_cs); - - hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); - if (FAILED(hr)) - { - LeaveCriticalSection(&dxgi_cs); - return hr; - } - + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); LeaveCriticalSection(&dxgi_cs); FIXME("Ignoring ScanlineOrdering, Scaling, SwapEffect and Flags\n"); @@ -227,7 +219,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; desc->Flags = 0; - return hr; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *iface, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1125cc6..2fa221a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -244,14 +244,12 @@ struct wined3d_device * CDECL wined3d_swapchain_get_device(const struct wined3d_ return swapchain->device; } -HRESULT CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, +void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc) { TRACE("swapchain %p, desc %p.\n", swapchain, desc); *desc = swapchain->desc; - - return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b277ca..521b2b3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2369,7 +2369,7 @@ HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swa HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, struct wined3d_gamma_ramp *ramp); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain); -HRESULT __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, +void __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc); HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status);

1 0

Henri Verbeet : wined3d: Just return the surface from wined3d_swapchain_get_back_buffer().
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 5fcc1f8f70100a3b1b29c36d53fa69d11804c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fcc1f8f70100a3b1b29c36d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:27 2012 +0200 wined3d: Just return the surface from wined3d_swapchain_get_back_buffer(). --- dlls/d3d8/device.c | 1 - dlls/d3d8/swapchain.c | 12 +++++++----- dlls/d3d9/device.c | 1 - dlls/d3d9/swapchain.c | 12 +++++++----- dlls/dxgi/swapchain.c | 8 +++----- dlls/wined3d/device.c | 4 +++- dlls/wined3d/stateblock.c | 5 +---- dlls/wined3d/swapchain.c | 19 +++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 10 files changed, 31 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fcc1f8f70100a3b1b29c…

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMGetBlendState().
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 272f63263e4fc8647052067daa021671816caab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272f63263e4fc8647052067da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:26 2012 +0200 d3d10core: Implement d3d10_device_OMGetBlendState(). --- dlls/d3d10core/device.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 95b337a..43cafa5 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -571,8 +571,15 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device *iface, ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor %p, sample_mask %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); + + if ((*blend_state = device->blend_state ? &device->blend_state->ID3D10BlendState_iface : NULL)) + ID3D10BlendState_AddRef(*blend_state); + memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); + *sample_mask = device->sample_mask; } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMSetBlendState().
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: e69c28a0f70bfea72efb701833b86fafda1123be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69c28a0f70bfea72efb70183… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:25 2012 +0200 d3d10core: Implement d3d10_device_OMSetBlendState(). --- dlls/d3d10core/d3d10core_private.h | 4 ++++ dlls/d3d10core/device.c | 8 +++++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2dcd89a..4297adf 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -217,6 +217,7 @@ struct d3d10_blend_state }; HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; +struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ struct d3d10_depthstencil_state @@ -269,6 +270,9 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct d3d10_blend_state *blend_state; + float blend_factor[4]; + UINT sample_mask; struct d3d10_depthstencil_state *depth_stencil_state; UINT stencil_ref; struct d3d10_rasterizer_state *rasterizer_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ae3b865..95b337a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -318,8 +318,14 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device *iface, ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x.\n", iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + + device->blend_state = unsafe_impl_from_ID3D10BlendState(blend_state); + memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); + device->sample_mask = sample_mask; } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 1d927ce..9e64ea6 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -140,6 +140,15 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) return S_OK; } +struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_blend_state_vtbl); + + return impl_from_ID3D10BlendState(iface); +} + static inline struct d3d10_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { return CONTAINING_RECORD(iface, struct d3d10_depthstencil_state, ID3D10DepthStencilState_iface);

1 0

Piotr Caban : msvcp60: Fixed ctype class vtable.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 291edc484ff25393c6bcae92e995ad355d2ca42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=291edc484ff25393c6bcae92e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:52 2012 +0200 msvcp60: Fixed ctype class vtable. --- dlls/msvcp60/cxx.h | 1 - dlls/msvcp60/locale.c | 92 ++++--------------------------------------------- dlls/msvcp60/main.c | 1 - 3 files changed, 7 insertions(+), 87 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index de934ce..42e9975 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -210,7 +210,6 @@ extern void *vtbl_wrapper_36; extern void *vtbl_wrapper_40; extern void *vtbl_wrapper_44; extern void *vtbl_wrapper_48; -extern void *vtbl_wrapper_52; #else diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 0cc3807..4471096 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -1087,12 +1087,6 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla return this; } -/* ?_Xran@ctype_base@std@@KAXXZ */ -static void ctype_base__Xran(void) -{ - throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); -} - /* ?id@?$ctype@D@std@@2V0locale@2@A */ locale_id ctype_char_id = {0}; /* ?table_size@?$ctype@D@std@@2IB */ @@ -1206,7 +1200,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla /* ?do_narrow@?$ctype@D@std@@MBEDDD@Z */ /* ?do_narrow@?$ctype@D@std@@MEBADDD@Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) -#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 32, \ char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { @@ -1217,7 +1211,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un /* ?do_narrow@?$ctype@D@std@@MBEPBDPBD0DPAD@Z */ /* ?do_narrow@?$ctype@D@std@@MEBAPEBDPEBD0DPEAD@Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) -#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 28, \ const char*, (const ctype_char*, const char*, const char*, char, char*), \ (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, @@ -1228,20 +1222,6 @@ const char* __thiscall ctype_char_do_narrow(const ctype_char *this, return last; } -/* ?_Do_narrow_s@?$ctype@D@std@@MBEPBDPBD0DPADI@Z */ -/* ?_Do_narrow_s@?$ctype@D@std@@MEBAPEBDPEBD0DPEAD_K@Z */ -DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) -#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ - const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ - (this, first, last, unused, dest, size)) -const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, - const char *last, char unused, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - memcpy_s(dest, size, first, last-first); - return last; -} - /* ?narrow@?$ctype@D@std@@QBEDDD@Z */ /* ?narrow@?$ctype@D@std@@QEBADDD@Z */ DEFINE_THISCALL_WRAPPER(ctype_char_narrow_ch, 12) @@ -1286,20 +1266,6 @@ const char* __thiscall ctype_char_do_widen(const ctype_char *this, return last; } -/* ?_Do_widen_s@?$ctype@D@std@@MBEPBDPBD0PADI@Z */ -/* ?_Do_widen_s@?$ctype@D@std@@MEBAPEBDPEBD0PEAD_K@Z */ -DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) -#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ - const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ - (this, first, last, dest, size)) -const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, - const char *first, const char *last, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - memcpy_s(dest, size, first, last-first); - return last; -} - /* ?widen@?$ctype@D@std@@QBEDD@Z */ /* ?widen@?$ctype@D@std@@QEBADD@Z */ DEFINE_THISCALL_WRAPPER(ctype_char_widen_ch, 8) @@ -1768,7 +1734,7 @@ static char ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char dflt /* ?do_narrow@?$ctype@G@std@@MBEDGD@Z */ /* ?do_narrow@?$ctype@G@std@@MEBADGD@Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12) -#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \ +#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 48, \ char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt)) char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { @@ -1780,7 +1746,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch /* ?do_narrow@?$ctype@G@std@@MBEPBGPBG0DPAD@Z */ /* ?do_narrow@?$ctype@G@std@@MEBAPEBGPEBG0DPEAD@Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20) -#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \ +#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 44, \ const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \ (this, first, last, dflt, dest)) const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, @@ -1792,25 +1758,6 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, return last; } -/* ?_Do_narrow_s@?$ctype@_W@std@@MBEPB_WPB_W0DPADI@Z */ -/* ?_Do_narrow_s@?$ctype@_W@std@@MEBAPEB_WPEB_W0DPEAD_K@Z */ -/* ?_Do_narrow_s@?$ctype@G@std@@MBEPBGPBG0DPADI@Z */ -/* ?_Do_narrow_s@?$ctype@G@std@@MEBAPEBGPEBG0DPEAD_K@Z */ -DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24) -#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \ - const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \ - (this, first, last, dflt, dest, size)) -const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, - const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); - /* This function converts all multi-byte characters to dflt, - * thanks to it result size is known before converting */ - if(last-first > size) - ctype_base__Xran(); - return ctype_wchar_do_narrow(this, first, last, dflt, dest); -} - /* ?narrow@?$ctype@_W@std@@QBED_WD@Z */ /* ?narrow@?$ctype@_W@std@@QEBAD_WD@Z */ /* ?narrow@?$ctype@G@std@@QBEDGD@Z */ @@ -1944,25 +1891,6 @@ const char* __thiscall ctype_wchar_do_widen(const ctype_wchar *this, return last; } -/* ?_Do_widen_s@?$ctype@_W@std@@MBEPBDPBD0PA_WI@Z */ -/* ?_Do_widen_s@?$ctype@_W@std@@MEBAPEBDPEBD0PEA_W_K@Z */ -/* ?_Do_widen_s@?$ctype@G@std@@MBEPBDPBD0PAGI@Z */ -/* ?_Do_widen_s@?$ctype@G@std@@MEBAPEBDPEBD0PEAG_K@Z */ -DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_widen_s, 20) -#define call_ctype_wchar__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 44, \ - const char*, (const ctype_wchar*, const char*, const char*, wchar_t*, MSVCP_size_t), \ - (this, first, last, dest, size)) -const char* __thiscall ctype_wchar__Do_widen_s(const ctype_wchar *this, - const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - /* This function converts all multi-byte characters to WEOF, - * thanks to it result size is known before converting */ - if(size < last-first) - ctype_base__Xran(); - return ctype_wchar_do_widen(this, first, last, dest); -} - /* ?widen@?$ctype@_W@std@@QBE_WD@Z */ /* ?widen@?$ctype@_W@std@@QEBA_WD@Z */ /* ?widen@?$ctype@G@std@@QBEGD@Z */ @@ -7991,10 +7919,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char_do_toupper_ch) VTABLE_ADD_FUNC(ctype_char_do_widen) VTABLE_ADD_FUNC(ctype_char_do_widen_ch) - VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8007,10 +7933,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8023,10 +7947,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 5b375dc..dd7a4ef 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -51,7 +51,6 @@ DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); -DEFINE_VTBL_WRAPPER(52); #endif

1 0

Piotr Caban : msvcp60: Fixed vtables in IO classes.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: b84d5d991ce0a6e8da7bc3af94795d88fdab516a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84d5d991ce0a6e8da7bc3af9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:34 2012 +0200 msvcp60: Fixed vtables in IO classes. --- dlls/msvcp60/ios.c | 56 ++++++++++++++++++--------------------------------- 1 files changed, 20 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b84d5d991ce0a6e8da7bc…

1 0

Piotr Caban : msvcp60: Handle differences in basic_string:: c_str function behavior on empty strings.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 458a39051dd8cd81ee23febb9c07d2669bc56e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458a39051dd8cd81ee23febb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:04 2012 +0200 msvcp60: Handle differences in basic_string::c_str function behavior on empty strings. --- dlls/msvcp60/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 17c754d..0cc3807 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -5101,7 +5101,7 @@ static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; istreambuf_iterator_char_val(first); if(first->strbuf && (first->val=='-' || first->val=='+')) { @@ -5258,7 +5258,7 @@ static int num_get_char__Getifld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -6007,7 +6007,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; @@ -6090,7 +6090,7 @@ static ostreambuf_iterator_char* num_put_char__Iput(const num_put *this, ostream /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++;

1 0

Piotr Caban : msvcp60: Copy source files from msvcp90.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 9d7f3c7651940c7f3164ccf09b9576bb563586f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7f3c7651940c7f3164ccf09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:15:41 2012 +0200 msvcp60: Copy source files from msvcp90. --- dlls/msvcp60/Makefile.in | 4 +- dlls/msvcp60/cxx.h | 2 - dlls/msvcp60/exception.c | 36 +- dlls/msvcp60/ios.c |11564 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp60/locale.c | 8198 ++++++++++++++++++++++++++++++++ dlls/msvcp60/main.c | 9 +- dlls/msvcp60/memory.c | 264 +- dlls/msvcp60/misc.c | 42 +- dlls/msvcp60/msvcp.h | 396 ++- dlls/msvcp60/msvcp60.spec | 3208 +++++++------- dlls/msvcp60/string.c | 67 +- 11 files changed, 21851 insertions(+), 1939 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d7f3c7651940c7f3164c…

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
96
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 October 2012