September 2013 - Wine-commits

Nikolay Sivov : oleaut32: LoadRegTypeLib() should check actual typelib version.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 1c23b501f75f7ae508851800df251c585492dc5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c23b501f75f7ae508851800d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:27:02 2013 +0400 oleaut32: LoadRegTypeLib() should check actual typelib version. --- dlls/oleaut32/tests/typelib.c | 27 +++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 14 ++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 2966e9a..7f92051 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4734,7 +4734,6 @@ static void test_LoadRegTypeLib(void) if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_register_test, 2, 0, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); /* manifest version is 2.7, actual is 2.5 */ @@ -4755,7 +4754,6 @@ todo_wine if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, &tl); @@ -5025,6 +5023,30 @@ static void test_SetTypeDescAlias(SYSKIND kind) DeleteFileA(filenameA); } +static void test_GetLibAttr(void) +{ + ULONG ref1, ref2; + TLIBATTR *attr; + ITypeLib *tl; + HRESULT hr; + + hr = LoadTypeLib(wszStdOle2, &tl); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref1 = ITypeLib_AddRef(tl); + ITypeLib_Release(tl); + + hr = ITypeLib_GetLibAttr(tl, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ref2 = ITypeLib_AddRef(tl); + ITypeLib_Release(tl); + ok(ref2 == ref1, "got %d, %d\n", ref2, ref1); + + ITypeLib_ReleaseTLibAttr(tl, attr); + ITypeLib_Release(tl); +} + START_TEST(typelib) { const char *filename; @@ -5062,4 +5084,5 @@ START_TEST(typelib) test_LoadTypeLib(); test_TypeInfo2_GetContainingTypeLib(); test_LoadRegTypeLib(); + test_GetLibAttr(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 616445a..c77bc62 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -536,6 +536,20 @@ HRESULT WINAPI LoadRegTypeLib( { res= LoadTypeLib(bstr, ppTLib); SysFreeString(bstr); + + if (*ppTLib) + { + TLIBATTR *attr; + + res = ITypeLib_GetLibAttr(*ppTLib, &attr); + if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + { + ITypeLib_ReleaseTLibAttr(*ppTLib, attr); + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } + } } TRACE("(IID: %s) load %s (%p)\n",debugstr_guid(rguid), SUCCEEDED(res)? "SUCCESS":"FAILED", *ppTLib);

1 0

Michael Stefaniuc : user32: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 7c7fa1051c31b93729c5d299a96b9ee8d83be312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7fa1051c31b93729c5d299a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:25:02 2013 +0200 user32: Avoid using CONST. --- dlls/user32/dde_misc.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/tests/resource.c | 2 +- dlls/user32/winproc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 724c074..ddbfa86 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -241,7 +241,7 @@ BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer) * DdeSetQualityOfService (USER32.@) */ -BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, +BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, const SECURITY_QUALITY_OF_SERVICE *pqosNew, PSECURITY_QUALITY_OF_SERVICE pqosPrev) { FIXME("(%p %p %p): stub\n", hwndClient, pqosNew, pqosPrev); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27e3441..b6720fb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4080,7 +4080,7 @@ BOOL WINAPI WaitMessage(void) /*********************************************************************** * MsgWaitForMultipleObjectsEx (USER32.@) */ -DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, +DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, DWORD timeout, DWORD mask, DWORD flags ) { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; @@ -4114,7 +4114,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, CONST HANDLE *pHandles, /*********************************************************************** * MsgWaitForMultipleObjects (USER32.@) */ -DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, CONST HANDLE *handles, +DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOL wait_all, DWORD timeout, DWORD mask ) { return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask, diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 346cc2a..6b89ef7 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -331,7 +331,7 @@ static void test_accel2(void) } static void test_PrivateExtractIcons(void) { - CONST CHAR szShell32Dll[] = "shell32.dll"; + const CHAR szShell32Dll[] = "shell32.dll"; HICON ahIcon[256]; UINT aIconId[256]; UINT cIcons, cIcons2; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index ebccbe4..57adfc2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1122,7 +1122,7 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.static_proc( hwnd, msg, wParam, lParam, TRUE ); } -static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) +static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution();

1 0

Michael Stefaniuc : winex11.drv: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 5fd4f943dcfa5a3e2df09f77c62d0971f170900a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd4f943dcfa5a3e2df09f77c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:27:27 2013 +0200 winex11.drv: Avoid using CONST. --- dlls/winex11.drv/ime.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 6a99c24..2822f3e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -610,8 +610,7 @@ LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData) return 0; } -BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, - CONST LPBYTE lpbKeyState) +BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) { /* See the comment at the head of this file */ TRACE("We do no processing via this route\n"); @@ -661,9 +660,8 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag) return TRUE; } -UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, - CONST LPBYTE lpbKeyState, LPDWORD lpdwTransKey, - UINT fuState, HIMC hIMC) +UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, + LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) { /* See the comment at the head of this file */ TRACE("We do no processing via this route\n");

1 0

Michael Stefaniuc : winemac.drv: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 3a13dc5995fe3d94f12bb794913b3ad290eb9a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a13dc5995fe3d94f12bb7949… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:26:34 2013 +0200 winemac.drv: Avoid using CONST. --- dlls/winemac.drv/ime.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index bed094d..5fca8fe 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -613,7 +613,7 @@ LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData) return 0; } -BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, CONST LPBYTE lpbKeyState) +BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) { LPINPUTCONTEXT lpIMC; BOOL inIME; @@ -700,7 +700,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) return TRUE; } -UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, CONST LPBYTE lpbKeyState, +UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) { UINT vkey;

1 0

Michael Stefaniuc : shell32: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 787bc8719a7a14f71a414b018b793cd7d7a56a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=787bc8719a7a14f71a414b018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:28:44 2013 +0200 shell32: Avoid using CONST. --- dlls/shell32/shellord.c | 8 ++------ dlls/shell32/undocshell.h | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 31891e4..8da849f 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -596,12 +596,8 @@ HRESULT WINAPI SHDoDragDrop( * ArrangeWindows [SHELL32.184] * */ -WORD WINAPI ArrangeWindows( - HWND hwndParent, - DWORD dwReserved, - LPCRECT lpRect, - WORD cKids, - CONST HWND * lpKids) +WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, + WORD cKids, const HWND *lpKids) { FIXME("(%p 0x%08x %p 0x%04x %p):stub.\n", hwndParent, dwReserved, lpRect, cKids, lpKids); diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index fa0ac05..3f3372a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -486,12 +486,8 @@ BOOL WINAPI SHWaitForFileToOpen( DWORD dwFlags, DWORD dwTimeout); -WORD WINAPI ArrangeWindows( - HWND hwndParent, - DWORD dwReserved, - LPCRECT lpRect, - WORD cKids, - CONST HWND * lpKids); +WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, + WORD cKids, const HWND *lpKids); /* RegisterShellHook types */ #define RSH_DEREGISTER 0

1 0

Michael Stefaniuc : windowscodecs: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: b08869420a3dd602b2c479f1ccd4d8b4dd45829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08869420a3dd602b2c479f1c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:31:50 2013 +0200 windowscodecs: Avoid using CONST. --- dlls/windowscodecs/regsvr.c | 90 +++++++++++++++++++++--------------------- 1 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b08869420a3dd602b2c47…

1 0

Jacek Caban : appwiz.cpl: Use asynchronous binding instead of separated thread to download addons.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: c9cef7153cbb5ee6d8962d592d3cf9ada09d06fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cef7153cbb5ee6d8962d592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 24 14:04:21 2013 +0200 appwiz.cpl: Use asynchronous binding instead of separated thread to download addons. --- dlls/appwiz.cpl/addons.c | 103 +++++++++++++++++++++++++++------------------ dlls/appwiz.cpl/appwiz.h | 18 ++++++++ 2 files changed, 80 insertions(+), 41 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b278a4a..d97e774 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -48,7 +48,6 @@ #include "res.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); @@ -107,6 +106,7 @@ static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; static IBinding *dwl_binding; +static WCHAR *msi_file; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; @@ -134,9 +134,11 @@ static BOOL sha_check(const WCHAR *file_name) SHA_CTX ctx; DWORD size, i; - file = CreateFileW(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - if(file == INVALID_HANDLE_VALUE) + file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) { + WARN("Could not open file: %u\n", GetLastError()); return FALSE; + } size = GetFileSize(file, NULL); @@ -186,8 +188,6 @@ static enum install_res install_file(const WCHAR *file_name) { ULONG res; - EnableWindow(GetDlgItem(install_dialog, IDCANCEL), 0); - res = MsiInstallProductW(file_name, NULL); if(res != ERROR_SUCCESS) { ERR("MsiInstallProduct failed: %u\n", res); @@ -488,23 +488,57 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, return S_OK; } + if(!msi_file) { + ERR("No MSI file\n"); + return E_FAIL; + } + set_status(IDS_INSTALLING); + EnableWindow(GetDlgItem(install_dialog, IDCANCEL), 0); + + if(sha_check(msi_file)) { + WCHAR *cache_file_name; + + install_file(msi_file); + + cache_file_name = get_cache_file_name(TRUE); + if(cache_file_name) { + MoveFileW(msi_file, cache_file_name); + heap_free(cache_file_name); + } + }else { + WCHAR message[256]; + + if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + } + + DeleteFileW(msi_file); + heap_free(msi_file); + msi_file = NULL; + + EndDialog(install_dialog, 0); return S_OK; } static HRESULT WINAPI InstallCallback_GetBindInfo(IBindStatusCallback *iface, DWORD* grfBINDF, BINDINFO* pbindinfo) { - /* FIXME */ - *grfBINDF = 0; + TRACE("()\n"); + + *grfBINDF = BINDF_ASYNCHRONOUS; return S_OK; } static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { - ERR("\n"); - return E_NOTIMPL; + if(!msi_file) { + msi_file = heap_strdupW(pstgmed->u.lpszFileName); + TRACE("got file name %s\n", debugstr_w(msi_file)); + } + + return S_OK; } static HRESULT WINAPI InstallCallback_OnObjectAvailable(IBindStatusCallback *iface, @@ -578,42 +612,29 @@ found: return url; } -static DWORD WINAPI download_proc(PVOID arg) +static BOOL start_download(void) { - WCHAR tmp_dir[MAX_PATH], tmp_file[MAX_PATH]; + IBindCtx *bind_ctx; + IMoniker *mon; + IUnknown *tmp; HRESULT hres; - GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir); - GetTempFileNameW(tmp_dir, NULL, 0, tmp_file); - - TRACE("using temp file %s\n", debugstr_w(tmp_file)); - - hres = URLDownloadToFileW(NULL, url, tmp_file, 0, &InstallCallback); - if(FAILED(hres)) { - ERR("URLDownloadToFile failed: %08x\n", hres); - return 0; - } - - if(sha_check(tmp_file)) { - WCHAR *cache_file_name; - - install_file(tmp_file); - - cache_file_name = get_cache_file_name(TRUE); - if(cache_file_name) { - MoveFileW(tmp_file, cache_file_name); - heap_free(cache_file_name); - } - }else { - WCHAR message[256]; + hres = CreateURLMoniker(NULL, url, &mon); + if(FAILED(hres)) + return FALSE; - if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) - MessageBoxW(NULL, message, NULL, MB_ICONERROR); + hres = CreateAsyncBindCtx(0, &InstallCallback, NULL, &bind_ctx); + if(SUCCEEDED(hres)) { + hres = IMoniker_BindToStorage(mon, bind_ctx, NULL, &IID_IUnknown, (void**)&tmp); + IBindCtx_Release(bind_ctx); } + IMoniker_Release(mon); + if(FAILED(hres)) + return FALSE; - DeleteFileW(tmp_file); - EndDialog(install_dialog, 0); - return 0; + if(tmp) + IUnknown_Release(tmp); + return TRUE; } static void run_winebrowser(const WCHAR *url) @@ -683,8 +704,8 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case ID_DWL_INSTALL: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); - CloseHandle( CreateThread(NULL, 0, download_proc, NULL, 0, NULL)); - return FALSE; + if(!start_download()) + EndDialog(install_dialog, 0); } } diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 12c2126..77636ae 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + typedef enum { ADDON_GECKO, ADDON_MONO @@ -40,6 +42,22 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret; + + if(str) { + size_t size = strlenW(str)+1; + ret = heap_alloc(size*sizeof(WCHAR)); + if(ret) + memcpy(ret, str, size*sizeof(WCHAR)); + }else { + ret = NULL; + } + + return ret; +} + static inline WCHAR *heap_strdupAtoW(const char *str) { WCHAR *ret = NULL;

1 0

Piotr Caban : msvcp80: Make it possible to shrink allocated memory in basic_string::reserve.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 69677bda344f24c0e1dc8048d24632e2722c7b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69677bda344f24c0e1dc8048d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:48:44 2013 +0200 msvcp80: Make it possible to shrink allocated memory in basic_string::reserve. --- dlls/msvcp80/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/string.c b/dlls/msvcp80/string.c index aeb19b0..83dceac 100644 --- a/dlls/msvcp80/string.c +++ b/dlls/msvcp80/string.c @@ -916,8 +916,8 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_s if(len > size) return; - basic_string_char_grow(this, size, FALSE); - basic_string_char_eos(this, len); + if(basic_string_char_grow(this, size, TRUE)) + basic_string_char_eos(this, len); } /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ @@ -2767,8 +2767,8 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP if(len > size) return; - basic_string_wchar_grow(this, size, FALSE); - basic_string_wchar_eos(this, len); + if(basic_string_wchar_grow(this, size, TRUE)) + basic_string_wchar_eos(this, len); } /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */

1 0

Piotr Caban : msvcp80: Fix default constructor closures arguments.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 459920a54d65f895a4da8d2e88c912f8b2181421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459920a54d65f895a4da8d2e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:49:11 2013 +0200 msvcp80: Fix default constructor closures arguments. --- dlls/msvcp80/ios.c | 54 ++++++++++++++++++++++---------------------- dlls/msvcp80/msvcp80.spec | 36 +++++++++++++++--------------- 2 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=459920a54d65f895a4da8…

1 0

Piotr Caban : msvcp80: Add ostream::operator<<(unsigned short) implementation.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 435cf5cebc82ebff92fa0167c18b80fdcc9b8542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435cf5cebc82ebff92fa0167c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:49:23 2013 +0200 msvcp80: Add ostream::operator<<(unsigned short) implementation. --- dlls/msvcp80/ios.c | 26 ++++++++++++++++++++------ dlls/msvcp80/msvcp80.spec | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/ios.c b/dlls/msvcp80/ios.c index de0033d..9cdaf1d 100644 --- a/dlls/msvcp80/ios.c +++ b/dlls/msvcp80/ios.c @@ -6540,19 +6540,15 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_short(basic_ostream_wc basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } -/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)G@Z */ -/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)G@Z */ -DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_print_ushort, 8) -basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ushort(basic_ostream_wchar *this, unsigned short val) +static basic_ostream_wchar* basic_ostream_print_ushort(basic_ostream_wchar *this, unsigned short val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); int state = IOSTATE_goodbit; - TRACE("(%p %u)\n", this, val); + TRACE("(%p %d)\n", this, val); if(basic_ostream_wchar_sentry_create(this)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - const num_put *numput = num_put_wchar_use_facet(strbuf->loc); ostreambuf_iterator_wchar dest = {0, strbuf}; num_put_wchar_put_ulong(numput, &dest, dest, &base->base, basic_ios_wchar_fill_get(base), val); @@ -6563,6 +6559,24 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ushort(basic_ostream_w return this; } +/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)G@Z */ +/* ??6?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)G@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_print_ushort, 8) +basic_ostream_wchar* __thiscall basic_ostream_wchar_print_ushort(basic_ostream_wchar *this, unsigned short val) +{ + return basic_ostream_print_ushort(this, val, num_put_wchar_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); +} + +/* ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)G@Z */ +/* ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)G@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_ushort, 8) +basic_ostream_wchar* __thiscall basic_ostream_short_print_ushort(basic_ostream_wchar *this, unsigned short val) +{ + return basic_ostream_print_ushort(this, val, num_put_short_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); +} + static basic_ostream_wchar* basic_ostream_print_int(basic_ostream_wchar *this, int val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 0a913ef..64e25b7 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -1606,8 +1606,8 @@ @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)_N@Z(ptr long) basic_ostream_char_print_bool @ thiscall -arch=i386 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)F@Z(ptr long) basic_ostream_short_print_short @ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)F@Z(ptr long) basic_ostream_short_print_short -@ stub -arch=win32 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)G@Z -@ stub -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)G@Z +@ thiscall -arch=win32 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)G@Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)G@Z(ptr long) basic_ostream_short_print_ushort @ thiscall -arch=i386 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)H@Z(ptr long) basic_ostream_short_print_int @ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)H@Z(ptr long) basic_ostream_short_print_int @ thiscall -arch=i386 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)I@Z(ptr long) basic_ostream_short_print_uint

1 0