wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Francois Gouget : po: Remove spaces before '\n's.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: c0539c6bfe0956f3afab97754320176578f64a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0539c6bfe0956f3afab9775… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 03:13:12 2018 +0200 po: Remove spaces before '\n's. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 8 ++++---- po/tr.po | 5 ++--- po/zh_CN.po | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8a99e0f..9370c8d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13000,18 +13000,18 @@ msgstr "" " Compatible avec toute autre option. Ignorée.\n" " /C Importer le contenu d'un fichier de registre.\n" " /D Effacer une clé de registre spécifiée.\n" -" /E Exporter le contenu d'une clé de registre spécifiée dans \n" +" /E Exporter le contenu d'une clé de registre spécifiée dans\n" " fichier. Si aucune clé n'est spécifiée, le registre " -"entier \n" +"entier\n" " est exporté.\n" " /S Mode silencieux. Aucun message ne sera affiché.\n" " /V Lancer l'interface graphique en mode avancé. Ignorée.\n" " /? Afficher ces informations et se terminer.\n" " [nom_fichier] L'emplacement du fichier contenant des informations de " -"registre \n" +"registre\n" " à importer.\n" " Si utilisée avec [/E], cette option spécifie " -"l'emplacement \n" +"l'emplacement\n" " du fichier où les informations du registre seront " "exportées.\n" " [clé_registre] La clé de registre à modifier.\n" diff --git a/po/tr.po b/po/tr.po index 85212a1..0a7a6ab 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12700,10 +12700,9 @@ msgstr "" " /S Sessiz kip. Herhangi bir ileti gösterilmez.\n" " /V Kullanıcı arayüzü gelişmiş kipte başlatılır. Önemsenmez.\n" " /? Bu yardımı gösterir.\n" -" [dosyaadı] Dışarıya verilecek kayıt bilgileri içeren dosyanın " -"konumu. \n" +" [dosyaadı] Dışarıya verilecek kayıt bilgileri içeren dosyanın konumu.\n" " [/E] seçeneğiyle kullanıldığında, kayıt bilgileri içeren " -"dosyanın \n" +"dosyanın\n" " nereye kaydedileceği belirtilir.\n" " [kayıt_anahtarı] Değiştirilecek kayıt defteri anahtarı.\n" "\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9051fc2..2e1b4c7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -15475,7 +15475,7 @@ msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" "语法:\n" -"XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H] \n" +"XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" "说明:\n"

1 0

Gijs Vermeulen : include: Add LOCALE_[ SLOCALIZEDDISPLAYNAME|ALLOW_NEUTRAL_NAMES] definitions.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 62b64a1f6f97f1f3cc30386367818691fab7117f URL: https://source.winehq.org/git/wine.git/?a=commit;h=62b64a1f6f97f1f3cc303863… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 22 00:53:46 2018 +0200 include: Add LOCALE_[SLOCALIZEDDISPLAYNAME|ALLOW_NEUTRAL_NAMES] definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index 7475f97..c8580bd 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -169,10 +169,12 @@ extern "C" { #define LOCALE_USE_CP_ACP 0x40000000 #define LOCALE_RETURN_NUMBER 0x20000000 #define LOCALE_RETURN_GENITIVE_NAMES 0x10000000 +#define LOCALE_ALLOW_NEUTRAL_NAMES 0x08000000 /* Locale information types */ #define LOCALE_ILANGUAGE 0x0001 #define LOCALE_SLANGUAGE 0x0002 +#define LOCALE_SLOCALIZEDDISPLAYNAME 0x0002 #define LOCALE_SENGLANGUAGE 0x1001 #define LOCALE_SENGLISHLANGUAGENAME 0x1001 #define LOCALE_SABBREVLANGNAME 0x0003

1 0

