April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Flip() implementations.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 0b523df93c30fc7455a10dfe5da599d003929f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b523df93c30fc7455a10dfe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 29 13:03:38 2011 +0200 wined3d: Merge the IWineD3DSurface::Flip() implementations. --- dlls/wined3d/surface.c | 163 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 73 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 80c9263..d5fe048 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1037,6 +1037,31 @@ static HRESULT surface_getdc(IWineD3DSurfaceImpl *surface) return hr; } +static HRESULT surface_flip(IWineD3DSurfaceImpl *surface, IWineD3DSurfaceImpl *override) +{ + TRACE("surface %p, override %p.\n", surface, override); + + /* Flipping is only supported on render targets and overlays. */ + if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY))) + { + WARN("Tried to flip a non-render target, non-overlay surface.\n"); + return WINEDDERR_NOTFLIPPABLE; + } + + if (surface->resource.usage & WINED3DUSAGE_OVERLAY) + { + flip_surface(surface, override); + + /* Update the overlay if it is visible */ + if (surface->overlay_dest) + return surface->surface_ops->surface_draw_overlay(surface); + else + return WINED3D_OK; + } + + return WINED3D_OK; +} + static HRESULT surface_set_mem(IWineD3DSurfaceImpl *surface, void *mem) { TRACE("surface %p, mem %p.\n", surface, mem); @@ -1207,6 +1232,7 @@ static const struct wined3d_surface_ops surface_ops = surface_map, surface_unmap, surface_getdc, + surface_flip, surface_set_mem, }; @@ -1383,6 +1409,13 @@ static HRESULT gdi_surface_getdc(IWineD3DSurfaceImpl *surface) return hr; } +static HRESULT gdi_surface_flip(IWineD3DSurfaceImpl *surface, IWineD3DSurfaceImpl *override) +{ + TRACE("surface %p, override %p.\n", surface, override); + + return WINED3D_OK; +} + static HRESULT gdi_surface_set_mem(IWineD3DSurfaceImpl *surface, void *mem) { TRACE("surface %p, mem %p.\n", surface, mem); @@ -1440,6 +1473,7 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_map, gdi_surface_unmap, gdi_surface_getdc, + gdi_surface_flip, gdi_surface_set_mem, }; @@ -4133,6 +4167,42 @@ static HRESULT WINAPI IWineD3DBaseSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, return WINED3D_OK; } +static HRESULT WINAPI IWineD3DBaseSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD flags) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + struct wined3d_swapchain *swapchain; + HRESULT hr; + + TRACE("iface %p, override %p, flags %#x.\n", iface, override, flags); + + if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) + { + ERR("Flipped surface is not on a swapchain.\n"); + return WINEDDERR_NOTFLIPPABLE; + } + swapchain = surface->container.u.swapchain; + + hr = surface->surface_ops->surface_flip(surface, (IWineD3DSurfaceImpl *)override); + if (FAILED(hr)) + return hr; + + /* Just overwrite the swapchain presentation interval. This is ok because + * only ddraw apps can call Flip, and only d3d8 and d3d9 applications + * specify the presentation interval. */ + if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4))) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE; + else if (flags & WINEDDFLIP_NOVSYNC) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; + else if (flags & WINEDDFLIP_INTERVAL2) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO; + else if (flags & WINEDDFLIP_INTERVAL3) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE; + else + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR; + + return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); +} + /* **************************************************** IWineD3DSurface IWineD3DResource parts follow **************************************************** */ @@ -5076,63 +5146,6 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { } } -static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD flags) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - struct wined3d_swapchain *swapchain = NULL; - - TRACE("iface %p, override %p, flags %#x.\n", iface, override, flags); - - /* Flipping is only supported on RenderTargets and overlays*/ - if( !(This->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY)) ) { - WARN("Tried to flip a non-render target, non-overlay surface\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - if(This->resource.usage & WINED3DUSAGE_OVERLAY) { - flip_surface(This, (IWineD3DSurfaceImpl *) override); - - /* Update the overlay if it is visible */ - if (This->overlay_dest) - return This->surface_ops->surface_draw_overlay(This); - else - return WINED3D_OK; - } - - if(override) { - /* DDraw sets this for the X11 surfaces, so don't confuse the user - * FIXME("(%p) Target override is not supported by now\n", This); - * Additionally, it isn't really possible to support triple-buffering - * properly on opengl at all - */ - } - - if (This->container.type != WINED3D_CONTAINER_SWAPCHAIN) - { - ERR("Flipped surface is not on a swapchain\n"); - return WINEDDERR_NOTFLIPPABLE; - } - swapchain = This->container.u.swapchain; - - /* Just overwrite the swapchain presentation interval. This is ok because only ddraw apps can call Flip, - * and only d3d8 and d3d9 apps specify the presentation interval - */ - if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4))) - /* Most common case first to avoid wasting time on all the other cases */ - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE; - else if (flags & WINEDDFLIP_NOVSYNC) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; - else if (flags & WINEDDFLIP_INTERVAL2) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO; - else if (flags & WINEDDFLIP_INTERVAL3) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE; - else - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR; - - /* Flipping a OpenGL surface -> present. */ - return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); -} - /* Does a direct frame buffer -> texture copy. Stretching is done * with single pixel copy calls */ @@ -7082,7 +7095,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_Unmap, IWineD3DBaseSurfaceImpl_GetDC, IWineD3DBaseSurfaceImpl_ReleaseDC, - IWineD3DSurfaceImpl_Flip, + IWineD3DBaseSurfaceImpl_Flip, IWineD3DSurfaceImpl_Blt, IWineD3DBaseSurfaceImpl_GetBltStatus, IWineD3DBaseSurfaceImpl_GetFlipStatus, @@ -7349,38 +7362,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -/***************************************************************************** - * IWineD3DSurface::Flip, GDI version - * - * Flips 2 flipping enabled surfaces. Determining the 2 targets is done by - * the parent library. This implementation changes the data pointers of the - * surfaces and copies the new front buffer content to the screen - * - * Params: - * override: Flipping target(e.g. back buffer) - * - * Returns: - * WINED3D_OK on success - * - *****************************************************************************/ -static HRESULT WINAPI IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD flags) -{ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; - struct wined3d_swapchain *swapchain; - HRESULT hr; - - if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) - { - ERR("Flipped surface is not on a swapchain\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - swapchain = surface->container.u.swapchain; - hr = wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); - - return hr; -} - static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = { /* IUnknown */ @@ -7401,7 +7382,7 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_Unmap, IWineD3DBaseSurfaceImpl_GetDC, IWineD3DBaseSurfaceImpl_ReleaseDC, - IWineGDISurfaceImpl_Flip, + IWineD3DBaseSurfaceImpl_Flip, IWineD3DBaseSurfaceImpl_Blt, IWineD3DBaseSurfaceImpl_GetBltStatus, IWineD3DBaseSurfaceImpl_GetFlipStatus, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3c025c..5fb2a67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2026,6 +2026,7 @@ struct wined3d_surface_ops void (*surface_map)(struct IWineD3DSurfaceImpl *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct IWineD3DSurfaceImpl *surface); HRESULT (*surface_getdc)(struct IWineD3DSurfaceImpl *surface); + HRESULT (*surface_flip)(struct IWineD3DSurfaceImpl *surface, struct IWineD3DSurfaceImpl *override); HRESULT (*surface_set_mem)(struct IWineD3DSurfaceImpl *surface, void *mem); };

