June 2015 - Wine-commits - list.winehq.org

Piotr Caban : msvcp60: Sync spec files.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 7c4f2b91d607c8c74b31f50080152dc2afcee10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4f2b91d607c8c74b31f5008… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 12 16:49:08 2015 +0200 msvcp60: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 2658014..4ba1584 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1363,8 +1363,8 @@ @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAV?$complex(a)O@0@@Z @ stub -arch=win32 ??5std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAF(a)Z @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEAF(a)Z -@ stub -arch=win32 ??5std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAG(a)Z -@ stub -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEAG(a)Z +@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PAG(a)Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEAG(a)Z(ptr ptr) basic_istream_wchar_read_ch @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)F@Z(ptr long) basic_ostream_char_print_short @ cdecl -arch=win64 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)F@Z(ptr long) basic_ostream_char_print_short @ thiscall -arch=win32 ??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)G@Z(ptr long) basic_ostream_char_print_ushort @@ -1435,12 +1435,12 @@ @ cdecl -arch=win64 ??6?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)_N@Z(ptr long) basic_ostream_short_print_bool @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)M@0@@Z(ptr ptr) basic_ostream_char_print_complex_float +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)N@0@@Z(ptr ptr) basic_ostream_char_print_complex_double +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z(ptr ptr) basic_ostream_char_print_complex_double +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z(ptr ptr) basic_ostream_char_print_complex_ldouble +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z(ptr ptr) basic_ostream_char_print_complex_ldouble @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@C(a)Z(ptr long) basic_ostream_char_print_ch @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@C(a)Z(ptr long) basic_ostream_char_print_ch @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@D(a)Z(ptr long) basic_ostream_char_print_ch

1 0

Jacek Caban : wininet: Get rid of no longer needed read_chunked field.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 7fa7e9bd3b27d3fe37c71089fc7fb3047d84f76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa7e9bd3b27d3fe37c71089f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 19:46:04 2015 +0200 wininet: Get rid of no longer needed read_chunked field. --- dlls/wininet/http.c | 3 +-- dlls/wininet/internet.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 45183cf..b7c4661 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -408,7 +408,7 @@ static void reset_data_stream(http_request_t *req) destroy_data_stream(req->data_stream); req->data_stream = &req->netconn_stream.data_stream; req->read_pos = req->read_size = req->netconn_stream.content_read = 0; - req->read_chunked = req->read_gzip = FALSE; + req->read_gzip = FALSE; } static void remove_header( http_request_t *request, const WCHAR *str, BOOL from_request ) @@ -2955,7 +2955,6 @@ static DWORD set_content_length(http_request_t *request) request->data_stream = &chunked_stream->data_stream; request->contentLength = ~0u; - request->read_chunked = TRUE; } if(request->decoding) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 925bfd0..40951b6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,7 +355,6 @@ typedef struct CRITICAL_SECTION read_section; /* section to protect the following fields */ DWORD contentLength; /* total number of bytes to be read */ - BOOL read_chunked; /* are we reading in chunked mode? */ BOOL read_gzip; /* are we reading in gzip mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */

1 0

Marcus Meissner : shlwapi: Add missing braces (Coverity).
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: a2869de4d40b94e6a4dfdda214ec97e078db0f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2869de4d40b94e6a4dfdda21… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 13 07:49:23 2015 +0200 shlwapi: Add missing braces (Coverity). --- dlls/shlwapi/ordinal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 68b66e3..df15c40 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1407,9 +1407,11 @@ HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *clsid) hr = IUnknown_QueryInterface(lpUnknown, &IID_IPersist, (void**)&persist); if (hr != S_OK) + { hr = IUnknown_QueryInterface(lpUnknown, &IID_IPersistFolder, (void**)&persist); if (hr != S_OK) return hr; + } hr = IPersist_GetClassID(persist, clsid); IPersist_Release(persist);

1 0

Marcus Meissner : oledb32: Free memory on error exit (Coverity).
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 99549e1e2e1bfa52adb667efc0b8d64048690237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99549e1e2e1bfa52adb667efc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 13 09:21:06 2015 +0200 oledb32: Free memory on error exit (Coverity). --- dlls/oledb32/datainit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3c5293a..3a76e0b 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -520,6 +520,8 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr if (FAILED(hr)) { ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); + free_dbpropset(1, *propset); + *propset = NULL; return hr; }

1 0