Gijs Vermeulen : include: Add FS_FILE_ENCRYPTION definition.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: a87097ba89c12dac44c0e68cbeace51257f0c4cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87097ba89c12dac44c0e68c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 22 00:53:45 2018 +0200 include: Add FS_FILE_ENCRYPTION definition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 7b99424..c38da9c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1194,6 +1194,7 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define FS_PERSISTENT_ACLS FILE_PERSISTENT_ACLS #define FS_VOL_IS_COMPRESSED FILE_VOLUME_IS_COMPRESSED #define FS_FILE_COMPRESSION FILE_FILE_COMPRESSION +#define FS_FILE_ENCRYPTION FILE_SUPPORTS_ENCRYPTION #define MUTEX_MODIFY_STATE MUTANT_QUERY_STATE #define MUTEX_ALL_ACCESS MUTANT_ALL_ACCESS

1 0

Gijs Vermeulen : include: Add FMS* definitions.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 7c0430bb557be16bb548586fbef5afda75c661b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0430bb557be16bb548586f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 22 00:53:44 2018 +0200 include: Add FMS* definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wfext.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/include/wfext.h b/include/wfext.h index e28c997..92cb4fb 100644 --- a/include/wfext.h +++ b/include/wfext.h @@ -57,6 +57,104 @@ extern "C" { #define FM_GETFILESEL WINELIB_NAME_AW(FM_GETFILESEL) #define FM_GETFILESELLFN WINELIB_NAME_AW(FM_GETFILESELLFN) +typedef struct _FMS_GETFILESELA +{ + FILETIME ftTime; + DWORD dwSize; + BYTE bAttr; + CHAR szName[260]; +} FMS_GETFILESELA, *LPFMS_GETFILESELA; + +typedef struct _FMS_GETFILESELW +{ + FILETIME ftTime; + DWORD dwSize; + BYTE bAttr; + WCHAR szName[260]; +} FMS_GETFILESELW, *LPFMS_GETFILESELW; + +#define FMS_GETFILESEL WINELIB_NAME_AW(FMS_GETFILESEL) +#define LPFMS_GETFILESEL WINELIB_NAME_AW(LPFMS_GETFILESEL) + +typedef struct _FMS_GETDRIVEINFOA +{ + DWORD dwTotalSpace; + DWORD dwFreeSpace; + CHAR szPath[260]; + CHAR szVolume[14]; + CHAR szShare[128]; +} FMS_GETDRIVEINFOA, *LPFMS_GETDRIVEINFOA; + +typedef struct _FMS_GETDRIVEINFOW +{ + DWORD dwTotalSpace; + DWORD dwFreeSpace; + WCHAR szPath[260]; + WCHAR szVolume[14]; + WCHAR szShare[128]; +} FMS_GETDRIVEINFOW, *LPFMS_GETDRIVEINFOW; + +#define FMS_GETDRIVEINFO WINELIB_NAME_AW(FMS_GETDRIVEINFO) +#define LPFMS_GETDRIVEINFO WINELIB_NAME_AW(LPFMS_GETDRIVEINFO) + +typedef struct _FMS_LOADA +{ + DWORD dwSize; + CHAR szMenuName[MENU_TEXT_LEN]; + HMENU hMenu; + UINT wMenuDelta; +} FMS_LOADA, *LPFMS_LOADA; + +typedef struct _FMS_LOADW +{ + DWORD dwSize; + WCHAR szMenuName[MENU_TEXT_LEN]; + HMENU hMenu; + UINT wMenuDelta; +} FMS_LOADW, *LPFMS_LOADW; + +#define FMS_LOAD WINELIB_NAME_AW(FMS_LOAD) +#define LPFMS_LOAD WINELIB_NAME_AW(LPFMS_LOAD) + +typedef struct tagEXT_BUTTON +{ + WORD idCommand; + WORD idsHelp; + WORD fsStyle; +} EXT_BUTTON, *LPEXT_BUTTON; + +typedef struct tagFMS_TOOLBARLOAD +{ + DWORD dwSize; + LPEXT_BUTTON lpButtons; + WORD cButtons; + WORD cBitmaps; + WORD idBitmap; + HBITMAP hBitmap; +} FMS_TOOLBARLOAD, *LPFMS_TOOLBARLOAD; + +typedef struct tagFMS_HELPSTRINGA +{ + INT idCommand; + HMENU hMenu; + CHAR szHelp[128]; +} FMS_HELPSTRINGA, *LPFMS_HELPSTRINGA; + +typedef struct tagFMS_HELPSTRINGW +{ + INT idCommand; + HMENU hMenu; + WCHAR szHelp[128]; +} FMS_HELPSTRINGW, *LPFMS_HELPSTRINGW; + +#define FMS_HELPSTRING WINELIB_NAME_AW(FMS_HELPSTRING) +#define LPFMS_HELPSTRING WINELIB_NAME_AW(LPFMS_HELPSTRING) + +typedef DWORD (WINAPI *FM_EXT_PROC)(HWND,WORD,LONG); +typedef DWORD (WINAPI *FM_UNDELETE_PROCA)(HWND,LPSTR); +typedef DWORD (WINAPI *FM_UNDELETE_PROCW)(HWND,LPWSTR); +DECL_WINELIB_TYPE_AW(FM_UNDELETE_PROC); + LONG WINAPI FMExtensionProc(HWND,WORD,LONG); LONG WINAPI FMExtensionProcW(HWND,WORD,LONG);

1 0

Dmitry Timoshkov : kernel32: GetLongPathName should fail when called with a wildcard.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: ccf9b18ea0aba1041b59fd287b6de8c726008a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf9b18ea0aba1041b59fd28… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 20 23:46:41 2018 +0300 kernel32: GetLongPathName should fail when called with a wildcard. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 10 ++++++++-- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a9db7e8..41f0d34 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -297,6 +297,8 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen HANDLE goit; BOOL is_legal_8dot3; + TRACE("%s,%p,%u\n", debugstr_w(shortpath), longpath, longlen); + if (!shortpath) { SetLastError(ERROR_INVALID_PARAMETER); @@ -308,8 +310,6 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen return 0; } - TRACE("%s,%p,%d\n", debugstr_w(shortpath), longpath, longlen); - if (shortpath[0] == '\\' && shortpath[1] == '\\') { FIXME("UNC pathname %s\n", debugstr_w(shortpath)); @@ -333,6 +333,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen lp = sp = 2; } + if (strpbrkW(shortpath + sp, wildcardsW)) + { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + while (shortpath[sp]) { /* check for path delimiters and reproduce them */ diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f0cfb4d..df91b31 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1202,9 +1202,7 @@ static void test_GetLongPathNameA(void) strcpy(name, "*"); SetLastError(0xdeadbeef); length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); -todo_wine ok(!length, "GetLongPathNameA should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); strcpy(name, "longfilename.longext");

1 0

Dmitry Timoshkov : kernel32: GetShortPathName should fail when called with a wildcard.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 3a78ec672a4c1635d848e0253f45127cb8690f26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a78ec672a4c1635d848e025… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 20 23:46:38 2018 +0300 kernel32: GetShortPathName should fail when called with a wildcard. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 11 ++++++++++- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7dcb937..a9db7e8 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ +static const WCHAR wildcardsW[] = {'*','?',0}; + /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) { @@ -445,7 +447,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl WIN32_FIND_DATAW wfd; HANDLE goit; - TRACE("%s\n", debugstr_w(longpath)); + TRACE("%s,%p,%u\n", debugstr_w(longpath), shortpath, shortlen); if (!longpath) { @@ -474,6 +476,13 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl sp = lp = 4; } + if (strpbrkW(longpath + lp, wildcardsW)) + { + HeapFree(GetProcessHeap(), 0, tmpshortpath); + SetLastError(ERROR_INVALID_NAME); + return 0; + } + /* check for drive letter */ if (longpath[lp] != '/' && longpath[lp + 1] == ':' ) { diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 5ca69d3..f0cfb4d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1477,9 +1477,7 @@ static void test_GetShortPathNameW(void) lstrcpyW(ptr, wildW); SetLastError(0xdeadbeef); length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ) ); -todo_wine ok(!length, "GetShortPathNameW should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); lstrcpyW(ptr, a_bcdeW);

1 0

Dmitry Timoshkov : kernel32/tests: Add some tests for GetLongPathName/ GetShortPathName called with a wildcard.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 9bc6068843430f2874c53374323cd0cfe4996755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc6068843430f2874c53374… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 20 23:46:35 2018 +0300 kernel32/tests: Add some tests for GetLongPathName/GetShortPathName called with a wildcard. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf3..5ca69d3 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1186,7 +1186,7 @@ static void test_GetTempPath(void) static void test_GetLongPathNameA(void) { DWORD length, explength, hostsize; - char tempfile[MAX_PATH]; + char tempfile[MAX_PATH], *name; char longpath[MAX_PATH]; char unc_prefix[MAX_PATH]; char unc_short[MAX_PATH], unc_long[MAX_PATH]; @@ -1197,7 +1197,17 @@ static void test_GetLongPathNameA(void) return; GetTempPathA(MAX_PATH, tempfile); - lstrcatA(tempfile, "longfilename.longext"); + name = tempfile + strlen(tempfile); + + strcpy(name, "*"); + SetLastError(0xdeadbeef); + length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); +todo_wine + ok(!length, "GetLongPathNameA should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); + + strcpy(name, "longfilename.longext"); file = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CloseHandle(file); @@ -1401,6 +1411,7 @@ static void test_GetShortPathNameW(void) static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; static const WCHAR backSlash[] = { '\\', 0 }; static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0}; + static const WCHAR wildW[] = { '*',0 }; WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr; WCHAR short_path[MAX_PATH]; DWORD length; @@ -1463,6 +1474,15 @@ static void test_GetShortPathNameW(void) length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path )); ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() ); + lstrcpyW(ptr, wildW); + SetLastError(0xdeadbeef); + length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ) ); +todo_wine + ok(!length, "GetShortPathNameW should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); + + lstrcpyW(ptr, a_bcdeW); ret = DeleteFileW( path ); ok( ret, "Cannot delete file.\n" ); *ptr = 0;

1 0

Jacek Caban : ntdll: Set IO_STATUS_BLOCK on non-blocking NtFlushBuffersFile success.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 6bcd695c786575d7ba136b3fa7016085977167b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcd695c786575d7ba136b3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:19:17 2018 +0200 ntdll: Set IO_STATUS_BLOCK on non-blocking NtFlushBuffersFile success. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 21 ++++++++++++++------- dlls/ntdll/tests/file.c | 2 -- dlls/ntdll/tests/pipe.c | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 93af301..77d2d32 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3298,13 +3298,15 @@ NTSTATUS WINAPI NtSetEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, * Success: 0. IoStatusBlock is updated. * Failure: An NTSTATUS error code describing the error. */ -NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock ) +NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) { NTSTATUS ret; - HANDLE hEvent = NULL; + HANDLE wait_handle; enum server_fd_type type; int fd, needs_close; + if (!io || !virtual_check_buffer_for_write( io, sizeof(io) )) return STATUS_ACCESS_VIOLATION; + ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); if (ret == STATUS_ACCESS_DENIED) ret = server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); @@ -3317,16 +3319,21 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { SERVER_START_REQ( flush ) { - req->async = server_async( hFile, NULL, NULL, NULL, NULL, IoStatusBlock ); + req->async = server_async( hFile, NULL, NULL, NULL, NULL, io ); ret = wine_server_call( req ); - hEvent = wine_server_ptr_handle( reply->event ); + wait_handle = wine_server_ptr_handle( reply->event ); + if (wait_handle && ret != STATUS_PENDING) + { + io->u.Status = ret; + io->Information = 0; + } } SERVER_END_REQ; - if (hEvent) + if (wait_handle) { - NtWaitForSingleObject( hEvent, FALSE, NULL ); - ret = STATUS_SUCCESS; + NtWaitForSingleObject( wait_handle, FALSE, NULL ); + ret = io->u.Status; } } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 0f4281d..e523990 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4501,11 +4501,9 @@ static void test_flush_buffers_file(void) ok(hfileread != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); status = pNtFlushBuffersFile(hfile, NULL); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); status = pNtFlushBuffersFile(hfile, &io_status_block); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 798df53..45c8466 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1378,8 +1378,8 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) { ok(status == STATUS_SUCCESS, "status = %x in %s state %u\n", status, is_server ? "server" : "client", state); - todo_wine ok(io.Status == status, "io.Status = %x\n", io.Status); + ok(!io.Information, "io.Information = %lx\n", io.Information); } if (state != FILE_PIPE_CONNECTED_STATE)

