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

Alexandre Julliard : user32/tests: Add some cross-process clipboard tests.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2e6fc893956c820a005b910665c5b22f0a90f1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6fc893956c820a005b91066… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 19:01:25 2016 +0900 user32/tests: Add some cross-process clipboard tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 138 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 625d550..d218941 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "wine/test.h" #include "winbase.h" #include "winerror.h" @@ -28,6 +29,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); static int thread_from_line; +static char *argv0; static DWORD WINAPI open_clipboard_thread(LPVOID arg) { @@ -80,6 +82,32 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) return 0; } +static void set_clipboard_data_process( int arg ) +{ + HANDLE ret; + + SetLastError( 0xdeadbeef ); + if (arg) + { + todo_wine_if( arg == 1 || arg == 3 ) + ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + todo_wine_if( arg == 2 || arg == 4 ) + ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); + } + else + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + arg, GetLastError()); + todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( !ret, "process %u: SetClipboardData succeeded\n", arg ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + arg, GetLastError()); + } +} + static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { DWORD ret; @@ -102,6 +130,23 @@ static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) CloseHandle(thread); } +static void run_process( const char *args ) +{ + char cmd[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + + sprintf( cmd, "%s clipboard %s", argv0, args ); + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + ok( CreateProcessA( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess %s failed\n", cmd ); + + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hProcess ); + CloseHandle( info.hThread ); +} + static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -137,6 +182,7 @@ static void test_ClipboardOwner(void) run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -152,6 +198,7 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + run_process( "set_clipboard_data 1" ); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -170,6 +217,7 @@ static void test_ClipboardOwner(void) ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + run_process( "set_clipboard_data 2" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -191,6 +239,7 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + run_process( "set_clipboard_data 3" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -199,6 +248,7 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + run_process( "set_clipboard_data 4" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); ret = CloseClipboard(); @@ -795,8 +845,56 @@ static DWORD WINAPI test_handles_thread( void *arg ) return 0; } +static DWORD WINAPI test_handles_thread2( void *arg ) +{ + BOOL r; + HANDLE h; + char *ptr; + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + h = GetClipboardData( format_id ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + return 0; +} + +static void test_handles_process( const char *str ) +{ + BOOL r; + HANDLE h; + char *ptr; + + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + h = GetClipboardData( format_id ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + static void test_data_handles(void) { + BOOL r; + HANDLE h; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -805,16 +903,56 @@ static void test_data_handles(void) test_handles( GetDesktopWindow() ); test_handles( hwnd ); run_thread( test_handles_thread, hwnd, __LINE__ ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + h = SetClipboardData( CF_TEXT, create_text() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( format_id, create_text() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + run_thread( test_handles_thread2, 0, __LINE__ ); + run_process( "handles test" ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = GetClipboardData( format_id ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + DestroyWindow( hwnd ); } START_TEST(clipboard) { + char **argv; + int argc = winetest_get_mainargs( &argv ); HMODULE mod = GetModuleHandleA( "user32" ); + argv0 = argv[0]; pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); + if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) + { + set_clipboard_data_process( atoi( argv[3] )); + return; + } + if (argc == 4 && !strcmp( argv[2], "handles" )) + { + test_handles_process( argv[3] ); + return; + } + test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

