August 2016 - Wine-Commits - list.winehq.org

Daniel Lehman : msvcr120: Add forwards for wcstoll and wcstoll_l.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: beb94094d03ab533f20e0a9aab6df6966e0b5b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb94094d03ab533f20e0a9aa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 11 08:22:41 2016 +0200 msvcr120: Add forwards for wcstoll and wcstoll_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index e2b5ab9..29b7a4c 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -57,7 +57,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) ucrtbase._wcstoui64 @@ -110,7 +110,7 @@ @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s @ cdecl wcstoul(wstr ptr long) ucrtbase.wcstoul diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0ac1de8..f65d150 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1894,7 +1894,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @@ -2476,7 +2476,7 @@ @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 99e1fa9..de68b87 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1587,7 +1587,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcr120._wcstoui64 @@ -2138,7 +2138,7 @@ @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcr120.wcstoul diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7582ba9..bb18d4f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2043,7 +2043,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @@ -2583,7 +2583,7 @@ @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul

1 0

Daniel Lehman : msvcp110: Use sentry in istream<>::tellg.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 3888aa4d8d406fce2c63b79e4e8fe164cd549a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3888aa4d8d406fce2c63b79e4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 13:24:21 2016 -0700 msvcp110: Use sentry in istream<>::tellg. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fbbb320..6b9a820 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8746,6 +8746,20 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int TRACE("(%p %p)\n", this, ret); +#if _MSVCP_VER >= 110 + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), + ret, 0, SEEKDIR_cur, OPENMODE_in); + + if(ret->off==-1 && ret->pos==0 && ret->state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + }else { + ret->off = -1; + ret->pos = 0; + ret->state = 0; + } + basic_istream_char_sentry_destroy(this); +#else if(ios_base_fail(&base->base)) { ret->off = -1; ret->pos = 0; @@ -8758,6 +8772,7 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_char_setstate(base, IOSTATE_failbit); +#endif return ret; } @@ -10270,6 +10285,20 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i TRACE("(%p %p)\n", this, ret); +#if _MSVCP_VER >= 110 + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), + ret, 0, SEEKDIR_cur, OPENMODE_in); + + if(ret->off==-1 && ret->pos==0 && ret->state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + }else { + ret->off = -1; + ret->pos = 0; + ret->state = 0; + } + basic_istream_wchar_sentry_destroy(this); +#else if(ios_base_fail(&base->base)) { ret->off = -1; ret->pos = 0; @@ -10281,7 +10310,7 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i ret, 0, SEEKDIR_cur, OPENMODE_in); if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); - +#endif return ret; }

1 0

