[PATCH 0/1] MR3980: windows.applicationmodel/tests: Use PathRemoveFileSpecW() instead of PathCchRemoveFileSpec().

[Mohamad Al-Jaf (＠maljaf)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55652

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3980

[PATCH 1/1] windows.applicationmodel/tests: Use PathRemoveFileSpecW() instead of PathCchRemoveFileSpec().

[Mohamad Al-Jaf]

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55652
---
 dlls/windows.applicationmodel/tests/Makefile.in   | 2 +-
 dlls/windows.applicationmodel/tests/application.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/windows.applicationmodel/tests/Makefile.in b/dlls/windows.applicationmodel/tests/Makefile.in
index 9289fe0bc8c..3987f627736 100644
--- a/dlls/windows.applicationmodel/tests/Makefile.in
+++ b/dlls/windows.applicationmodel/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL = windows.applicationmodel.dll
-IMPORTS = combase advapi32 kernelbase
+IMPORTS = combase advapi32 shlwapi
 
 application_EXTRADLLFLAGS = -mconsole
 
diff --git a/dlls/windows.applicationmodel/tests/application.c b/dlls/windows.applicationmodel/tests/application.c
index 426d0d526a0..68abcc14450 100644
--- a/dlls/windows.applicationmodel/tests/application.c
+++ b/dlls/windows.applicationmodel/tests/application.c
@@ -28,7 +28,7 @@
 #include "winbase.h"
 #include "initguid.h"
 #include "winstring.h"
-#include "pathcch.h"
+#include "shlwapi.h"
 
 #include "roapi.h"
 
@@ -113,8 +113,7 @@ static void test_PackageStatics(void)
     hr = IStorageItem_get_Path( storage_item, &str );
     ok( hr == S_OK, "got hr %#lx.\n", hr );
     GetModuleFileNameW( NULL, buffer, MAX_PATH );
-    hr = PathCchRemoveFileSpec( buffer, ARRAY_SIZE(buffer) );
-    ok( hr == S_OK, "got hr %#lx.\n", hr );
+    PathRemoveFileSpecW( buffer );
     hr = WindowsCreateString( buffer, wcslen(buffer), &wine_str );
     ok( hr == S_OK, "got hr %#lx.\n", hr );
     hr = WindowsCompareStringOrdinal( str, wine_str, &res );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3980

[PATCH 1/1] windows.applicationmodel/tests: Use PathRemoveFileSpecW() instead of PathCchRemoveFileSpec().

[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 full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=138089

Your paranoid android.


=== w8 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w8adm (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w864 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064v1507 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064v1809 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064_tsign (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w10pro64 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w10pro64_en_AE_u8 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w11pro64 (32 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w864 (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064v1507 (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064v1809 (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064_2qxl (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064_adm (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w1064_tsign (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w10pro64 (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w10pro64_ar (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w10pro64_ja (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w10pro64_zh_CN (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

=== w11pro64_amd (64 bit report) ===

windows.applicationmodel:
Fatal: test 'application' does not exist.

[PATCH 0/1] MR3980: windows.applicationmodel/tests: Use PathRemoveFileSpecW() instead of PathCchRemoveFileSpec(). - approved

[Rémi Bernon]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3980