wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : msi: Check for a NULL return from deformat_string() when checking for failure.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 814f18ab756cd69158ce893c4f7898e14d3e46dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=814f18ab756cd69158ce893c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:47 2021 -0500 msi: Check for a NULL return from deformat_string() when checking for failure. An empty string is valid, and can occur if e.g. a nonexistent property is expanded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51091 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 69 ++++++++++++++++++++++++++++++++----------------- dlls/msi/tests/action.c | 8 +++++- 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bcb1a4f578e..68688713074 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6790,25 +6790,34 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (res != ERROR_SUCCESS || !value) goto done; - if (value && !deformat_string(package, value, &deformatted)) + if (value) { - res = ERROR_OUTOFMEMORY; - goto done; - } + DWORD len = deformat_string( package, value, &deformatted ); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } - if ((value = deformatted)) - { - if (flags & ENV_MOD_PREFIX) + if (len) { - p = wcsrchr( value, ';' ); - len_value = p - value; + value = deformatted; + if (flags & ENV_MOD_PREFIX) + { + p = wcsrchr( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = wcschr( value, ';' ) + 1; + len_value = lstrlenW( value ); + } + else len_value = lstrlenW( value ); } - else if (flags & ENV_MOD_APPEND) + else { - value = wcschr( value, ';' ) + 1; - len_value = lstrlenW( value ); + value = NULL; } - else len_value = lstrlenW( value ); } res = open_env_key( flags, &env ); @@ -6997,22 +7006,34 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) return ERROR_SUCCESS; } - if (value && !deformat_string( package, value, &deformatted )) - return ERROR_OUTOFMEMORY; - - if ((value = deformatted)) + if (value) { - if (flags & ENV_MOD_PREFIX) + DWORD len = deformat_string( package, value, &deformatted ); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } + + if (len) { - p = wcschr( value, ';' ); - len_value = p - value; + value = deformatted; + if (flags & ENV_MOD_PREFIX) + { + p = wcsrchr( value, ';' ); + len_value = p - value; + } + else if (flags & ENV_MOD_APPEND) + { + value = wcschr( value, ';' ) + 1; + len_value = lstrlenW( value ); + } + else len_value = lstrlenW( value ); } - else if (flags & ENV_MOD_APPEND) + else { - value = wcschr( value, ';' ) + 1; - len_value = lstrlenW( value ); + value = NULL; } - else len_value = lstrlenW( value ); } r = open_env_key( flags, &env ); diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index a5d2882acda..17de636ae52 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -249,7 +249,9 @@ static const char env_environment_dat[] = "Var27\t+-MSITESTVAR21\t[~];1\tOne\n" "Var28\t-MSITESTVAR22\t1\tOne\n" "Var29\t-MSITESTVAR23\t2\tOne\n" - "Var30\t*MSITESTVAR100\t1\tOne\n"; + "Var30\t*MSITESTVAR100\t1\tOne\n" + "Var31\t-=MSITESTVAR24\t[SERVNAME]\tOne\n" + "Var32\t-=MSITESTVAR25\t[bogus_prop]\tOne\n"; static const char service_install_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -5044,6 +5046,7 @@ static void test_envvar(void) CHECK_REG_STR(env, "MSITESTVAR19", "1"); CHECK_REG_STR(env, "MSITESTVAR20", "1"); CHECK_REG_STR(env, "MSITESTVAR21", "1"); + CHECK_REG_STR(env, "MSITESTVAR24", "TestService"); CHECK_REG_STR(env2, "MSITESTVAR100", "1"); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); @@ -5052,6 +5055,9 @@ static void test_envvar(void) res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegDeleteValueA(env, "MSITESTVAR25"); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(!r, "got %u\n", r);

1 0

Zebediah Figura : msi/tests: Make check_reg_* helpers more verbose.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: a0f54eee2a5dc985d7e16c382516c8b66e61e54f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f54eee2a5dc985d7e16c38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:46 2021 -0500 msi/tests: Make check_reg_* helpers more verbose. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 129 +++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f54eee2a5dc985d7e1…

1 0

