August 2010 - Wine-commits - list.winehq.org

Jacek Caban : oleaut32: Try both SYS_WIN64 and SYS_WIN32 syskind in QueryPathOfRegTypeLib on win64 .
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 7d7586d35805d36c63a1cfac8c28eec979eafdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7586d35805d36c63a1cfac8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 18:13:43 2010 +0200 oleaut32: Try both SYS_WIN64 and SYS_WIN32 syskind in QueryPathOfRegTypeLib on win64. --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++----------- dlls/oleaut32/typelib.c | 5 +++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0c7e9ab..63b982b 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -692,10 +692,10 @@ cleanup: return ret; } -static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL remove) +static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, DWORD arch, LPCWSTR base, BOOL remove) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; - static const WCHAR formatW[] = {'\\','%','u','.','%','u','\\','0','\\','w','i','n','3','2',0}; + static const WCHAR formatW[] = {'\\','%','u','.','%','u','\\','0','\\','w','i','n','%','u',0}; static const WCHAR format2W[] = {'%','s','_','%','u','_','%','u','.','d','l','l',0}; WCHAR buf[128]; HKEY hkey; @@ -711,7 +711,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL return TRUE; } - wsprintfW(buf + lstrlenW(buf), formatW, maj, min ); + wsprintfW(buf + lstrlenW(buf), formatW, maj, min, arch); SetLastError(0xdeadbeef); res = RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, @@ -724,7 +724,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL if (res != ERROR_SUCCESS) { - trace("RegCreateKeyExW failed\n"); + trace("RegCreateKeyExW failed: %u\n", res); return FALSE; } @@ -739,7 +739,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL return ret; } -static void test_QueryPathOfRegTypeLib(void) +static void test_QueryPathOfRegTypeLib(DWORD arch) { static const struct test_data { @@ -760,6 +760,7 @@ static void test_QueryPathOfRegTypeLib(void) { 4, 0, TYPE_E_LIBNOTREGISTERED, { 0 } } }; static const WCHAR base[] = {'f','a','k','e',0}; + static const WCHAR wrongW[] = {'w','r','o','n','g',0}; UINT i; RPC_STATUS status; GUID uid; @@ -773,10 +774,11 @@ static void test_QueryPathOfRegTypeLib(void) StringFromGUID2(&uid, uid_str, 40); /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/ - if (!do_typelib_reg_key(&uid, 3, 0, base, 0)) return; - if (!do_typelib_reg_key(&uid, 3, 1, base, 0)) return; - if (!do_typelib_reg_key(&uid, 3, 37, base, 0)) return; - if (!do_typelib_reg_key(&uid, 5, 37, base, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 0, arch, base, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 1, arch, base, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 37, arch, base, 0)) return; + if (!do_typelib_reg_key(&uid, 5, 37, arch, base, 0)) return; + if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, 0)) return; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { @@ -789,7 +791,7 @@ static void test_QueryPathOfRegTypeLib(void) } } - do_typelib_reg_key(&uid, 0, 0, NULL, 1); + do_typelib_reg_key(&uid, 0, 0, arch, NULL, 1); } static void test_inheritance(void) @@ -2340,7 +2342,9 @@ START_TEST(typelib) test_TypeComp(); test_CreateDispTypeInfo(); test_TypeInfo(); - test_QueryPathOfRegTypeLib(); + test_QueryPathOfRegTypeLib(32); + if(sizeof(void*) == 8) + test_QueryPathOfRegTypeLib(64); test_inheritance(); test_CreateTypeLib(); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 46c0d28..da0d43d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -367,6 +367,11 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, */ HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) { +#ifdef _WIN64 + HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path ); + if(SUCCEEDED(hres)) + return hres; +#endif return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path ); }

1 0

Jerome Leclanche : gdi32: Properly set ERROR_NOACCESS when GetObject receives invalid arguments.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: da40f95efa58534d6f59dff11f8c9dbbbbb68520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da40f95efa58534d6f59dff11… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Thu Aug 19 14:30:49 2010 +0100 gdi32: Properly set ERROR_NOACCESS when GetObject receives invalid arguments. --- dlls/gdi32/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 3f84f9c..a941e2b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -973,7 +973,12 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); if (funcs && funcs->pGetObjectA) - result = funcs->pGetObjectA( handle, count, buffer ); + { + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + SetLastError( ERROR_NOACCESS ); + else + result = funcs->pGetObjectA( handle, count, buffer ); + } else SetLastError( ERROR_INVALID_HANDLE ); @@ -995,7 +1000,12 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); if (funcs && funcs->pGetObjectW) - result = funcs->pGetObjectW( handle, count, buffer ); + { + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + SetLastError( ERROR_NOACCESS ); + else + result = funcs->pGetObjectW( handle, count, buffer ); + } else SetLastError( ERROR_INVALID_HANDLE ); diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index c1adc0f..7302134 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -81,6 +81,14 @@ static void test_gdi_objects(void) "GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); + /* GetObject expects ERROR_NOACCESS when passed an invalid buffer */ + hp = SelectObject(hdc, GetStockObject(BLACK_PEN)); + SetLastError(0); + i = GetObjectA(hp, (INT_PTR)buff, (LPVOID)sizeof(buff)); + ok (!i && GetLastError() == ERROR_NOACCESS, + "GetObject(invalid buff), expected 0, ERROR_NOACCESS, got %d, %u\n", + i, GetLastError()); + /* GetObjectType does SetLastError() on a null object */ SetLastError(0); i = GetObjectType(NULL);