Sebastian Lackner : services: Remove service_terminate function.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: cafcf6448fcd0099c08565d28ff3f6afdf4a1209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafcf6448fcd0099c08565d28… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 07:22:27 2016 +0200 services: Remove service_terminate function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 3 ++- programs/services/services.c | 19 ++----------------- programs/services/services.h | 1 - 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 228371c..45366fb 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1137,7 +1137,8 @@ DWORD __cdecl svcctl_ControlService( if (result == ERROR_SUCCESS && service->service_entry->force_shutdown) { result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; - service_terminate(service->service_entry); + if ((process = service->service_entry->process)) + process_terminate(process); } if (result != ERROR_SUCCESS) diff --git a/programs/services/services.c b/programs/services/services.c index feb137d..b0d008d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -787,7 +787,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p if (!r) { err = GetLastError(); - service_terminate(service_entry); + process_terminate(process); return err; } @@ -915,7 +915,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err == ERROR_SUCCESS) ReleaseMutex(process->control_mutex); else - service_terminate(service); + process_terminate(process); } scmdatabase_unlock_startup(service->db); @@ -925,21 +925,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return err; } -void service_terminate(struct service_entry *service) -{ - struct process_entry *process; - - service_lock(service); - if ((process = service->process)) - { - TerminateProcess(process->process, 0); - release_process(process); - service->process = NULL; - } - service->status.dwCurrentState = SERVICE_STOPPED; - service_unlock(service); -} - void process_terminate(struct process_entry *process) { struct scmdatabase *db = process->db; diff --git a/programs/services/services.h b/programs/services/services.h index 778b30a..16f99f89 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,7 +88,6 @@ void release_service(struct service_entry *service); void service_lock(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); -void service_terminate(struct service_entry *service); /* Process functions */

1 0

Nikolay Sivov : setupapi: Added CM_Get_Version().
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: af533d1eebd382d7ee72eaaef1cf7461356da9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af533d1eebd382d7ee72eaaef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:30:51 2016 +0300 setupapi: Added CM_Get_Version(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/misc.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 90a05ab..116180c 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -114,7 +114,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index de73966..98a6ed7 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1751,3 +1751,12 @@ BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) HeapFree(GetProcessHeap(), 0, msg); return ret; } + +/*********************************************************************** + * CM_Get_Version (SETUPAPI.@) + */ +WORD WINAPI CM_Get_Version(void) +{ + TRACE("()\n"); + return 0x0400; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 897572d..cc873ae 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -125,7 +125,7 @@ @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling @ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version +@ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 09e0fb8..04b2171 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "winreg.h" #include "setupapi.h" +#include "cfgmgr32.h" #include "wine/test.h" @@ -816,6 +817,14 @@ static void test_SetupLogError(void) SetupCloseLog(); } +static void test_CM_Get_Version(void) +{ + WORD ret; + + ret = CM_Get_Version(); + ok(ret == 0x0400, "got version %#x\n", ret); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -849,4 +858,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); + test_CM_Get_Version(); } diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index e3966f9..7dc31e1 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -192,6 +192,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode)

1 0

Hugh McMaster : wineconsole: Add 'PopupColors' support to the registry.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: b9a79c095e3410ada90d4f04308d97aa9e4e43cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a79c095e3410ada90d4f043… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:45 2016 +0000 wineconsole: Add 'PopupColors' support to the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 20 +++++++++++++++----- programs/wineconsole/winecon_private.h | 3 ++- programs/wineconsole/wineconsole.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index f5fa433..e537a86 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -44,6 +44,7 @@ static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u' static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0}; static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0}; static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0}; +static const WCHAR wszPopupColors[] = {'P','o','p','u','p','C','o','l','o','r','s',0}; static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0}; static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0}; static const WCHAR wszScreenColors[] = {'S','c','r','e','e','n','C','o','l','o','r','s',0}; @@ -55,12 +56,13 @@ static const WCHAR color_name_fmt[] = {'%','s','%','0','2','d',0}; void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x pop-up=%02x font=%s/%u hist=%u/%d flags=%c%c%c " + "msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, - wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, - cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', - cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, - cfg->edition_mode, + cfg->popup_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, + cfg->history_nodup ? 1 : 2, cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', + cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, + cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, wine_dbgstr_w(cfg->registry)); } @@ -149,6 +151,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) cfg->menu_mask = val; count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszPopupColors, 0, &type, (LPBYTE)&val, &count)) + cfg->popup_attr = val; + + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszQuickEdit, 0, &type, (LPBYTE)&val, &count)) cfg->quick_edit = val; @@ -209,6 +215,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->history_nodup = 0; cfg->insert_mode = 1; cfg->menu_mask = 0; + cfg->popup_attr = 0xF5; cfg->quick_edit = 0; cfg->sb_height = 25; cfg->sb_width = 80; @@ -293,6 +300,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) val = cfg->menu_mask; RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->popup_attr; + RegSetValueExW(hConKey, wszPopupColors, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->quick_edit; RegSetValueExW(hConKey, wszQuickEdit, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 7236879..d556299 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -32,7 +32,8 @@ struct config_data { unsigned cell_height; /* height in pixels of a character */ int cursor_size; /* in % of cell height */ int cursor_visible; - DWORD def_attr; + DWORD def_attr; /* default fill attributes (screen colors) */ + DWORD popup_attr; /* pop-up color attributes */ WCHAR face_name[32]; /* name of font (size is LF_FACESIZE) */ DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index b9da7b6..babc3ef 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -214,13 +214,14 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) /****************************************************************** * WINECON_SetColors * - * + * Sets ColorTable and Pop-up menu colors */ static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) { size_t color_map_size = sizeof(data->curcfg.color_map); memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + data->curcfg.popup_attr = cfg->popup_attr; SERVER_START_REQ( set_console_output_info ) {

1 0

Hugh McMaster : server: Get and set the console color table.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 2d7c73d802f7a8c09cf8896609c1c8c66acb1bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7c73d802f7a8c09cf889660… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:34 2016 +0000 server: Get and set the console color table. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 5 ++++- programs/wineconsole/wineconsole.c | 23 ++++++++++++++++++++++- server/console.c | 9 +++++++++ server/protocol.def | 3 +++ server/trace.c | 20 ++++++++++++++------ 5 files changed, 52 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b221570..5a6e277 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1947,6 +1947,7 @@ struct set_console_output_info_request short int max_height; short int font_width; short int font_height; + /* VARARG(colors,uints); */ char __pad_50[6]; }; struct set_console_output_info_reply @@ -1960,6 +1961,7 @@ struct set_console_output_info_reply #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x80 @@ -1986,6 +1988,7 @@ struct get_console_output_info_reply short int max_height; short int font_width; short int font_height; + /* VARARG(colors,uints); */ char __pad_38[2]; }; @@ -6245,6 +6248,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 507 +#define SERVER_PROTOCOL_VERSION 508 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e5e2823..b9da7b6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -212,6 +212,27 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) } /****************************************************************** + * WINECON_SetColors + * + * + */ +static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) +{ + size_t color_map_size = sizeof(data->curcfg.color_map); + + memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + + SERVER_START_REQ( set_console_output_info ) + { + req->handle = wine_server_obj_handle( data->hConOut ); + req->mask = SET_CONSOLE_OUTPUT_INFO_COLORTABLE; + wine_server_add_data( req, cfg->color_map, color_map_size ); + wine_server_call( req ); + } + SERVER_END_REQ; +} + +/****************************************************************** * WINECON_GrabChanges * * A change occurs, try to figure out which @@ -449,6 +470,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); SetConsoleTextAttribute(data->hConOut, cfg->def_attr); } + WINECON_SetColors(data, cfg); /* now let's look at the window / sb size changes... * since the server checks that sb is always bigger than window, * we have to take care of doing the operations in the right order @@ -703,7 +725,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* fall through */ case init_success: WINECON_GetServerConfig(data); - memcpy(data->curcfg.color_map, cfg.color_map, sizeof(data->curcfg.color_map)); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n"); diff --git a/server/console.c b/server/console.c index 93f785a..ab764dc 100644 --- a/server/console.c +++ b/server/console.c @@ -147,6 +147,7 @@ struct screen_buffer int max_height; char_info_t *data; /* the data for each cell - a width x height matrix */ unsigned short attr; /* default attribute for screen buffer */ + unsigned int color_map[16]; /* color table */ rectangle_t win; /* current visible window on the screen buffer * * as seen in wineconsole */ struct font_info font; /* console font information */ @@ -426,6 +427,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->data = NULL; screen_buffer->font.width = 0; screen_buffer->font.height = 0; + memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); if (fd == -1) @@ -1032,6 +1034,11 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, screen_buffer->font.width = req->font_width; screen_buffer->font.height = req->font_height; } + if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) + { + memcpy( screen_buffer->color_map, get_req_data(), + min( sizeof(screen_buffer->color_map), get_req_data_size() )); + } return 1; } @@ -1690,6 +1697,8 @@ DECL_HANDLER(get_console_output_info) reply->max_height = screen_buffer->max_height; reply->font_width = screen_buffer->font.width; reply->font_height = screen_buffer->font.height; + set_reply_data( screen_buffer->color_map, + min( sizeof(screen_buffer->color_map), get_reply_max_size() )); release_object( screen_buffer ); } } diff --git a/server/protocol.def b/server/protocol.def index 5917212..c11b679 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1537,6 +1537,7 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + VARARG(colors,uints); /* color table */ @END #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x01 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x02 @@ -1545,6 +1546,7 @@ struct console_renderer_event #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x80 /* Get info about a console (output only) */ @@ -1566,6 +1568,7 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + VARARG(colors,uints); /* color table */ @END /* Add input records to a console input queue */ diff --git a/server/trace.c b/server/trace.c index 9e64b4c..d17564f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -58,9 +58,9 @@ static inline void remove_data( data_size_t size ) cur_size -= size; } -static void dump_uints( const int *ptr, int len ) +static void dump_uints( const char *prefix, const unsigned int *ptr, int len ) { - fputc( '{', stderr ); + fprintf( stderr, "%s{", prefix ); while (len > 0) { fprintf( stderr, "%08x", *ptr++ ); @@ -407,6 +407,14 @@ static void dump_varargs_ints( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_uints( const char *prefix, data_size_t size ) +{ + const unsigned int *data = cur_data; + + dump_uints( prefix, data, size / sizeof(*data) ); + remove_data( size ); +} + static void dump_varargs_uints64( const char *prefix, data_size_t size ) { const unsigned __int64 *data = cur_data; @@ -574,10 +582,8 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) - { - fprintf( stderr, ",extended=" ); - dump_uints( (const int *)ctx.ext.i386_regs, sizeof(ctx.ext.i386_regs) / sizeof(int) ); - } + dump_uints( ",extended=", (const unsigned int *)ctx.ext.i386_regs, + sizeof(ctx.ext.i386_regs) / sizeof(int) ); break; case CPU_x86_64: if (ctx.flags & SERVER_CTX_CONTROL) @@ -2035,6 +2041,7 @@ static void dump_set_console_output_info_request( const struct set_console_outpu fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); + dump_varargs_uints( ", colors=", cur_size ); } static void dump_get_console_output_info_request( const struct get_console_output_info_request *req ) @@ -2059,6 +2066,7 @@ static void dump_get_console_output_info_reply( const struct get_console_output_ fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); + dump_varargs_uints( ", colors=", cur_size ); } static void dump_write_console_input_request( const struct write_console_input_request *req )