Zebediah Figura : msi/tests: Always explicitly test REG_MULTI_SZ strings.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 80426fdc76597768b787a38644f1c53110b26f05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80426fdc76597768b787a386… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:45 2021 -0500 msi/tests: Always explicitly test REG_MULTI_SZ strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index c1263258948..4ede8458070 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2513,7 +2513,7 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)val, &size); if (res != ERROR_SUCCESS || - (type != REG_SZ && type != REG_EXPAND_SZ && type != REG_MULTI_SZ)) + (type != REG_SZ && type != REG_EXPAND_SZ)) { ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); return; @@ -2528,9 +2528,14 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, DWORD line) { char val[MAX_PATH]; - DWORD size, type; + DWORD expect_size = 0, size, type; + const char *p; LONG res; + for (p = expect; *p; p += strlen(p) + 1) + ; + expect_size = (p + 1) - expect; + size = MAX_PATH; val[0] = '\0'; res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size); @@ -2541,7 +2546,8 @@ static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, return; } - ok_(__FILE__, line)(!memcmp(val, expect, size), "wrong data\n"); + ok_(__FILE__, line)(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok_(__FILE__, line)(!memcmp(val, expect, size), "got %s\n", debugstr_an(val, size)); } static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD line) @@ -2582,6 +2588,12 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin #define CHECK_REG_MULTI(key, name, expect) \ check_reg_multi(key, name, expect, __LINE__); +#define CHECK_DEL_REG_MULTI(key, name, expect) \ + do { \ + check_reg_multi(key, name, expect, __LINE__); \ + RegDeleteValueA(key, name); \ + } while(0) + #define CHECK_REG_DWORD(prodkey, name, expected) \ check_reg_dword(prodkey, name, expected, __LINE__); @@ -3124,7 +3136,7 @@ currentuser: CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); - CHECK_DEL_REG_STR(hkey, "Clients", ":"); + CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0"); res = RegOpenKeyA(hkey, "SourceList", &sourcelist); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -3205,7 +3217,7 @@ machprod: todo_wine CHECK_DEL_REG_DWORD(hkey, "Assignment", 1); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); - CHECK_DEL_REG_STR(hkey, "Clients", ":"); + CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0"); res = RegOpenKeyExA(hkey, "SourceList", 0, access, &sourcelist); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -6358,24 +6370,24 @@ static void test_publish_assemblies(void) res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); + CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox"); + CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox\0"); RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0"); RegCloseKey(hkey); /* No registration is done for a local assembly with no matching file */ @@ -6422,24 +6434,24 @@ static void test_publish_assemblies(void) res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_dotnet, 0, access, &hkey); } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); + CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox"); + CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox\0"); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0"); RegCloseKey(hkey); /* No registration is done for a local assembly with no matching file */

1 0

Zebediah Figura : msi: Write "Clients" value as REG_MULTI_SZ in PublishProduct.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 1951853d06144e67b8a3d9d63c835e06a7232588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1951853d06144e67b8a3d9d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:44 2021 -0500 msi: Write "Clients" value as REG_MULTI_SZ in PublishProduct. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cc5d56fdc2b..bcb1a4f578e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4042,7 +4042,7 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, L"Assignment", 0); msi_reg_set_val_dword(hkey, L"AdvertiseFlags", 0x184); msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); - msi_reg_set_val_str(hkey, L"Clients", L":"); + msi_reg_set_val_multi_str(hkey, L"Clients", L":\0"); if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; if ((ptr = wcschr(guids, ';'))) *ptr = 0;

1 0

Zebediah Figura : msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 2052d03fdf82ea9112c6ce3719936e245834eeb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2052d03fdf82ea9112c6ce37… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:43 2021 -0500 msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 265 ++++++++++++++++++++++++------------------------ 1 file changed, 130 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2052d03fdf82ea9112c6…

1 0

Zebediah Figura : server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 15aceec06730ec0307ad63a233cd71cb2eb15232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15aceec06730ec0307ad63a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:49 2021 -0500 server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ++-- server/trace.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 08399644a07..36fda31f9c1 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1221,8 +1221,8 @@ static unsigned int sock_get_error( int err ) case EFAULT: return WSAEFAULT; case EINVAL: return WSAEINVAL; case EMFILE: return WSAEMFILE; + case EINPROGRESS: case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; @@ -1290,8 +1290,8 @@ static int sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case EINPROGRESS: case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; diff --git a/server/trace.c b/server/trace.c index cd41d63d8c9..0fccf47d16a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5424,7 +5424,6 @@ static const struct { "WSAEFAULT", 0xc0010000 | WSAEFAULT }, { "WSAEHOSTDOWN", 0xc0010000 | WSAEHOSTDOWN }, { "WSAEHOSTUNREACH", 0xc0010000 | WSAEHOSTUNREACH }, - { "WSAEINPROGRESS", 0xc0010000 | WSAEINPROGRESS }, { "WSAEINTR", 0xc0010000 | WSAEINTR }, { "WSAEINVAL", 0xc0010000 | WSAEINVAL }, { "WSAEISCONN", 0xc0010000 | WSAEISCONN },

1 0