Sebastian Lackner : services: Add a grab_service function.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 46a974856fee148a1006478df1978a82153fb9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a974856fee148a1006478df… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:12:27 2016 +0200 services: Add a grab_service function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 +--- programs/services/services.c | 13 +++++++++---- programs/services/services.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 45366fb..eb8f4ff 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -373,9 +373,7 @@ DWORD __cdecl svcctl_OpenServiceW( return ERROR_INVALID_NAME; scmdatabase_lock(manager->db); - entry = scmdatabase_find_service(manager->db, lpServiceName); - if (entry != NULL) - InterlockedIncrement(&entry->ref_count); + entry = grab_service(scmdatabase_find_service(manager->db, lpServiceName)); scmdatabase_unlock(manager->db); if (entry == NULL) diff --git a/programs/services/services.c b/programs/services/services.c index f7a2725..9be9bb8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -346,15 +346,13 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) break; services_list = slist_new; } - services_list[i] = service; - InterlockedIncrement(&service->ref_count); - i++; + services_list[i++] = grab_service(service); } } + size = i; scmdatabase_unlock(db); - size = i; for (i = 0; i < size; i++) { DWORD err; @@ -494,6 +492,13 @@ void release_process(struct process_entry *process) scmdatabase_unlock(db); } +struct service_entry *grab_service(struct service_entry *service) +{ + if (service) + InterlockedIncrement(&service->ref_count); + return service; +} + void release_service(struct service_entry *service) { struct scmdatabase *db = service->db; diff --git a/programs/services/services.h b/programs/services/services.h index 16f99f89..59d8d00 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -84,6 +84,7 @@ BOOL validate_service_name(LPCWSTR name); BOOL validate_service_config(struct service_entry *entry); DWORD save_service_config(struct service_entry *entry); void free_service_entry(struct service_entry *entry); +struct service_entry *grab_service(struct service_entry *service); void release_service(struct service_entry *service); void service_lock(struct service_entry *service); void service_unlock(struct service_entry *service);

1 0

Sebastian Lackner : advapi32: Simplify RegisterServiceCtrlHandlerExW.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: f4590e91ebd1530dd04e81a9d724ce06cd1df2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4590e91ebd1530dd04e81a9d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:35:30 2016 +0200 advapi32: Simplify RegisterServiceCtrlHandlerExW. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 86bd713..ccca721 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2360,7 +2360,6 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam { service_data *service; SC_HANDLE hService = 0; - BOOL found = FALSE; TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); @@ -2370,12 +2369,10 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam service->handler = lpHandlerProc; service->context = lpContext; hService = service->handle; - found = TRUE; } LeaveCriticalSection( &service_cs ); - if (!found) SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - + if (!hService) SetLastError( ERROR_SERVICE_DOES_NOT_EXIST ); return (SERVICE_STATUS_HANDLE)hService; }

1 0

Sebastian Lackner : advapi32: Hold lock while processing service controls.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 63c36da6da2f1da6fc4b184b5101503ad2996f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c36da6da2f1da6fc4b184b5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:36:13 2016 +0200 advapi32: Hold lock while processing service controls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ccca721..11186c5 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -461,6 +461,8 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } } + EnterCriticalSection( &service_cs ); + /* validate service name */ name = (WCHAR *)data; if (!info.name_size || data_size < info.name_size * sizeof(WCHAR) || name[info.name_size - 1]) @@ -504,6 +506,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } done: + LeaveCriticalSection( &service_cs ); WriteFile( disp->pipe, &result, sizeof(result), &count, NULL ); heap_free( data ); }

1 0

Sebastian Lackner : advapi32: Hold lock while handling service thread shutdown.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 13bb213aeb65b657a57adbf486ddb73da78dffbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13bb213aeb65b657a57adbf48… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:36:59 2016 +0200 advapi32: Hold lock while handling service thread shutdown. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 11186c5..d6bd14c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -625,8 +625,11 @@ static BOOL service_run_main_thread(void) } else if (ret < n) { - services[wait_services[ret]]->thread = 0; - CloseHandle( wait_handles[ret] ); + i = wait_services[ret]; + EnterCriticalSection( &service_cs ); + CloseHandle( services[i]->thread ); + services[i]->thread = NULL; + LeaveCriticalSection( &service_cs ); } else return FALSE; }

1 0