1 0

Austin English : advapi32: Add ProcessTrace stub.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 51bdb255e3c635a4918ad1c9db99dfd700ad37e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bdb255e3c635a4918ad1c9d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 28 16:06:34 2011 -0500 advapi32: Add ProcessTrace stub. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 59a4084..e01217f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -447,7 +447,7 @@ @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) # @ stub ProcessIdleTasks -# @ stub ProcessTrace +@ stdcall ProcessTrace(ptr long ptr ptr) @ stdcall QueryAllTracesA(ptr long ptr) @ stdcall QueryAllTracesW(ptr long ptr) # @ stub QueryRecoveryAgentsOnEncryptedFile diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f6a0f7e..ecc887e 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -871,3 +871,12 @@ TRACEHANDLE WINAPI OpenTraceW( PEVENT_TRACE_LOGFILEW logfile ) SetLastError(ERROR_ACCESS_DENIED); return INVALID_PROCESSTRACE_HANDLE; } + +/****************************************************************************** + * ProcessTrace [ADVAPI32.@] + */ +ULONG WINAPI ProcessTrace( PTRACEHANDLE HandleArray, ULONG HandleCount, LPFILETIME StartTime, LPFILETIME EndTime) +{ + FIXME("%p %u %p %p: stub\n", HandleArray, HandleCount, StartTime, EndTime); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::BltFast() implementations.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 29c95df7c358df8a726d6d545e009bc4f8a941f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c95df7c358df8a726d6d545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 29 13:03:39 2011 +0200 wined3d: Merge the IWineD3DSurface::BltFast() implementations. --- dlls/wined3d/surface.c | 869 +++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 450 insertions(+), 421 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29c95df7c358df8a726d6…