Zebediah Figura : ws2_32: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 0f9d9a032671f71970431864a6295d5722ffdaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f9d9a032671f71970431864… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:48 2021 -0500 ws2_32: Map EINPROGRESS to STATUS_DEVICE_NOT_READY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ff89ffb2d4b..74e86e9d845 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -816,8 +816,8 @@ static NTSTATUS sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case EINPROGRESS: case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; @@ -858,8 +858,8 @@ UINT sock_get_error( int err ) case EFAULT: return WSAEFAULT; case EINVAL: return WSAEINVAL; case EMFILE: return WSAEMFILE; + case EINPROGRESS: case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; case EBADF: case ENOTSOCK: return WSAENOTSOCK; @@ -943,8 +943,8 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEFAULT: return STATUS_ACCESS_VIOLATION; case WSAEINVAL: return STATUS_INVALID_PARAMETER; case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case WSAEINPROGRESS: case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case WSAEINPROGRESS: return STATUS_PENDING; case WSAEALREADY: return STATUS_NETWORK_BUSY; case WSAENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case WSAEDESTADDRREQ: return STATUS_INVALID_PARAMETER; @@ -2958,7 +2958,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (ret == 0) goto connect_success; - if (ret == WSAEINPROGRESS) + if (ret == WSAEWOULDBLOCK) { /* tell wineserver that a connection is in progress */ _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, @@ -3047,7 +3047,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n if (WSASend(s, &wsabuf, sendBuf ? 1 : 0, sent, 0, ov, NULL) != SOCKET_ERROR) goto connection_success; } - else if (ret == WSAEINPROGRESS) + else if (ret == WSAEWOULDBLOCK) { struct ws2_async *wsa; DWORD size;

1 0

Zebediah Figura : server: Map EFAULT to STATUS_ACCESS_VIOLATION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 523032e6f1806ce5593103d37f467d28908797e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523032e6f1806ce5593103d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:47 2021 -0500 server: Map EFAULT to STATUS_ACCESS_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index cb2a1095496..08399644a07 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1286,7 +1286,7 @@ static int sock_get_ntstatus( int err ) case EBUSY: return STATUS_DEVICE_BUSY; case EPERM: case EACCES: return STATUS_ACCESS_DENIED; - case EFAULT: return STATUS_NO_MEMORY; + case EFAULT: return STATUS_ACCESS_VIOLATION; case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES;

1 0

Zebediah Figura : ws2_32: Map EFAULT to STATUS_ACCESS_VIOLATION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: 44c395d616d9bb668713ca8b9e4c168af945aadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c395d616d9bb668713ca8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:46 2021 -0500 ws2_32: Map EFAULT to STATUS_ACCESS_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9eeb506f985..ff89ffb2d4b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -812,7 +812,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EBUSY: return STATUS_DEVICE_BUSY; case EPERM: case EACCES: return STATUS_ACCESS_DENIED; - case EFAULT: return STATUS_NO_MEMORY; + case EFAULT: return STATUS_ACCESS_VIOLATION; case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; @@ -940,7 +940,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case 0: return STATUS_SUCCESS; case WSAEBADF: return STATUS_INVALID_HANDLE; case WSAEACCES: return STATUS_ACCESS_DENIED; - case WSAEFAULT: return STATUS_NO_MEMORY; + case WSAEFAULT: return STATUS_ACCESS_VIOLATION; case WSAEINVAL: return STATUS_INVALID_PARAMETER; case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; @@ -992,7 +992,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_SHARING_VIOLATION: return WSAEADDRINUSE; case STATUS_IO_TIMEOUT: case STATUS_TIMEOUT: return WSAETIMEDOUT; - case STATUS_NO_MEMORY: return WSAEFAULT; + case STATUS_ACCESS_VIOLATION: return WSAEFAULT; case STATUS_ACCESS_DENIED: return WSAEACCES; case STATUS_TOO_MANY_OPENED_FILES: return WSAEMFILE; case STATUS_DEVICE_NOT_READY: return WSAEWOULDBLOCK;

1 0

Zebediah Figura : server: Map ENOTCONN to STATUS_INVALID_CONNECTION.
by Alexandre Julliard 06 May '21

06 May '21

Module: wine Branch: master Commit: d6d4fa4bd1e17aeb3d4a15f828e1a4dc9b606654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d4fa4bd1e17aeb3d4a15f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:45 2021 -0500 server: Map ENOTCONN to STATUS_INVALID_CONNECTION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- server/trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 49a75c33d2a..cb2a1095496 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1307,7 +1307,7 @@ static int sock_get_ntstatus( int err ) case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case ENOTCONN: return STATUS_INVALID_CONNECTION; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case EHOSTUNREACH: return STATUS_HOST_UNREACHABLE; diff --git a/server/trace.c b/server/trace.c index 645c183a52f..cd41d63d8c9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5300,7 +5300,6 @@ static const struct { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, { "CONNECTION_ABORTED", STATUS_CONNECTION_ABORTED }, - { "CONNECTION_DISCONNECTED", STATUS_CONNECTION_DISCONNECTED }, { "CONNECTION_REFUSED", STATUS_CONNECTION_REFUSED }, { "CONNECTION_RESET", STATUS_CONNECTION_RESET }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, @@ -5335,6 +5334,7 @@ static const struct { "INSUFFICIENT_RESOURCES", STATUS_INSUFFICIENT_RESOURCES }, { "INVALID_ADDRESS", STATUS_INVALID_ADDRESS }, { "INVALID_CID", STATUS_INVALID_CID }, + { "INVALID_CONNECTION", STATUS_INVALID_CONNECTION }, { "INVALID_DEVICE_REQUEST", STATUS_INVALID_DEVICE_REQUEST }, { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION }, { "INVALID_HANDLE", STATUS_INVALID_HANDLE },

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
77
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 May 2021