1 0

Jacek Caban : server: Improve error handling of disconnected named pipe clients.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: dd1769a16a8977f2eb106d04f6530a590a77fdd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1769a16a8977f2eb106d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:18:37 2018 +0200 server: Improve error handling of disconnected named pipe clients. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 1 - dlls/ntdll/tests/pipe.c | 4 ---- server/named_pipe.c | 10 ++++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b85e6ee..7f77df1 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1506,7 +1506,6 @@ static int test_DisconnectNamedPipe(void) ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ret = PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "PeekNamedPipe returned %x (%u)\n", ret, GetLastError()); ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 51024a2..798df53 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1348,7 +1348,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_PIPE_BROKEN; break; } - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) @@ -1363,7 +1362,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) buf, 1, buf+1, 1); if (!status || status == STATUS_PENDING) status = io.Status; - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); @@ -1373,7 +1371,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) status = NtFlushBuffersFile(pipe, &io); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) { - todo_wine ok(status == STATUS_PIPE_DISCONNECTED, "status = %x in %s state %u\n", status, is_server ? "server" : "client", state); } @@ -1472,7 +1469,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_BUFFER_OVERFLOW; break; } - todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (status == STATUS_BUFFER_OVERFLOW) diff --git a/server/named_pipe.c b/server/named_pipe.c index 0d98bf8..ebd8c4f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -501,6 +501,12 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) { struct pipe_end *pipe_end = get_fd_user( fd ); + if (!pipe_end->pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + } + if (pipe_end->connection && !list_empty( &pipe_end->connection->message_queue )) { fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT ); @@ -888,7 +894,7 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) set_error( STATUS_PIPE_BROKEN ); return 0; default: - set_error( STATUS_INVALID_PIPE_STATE ); + set_error( pipe_end->pipe ? STATUS_INVALID_PIPE_STATE : STATUS_PIPE_DISCONNECTED ); return 0; } @@ -932,7 +938,7 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) if (!pipe_end->connection) { - set_error( STATUS_INVALID_PIPE_STATE ); + set_error( pipe_end->pipe ? STATUS_INVALID_PIPE_STATE : STATUS_PIPE_DISCONNECTED ); return 0; }