Nikolay Sivov : regedit: Make it possible for save/ restore position on tree root.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 6827724e54c49a5f15993ba7e24dddafa68e8502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6827724e54c49a5f15993ba7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 13 19:26:22 2015 +0300 regedit: Make it possible for save/restore position on tree root. --- programs/regedit/childwnd.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6dc7d0c..55b11de 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -243,7 +243,14 @@ static void get_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) { if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)FindPathInTree(hwndTV, wszVal)); + { + HTREEITEM selection; + if (!strcmpW(wszVal, g_pChildWnd->szPath)) + selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + else + selection = FindPathInTree(hwndTV, wszVal); + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); + } RegCloseKey(hkey); } @@ -258,15 +265,20 @@ static void get_last_key(HWND hwndTV) static void set_last_key(HWND hwndTV) { HKEY hkey; - WCHAR *wszVal; if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) { HTREEITEM selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); - - wszVal = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); - RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)wszVal, (lstrlenW(wszVal) + 1) * sizeof(WCHAR)); - HeapFree(GetProcessHeap(), 0, wszVal); + HTREEITEM root = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + WCHAR *value; + + if (selection == root) + value = g_pChildWnd->szPath; + else + value = GetItemFullPath(g_pChildWnd->hTreeWnd, selection, FALSE); + RegSetValueExW(hkey, wszLastKey, 0, REG_SZ, (LPBYTE)value, (lstrlenW(value) + 1) * sizeof(WCHAR)); + if (selection != root) + HeapFree(GetProcessHeap(), 0, value); RegCloseKey(hkey); } }

1 0

Piotr Caban : msvcrt: Write directly to the console in _putwch.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: eb9e00857a7a2f6caedbc6041454ae18e7e59052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9e00857a7a2f6caedbc6041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:30:51 2015 +0200 msvcrt: Write directly to the console in _putwch. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/console.c | 22 ++++++++++++++++++++++ dlls/msvcrt/file.c | 8 -------- dlls/msvcrt/msvcrt.spec | 2 +- 10 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 194554b..3e4badc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1239,8 +1239,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9114632..25efacd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1597,8 +1597,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9537d79..148b378 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1605,8 +1605,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c494ce0..51415a9 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -495,7 +495,7 @@ @ cdecl _putch(long) @ cdecl _putenv(str) @ cdecl _putw(long ptr) MSVCRT__putw -@ cdecl _putwch(long) MSVCRT__putwch +@ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f8a52f1..a28725b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -490,7 +490,7 @@ @ cdecl _putch(long) @ cdecl _putenv(str) @ cdecl _putw(long ptr) MSVCRT__putw -@ cdecl _putwch(long) MSVCRT__putwch +@ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 00f7ab2..3c1bb87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -914,8 +914,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9384a3f..547f668 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -889,8 +889,8 @@ @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -@ cdecl _putwch(long) MSVCRT__putwch -@ stub _putwch_nolock +@ cdecl _putwch(long) +@ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 3da7fb8..d6bd40e 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -218,6 +218,28 @@ int CDECL _putch(int c) } /********************************************************************* + * _putwch_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _putwch_nolock(MSVCRT_wchar_t c) +{ + DWORD count; + if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1) + return c; + return MSVCRT_WEOF; +} + +/********************************************************************* + * _putwch (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _putwch(MSVCRT_wchar_t c) +{ + LOCK_CONSOLE; + c = _putwch_nolock(c); + UNLOCK_CONSOLE; + return c; +} + +/********************************************************************* * _getche_nolock (MSVCR80.@) */ int CDECL _getche_nolock(void) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1069cf7..241c337 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4631,14 +4631,6 @@ int CDECL MSVCRT_putchar(int c) } /********************************************************************* - * _putwch (MSVCRT.@) - */ -int CDECL MSVCRT__putwch(int c) -{ - return MSVCRT_fputwc(c, MSVCRT_stdout); -} - -/********************************************************************* * puts (MSVCRT.@) */ int CDECL MSVCRT_puts(const char *s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1f2a8ce..46cbf08 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -861,7 +861,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw -@ cdecl _putwch(long) MSVCRT__putwch +@ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read

1 0

Piotr Caban : msvcrt: Fix return value of _cputs.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 9ed740377ba0c88be0aebad82eef61c3f4df5940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed740377ba0c88be0aebad82… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:01 2015 +0200 msvcrt: Fix return value of _cputs. --- dlls/msvcrt/console.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index d6bd40e..85fe7e0 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -69,11 +69,14 @@ void msvcrt_free_console(void) int CDECL _cputs(const char* str) { DWORD count; - int retval = MSVCRT_EOF; + int len, retval = -1; + + if (!MSVCRT_CHECK_PMT(str != NULL)) return -1; + len = strlen(str); LOCK_CONSOLE; - if (WriteConsoleA(MSVCRT_console_out, str, strlen(str), &count, NULL) - && count == 1) + if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + && count == len) retval = 0; UNLOCK_CONSOLE; return retval;

1 0

Piotr Caban : msvcrt: Fix return value of cputws.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: de68efdb7d69e03a91db8b61c33f3465bd324ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=de68efdb7d69e03a91db8b61c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:08 2015 +0200 msvcrt: Fix return value of cputws. --- dlls/msvcrt/console.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 85fe7e0..e8eea7f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -88,11 +88,14 @@ int CDECL _cputs(const char* str) int CDECL _cputws(const MSVCRT_wchar_t* str) { DWORD count; - int retval = MSVCRT_EOF; + int len, retval = -1; + + if (!MSVCRT_CHECK_PMT(str != NULL)) return -1; + len = lstrlenW(str); LOCK_CONSOLE; - if (WriteConsoleW(MSVCRT_console_out, str, lstrlenW(str), &count, NULL) - && count == 1) + if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL) + && count == len) retval = 0; UNLOCK_CONSOLE; return retval;