1 0

Pierre Schweitzer : mpr: Implement local name automatic redirection for disks.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: b452e6285915b1ad46920fc8551335ab28bfb4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b452e6285915b1ad46920fc85… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Aug 10 11:43:46 2016 +0200 mpr: Implement local name automatic redirection for disks. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 71 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 0d4209c..50d3d83 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1581,18 +1581,18 @@ struct use_connection_context void *accessname; DWORD *buffer_size; DWORD *result; - DWORD (*pre_set_accessname)(struct use_connection_context*); - void (*set_accessname)(struct use_connection_context*); + DWORD (*pre_set_accessname)(struct use_connection_context*, WCHAR *); + void (*set_accessname)(struct use_connection_context*, WCHAR *); }; -static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resource->lpLocalName) - len = strlenW(ctxt->resource->lpLocalName); + if (local_name) + len = strlenW(local_name); else len = strlenW(ctxt->resource->lpRemoteName); @@ -1608,11 +1608,11 @@ static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *c return ERROR_SUCCESS; } -static void use_connection_set_accessnameW(struct use_connection_context *ctxt) +static void use_connection_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { WCHAR *accessname = ctxt->accessname; - if (ctxt->resource->lpLocalName) - strcpyW(accessname, ctxt->resource->lpLocalName); + if (local_name) + strcpyW(accessname, local_name); else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1621,29 +1621,42 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; DWORD index, ret, caps; + BOOL redirect = FALSE; + WCHAR letter[3] = {'Z', ':', 0}; + NETRESOURCEW netres; if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; if (!ctxt->resource) return ERROR_INVALID_PARAMETER; + netres = *ctxt->resource; - if (!ctxt->resource->lpProvider) + if (!netres.lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) { - FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; + if (netres.dwType != RESOURCETYPE_DISK && netres.dwType != RESOURCETYPE_PRINT) + return ERROR_BAD_DEV_TYPE; + + if (netres.dwType == RESOURCETYPE_PRINT) + { + FIXME("Local device selection is not implemented for printers.\n"); + return WN_NO_NETWORK; + } + + redirect = TRUE; + netres.lpLocalName = letter; } - if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) + if (!netres.lpProvider) { - FIXME("Locale device selection is not implemented.\n"); + FIXME("Networking provider selection is not implemented.\n"); return WN_NO_NETWORK; } if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(ctxt->resource->lpProvider); + index = _findProviderIndexW(netres.lpProvider); if (index == BAD_PROVIDER_INDEX) return ERROR_BAD_PROVIDER; @@ -1652,17 +1665,23 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) return ERROR_BAD_PROVIDER; - if ((ret = ctxt->pre_set_accessname(ctxt))) + if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) return ret; ret = WN_ACCESS_DENIED; - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); + + if (ret != NO_ERROR && redirect) + letter[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'C'); if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt); + ctxt->set_accessname(ctxt, netres.lpLocalName); return ret; } @@ -1694,14 +1713,14 @@ DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR return wnet_use_connection(&ctxt); } -static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resourceA->lpLocalName) - len = strlen(ctxt->resourceA->lpLocalName); + if (local_name) + len = WideCharToMultiByte(CP_ACP, 0, local_name, -1, NULL, 0, NULL, NULL) - 1; else len = strlen(ctxt->resourceA->lpRemoteName); @@ -1717,11 +1736,11 @@ static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *c return ERROR_SUCCESS; } -static void use_connection_set_accessnameA(struct use_connection_context *ctxt) +static void use_connection_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { char *accessname = ctxt->accessname; - if (ctxt->resourceA->lpLocalName) - strcpy(accessname, ctxt->resourceA->lpLocalName); + if (local_name) + WideCharToMultiByte(CP_ACP, 0, local_name, -1, accessname, *ctxt->buffer_size, NULL, NULL); else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

1 0

Michael Stefaniuc : avifil32: Avoid a cast from a COM object to an iface.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: b7b031aa431076b5e47e834fb4d412628f8ffa61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b031aa431076b5e47e834fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:49:26 2016 +0200 avifil32: Avoid a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/getframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 46b1683..c8580a8 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -504,7 +504,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) IAVIStream_AddRef(pStream); } - return (PGETFRAME)pg; + return &pg->IGetFrame_iface; } /***********************************************************************/