1 0

Jacek Caban : kernel32/tests: Add more PeekNamedPipe tests.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 0fe08b794d9029acf36c724a198724077b6257b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe08b794d9029acf36c724a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:18:12 2018 +0200 kernel32/tests: Add more PeekNamedPipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 10c971b..b85e6ee 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2721,7 +2721,7 @@ static void test_readfileex_pending(void) static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail, DWORD expected_message_length) { DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef, left = 0xdeadbeed; - char buf[4000]; + char buf[12000]; FILE_PIPE_PEEK_BUFFER *peek_buf = (void*)buf; IO_STATUS_BLOCK io; NTSTATUS status; @@ -2939,39 +2939,53 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* write more data than needed for read */ overlapped_write_sync(writer, buf, 4000); test_overlapped_result(reader, &read_overlapped, 1000, msg_read); + test_peek_pipe(reader, 3000, 3000, msg_mode ? 3000 : 0); /* test pending write with overlapped event */ overlapped_write_async(writer, buf, buf_size, &write_overlapped); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size), 3000 + buf_size, msg_mode ? 3000 : 0); /* write one more byte */ overlapped_write_async(writer, buf, 1, &write_overlapped2); flush_thread = test_flush_async(writer, ERROR_SUCCESS); test_not_signaled(write_overlapped.hEvent); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size + 1), 3000 + buf_size + 1, + msg_mode ? 3000 : 0); /* empty write will not block */ overlapped_write_sync(writer, buf, 0); test_not_signaled(write_overlapped.hEvent); test_not_signaled(write_overlapped2.hEvent); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size + 1), 3000 + buf_size + 1, + msg_mode ? 3000 : 0); /* read remaining data from the first write */ overlapped_read_sync(reader, read_buf, 3000, 3000, FALSE); test_overlapped_result(writer, &write_overlapped, buf_size, FALSE); test_not_signaled(write_overlapped2.hEvent); test_not_signaled(flush_thread); + test_peek_pipe(reader, buf_size + (msg_mode ? 0 : 1), buf_size + 1, msg_mode ? buf_size : 0); /* read one byte so that the next write fits the buffer */ overlapped_read_sync(reader, read_buf, 1, 1, msg_read); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, buf_size + (msg_mode ? -1 : 0), buf_size, msg_mode ? buf_size - 1 : 0); /* read the whole buffer */ overlapped_read_sync(reader, read_buf, buf_size, buf_size-msg_read, FALSE); + test_peek_pipe(reader, msg_read ? 1 : 0, msg_read ? 1 : 0, msg_read ? 1 : 0); if(msg_read) + { overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); + } - if(msg_mode) { + if(msg_mode) + { /* we still have an empty message in queue */ overlapped_read_sync(reader, read_buf, 1000, 0, FALSE); + test_peek_pipe(reader, 0, 0, 0); } test_flush_done(flush_thread); @@ -2983,23 +2997,29 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL overlapped_write_sync(writer, buf, 1); test_overlapped_result(reader, &read_overlapped, 0, msg_read); test_overlapped_result(reader, &read_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* write a message larger than buffer */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); + test_peek_pipe(reader, buf_size + 2000, buf_size + 2000, msg_mode ? buf_size + 2000 : 0); /* read so that pending write is still larger than the buffer */ overlapped_read_sync(reader, read_buf, 1999, 1999, msg_read); test_not_signaled(write_overlapped.hEvent); + test_peek_pipe(reader, buf_size + 1, buf_size + 1, msg_mode ? buf_size + 1 : 0); /* read one more byte */ overlapped_read_sync(reader, read_buf, 1, 1, msg_read); test_overlapped_result(writer, &write_overlapped, buf_size+2000, FALSE); + test_peek_pipe(reader, buf_size, buf_size, msg_mode ? buf_size : 0); /* read remaining data */ overlapped_read_sync(reader, read_buf, buf_size+1, buf_size, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* simple pass of empty message */ overlapped_write_sync(writer, buf, 0); + test_peek_pipe(reader, 0, 0, 0); if(msg_mode) overlapped_read_sync(reader, read_buf, 1, 0, FALSE); @@ -3044,24 +3064,33 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* make two async writes, cancel the first one and make sure that we read from the second one */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); + test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), + buf_size + 2001, msg_mode ? buf_size + 2000 : 0); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 1, 1, msg_mode ? 1 : 0); overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* same as above, but parially read written data before canceling */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); + test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), + buf_size + 2001, msg_mode ? buf_size + 2000 : 0); overlapped_read_sync(reader, read_buf, 10, 10, msg_read); test_not_signaled(write_overlapped.hEvent); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 1, 1, msg_mode ? 1 : 0); overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* empty queue by canceling write and make sure that flush is signaled */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); flush_thread = test_flush_async(writer, ERROR_SUCCESS); test_not_signaled(flush_thread); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 0, 0, 0); test_flush_done(flush_thread); }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018