subject:"\[Openvpn\-devel\] \[S\] Change in openvpn\[master\]\: win32\: Change some APIs to use DWORD instead of size

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

2025-10-18 Thread cron2 (Code Review)

cron2 has submitted this change. ( 
http://gerrit.openvpn.net/c/openvpn/+/1269?usp=email )

Change subject: win32: Change some APIs to use DWORD instead of size_t
..

win32: Change some APIs to use DWORD instead of size_t

This is what the Win32 APIs use. Since we put static
integers into this (e.g. sizeof()) this doesn't
result in new conversion warnings at the caller sites.

Change-Id: Ia836e3c05a868a7e8419c2bb2f547d968260783c
Signed-off-by: Frank Lichtenheld 
Acked-by: Gert Doering 
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1269
Message-Id: <[email protected]>
URL: https://sourceforge.net/p/openvpn/mailman/message/59246222/
Signed-off-by: Gert Doering 
---
M src/openvpn/route.c
M src/openvpn/win32.c
M src/openvpn/win32.h
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 20 insertions(+), 24 deletions(-)




diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index ae9aaac..7d988da 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -2840,7 +2840,7 @@

 /* Returns RTA_SUCCESS on success, RTA_EEXIST if route exists, RTA_ERROR on 
error */
 static int
-do_route_service(const bool add, const route_message_t *rt, const size_t size, 
HANDLE pipe)
+do_route_service(const bool add, const route_message_t *rt, const DWORD size, 
HANDLE pipe)
 {
 int ret = RTA_ERROR;
 ack_message_t ack;
diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index eac2352..3c11ec3 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -1418,13 +1418,8 @@
 return (const char *)out.data;
 }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 bool
-send_msg_iservice(HANDLE pipe, const void *data, size_t size, ack_message_t 
*ack,
+send_msg_iservice(HANDLE pipe, const void *data, DWORD size, ack_message_t 
*ack,
   const char *context)
 {
 struct gc_arena gc = gc_new();
@@ -1527,7 +1522,8 @@

 while (expire >= now)
 {
-DWORD status = WaitForSingleObject(win32_signal.in.read, (expire - 
now) * 1000);
+DWORD wait_ms = (DWORD)((expire - now) * 1000);
+DWORD status = WaitForSingleObject(win32_signal.in.read, wait_ms);
 if ((status == WAIT_OBJECT_0 && win32_signal_get(&win32_signal)) || 
status == WAIT_TIMEOUT)
 {
 return;
@@ -1539,7 +1535,7 @@
 {
 if (expire > now)
 {
-Sleep((expire - now) * 1000);
+Sleep((DWORD)((expire - now) * 1000));
 }
 return;
 }
@@ -1602,7 +1598,7 @@
 }

 bool
-protect_buffer_win32(char *buf, size_t len)
+protect_buffer_win32(char *buf, DWORD len)
 {
 bool ret;
 if (len % CRYPTPROTECTMEMORY_BLOCK_SIZE)
@@ -1620,7 +1616,7 @@
 }

 bool
-unprotect_buffer_win32(char *buf, size_t len)
+unprotect_buffer_win32(char *buf, DWORD len)
 {
 bool ret;
 if (len % CRYPTPROTECTMEMORY_BLOCK_SIZE)
@@ -1637,8 +1633,4 @@
 return ret;
 }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 #endif /* ifdef _WIN32 */
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h
index ff3145a..07a58d8 100644
--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.h
@@ -301,12 +301,14 @@
  */
 const char *win32_version_string(struct gc_arena *gc);

-/*
- * Send the |size| bytes in buffer |data| to the interactive service |pipe|
- * and read the result in |ack|. Returns false on communication error.
- * The string in |context| is used to prefix error messages.
+/**
+ * Send the \p size bytes in buffer \p data to the interactive service \p pipe
+ * and read the result in \p ack.
+ * The string in \p context is used to prefix error messages.
+ *
+ * @return true on success, false on communication error
  */
-bool send_msg_iservice(HANDLE pipe, const void *data, size_t size, 
ack_message_t *ack,
+bool send_msg_iservice(HANDLE pipe, const void *data, DWORD size, 
ack_message_t *ack,
const char *context);

 /*
@@ -350,7 +352,7 @@
  * - len   number of bytes to encrypt -- must be a multiple of
  * CRYPTPROTECTMEMORY_BLOCK_SIZE = 16
  */
-bool protect_buffer_win32(char *buf, size_t len);
+bool protect_buffer_win32(char *buf, DWORD len);

 /**
  * Decrypt a previously encrypted region of memory using CryptUnProtectMemory()
@@ -360,7 +362,7 @@
  * - len   number of bytes to encrypt -- must be a multiple of
  * CRYPTPROTECTMEMORY_BLOCK_SIZE = 16
  */
-bool unprotect_buffer_win32(char *buf, size_t len);
+bool unprotect_buffer_win32(char *buf, DWORD len);

 #endif /* ifndef OPENVPN_WIN32_H */
 #endif /* ifdef _WIN32 */
diff --git a/tests/unit_tests/openvpn/test_user_pass.c 
b/tests/unit_tests/openvpn/test_user_pass.c
index f56..abe223c 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -79,17 +79,19 @@
 return 0;
 }

+#i

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

2025-10-18 Thread cron2 (Code Review)

cron2 has uploaded a new patch set (#2) to the change originally created by 
flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1269?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2


Change subject: win32: Change some APIs to use DWORD instead of size_t
..

win32: Change some APIs to use DWORD instead of size_t

This is what the Win32 APIs use. Since we put static
integers into this (e.g. sizeof()) this doesn't
result in new conversion warnings at the caller sites.

Change-Id: Ia836e3c05a868a7e8419c2bb2f547d968260783c
Signed-off-by: Frank Lichtenheld 
Acked-by: Gert Doering 
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1269
Message-Id: <[email protected]>
URL: https://sourceforge.net/p/openvpn/mailman/message/59246222/
Signed-off-by: Gert Doering 
---
M src/openvpn/route.c
M src/openvpn/win32.c
M src/openvpn/win32.h
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 20 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/69/1269/2

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index ae9aaac..7d988da 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -2840,7 +2840,7 @@

 /* Returns RTA_SUCCESS on success, RTA_EEXIST if route exists, RTA_ERROR on 
error */
 static int
-do_route_service(const bool add, const route_message_t *rt, const size_t size, 
HANDLE pipe)
+do_route_service(const bool add, const route_message_t *rt, const DWORD size, 
HANDLE pipe)
 {
 int ret = RTA_ERROR;
 ack_message_t ack;
diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index eac2352..3c11ec3 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -1418,13 +1418,8 @@
 return (const char *)out.data;
 }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 bool
-send_msg_iservice(HANDLE pipe, const void *data, size_t size, ack_message_t 
*ack,
+send_msg_iservice(HANDLE pipe, const void *data, DWORD size, ack_message_t 
*ack,
   const char *context)
 {
 struct gc_arena gc = gc_new();
@@ -1527,7 +1522,8 @@

 while (expire >= now)
 {
-DWORD status = WaitForSingleObject(win32_signal.in.read, (expire - 
now) * 1000);
+DWORD wait_ms = (DWORD)((expire - now) * 1000);
+DWORD status = WaitForSingleObject(win32_signal.in.read, wait_ms);
 if ((status == WAIT_OBJECT_0 && win32_signal_get(&win32_signal)) || 
status == WAIT_TIMEOUT)
 {
 return;
@@ -1539,7 +1535,7 @@
 {
 if (expire > now)
 {
-Sleep((expire - now) * 1000);
+Sleep((DWORD)((expire - now) * 1000));
 }
 return;
 }
@@ -1602,7 +1598,7 @@
 }

 bool
-protect_buffer_win32(char *buf, size_t len)
+protect_buffer_win32(char *buf, DWORD len)
 {
 bool ret;
 if (len % CRYPTPROTECTMEMORY_BLOCK_SIZE)
@@ -1620,7 +1616,7 @@
 }

 bool
-unprotect_buffer_win32(char *buf, size_t len)
+unprotect_buffer_win32(char *buf, DWORD len)
 {
 bool ret;
 if (len % CRYPTPROTECTMEMORY_BLOCK_SIZE)
@@ -1637,8 +1633,4 @@
 return ret;
 }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 #endif /* ifdef _WIN32 */
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h
index ff3145a..07a58d8 100644
--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.h
@@ -301,12 +301,14 @@
  */
 const char *win32_version_string(struct gc_arena *gc);

-/*
- * Send the |size| bytes in buffer |data| to the interactive service |pipe|
- * and read the result in |ack|. Returns false on communication error.
- * The string in |context| is used to prefix error messages.
+/**
+ * Send the \p size bytes in buffer \p data to the interactive service \p pipe
+ * and read the result in \p ack.
+ * The string in \p context is used to prefix error messages.
+ *
+ * @return true on success, false on communication error
  */
-bool send_msg_iservice(HANDLE pipe, const void *data, size_t size, 
ack_message_t *ack,
+bool send_msg_iservice(HANDLE pipe, const void *data, DWORD size, 
ack_message_t *ack,
const char *context);

 /*
@@ -350,7 +352,7 @@
  * - len   number of bytes to encrypt -- must be a multiple of
  * CRYPTPROTECTMEMORY_BLOCK_SIZE = 16
  */
-bool protect_buffer_win32(char *buf, size_t len);
+bool protect_buffer_win32(char *buf, DWORD len);

 /**
  * Decrypt a previously encrypted region of memory using CryptUnProtectMemory()
@@ -360,7 +362,7 @@
  * - len   number of bytes to encrypt -- must be a multiple of
  * CRYPTPROTECTMEMORY_BLOCK_SIZE = 16
  */
-bool unprotect_buffer_win32(char *buf, size_t len);
+bool unprotect_buffer_win32(char *buf, DWORD len);

 #endif /* ifndef OPENVPN_WIN32_H */
 #endif /* ifdef _WIN32 */
diff --git a/tests/unit_tests/openvpn/test_user_pass.c 
b/t

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

2025-10-17 Thread cron2 (Code Review)

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change by flichtenheld. ( 
http://gerrit.openvpn.net/c/openvpn/+/1269?usp=email )

Change subject: win32: Change some APIs to use DWORD instead of size_t
..


Patch Set 1: Code-Review+2


--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1269?usp=email
To unsubscribe, or for help writing mail filters, visit 
http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia836e3c05a868a7e8419c2bb2f547d968260783c
Gerrit-Change-Number: 1269
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld 
Gerrit-Reviewer: cron2 
Gerrit-Reviewer: plaisthos 
Gerrit-CC: openvpn-devel 
Gerrit-Attention: plaisthos 
Gerrit-Attention: flichtenheld 
Gerrit-Comment-Date: Mon, 13 Oct 2025 16:22:06 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
___
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

2025-10-13 Thread flichtenheld (Code Review)

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

http://gerrit.openvpn.net/c/openvpn/+/1269?usp=email

to review the following change.


Change subject: win32: Change some APIs to use DWORD instead of size_t
..

win32: Change some APIs to use DWORD instead of size_t

This is what the Win32 APIs use. Since we put static
integers into this (e.g. sizeof()) this doesn't
result in new conversion warnings at the caller sites.

Change-Id: Ia836e3c05a868a7e8419c2bb2f547d968260783c
Signed-off-by: Frank Lichtenheld 
---
M src/openvpn/route.c
M src/openvpn/win32.c
M src/openvpn/win32.h
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 20 insertions(+), 24 deletions(-)



  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/69/1269/1

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 0044794..fde460a 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -2840,7 +2840,7 @@

 /* Returns RTA_SUCCESS on success, RTA_EEXIST if route exists, RTA_ERROR on 
error */
 static int
-do_route_service(const bool add, const route_message_t *rt, const size_t size, 
HANDLE pipe)
+do_route_service(const bool add, const route_message_t *rt, const DWORD size, 
HANDLE pipe)
 {
 int ret = RTA_ERROR;
 ack_message_t ack;
diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index eac2352..3c11ec3 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -1418,13 +1418,8 @@
 return (const char *)out.data;
 }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 bool
-send_msg_iservice(HANDLE pipe, const void *data, size_t size, ack_message_t 
*ack,
+send_msg_iservice(HANDLE pipe, const void *data, DWORD size, ack_message_t 
*ack,
   const char *context)
 {
 struct gc_arena gc = gc_new();
@@ -1527,7 +1522,8 @@

 while (expire >= now)
 {
-DWORD status = WaitForSingleObject(win32_signal.in.read, (expire - 
now) * 1000);
+DWORD wait_ms = (DWORD)((expire - now) * 1000);
+DWORD status = WaitForSingleObject(win32_signal.in.read, wait_ms);
 if ((status == WAIT_OBJECT_0 && win32_signal_get(&win32_signal)) || 
status == WAIT_TIMEOUT)
 {
 return;
@@ -1539,7 +1535,7 @@
 {
 if (expire > now)
 {
-Sleep((expire - now) * 1000);
+Sleep((DWORD)((expire - now) * 1000));
 }
 return;
 }
@@ -1602,7 +1598,7 @@
 }

 bool
-protect_buffer_win32(char *buf, size_t len)
+protect_buffer_win32(char *buf, DWORD len)
 {
 bool ret;
 if (len % CRYPTPROTECTMEMORY_BLOCK_SIZE)
@@ -1620,7 +1616,7 @@
 }

 bool
-unprotect_buffer_win32(char *buf, size_t len)
+unprotect_buffer_win32(char *buf, DWORD len)
 {
 bool ret;
 if (len % CRYPTPROTECTMEMORY_BLOCK_SIZE)
@@ -1637,8 +1633,4 @@
 return ret;
 }

-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 #endif /* ifdef _WIN32 */
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h
index ff3145a..07a58d8 100644
--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.h
@@ -301,12 +301,14 @@
  */
 const char *win32_version_string(struct gc_arena *gc);

-/*
- * Send the |size| bytes in buffer |data| to the interactive service |pipe|
- * and read the result in |ack|. Returns false on communication error.
- * The string in |context| is used to prefix error messages.
+/**
+ * Send the \p size bytes in buffer \p data to the interactive service \p pipe
+ * and read the result in \p ack.
+ * The string in \p context is used to prefix error messages.
+ *
+ * @return true on success, false on communication error
  */
-bool send_msg_iservice(HANDLE pipe, const void *data, size_t size, 
ack_message_t *ack,
+bool send_msg_iservice(HANDLE pipe, const void *data, DWORD size, 
ack_message_t *ack,
const char *context);

 /*
@@ -350,7 +352,7 @@
  * - len   number of bytes to encrypt -- must be a multiple of
  * CRYPTPROTECTMEMORY_BLOCK_SIZE = 16
  */
-bool protect_buffer_win32(char *buf, size_t len);
+bool protect_buffer_win32(char *buf, DWORD len);

 /**
  * Decrypt a previously encrypted region of memory using CryptUnProtectMemory()
@@ -360,7 +362,7 @@
  * - len   number of bytes to encrypt -- must be a multiple of
  * CRYPTPROTECTMEMORY_BLOCK_SIZE = 16
  */
-bool unprotect_buffer_win32(char *buf, size_t len);
+bool unprotect_buffer_win32(char *buf, DWORD len);

 #endif /* ifndef OPENVPN_WIN32_H */
 #endif /* ifdef _WIN32 */
diff --git a/tests/unit_tests/openvpn/test_user_pass.c 
b/tests/unit_tests/openvpn/test_user_pass.c
index f56..abe223c 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -79,17 +79,19 @@
 return 0;
 }

+#ifdef _WIN32
 bool
-protect_buffer_win32(c

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

[Openvpn-devel] [S] Change in openvpn[master]: win32: Change some APIs to use DWORD instead of size_t

4 matches

Site Navigation

Mail list logo

Footer information