1 0

Piotr Caban : msvcp90: Added ~basic_string<char> implementation.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 703ab02bc3d69909e1b3b5a48cf867638abb1339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703ab02bc3d69909e1b3b5a48… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 12:17:53 2010 +0200 msvcp90: Added ~basic_string<char> implementation. --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 9a0a17a..3db1999 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1212,8 +1212,8 @@ @ stub -arch=win64 ??1?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@UEAA(a)XZ @ stub -arch=win32 ??1?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@UAE(a)XZ @ stub -arch=win64 ??1?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@UEAA(a)XZ -@ stub -arch=win32 ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ -@ stub -arch=win64 ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ +@ cdecl -arch=win32 -i386 -norelay ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ() __thiscall_MSVCP_basic_string_char_dtor +@ cdecl -arch=win64 ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ(ptr) MSVCP_basic_string_char_dtor @ stub -arch=win32 ??1?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)XZ @ stub -arch=win64 ??1?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)XZ @ stub -arch=win32 ??1?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 93cef1b..0021245 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -665,3 +665,12 @@ basic_string_char* __stdcall MSVCP_basic_string_char_ctor(basic_string_char *thi basic_string_char_tidy(this, FALSE, 0); return this; } + +/* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ +/* ??1?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) +void __stdcall MSVCP_basic_string_char_dtor(basic_string_char *this) +{ + TRACE("%p\n", this); + basic_string_char_tidy(this, TRUE, 0); +}

1 0

Piotr Caban : msvcp90: Added allocator<void> implementation.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 99a6926f3ee1c1ecc23ed5e9c14f014e5248a437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a6926f3ee1c1ecc23ed5e9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 12:15:51 2010 +0200 msvcp90: Added allocator<void> implementation. --- dlls/msvcp90/memory.c | 25 +++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 998130b..acbdda7 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -312,3 +312,28 @@ size_t __stdcall MSVCP_allocator_short_max_size(void *this) { return UINT_MAX/sizeof(unsigned short); } + +/* allocator<void> */ +/* ??0?$allocator(a)X@std@@QAE(a)XZ */ +/* ??0?$allocator(a)X@std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4); +void* __stdcall MSVCP_allocator_void_ctor(void *this) +{ + return this; +} + +/* ??0?$allocator(a)X@std@@QAE(a)ABV01@@Z */ +/* ??0?$allocator(a)X@std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8); +void* __stdcall MSVCP_allocator_void_copy_ctor(void *this, void *copy) +{ + return this; +} + +/* ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$allocator(a)X@std@@QEAAAEAV01(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8); +void* __stdcall MSVCP_allocator_void_assign(void *this, void *assign) +{ + return this; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 8e96c5d..0542b63 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -538,10 +538,10 @@ @ cdecl -arch=win64 ??0?$allocator(a)G@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_short_copy_ctor @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)G@std@@QAE(a)XZ() __thiscall_MSVCP_allocator_short_ctor @ cdecl -arch=win64 ??0?$allocator(a)G@std@@QEAA(a)XZ(ptr) MSVCP_allocator_short_ctor -@ stub -arch=win32 ??0?$allocator(a)X@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$allocator(a)X@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$allocator(a)X@std@@QAE(a)XZ -@ stub -arch=win64 ??0?$allocator(a)X@std@@QEAA(a)XZ +@ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)X@std@@QAE(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_void_copy_ctor +@ cdecl -arch=win64 ??0?$allocator(a)X@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_void_copy_ctor +@ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)X@std@@QAE(a)XZ() __thiscall_MSVCP_allocator_void_ctor +@ cdecl -arch=win64 ??0?$allocator(a)X@std@@QEAA(a)XZ(ptr) MSVCP_allocator_void_ctor @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)_W@std@@QAE(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_wchar_copy_ctor @ cdecl -arch=win64 ??0?$allocator(a)_W@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_copy_ctor @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)_W@std@@QAE(a)XZ() __thiscall_MSVCP_allocator_wchar_ctor @@ -1376,8 +1376,8 @@ @ cdecl -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ cdecl -arch=win32 -i386 -norelay ??4?$allocator(a)G@std@@QAEAAV01(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_short_assign @ cdecl -arch=win64 ??4?$allocator(a)G@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_short_assign -@ stub -arch=win32 ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$allocator(a)X@std@@QEAAAEAV01(a)AEBV01@@Z +@ cdecl -arch=win32 -i386 -norelay ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_void_assign +@ cdecl -arch=win64 ??4?$allocator(a)X@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_void_assign @ cdecl -arch=win32 -i386 -norelay ??4?$allocator(a)_W@std@@QAEAAV01(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_wchar_assign @ cdecl -arch=win64 ??4?$allocator(a)_W@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign @ stub -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z

1 0

Piotr Caban : msvcp90: Added basic_string<char> constructor ( with no arguments) implementation.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 6c57f13a6b16ee220cb02087c7527d9edba607c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c57f13a6b16ee220cb02087c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 12:17:11 2010 +0200 msvcp90: Added basic_string<char> constructor (with no arguments) implementation. --- dlls/msvcp90/msvcp90.h | 15 +++++++++++++ dlls/msvcp90/msvcp90.spec | 4 +- dlls/msvcp90/string.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 8d588ef..89d549b 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -109,3 +109,18 @@ typedef struct _rtti_object_locator const type_info *type_descriptor; const rtti_object_hierarchy *type_hierarchy; } rtti_object_locator; + +/* basic_string<char, char_traits<char>, allocator<char>> */ +#define BUF_SIZE_CHAR 16 +typedef struct _basic_string_char +{ + void *allocator; + union _data { + char buf[BUF_SIZE_CHAR]; + char *ptr; + } data; + size_t size; + size_t res; +} basic_string_char; + +void __stdcall MSVCP_allocator_char_deallocate(void*, char*, size_t); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 0542b63..2d6b312 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -753,10 +753,10 @@ @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)PBDI@Z @ 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 -@ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ +@ 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 @ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1(a)0@Z @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)_KD@Z -@ stub -arch=win32 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ +@ cdecl -arch=win32 -i386 -norelay ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ() __thiscall_MSVCP_basic_string_char_ctor @ stub -arch=win64 ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)_KDAEBV?$allocator(a)D@1@@Z @ stub -arch=win32 ??0?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)AEBV01@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 8b7c320..ddf8f88 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "msvcp90.h" @@ -462,3 +464,50 @@ unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in) { return (*in==(unsigned short)-1 ? 0 : *in); } + + +/* basic_string<char, char_traits<char>, allocator<char>> */ +/* Internal: basic_string_char_ptr - return pointer to stored string */ +static char* basic_string_char_ptr(basic_string_char *this) +{ + if(this->res == BUF_SIZE_CHAR-1) + return this->data.buf; + return this->data.ptr; +} + +/* Internal: basic_string_char_eos - sets string length, puts '\0' on the end */ +static void basic_string_char_eos(basic_string_char *this, size_t len) +{ + static const char nullbyte = '\0'; + + this->size = len; + MSVCP_char_traits_char_assign(basic_string_char_ptr(this)+len, &nullbyte); +} + +/* Internal: basic_string_char_tidy - initialize basic_string buffer, deallocates data */ +/* Caution: new_size have to be smaller than BUF_SIZE_CHAR */ +static void basic_string_char_tidy(basic_string_char *this, + MSVCP_BOOL built, int new_size) +{ + if(built && BUF_SIZE_CHAR<=this->res) { + char *ptr = this->data.ptr; + + if(new_size > 0) + MSVCP_char_traits_char__Copy_s(this->data.buf, BUF_SIZE_CHAR, ptr, new_size); + MSVCP_allocator_char_deallocate(this->allocator, ptr, this->res+1); + } + + this->res = BUF_SIZE_CHAR-1; + basic_string_char_eos(this, new_size); +} + +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ +/* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor, 4) +basic_string_char* __stdcall MSVCP_basic_string_char_ctor(basic_string_char *this) +{ + TRACE("%p\n", this); + + basic_string_char_tidy(this, FALSE, 0); + return this; +}