1 0

Piotr Caban : msvcrt: Add _getwch implementation.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 9a10a7163831f6968a1d7a20599f83a2159c3d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a10a7163831f6968a1d7a205… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:14 2015 +0200 msvcrt: Add _getwch implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/console.c | 127 ++++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/msvcrt.spec | 2 +- 9 files changed, 118 insertions(+), 35 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3e4badc..2a3ab47 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -907,8 +907,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 25efacd..d0a4c05 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1254,8 +1254,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 148b378..a86edff 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1252,8 +1252,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 51415a9..0905603 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -343,7 +343,7 @@ @ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw -@ stub _getwch +@ cdecl _getwch() @ stub _getwche @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index a28725b..35e515e 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -338,7 +338,7 @@ @ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw -@ stub _getwch +@ cdecl _getwch() @ stub _getwche @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3c1bb87..7b37e71 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -581,8 +581,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 547f668..f7a9818 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -558,8 +558,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index e8eea7f..9c3cccf 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static HANDLE MSVCRT_console_in = INVALID_HANDLE_VALUE; static HANDLE MSVCRT_console_out= INVALID_HANDLE_VALUE; static int __MSVCRT_console_buffer = MSVCRT_EOF; +static MSVCRT_wchar_t __MSVCRT_console_buffer_w = MSVCRT_WEOF; /* INTERNAL: Initialise console handles */ void msvcrt_init_console(void) @@ -106,7 +107,7 @@ int CDECL _cputws(const MSVCRT_wchar_t* str) #define CTRL_CHAR 2 #define SHIFT_CHAR 3 -static const struct {unsigned vk; unsigned ch[4][2];} enh_map[] = { +static const struct {unsigned short vk; unsigned char ch[4][2];} enh_map[] = { {0x47, {{0xE0, 0x47}, {0x00, 0x97}, {0xE0, 0x77}, {0xE0, 0x47}}}, {0x48, {{0xE0, 0x48}, {0x00, 0x98}, {0xE0, 0x8D}, {0xE0, 0x48}}}, {0x49, {{0xE0, 0x49}, {0x00, 0x99}, {0xE0, 0x86}, {0xE0, 0x49}}}, @@ -119,6 +120,36 @@ static const struct {unsigned vk; unsigned ch[4][2];} enh_map[] = { {0x53, {{0xE0, 0x53}, {0x00, 0xA3}, {0xE0, 0x93}, {0xE0, 0x53}}}, }; +static BOOL handle_enhanced_keys(INPUT_RECORD *ir, unsigned char *ch1, unsigned char *ch2) +{ + int i; + + for (i = 0; i < sizeof(enh_map) / sizeof(enh_map[0]); i++) + { + if (ir->Event.KeyEvent.wVirtualScanCode == enh_map[i].vk) + { + unsigned idx; + + if (ir->Event.KeyEvent.dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + idx = ALT_CHAR; + else if (ir->Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ) + idx = CTRL_CHAR; + else if (ir->Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) + idx = SHIFT_CHAR; + else + idx = NORMAL_CHAR; + + *ch1 = enh_map[i].ch[idx][0]; + *ch2 = enh_map[i].ch[idx][1]; + return TRUE; + } + } + + WARN("Unmapped char keyState=%x vk=%x\n", + ir->Event.KeyEvent.dwControlKeyState, ir->Event.KeyEvent.wVirtualScanCode); + return FALSE; +} + /********************************************************************* * _getch_nolock (MSVCR80.@) */ @@ -144,39 +175,24 @@ int CDECL _getch_nolock(void) do { if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) { - unsigned int i; /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { + unsigned char ch1, ch2; + if (ir.Event.KeyEvent.uChar.AsciiChar) { retval = ir.Event.KeyEvent.uChar.AsciiChar; break; } - for (i = 0; i < sizeof(enh_map) / sizeof(enh_map[0]); i++) - { - if (ir.Event.KeyEvent.wVirtualScanCode == enh_map[i].vk) break; - } - if (i < sizeof(enh_map) / sizeof(enh_map[0])) + + if (handle_enhanced_keys(&ir, &ch1, &ch2)) { - unsigned idx; - - if (ir.Event.KeyEvent.dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - idx = ALT_CHAR; - else if (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ) - idx = CTRL_CHAR; - else if (ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) - idx = SHIFT_CHAR; - else - idx = NORMAL_CHAR; - - retval = enh_map[i].ch[idx][0]; - __MSVCRT_console_buffer = enh_map[i].ch[idx][1]; + retval = ch1; + __MSVCRT_console_buffer = ch2; break; } - WARN("Unmapped char keyState=%x vk=%x\n", - ir.Event.KeyEvent.dwControlKeyState, ir.Event.KeyEvent.wVirtualScanCode); } } else @@ -202,6 +218,73 @@ int CDECL _getch(void) } /********************************************************************* + * _getwch_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _getwch_nolock(void) +{ + MSVCRT_wchar_t retval = MSVCRT_WEOF; + + if (__MSVCRT_console_buffer_w != MSVCRT_WEOF) + { + retval = __MSVCRT_console_buffer_w; + __MSVCRT_console_buffer_w = MSVCRT_WEOF; + } + else + { + INPUT_RECORD ir; + DWORD count; + DWORD mode = 0; + + GetConsoleMode(MSVCRT_console_in, &mode); + if(mode) + SetConsoleMode(MSVCRT_console_in, 0); + + do { + if (ReadConsoleInputW(MSVCRT_console_in, &ir, 1, &count)) + { + /* Only interested in ASCII chars */ + if (ir.EventType == KEY_EVENT && + ir.Event.KeyEvent.bKeyDown) + { + unsigned char ch1, ch2; + + if (ir.Event.KeyEvent.uChar.UnicodeChar) + { + retval = ir.Event.KeyEvent.uChar.UnicodeChar; + break; + } + + if (handle_enhanced_keys(&ir, &ch1, &ch2)) + { + retval = ch1; + __MSVCRT_console_buffer_w = ch2; + break; + } + } + } + else + break; + } while(1); + if (mode) + SetConsoleMode(MSVCRT_console_in, mode); + } + return retval; +} + +/********************************************************************* + * _getwch (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _getwch(void) +{ + MSVCRT_wchar_t ret; + + LOCK_CONSOLE; + ret = _getwch_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _putch_nolock (MSVCR80.@) */ int CDECL _putch_nolock(int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 46cbf08..4ac232c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -533,7 +533,7 @@ @ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw -# stub _getwch() +@ cdecl _getwch() # stub _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr)