1 0

Sebastian Lackner : configure: Explicitly check for sysinfo function.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 9815806f16441004b87b11e3c0bbc190e9011044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9815806f16441004b87b11e3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 08:34:21 2016 +0200 configure: Explicitly check for sysinfo function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/virtual.c | 4 ++-- include/config.h.in | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b8eedc5..bf4d1a7 100755 --- a/configure +++ b/configure @@ -15133,6 +15133,7 @@ for ac_func in \ strtoll \ strtoull \ symlink \ + sysinfo \ tcdrain \ thr_kill2 \ timegm \ diff --git a/configure.ac b/configure.ac index f5dde04..0fad32f 100644 --- a/configure.ac +++ b/configure.ac @@ -2039,6 +2039,7 @@ AC_CHECK_FUNCS(\ strtoll \ strtoull \ symlink \ + sysinfo \ tcdrain \ thr_kill2 \ timegm \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1312c8b..e826fa0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1359,7 +1359,7 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { -#ifdef HAVE_SYS_SYSINFO_H +#ifdef HAVE_SYSINFO struct sysinfo sinfo; #endif @@ -1368,7 +1368,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; -#ifdef HAVE_SYS_SYSINFO_H +#ifdef HAVE_SYSINFO if (!sysinfo(&sinfo)) { ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; diff --git a/include/config.h.in b/include/config.h.in index 64f56fd..6acafca 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1008,6 +1008,9 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define to 1 if you have the `sysinfo' function. */ +#undef HAVE_SYSINFO + /* Define to 1 if you have the <sys/asoundlib.h> header file. */ #undef HAVE_SYS_ASOUNDLIB_H

1 0

Daniel Lehman : msvcp140: Forward __ExceptionPtr* to msvcr120.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 4686a5ee59f91e1033daeeb5bc5d5f5121a8075e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686a5ee59f91e1033daeeb5b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jun 16 16:38:08 2016 -0700 msvcp140: Forward __ExceptionPtr* to msvcr120. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6e17e0d..f5a0838 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1693,22 +1693,22 @@ @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z @ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z -@ stub -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z -@ stub -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z -@ stub -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z -@ stub -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z -@ stub -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z -@ stub -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPAX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv

1 0