1 0

Austin English : advapi32: Add OpenTraceA/W stubs.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: f9a455964c818392f6c0796b66ba11e3611b4fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a455964c818392f6c0796b6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 28 16:06:23 2011 -0500 advapi32: Add OpenTraceA/W stubs. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 20 ++++++++++++++++++++ include/evntrace.h | 2 ++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9bb202d..59a4084 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -441,8 +441,8 @@ @ stdcall OpenServiceA(long str long) @ stdcall OpenServiceW(long wstr long) @ stdcall OpenThreadToken(long long long ptr) -# @ stub OpenTraceA -# @ stub OpenTraceW +@ stdcall -ret64 OpenTraceA(ptr) +@ stdcall -ret64 OpenTraceW(ptr) @ stdcall PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index d76e0de..f6a0f7e 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -851,3 +851,23 @@ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_ FIXME("%s %s %p: stub\n", wine_dbgstr_longlong(handle), debugstr_w(sessionname), properties); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * OpenTraceA [ADVAPI32.@] + */ +TRACEHANDLE WINAPI OpenTraceA( PEVENT_TRACE_LOGFILEA logfile ) +{ + FIXME("%p: stub\n", logfile); + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_PROCESSTRACE_HANDLE; +} + +/****************************************************************************** + * OpenTraceW [ADVAPI32.@] + */ +TRACEHANDLE WINAPI OpenTraceW( PEVENT_TRACE_LOGFILEW logfile ) +{ + FIXME("%p: stub\n", logfile); + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_PROCESSTRACE_HANDLE; +} diff --git a/include/evntrace.h b/include/evntrace.h index 41083ae..4cacc84 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -202,6 +202,8 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; +#define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) + ULONG WINAPI CloseTrace(TRACEHANDLE); ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG);

1 0

Alexandre Julliard : msvcrt: Forward preferably to msvcr90 when there is an export with the same name.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 2fcba8ee23e5a65e063a2efca8a360e858395b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcba8ee23e5a65e063a2efca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 15:46:37 2011 +0200 msvcrt: Forward preferably to msvcr90 when there is an export with the same name. --- dlls/msvcr100/msvcr100.spec | 138 +++++++++++++++++++++--------------------- dlls/msvcr71/msvcr71.spec | 6 +- dlls/msvcr80/msvcr80.spec | 140 +++++++++++++++++++++--------------------- 3 files changed, 142 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fcba8ee23e5a65e063a2…

1 0