1 0

Piotr Caban : msvcp90: Added basic_string<char>::npos.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 50c99f0018fc26be466b99265db4f44da0ac4a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c99f0018fc26be466b99265… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 12:17:22 2010 +0200 msvcp90: Added basic_string<char>::npos. --- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/string.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2d6b312..df3664b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4589,7 +4589,7 @@ @ cdecl -arch=win64 ?not_eof@?$char_traits(a)G@std@@SAGAEBG(a)Z(ptr) MSVCP_char_traits_short_not_eof @ cdecl -arch=win32 ?not_eof@?$char_traits(a)_W@std@@SAGABG(a)Z(ptr) MSVCP_char_traits_wchar_not_eof @ cdecl -arch=win64 ?not_eof@?$char_traits(a)_W@std@@SAGAEBG(a)Z(ptr) MSVCP_char_traits_wchar_not_eof -@ stub -arch=win32 ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB +@ extern -arch=win32 ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB MSVCP_basic_string_char_npos @ stub -arch=win64 ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB @ stub -arch=win32 ?npos@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@2IB @ stub -arch=win64 ?npos@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@2_KB diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ddf8f88..a1cba11 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -467,6 +467,9 @@ unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in) /* basic_string<char, char_traits<char>, allocator<char>> */ +/* ?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB */ +const size_t MSVCP_basic_string_char_npos = -1; + /* Internal: basic_string_char_ptr - return pointer to stored string */ static char* basic_string_char_ptr(basic_string_char *this) {

1 0

Piotr Caban : msvcp90: Added basic_string<char>::erase implementation.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 935e0f53a195adced5792845880f46cb4eeabd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e0f53a195adced57928458… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 12:17:31 2010 +0200 msvcp90: Added basic_string<char>::erase implementation. --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index df3664b..1f60fb6 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3774,8 +3774,8 @@ @ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z @ stub -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z -@ stub -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z -@ stub -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z +@ cdecl -arch=win32 -i386 -norelay ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(long long) __thiscall_MSVCP_basic_string_char_erase +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) MSVCP_basic_string_char_erase @ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z @ stub -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z @ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index a1cba11..82397e2 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -504,6 +504,32 @@ static void basic_string_char_tidy(basic_string_char *this, basic_string_char_eos(this, new_size); } +/* ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z */ +/* ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_erase, 12) +basic_string_char* __stdcall MSVCP_basic_string_char_erase( + basic_string_char *this, size_t pos, size_t len) +{ + TRACE("%p %d %d\n", this, pos, len); + + if(pos > this->size) { + FIXME("Throw exception (_Xran)\n"); + return NULL; + } + + if(len > this->size-pos) + len = this->size-pos; + + if(len) { + MSVCP_char_traits_char__Move_s(basic_string_char_ptr(this)+pos, + this->res-pos, basic_string_char_ptr(this)+pos+len, + this->size-pos-len); + basic_string_char_eos(this, this->size-len); + } + + return this; +} + /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor, 4)

1 0

Piotr Caban : msvcp90: Added some basic_string<char>:: assign implementations.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 6040c8f89752b8d8dd3c62231f510dd25f6d176f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6040c8f89752b8d8dd3c62231… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 19 12:17:42 2010 +0200 msvcp90: Added some basic_string<char>::assign implementations. --- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 16 +++--- dlls/msvcp90/string.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6040c8f89752b8d8dd3c6…

1 0

Jacek Caban : mshtml: Added an explicit CDECL attribute to imported functions.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: c22b8fd8684625bf4e644ad5a8429592f510739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22b8fd8684625bf4e644ad5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 14:49:23 2010 +0200 mshtml: Added an explicit CDECL attribute to imported functions. --- dlls/mshtml/nsembed.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4b7cada..b2f14dd 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -52,18 +52,18 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_STRING_CONTAINER_INIT_DEPEND 0x0002 #define NS_CSTRING_CONTAINER_INIT_DEPEND 0x0002 -static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); -static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); -static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); -static nsresult (*NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32); -static nsresult (*NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32); -static nsresult (*NS_StringContainerFinish)(nsStringContainer*); -static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); -static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); -static nsresult (*NS_CStringSetData)(nsACString*,const char*,PRUint32); -static nsresult (*NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); -static PRUint32 (*NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*); -static PRUint32 (*NS_CStringGetData)(const nsACString*,const char**,PRBool*); +static nsresult (CDECL *NS_InitXPCOM2)(nsIServiceManager**,void*,void*); +static nsresult (CDECL *NS_ShutdownXPCOM)(nsIServiceManager*); +static nsresult (CDECL *NS_GetComponentRegistrar)(nsIComponentRegistrar**); +static nsresult (CDECL *NS_StringContainerInit2)(nsStringContainer*,const PRUnichar*,PRUint32,PRUint32); +static nsresult (CDECL *NS_CStringContainerInit2)(nsCStringContainer*,const char*,PRUint32,PRUint32); +static nsresult (CDECL *NS_StringContainerFinish)(nsStringContainer*); +static nsresult (CDECL *NS_CStringContainerFinish)(nsCStringContainer*); +static nsresult (CDECL *NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); +static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32); +static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); +static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*); +static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,PRBool*); static HINSTANCE hXPCOM = NULL;

1 0

Jacek Caban : mshtml: Don't use start_binding in IPersistStreamInit:: InitNew.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 6ae22663c0c2fe6af0f2787683d2a171262a66d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae22663c0c2fe6af0f278768… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 14:52:31 2010 +0200 mshtml: Don't use start_binding in IPersistStreamInit::InitNew. --- dlls/mshtml/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 76e3773..89a056f 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -736,7 +736,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) if(FAILED(hres)) return hres; - return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, NULL); + return channelbsc_load_stream(This->window->bscallback, NULL); } #undef PERSTRINIT_THIS

1 0