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

Henri Verbeet : wined3d: Merge the IWineD3DSurface::BltFast() implementations.
by Alexandre Julliard 29 Apr '11

29 Apr '11

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 29 Apr '11

29 Apr '11

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

Austin English : advapi32: Add ProcessTrace stub.
by Alexandre Julliard 29 Apr '11

29 Apr '11

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::Blt() implementations.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: ab199f56a637652ead0e0aa84d9ab72bfbfc8678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab199f56a637652ead0e0aa84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 29 13:03:40 2011 +0200 wined3d: Merge the IWineD3DSurface::Blt() implementations. --- dlls/wined3d/surface.c | 4187 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 3 + 2 files changed, 2084 insertions(+), 2106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab199f56a637652ead0e0…

1 0

Piotr Caban : msvcp90: Added basic_string<char> resize implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

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

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

29 Apr '11

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> clear implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 930cfafa0589ed295336022d9ba91638ac1014c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930cfafa0589ed295336022d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:34 2011 +0200 msvcp90: Added basic_string<char> clear implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index dd1d3a7..881908c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3071,12 +3071,12 @@ @ stub -arch=win64 ?clear@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXH_N(a)Z @ stub -arch=win32 ?clear@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXI(a)Z @ stub -arch=win64 ?clear@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXI(a)Z -@ stub -arch=win32 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ -@ stub -arch=win64 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ +@ thiscall -arch=win32 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ(ptr) MSVCP_basic_string_char_clear +@ cdecl -arch=win64 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ(ptr) MSVCP_basic_string_char_clear @ stub -arch=win32 ?clear@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXXZ @ stub -arch=win64 ?clear@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXXZ -@ stub -arch=win32 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ -@ stub -arch=win64 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ +@ thiscall -arch=win32 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ(ptr) MSVCP_basic_string_wchar_clear +@ cdecl -arch=win64 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ(ptr) MSVCP_basic_string_wchar_clear @ stub -arch=win32 ?clear(a)ios_base@std@@QAEXH(a)Z @ stub -arch=win64 ?clear(a)ios_base@std@@QEAAXH(a)Z @ stub -arch=win32 ?clear(a)ios_base@std@@QAEXH_N(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6a9dcb1..19c1882 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1156,6 +1156,14 @@ void __thiscall MSVCP_basic_string_char_resize( MSVCP_basic_string_char_resize_ch(this, size, '\0'); } +/* ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_clear, 4) +void __thiscall MSVCP_basic_string_char_clear(basic_string_char *this) +{ + basic_string_char_eos(this, 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 */ @@ -1815,3 +1823,11 @@ void __thiscall MSVCP_basic_string_wchar_resize( { MSVCP_basic_string_wchar_resize_ch(this, size, '\0'); } + +/* ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_clear, 4) +void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar *this) +{ + basic_string_wchar_eos(this, 0); +}

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator+=(char*) implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: f55449d3547a914d41f45642367de6436857a02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55449d3547a914d41f456423… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:46 2011 +0200 msvcp90: Added basic_string<char> operator+=(char*) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 881908c..f594990 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1726,8 +1726,8 @@ @ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_append @ thiscall -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z(ptr long) MSVCP_basic_string_char_append_ch @ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z(ptr long) MSVCP_basic_string_char_append_ch -@ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z -@ stub -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z(ptr str) MSVCP_basic_string_char_append_cstr +@ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z(ptr str) MSVCP_basic_string_char_append_cstr @ stub -arch=win32 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)G@Z @@ -1736,8 +1736,8 @@ @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z @ thiscall -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_append @ cdecl -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_append -@ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z -@ stub -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_append_cstr +@ cdecl -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_append_cstr @ thiscall -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_append_ch @ cdecl -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_append_ch @ stub -arch=win32 ??Y?$complex(a)M@std@@QAEAAV01(a)ABM@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 19c1882..ddb0b51 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -879,6 +879,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr_len( /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD@Z */ +/* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z */ +/* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_cstr, 8) basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr( basic_string_char *this, const char *append) @@ -1547,6 +1549,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr_len( /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z */ +/* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z */ +/* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_cstr, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr( basic_string_wchar *this, const wchar_t *append)

1 0

Piotr Caban : msvcp80: Updated spec file.
by Alexandre Julliard 29 Apr '11

29 Apr '11

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

Alexandre Julliard : msvcp60: Add a stub dll.
by Alexandre Julliard 29 Apr '11

29 Apr '11

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