Piotr Caban : msvcp90: Added basic_string<char> constructor implementation (cstr, len).
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 391d488694e896dd80090daf04cc7b7215ae0887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391d488694e896dd80090daf0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:19 2011 +0200 msvcp90: Added basic_string<char> constructor implementation (cstr, len). --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f52c824..dd1d3a7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -747,10 +747,10 @@ @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBD0@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBDAEBV?$allocator(a)D@1@@Z @ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBD@Z(ptr str) MSVCP_basic_string_char_ctor_cstr -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD_K@Z +@ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD_K@Z(ptr str long) MSVCP_basic_string_char_ctor_cstr_len @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDABV?$allocator(a)D@1@@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD_KAEBV?$allocator(a)D@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDI@Z +@ thiscall -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDI@Z(ptr str long) MSVCP_basic_string_char_ctor_cstr_len @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)0@Z @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDIABV?$allocator(a)D@1@@Z @ cdecl -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ(ptr) MSVCP_basic_string_char_ctor @@ -799,10 +799,10 @@ @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_W0@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_WAEBV?$allocator(a)_W@1@@Z @ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_ctor_cstr -@ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_W_K@Z +@ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_W_K@Z(ptr wstr long) MSVCP_basic_string_wchar_ctor_cstr_len @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_WABV?$allocator(a)_W@1@@Z @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_W_KAEBV?$allocator(a)_W@1@@Z -@ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_WI@Z +@ thiscall -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_WI@Z(ptr wstr long) MSVCP_basic_string_wchar_ctor_cstr_len @ stub -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@1(a)0@Z @ stub -arch=win32 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_WIABV?$allocator(a)_W@1@@Z @ cdecl -arch=win64 ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ(ptr) MSVCP_basic_string_wchar_ctor diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 0503a41..6a9dcb1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -746,6 +746,19 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr( return this; } +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDI@Z */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)PEBD_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr_len, 12) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len( + basic_string_char *this, const char *str, size_t len) +{ + TRACE("%p %s %d\n", this, str, len); + + basic_string_char_tidy(this, FALSE, 0); + MSVCP_basic_string_char_assign_cstr_len(this, str, len); + return this; +} + /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)ABV01@II(a)Z */ /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)AEBV01@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_substr, 16) @@ -1393,6 +1406,19 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr( return this; } +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)PB_WI@Z */ +/* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)PEB_W_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_cstr_len, 12) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len( + basic_string_wchar *this, const wchar_t *str, size_t len) +{ + TRACE("%p %s %d\n", this, debugstr_w(str), len); + + basic_string_wchar_tidy(this, FALSE, 0); + MSVCP_basic_string_wchar_assign_cstr_len(this, str, len); + return this; +} + /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)ABV01@II(a)Z */ /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)AEBV01@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_substr, 16)

1 0

