[PATCH 0/2] MR2612: Small wininet:internet cleanups

[Francois Gouget (＠fgouget)]

* wininet/tests: Avoid an unnecessary strlen() call in internet.c.
* wininet/tests: Remove redundant quotes in an ok() message.

[PATCH 1/2] wininet/tests: Remove redundant quotes in an ok() message.

[Francois Gouget]

From: Francois Gouget

wine_dbgstr_w() already quotes (and escapes) the string.
---
 dlls/wininet/tests/internet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 04b7f1041f7..e93bc120dec 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1736,7 +1736,7 @@ static void test_InternetGetConnectedStateExW(void)
     wcscpy(buffer, L"wine");
     SetLastError(0xdeadbeef);
     res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0);
-    trace("Internet Connection: Flags 0x%02lx - Name '%s'\n", flags, wine_dbgstr_w(buffer));
+    trace("Internet Connection: Flags 0x%02lx - Name %s\n", flags, wine_dbgstr_w(buffer));
     ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n");
     if(!res) {
         DWORD error = GetLastError();

[PATCH 2/2] wininet/tests: Avoid an unnecessary strlen() call in internet.c.

[Francois Gouget]

From: Francois Gouget

---
 dlls/wininet/tests/internet.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index e93bc120dec..e977bb4af6b 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1668,16 +1668,15 @@ static void test_InternetGetConnectedStateExA(void)
     buffer[0] = 0;
     res = pInternetGetConnectedStateExA(NULL, buffer, sizeof(buffer), 0);
     ok(res == TRUE, "Expected TRUE, got %d\n", res);
-    sz = strlen(buffer);
-    ok(sz > 0, "Expected a connection name\n");
+    ok(buffer[0], "Expected a connection name\n");

buffer[0] = 0;
     flags = 0;
     res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0);
     ok(res == TRUE, "Expected TRUE, got %d\n", res);
     ok(flags, "Expected at least one flag set\n");
+    ok(buffer[0], "Expected a connection name\n");
     sz = strlen(buffer);
-    ok(sz > 0, "Expected a connection name\n");

flags = 0;
     res = pInternetGetConnectedStateExA(&flags, NULL, sizeof(buffer), 0);

[PATCH 0/2] MR2612: Small wininet:internet cleanups - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.