Sebastian Lackner : advapi32: Do not stop service main thread as long as there are still running services.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2263baaf2e4d5e3325fb2339613a68a8a232923b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2263baaf2e4d5e3325fb23396… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:40:04 2016 +0200 advapi32: Do not stop service main thread as long as there are still running services. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index d6bd14c..cd3cd2f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -96,7 +96,7 @@ static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; static service_data **services; static unsigned int nb_services; static HANDLE service_event; -static HANDLE stop_event; +static BOOL stop_service; extern HANDLE CDECL __wine_make_process_system(void); @@ -546,22 +546,21 @@ static BOOL service_run_main_thread(void) } service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + stop_service = FALSE; /* FIXME: service_control_dispatcher should be merged into the main thread */ wait_handles[0] = __wine_make_process_system(); wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); wait_handles[2] = service_event; - wait_handles[3] = stop_event; TRACE("Starting %d services running as process %d\n", nb_services, GetCurrentProcessId()); /* wait for all the threads to pack up and exit */ - for (;;) + while (!stop_service) { EnterCriticalSection( &service_cs ); - for (i = 0, n = 4; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + for (i = 0, n = 3; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) { if (!services[i]->thread) continue; wait_services[n] = i; @@ -619,10 +618,6 @@ static BOOL service_run_main_thread(void) { continue; /* rebuild the list */ } - else if (ret == 3) - { - return TRUE; - } else if (ret < n) { i = wait_services[ret]; @@ -633,6 +628,8 @@ static BOOL service_run_main_thread(void) } else return FALSE; } + + return TRUE; } /****************************************************************************** @@ -810,9 +807,21 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) return FALSE; } - if (lpStatus->dwCurrentState == SERVICE_STOPPED) { - SetEvent(stop_event); - CloseServiceHandle((SC_HANDLE)hService); + if (lpStatus->dwCurrentState == SERVICE_STOPPED) + { + unsigned int i, count = 0; + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + if (services[i]->handle == (SC_HANDLE)hService) continue; + if (services[i]->thread) count++; + } + if (!count) + { + stop_service = TRUE; + SetEvent( service_event ); /* notify the main loop */ + } + LeaveCriticalSection( &service_cs ); } return TRUE;

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeOleObjectFromMoniker stub.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: c40001cdc44aad5d31ae2b3bd28c1d58f2234393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40001cdc44aad5d31ae2b3bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 15 20:53:45 2016 +0000 inetcomm: Add MimeOleObjectFromMoniker stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index bfd115c..439a409 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -82,7 +82,7 @@ @ stdcall MimeOleGetPropertySchema(ptr) @ stub MimeOleGetRelatedSection @ stub MimeOleInetDateToFileTime -@ stub MimeOleObjectFromMoniker +@ stdcall MimeOleObjectFromMoniker(long ptr ptr ptr ptr ptr) @ stub MimeOleOpenFileStream @ stub MimeOleParseMhtmlUrl @ stub MimeOleParseRfc822Address diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6046c74..e1e10bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3436,3 +3436,11 @@ HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type, return E_NOTIMPL; } + +HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx *binding, + REFIID riid, void **out, IMoniker **moniker_new) +{ + FIXME("(0x%08x, %p, %p, %s, %p, %p) stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); + + return E_NOTIMPL; +}

1 0

Daniel Lehman : ucrtbase: Add __stdio_common_vfwscanf.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 48340bd1fea772d0c3539edc693135ce800d4aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=48340bd1fea772d0c3539edc6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 14:02:16 2016 -0700 ucrtbase: Add __stdio_common_vfwscanf. 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> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index d52c0d4..0dc03b8 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -8,7 +8,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8c9cd87..579dec5 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -683,6 +683,23 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vfwscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, + MSVCRT_FILE *file, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options & ~UCRTBASE_SCANF_SECURECRT) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vfwscanf_s_l(file, format, locale, valist); + else + return MSVCRT_vfwscanf_l(file, format, locale, valist); +} + +/********************************************************************* * _snwscanf (MSVCRT.@) */ int CDECL MSVCRT__snwscanf(MSVCRT_wchar_t *input, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ed985d2..1adc80a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -153,7 +153,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf

1 0

Piotr Caban : msvcrt: Add _wcreate_locale.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: dd4c9358f672f878610f1dc11e3114c07d6b2385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4c9358f672f878610f1dc11… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 13:17:17 2016 +0200 msvcrt: Add _wcreate_locale. 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> --- .../api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 49 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 25 +++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index c7e5aae..60c588b 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp @ cdecl _unlock_locales() ucrtbase._unlock_locales -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) ucrtbase._wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv @ cdecl setlocale(long str) ucrtbase.setlocale diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5f33acf..1890a13 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1844,7 +1844,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 953cdba..66334d8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1862,7 +1862,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 25330f1..4ecea51 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -170,6 +170,8 @@ static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p__clearfp)(void); +static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); +static void (__cdecl *p_free_locale)(_locale_t); /* make sure we use the correct errno */ #undef errno @@ -215,6 +217,8 @@ static BOOL init(void) p_wcstof = (void*)GetProcAddress(module, "wcstof"); p_remainder = (void*)GetProcAddress(module, "remainder"); p_errno = (void*)GetProcAddress(module, "_errno"); + p_wcreate_locale = (void*)GetProcAddress(module, "_wcreate_locale"); + p_free_locale = (void*)GetProcAddress(module, "_free_locale"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -710,6 +714,50 @@ static void test_fegetenv(void) ok(!env.status, "env.status = %x\n", env.status); } +static void test__wcreate_locale(void) +{ + static const wchar_t c_locale[] = {'C',0}; + static const wchar_t bogus[] = {'b','o','g','u','s',0}; + static const wchar_t empty[] = {0}; + _locale_t lcl; + errno_t e; + + /* simple success */ + errno = -1; + lcl = p_wcreate_locale(LC_ALL, c_locale); + e = errno; + ok(!!lcl, "expected success, but got NULL\n"); + ok(errno == -1, "expected errno -1, but got %i\n", e); + p_free_locale(lcl); + + errno = -1; + lcl = p_wcreate_locale(LC_ALL, empty); + e = errno; + ok(!!lcl, "expected success, but got NULL\n"); + ok(errno == -1, "expected errno -1, but got %i\n", e); + p_free_locale(lcl); + + /* bogus category */ + errno = -1; + lcl = p_wcreate_locale(-1, c_locale); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); + + /* bogus names */ + errno = -1; + lcl = p_wcreate_locale(LC_ALL, bogus); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); + + errno = -1; + lcl = p_wcreate_locale(LC_ALL, NULL); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -724,4 +772,5 @@ START_TEST(msvcr120) test_remainder(); test_critical_section(); test_fegetenv(); + test__wcreate_locale(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c88cde0..6f0daca 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1555,7 +1555,7 @@ @ cdecl _wchmod(wstr long) msvcr120._wchmod @ extern _wcmdln msvcr120._wcmdln @ cdecl _wcreat(wstr long) msvcr120._wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) msvcr120._wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) msvcr120._wcscoll_l @ cdecl _wcsdup(wstr) msvcr120._wcsdup @ cdecl _wcserror(long) msvcr120._wcserror diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 024ec99..c3e5630 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1634,6 +1634,31 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } /********************************************************************* + * _wcreate_locale (MSVCRT.@) + */ +MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t *locale) +{ + MSVCRT__locale_t loc; + MSVCRT_size_t len; + char *str; + + if(category<MSVCRT_LC_MIN || category>MSVCRT_LC_MAX || !locale) + return NULL; + + len = MSVCRT_wcstombs(NULL, locale, 0); + if(len == -1) + return NULL; + if(!(str = MSVCRT_malloc(++len))) + return NULL; + MSVCRT_wcstombs(str, locale, len); + + loc = MSVCRT__create_locale(category, str); + + MSVCRT_free(str); + return loc; +} + +/********************************************************************* * setlocale (MSVCRT.@) */ char* CDECL MSVCRT_setlocale(int category, const char* locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1adc80a..0e1faa1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2011,7 +2011,7 @@ @ cdecl _wchdir(wstr) MSVCRT__wchdir @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class Iostream_init.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 5981a3279ba5c03ad86b159d9ee4135ecdae871e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5981a3279ba5c03ad86b159d9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 11:57:36 2016 +0100 msvcirt: Add a partial implementation of class Iostream_init. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 16 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 16 ++++++++-------- dlls/msvcrt40/msvcrt40.spec | 16 ++++++++-------- 4 files changed, 59 insertions(+), 24 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fd721b5..6cc8f1c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4032,6 +4032,41 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags) return this; } +/* ??0Iostream_init@@QAE(a)AAVios@@H(a)Z */ +/* ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z */ +DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) +void* __thiscall Iostream_init_ios_ctor(void *this, ios *obj, int n) +{ + FIXME("(%p %p %d) stub\n", this, obj, n); + return this; +} + +/* ??0Iostream_init@@QAE(a)XZ */ +/* ??0Iostream_init@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(Iostream_init_ctor, 4) +void* __thiscall Iostream_init_ctor(void *this) +{ + TRACE("(%p)\n", this); + return this; +} + +/* ??1Iostream_init@@QAE(a)XZ */ +/* ??1Iostream_init@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(Iostream_init_dtor, 4) +void __thiscall Iostream_init_dtor(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ??4Iostream_init@@QAEAAV0(a)ABV0@@Z */ +/* ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(Iostream_init_assign, 8) +void* __thiscall Iostream_init_assign(void *this, const void *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + return this; +} + /****************************************************************** * ??0ostrstream@@QAE(a)XZ (MSVCRTI.@) */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 8361896..7b67bc7 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z # __thiscall Iostream_init::Iostream_init(class ios &,int) -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z -@ stub -arch=win32 ??0Iostream_init@@QAE(a)XZ # __thiscall Iostream_init::Iostream_init(void) -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z(ptr ptr long) Iostream_init_ios_ctor +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z(ptr ptr long) Iostream_init_ios_ctor +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)XZ(ptr) Iostream_init_ctor +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)XZ(ptr) Iostream_init_ctor @ thiscall -arch=i386 ??0exception@@QAE(a)ABQBD@Z(ptr ptr) MSVCP_exception_ctor @ cdecl -arch=win64 ??0exception@@QEAA(a)AEBQEBD@Z(ptr ptr) MSVCP_exception_ctor @ thiscall -arch=i386 ??0exception@@QAE(a)ABV0@@Z(ptr ptr) MSVCP_exception_copy_ctor @@ -130,8 +130,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)PEAEH0@Z(ptr ptr long ptr) strstreambuf_ubuffer_ctor @ thiscall -arch=win32 ??0strstreambuf@@QAE(a)XZ(ptr) strstreambuf_ctor @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)XZ(ptr) strstreambuf_ctor -@ stub -arch=win32 ??1Iostream_init@@QAE(a)XZ # __thiscall Iostream_init::~Iostream_init(void) -@ stub -arch=win64 ??1Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE(a)XZ(ptr) Iostream_init_dtor +@ cdecl -arch=win64 ??1Iostream_init@@QEAA(a)XZ(ptr) Iostream_init_dtor @ thiscall -arch=i386 ??1exception@@UAE(a)XZ(ptr) MSVCP_exception_dtor @ cdecl -arch=win64 ??1exception@@UEAA(a)XZ(ptr) MSVCP_exception_dtor @ thiscall -arch=win32 ??1filebuf@@UAE(a)XZ(ptr) filebuf_dtor @@ -170,8 +170,8 @@ @ stub -arch=win64 ??1strstream@@UEAA(a)XZ @ thiscall -arch=win32 ??1strstreambuf@@UAE(a)XZ(ptr) strstreambuf_dtor @ cdecl -arch=win64 ??1strstreambuf@@UEAA(a)XZ(ptr) strstreambuf_dtor -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z # class Iostream_init & __thiscall Iostream_init::operator=(class Iostream_init const &) -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z(ptr ptr) Iostream_init_assign +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) Iostream_init_assign @ thiscall -arch=i386 ??4exception@@QAEAAV0(a)ABV0@@Z(ptr ptr) MSVCP_exception_assign @ cdecl -arch=win64 ??4exception@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) MSVCP_exception_assign @ thiscall -arch=win32 ??4filebuf@@QAEAAV0(a)ABV0@@Z(ptr ptr) filebuf_assign diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 86d1120..fad156b 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z -@ stub -arch=win32 ??0Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QAE(a)AAVios@@H(a)Z +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)XZ(ptr) msvcirt.??0Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??0Iostream_init@@QEAA(a)XZ @ thiscall -arch=win32 ??0filebuf@@QAE(a)ABV0@@Z(ptr ptr) msvcirt.??0filebuf@@QAE(a)ABV0@@Z @ cdecl -arch=win64 ??0filebuf@@QEAA(a)AEBV0@@Z(ptr ptr) msvcirt.??0filebuf@@QEAA(a)AEBV0@@Z @ thiscall -arch=win32 ??0filebuf@@QAE(a)H@Z(ptr long) msvcirt.??0filebuf@@QAE(a)H@Z @@ -118,8 +118,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)PEADH0@Z(ptr ptr long ptr) msvcirt.??0strstreambuf@@QEAA(a)PEADH0@Z @ thiscall -arch=win32 ??0strstreambuf@@QAE(a)XZ(ptr) msvcirt.??0strstreambuf@@QAE(a)XZ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)XZ(ptr) msvcirt.??0strstreambuf@@QEAA(a)XZ -@ stub -arch=win32 ??1Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??1Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE(a)XZ(ptr) msvcirt.??1Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??1Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??1Iostream_init@@QEAA(a)XZ @ thiscall -arch=win32 ??1filebuf@@UAE(a)XZ(ptr) msvcirt.??1filebuf@@UAE(a)XZ @ cdecl -arch=win64 ??1filebuf@@UEAA(a)XZ(ptr) msvcirt.??1filebuf@@UEAA(a)XZ @ stub -arch=win32 ??1fstream@@UAE(a)XZ @@ -158,8 +158,8 @@ @ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z @ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z @ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=win32 ??4filebuf@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcirt.??4filebuf@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0(a)AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0(a)AAV0@@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e78f085..4ac328a 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z -@ stub -arch=win32 ??0Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??0Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)AAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QAE(a)AAVios@@H(a)Z +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z(ptr ptr long) msvcirt.??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z +@ thiscall -arch=win32 ??0Iostream_init@@QAE(a)XZ(ptr) msvcirt.??0Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??0Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??0Iostream_init@@QEAA(a)XZ @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)ABV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE(a)ABV0@@Z @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA(a)AEBV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA(a)AEBV0@@Z @ thiscall -arch=i386 ??0__non_rtti_object@@QAE(a)PBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE(a)PBD@Z @@ -140,8 +140,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)PEADH0@Z(ptr ptr long ptr) msvcirt.??0strstreambuf@@QEAA(a)PEADH0@Z @ thiscall -arch=win32 ??0strstreambuf@@QAE(a)XZ(ptr) msvcirt.??0strstreambuf@@QAE(a)XZ @ cdecl -arch=win64 ??0strstreambuf@@QEAA(a)XZ(ptr) msvcirt.??0strstreambuf@@QEAA(a)XZ -@ stub -arch=win32 ??1Iostream_init@@QAE(a)XZ -@ stub -arch=win64 ??1Iostream_init@@QEAA(a)XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE(a)XZ(ptr) msvcirt.??1Iostream_init@@QAE(a)XZ +@ cdecl -arch=win64 ??1Iostream_init@@QEAA(a)XZ(ptr) msvcirt.??1Iostream_init@@QEAA(a)XZ @ thiscall -arch=i386 ??1__non_rtti_object@@UAE(a)XZ(ptr) msvcrt.??1__non_rtti_object@@UAE(a)XZ @ cdecl -arch=win64 ??1__non_rtti_object@@UEAA(a)XZ(ptr) msvcrt.??1__non_rtti_object@@UEAA(a)XZ @ thiscall -arch=i386 ??1bad_cast@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ @@ -192,8 +192,8 @@ @ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z @ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z @ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0(a)AEBV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4bad_cast@@QAEAAV0(a)ABV0@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z

1 0