[PATCH 0/3] MR4629: user32: Correct capitalization of SetDeskWallpaper.

[PATCH 1/3] include: Remove SetDeskWallPaper.

[Alex Henrie]

From: Alex Henrie

This function is not documented, nor is it defined in any public header.
---
 include/winuser.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/winuser.h b/include/winuser.h
index 82824cd0afc..98cfc18a61e 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4568,7 +4568,6 @@ WINUSERAPI UINT_PTR    WINAPI SetCoalescableTimer(HWND,UINT_PTR,UINT,TIMERPROC,U
 WINUSERAPI HCURSOR     WINAPI SetCursor(HCURSOR);
 WINUSERAPI BOOL        WINAPI SetCursorPos(INT,INT);
 WINUSERAPI VOID        WINAPI SetDebugErrorLevel(DWORD);
-WINUSERAPI BOOL        WINAPI SetDeskWallPaper(LPCSTR);
 WINUSERAPI BOOL        WINAPI SetDisplayAutoRotationPreferences(ORIENTATION_PREFERENCE);
 WINUSERAPI BOOL        WINAPI SetDlgItemInt(HWND,INT,UINT,BOOL);
 WINUSERAPI BOOL        WINAPI SetDlgItemTextA(HWND,INT,LPCSTR);

[PATCH 2/3] user32: Correct capitalization of SetDeskWallpaper.

[Alex Henrie]

From: Alex Henrie

Spotted by Vijay Kiran Kamuju.
---
 dlls/user32/desktop.c   | 7 ++-----
 dlls/user32/user32.spec | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c
index b0384b6d8c2..f73d10f87eb 100644
--- a/dlls/user32/desktop.c
+++ b/dlls/user32/desktop.c
@@ -151,16 +151,13 @@ BOOL WINAPI PaintDesktop(HDC hdc)
 }

/***********************************************************************
- *           SetDeskWallPaper   (USER32.@)
- *
- * FIXME: is there a unicode version?
+ *           SetDeskWallpaper   (USER32.@)
  */
-BOOL WINAPI SetDeskWallPaper( LPCSTR filename )
+BOOL WINAPI SetDeskWallpaper( const char *filename )
 {
     return SystemParametersInfoA( SPI_SETDESKWALLPAPER, MAX_PATH, (void *)filename, SPIF_UPDATEINIFILE );
 }

-
 /***********************************************************************
  *           update_wallpaper
  */
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index ecaeb075450..042730845f1 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -671,8 +671,7 @@
 @ stub SetCursorContents
 @ stdcall -import SetCursorPos(long long) NtUserSetCursorPos
 @ stdcall SetDebugErrorLevel(long)
-@ stdcall SetDeskWallPaper(str)
-# @ stub SetDeskWallpaper
+@ stdcall SetDeskWallpaper(str)
 # @ stub SetDesktopBitmap
 @ stdcall SetDisplayAutoRotationPreferences(long)
 @ stdcall SetDisplayConfig(long ptr long ptr long)

[PATCH 3/3] user.exe: Rename SetDesktopWallPaper to SetDesktopWallpaper.

[Alex Henrie]

From: Alex Henrie

Although 16-bit function names are not case sensitive, it's best to
match the 32-bit version.
---
 dlls/user.exe16/user.c          | 6 +++---
 dlls/user.exe16/user.exe16.spec | 2 +-
 include/wine/winuser16.h        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c
index e1b44d28101..ef3ccc8a9da 100644
--- a/dlls/user.exe16/user.c
+++ b/dlls/user.exe16/user.c
@@ -1824,11 +1824,11 @@ WORD WINAPI GetFreeSystemResources16( WORD resType )

/***********************************************************************
- *           SetDeskWallPaper   (USER.285)
+ *           SetDeskWallpaper   (USER.285)
  */
-BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename )
+BOOL16 WINAPI SetDeskWallpaper16( const char *filename )
 {
-    return SetDeskWallPaper( filename );
+    return SetDeskWallpaper( filename );
 }

diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec
index ec571800e71..4798ccc2ce5 100644
--- a/dlls/user.exe16/user.exe16.spec
+++ b/dlls/user.exe16/user.exe16.spec
@@ -282,7 +282,7 @@
 282 pascal -ret16 SelectPalette(word word word) SelectPalette16
 283 pascal -ret16 RealizePalette(word) RealizePalette16
 284 pascal -ret16 GetFreeSystemResources(word) GetFreeSystemResources16
-285 pascal -ret16 SetDeskWallPaper(ptr) SetDeskWallPaper16 # BEAR285
+285 pascal -ret16 SetDeskWallpaper(str) SetDeskWallpaper16 # BEAR285
 286 pascal -ret16 GetDesktopWindow() GetDesktopWindow16
 287 pascal -ret16 GetLastActivePopup(word) GetLastActivePopup16
 288 pascal   GetMessageExtraInfo() GetMessageExtraInfo
diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h
index 3dc984254c9..90e80c7fdca 100644
--- a/include/wine/winuser16.h
+++ b/include/wine/winuser16.h
@@ -880,7 +880,7 @@ HWND16      WINAPI SetClipboardViewer16(HWND16);
 INT16       WINAPI SetCommBreak16(INT16);
 HCURSOR16   WINAPI SetCursor16(HCURSOR16);
 void        WINAPI SetCursorPos16(INT16,INT16);
-BOOL16      WINAPI SetDeskWallPaper16(LPCSTR);
+BOOL16      WINAPI SetDeskWallpaper16(const char*);
 void        WINAPI SetDlgItemInt16(HWND16,INT16,UINT16,BOOL16);
 void        WINAPI SetDlgItemText16(HWND16,INT16,SEGPTR);
 VOID        WINAPI SetDoubleClickTime16(UINT16);

[PATCH 3/3] user.exe: Rename SetDesktopWallPaper to SetDesktopWallpaper.

[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=140894

Your paranoid android.

=== debian11 (build log) ===

/home/winetest/tools/testbot/var/wine-win32/../wine/dlls/user.exe16/user.c:1831: undefined reference to `SetDeskWallpaper'
collect2: error: ld returned 1 exit status
Task: The win32 Wine build failed

=== debian11b (build log) ===

/home/winetest/tools/testbot/var/wine-wow32/../wine/dlls/user.exe16/user.c:1831: undefined reference to `SetDeskWallpaper'
collect2: error: ld returned 1 exit status
Task: The wow32 Wine build failed