[PATCH 0/2] MR6837: include: Add cpp header guard to the pathcch.h

[Nikolay Sivov (＠nsivov)]

This is !1421 and !1443 together, with the author name fixed up.

[PATCH 1/2] include: Add cpp header guard to the pathcch.h

[Vitor Ramos]

From: Vitor Ramos

Signed-off-by: Nikolay Sivov 
---
 include/pathcch.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/pathcch.h b/include/pathcch.h
index 72fbe2ad23b..c5df7021126 100644
--- a/include/pathcch.h
+++ b/include/pathcch.h
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define PATHCCH_NONE                            0x00
 #define PATHCCH_ALLOW_LONG_PATHS                0x01
 #define PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS  0x02
@@ -48,3 +52,7 @@ WINBASEAPI HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_
 WINBASEAPI HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size);
 WINBASEAPI HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size);
 WINBASEAPI BOOL    WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server);
+
+#ifdef __cplusplus
+}
+#endif

[PATCH 2/2] include: Use enum for PATHCCH_ options.

[Vitor Ramos]

From: Vitor Ramos

Signed-off-by: Nikolay Sivov 
---
 include/pathcch.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/include/pathcch.h b/include/pathcch.h
index c5df7021126..d0214d9e9bb 100644
--- a/include/pathcch.h
+++ b/include/pathcch.h
@@ -20,13 +20,16 @@
 extern "C" {
 #endif

-#define PATHCCH_NONE                            0x00
-#define PATHCCH_ALLOW_LONG_PATHS                0x01
-#define PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS  0x02
-#define PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS 0x04
-#define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS       0x08
-#define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH  0x10
-#define PATHCCH_ENSURE_TRAILING_SLASH           0x20
+typedef enum PATHCCH_OPTIONS
+{
+    PATHCCH_NONE = 0x00,
+    PATHCCH_ALLOW_LONG_PATHS = 0x01,
+    PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS = 0x02,
+    PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS = 0x04,
+    PATHCCH_DO_NOT_NORMALIZE_SEGMENTS = 0x08,
+    PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH = 0x10,
+    PATHCCH_ENSURE_TRAILING_SLASH = 0x20,
+} PATHCCH_OPTIONS;

#define PATHCCH_MAX_CCH 0x8000

[PATCH 2/2] include: Use enum for PATHCCH_ options.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149737

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
win.c:4073: Test succeeded inside todo block: Expected active window 0000000005FD017A, got 0000000005FD017A.
win.c:4074: Test succeeded inside todo block: Expected focus window 0000000005FD017A, got 0000000005FD017A.

[PATCH 0/2] MR6837: include: Add cpp header guard to the pathcch.h - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.