1 0

Piotr Caban : msvcrt: Add _getwche implementation.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: d4fab07110aeb5d61339aa917ea0b1b6d7f77fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fab07110aeb5d61339aa917… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:23 2015 +0200 msvcrt: Add _getwche implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/console.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2a3ab47..ce36cdf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -909,8 +909,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d0a4c05..8cf1202 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1256,8 +1256,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a86edff..bbf8f90 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1254,8 +1254,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 0905603..299a645 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -344,7 +344,7 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwch() -@ stub _getwche +@ cdecl _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 35e515e..4741b85 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -339,7 +339,7 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwch() -@ stub _getwche +@ cdecl _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7b37e71..8f1f6f9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -583,8 +583,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f7a9818..109e2ad 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -560,8 +560,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 9c3cccf..59b1dbb 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -354,6 +354,31 @@ int CDECL _getche(void) } /********************************************************************* + * _getwche_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _getwche_nolock(void) +{ + MSVCRT_wchar_t wch; + wch = _getch_nolock(); + if (wch == MSVCRT_WEOF) + return wch; + return _putwch_nolock(wch); +} + +/********************************************************************* + * _getwche (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _getwche(void) +{ + MSVCRT_wchar_t ret; + + LOCK_CONSOLE; + ret = _getwche_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _cgets (MSVCRT.@) */ char* CDECL _cgets(char* str) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4ac232c..b81ebf9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -534,7 +534,7 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwch() -# stub _getwche() +@ cdecl _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime32(ptr) MSVCRT__gmtime32

1 0