Piotr Caban : msvcp90: Added basic_string<char> resize implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 35b4d8eb9d424ce088e5f05c810d03c0691a958b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b4d8eb9d424ce088e5f05c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:10 2011 +0200 msvcp90: Added basic_string<char> resize implementation. --- dlls/msvcp90/msvcp90.spec | 16 +++++++------- dlls/msvcp90/string.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2601900..f52c824 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5174,18 +5174,18 @@ @ stub -arch=win32 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z @ stub -arch=win64 ?reserve@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z @ stub ?resetiosflags(a)std@@YA?AU?$_Smanip(a)H@1(a)H@Z -@ stub -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z -@ stub -arch=win64 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z -@ stub -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXID(a)Z -@ stub -arch=win64 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_KD(a)Z +@ thiscall -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_char_resize +@ cdecl -arch=win64 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_char_resize +@ thiscall -arch=win32 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXID(a)Z(ptr long long) MSVCP_basic_string_char_resize_ch +@ cdecl -arch=win64 ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_KD(a)Z(ptr long long) MSVCP_basic_string_char_resize_ch @ stub -arch=win32 ?resize@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXI(a)Z @ stub -arch=win64 ?resize@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAX_K(a)Z @ stub -arch=win32 ?resize@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXIG(a)Z @ stub -arch=win64 ?resize@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAX_KG(a)Z -@ stub -arch=win32 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z -@ stub -arch=win64 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z -@ stub -arch=win32 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI_W(a)Z -@ stub -arch=win64 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K_W(a)Z +@ thiscall -arch=win32 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z(ptr long) MSVCP_basic_string_wchar_resize +@ cdecl -arch=win64 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z(ptr long) MSVCP_basic_string_wchar_resize +@ thiscall -arch=win32 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI_W(a)Z(ptr long long) MSVCP_basic_string_wchar_resize_ch +@ cdecl -arch=win64 ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K_W(a)Z(ptr long long) MSVCP_basic_string_wchar_resize_ch @ stub -arch=win32 ?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z @ stub -arch=win32 ?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 2c565c0..0503a41 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1120,6 +1120,29 @@ const char* __thiscall MSVCP_basic_string_char_const_at( return basic_string_char_const_ptr(this)+pos; } +/* ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXID(a)Z */ +/* ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_KD(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_resize_ch, 12) +void __thiscall MSVCP_basic_string_char_resize_ch( + basic_string_char *this, size_t size, char ch) +{ + TRACE("%p %lu %c\n", this, (unsigned long)size, ch); + + if(size <= this->size) + MSVCP_basic_string_char_erase(this, size, this->size); + else + MSVCP_basic_string_char_append_len_ch(this, size-this->size, ch); +} + +/* ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXI(a)Z */ +/* ?resize@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAX_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_resize, 8) +void __thiscall MSVCP_basic_string_char_resize( + basic_string_char *this, size_t size) +{ + MSVCP_basic_string_char_resize_ch(this, size, '\0'); +} + /* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2IB */ @@ -1743,3 +1766,26 @@ const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( return basic_string_wchar_const_ptr(this)+pos; } + +/* ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI_W(a)Z */ +/* ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K_W(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_resize_ch, 12) +void __thiscall MSVCP_basic_string_wchar_resize_ch( + basic_string_wchar *this, size_t size, wchar_t ch) +{ + TRACE("%p %lu %c\n", this, (unsigned long)size, ch); + + if(size <= this->size) + MSVCP_basic_string_wchar_erase(this, size, this->size); + else + MSVCP_basic_string_wchar_append_len_ch(this, size-this->size, ch); +} + +/* ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXI(a)Z */ +/* ?resize@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_resize, 8) +void __thiscall MSVCP_basic_string_wchar_resize( + basic_string_wchar *this, size_t size) +{ + MSVCP_basic_string_wchar_resize_ch(this, size, '\0'); +}

1 0

Alexandre Julliard : msvcrt: Synchronize spec files across dlls.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 60f3a809f5fcac32263e7b902699d0c48f7f9400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f3a809f5fcac32263e7b902… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 15:06:53 2011 +0200 msvcrt: Synchronize spec files across dlls. --- dlls/msvcr100/msvcr100.spec | 26 ++-- dlls/msvcr70/msvcr70.spec | 32 +++--- dlls/msvcr71/msvcr71.spec | 190 ++++++++++++++-------------- dlls/msvcr80/msvcr80.spec | 40 +++--- dlls/msvcr90/msvcr90.spec | 38 +++--- dlls/msvcrt/msvcrt.spec | 16 +- dlls/msvcrt20/msvcrt20.spec | 162 ++++++++++++------------ dlls/msvcrt40/msvcrt40.spec | 178 +++++++++++++------------- dlls/msvcrtd/msvcrtd.spec | 300 +++++++++++++++++++++--------------------- 9 files changed, 491 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60f3a809f5fcac32263e7…

1 0

Alexandre Julliard : msvcp60: Add a stub dll.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: a3172a5dcdecb8022bb203ca6a532015c1fe7854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3172a5dcdecb8022bb203ca6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 28 23:30:07 2011 +0200 msvcp60: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp60/Makefile.in | 5 + dlls/msvcp60/msvcp60.c | 37 + dlls/msvcp60/msvcp60.spec | 4320 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 4364 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3172a5dcdecb8022bb20…

1 0

Piotr Caban : msvcp80: Updated spec file.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 65c2fa9b2c33655f428b68903d0060067558bc48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c2fa9b2c33655f428b68903… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:55 2011 +0200 msvcp80: Updated spec file. --- dlls/msvcp80/msvcp80.spec | 128 ++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65c2fa9b2c33655f428b6…

1 0