[PATCH 1/5] shell32: Move SHWaitForFileToOpen() flags to shellord.c.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shellord.c | 5 +++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 2c73ce18940..a138f381a92 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -50,6 +50,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); +/* SHWaitForFileToOpen flags */ +#define SHWFF_ADD 0x01 +#define SHWFF_REMOVE 0x02 +#define SHWFF_WAIT 0x04 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 5ed8d25f234..459c51c8454 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -208,16 +208,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); * Misc Stuff */ -/* SHWaitForFileToOpen flags */ -#define SHWFF_ADD 0x01 -#define SHWFF_REMOVE 0x02 -#define SHWFF_WAIT 0x04 - -BOOL WINAPI SHWaitForFileToOpen( - LPCITEMIDLIST pidl, - DWORD dwFlags, - DWORD dwTimeout); - WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids); -- 2.34.1
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shellord.c | 6 ++++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a138f381a92..57308e1c988 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -55,6 +55,12 @@ WINE_DECLARE_DEBUG_CHANNEL(pidl); #define SHWFF_REMOVE 0x02 #define SHWFF_WAIT 0x04 +/* RegisterShellHook types */ +#define RSH_DEREGISTER 0 +#define RSH_REGISTER 1 +#define RSH_REGISTER_PROGMAN 2 +#define RSH_REGISTER_TASKMAN 3 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 459c51c8454..dd20090d7bd 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -211,16 +211,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids); -/* RegisterShellHook types */ -#define RSH_DEREGISTER 0 -#define RSH_REGISTER 1 -#define RSH_REGISTER_PROGMAN 2 -#define RSH_REGISTER_TASKMAN 3 - -BOOL WINAPI RegisterShellHook( - HWND hWnd, - DWORD dwType); - /* SHCreateDefClassObject callback function */ typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)( LPUNKNOWN pUnkOuter, -- 2.34.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106913 Your paranoid android. === debian11 (32 bit report) === shell32: shelllink.c:802: Test failed: dirty (0x00000000) shelllink.c:802: Test failed: got 0x00000001 shelllink.c:802: Test failed: Didn't expect NULL Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x6a2e908d). shellpath.c:3049: Test failed: test 4: expected L"C:\\users\\winetest\\Temp\\test.lnk", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3049: Test failed: test 8: expected L"C:\\users\\winetest\\Temp\\test.lnk", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3048: Test failed: test 14: expected 0, got 1 shellpath.c:3049: Test failed: test 14: expected L"C:\\users\\winetest\\Temp\\test", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3049: Test failed: test 16: expected L"C:\\users\\winetest\\Temp\\test.lnk", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3049: Test failed: test 19: expected L"C:\\users\\winetest\\Temp\\test.lnk", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3049: Test failed: test 20: expected L"C:\\users\\winetest\\Temp\\test.lnk", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3049: Test failed: test 24: expected L"C:\\users\\winetest\\Temp\\test.lnk", got L"C:\\users\\winetest\\Temp\\test.bat" shellpath.c:3048: Test failed: test 26: expected 0, got 1 shellpath.c:3049: Test failed: test 26: expected L"C:\\users\\winetest\\Temp\\test", got L"C:\\users\\winetest\\Temp\\test.bat"
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shlfolder.c | 4 ++++ dlls/shell32/undocshell.h | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..2ea6af11271 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -48,6 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +/* SHCreateLinks flags */ +#define SHCLF_PREFIXNAME 0x01 +#define SHCLF_CREATEONDESKTOP 0x02 + /*************************************************************************** * SHELL32_GetCustomFolderAttribute (internal function) * diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index dd20090d7bd..e4ed7c3630a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -226,17 +226,6 @@ HRESULT WINAPI SHCreateDefClassObject( void WINAPI SHFreeUnusedLibraries(void); -/* SHCreateLinks flags */ -#define SHCLF_PREFIXNAME 0x01 -#define SHCLF_CREATEONDESKTOP 0x02 - -HRESULT WINAPI SHCreateLinks( - HWND hWnd, - LPCSTR lpszDir, - LPDATAOBJECT lpDataObject, - UINT uFlags, - LPITEMIDLIST *lppidlLinks); - DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len); DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len); -- 2.34.1
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shell32_main.h | 22 ++++++++++++++++++++++ dlls/shell32/undocshell.h | 25 ------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index b98629298aa..ea8019a85e2 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -268,4 +268,26 @@ static inline WCHAR *strdupAtoW(const char *str) return ret; } +/* explorer ("cabinet") window messages */ +#define CWM_SETPATH (WM_USER + 2) +#define CWM_WANTIDLE (WM_USER + 3) +#define CWM_GETSETCURRENTINFO (WM_USER + 4) +#define CWM_SELECTITEM (WM_USER + 5) +#define CWM_SELECTITEMSTR (WM_USER + 6) +#define CWM_GETISHELLBROWSER (WM_USER + 7) +#define CWM_TESTPATH (WM_USER + 9) +#define CWM_STATECHANGE (WM_USER + 10) +#define CWM_GETPATH (WM_USER + 12) + +/* CWM_TESTPATH types */ +#define CWTP_ISEQUAL 0 +#define CWTP_ISCHILD 1 + +/* CWM_TESTPATH structure */ +typedef struct +{ + DWORD dwType; + ITEMIDLIST idl; +} CWTESTPATHSTRUCT; + #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index e4ed7c3630a..881832c5185 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -61,31 +61,6 @@ LPVOID WINAPI SHLockShared( BOOL WINAPI SHUnlockShared(LPVOID pv); -/**************************************************************************** - * Cabinet Window Messages - */ - -#define CWM_SETPATH (WM_USER + 2) -#define CWM_WANTIDLE (WM_USER + 3) -#define CWM_GETSETCURRENTINFO (WM_USER + 4) -#define CWM_SELECTITEM (WM_USER + 5) -#define CWM_SELECTITEMSTR (WM_USER + 6) -#define CWM_GETISHELLBROWSER (WM_USER + 7) -#define CWM_TESTPATH (WM_USER + 9) -#define CWM_STATECHANGE (WM_USER + 10) -#define CWM_GETPATH (WM_USER + 12) - -/* CWM_TESTPATH types */ -#define CWTP_ISEQUAL 0 -#define CWTP_ISCHILD 1 - -/* CWM_TESTPATH structure */ -typedef struct -{ - DWORD dwType; - ITEMIDLIST idl; -} CWTESTPATHSTRUCT,* LPCWTESTPATHSTRUCT; - /**************************************************************************** * System Imagelist Routines */ -- 2.34.1
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shell32/shell32_main.h | 3 +++ dlls/shell32/undocshell.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ea8019a85e2..14011489e86 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -290,4 +290,7 @@ typedef struct ITEMIDLIST idl; } CWTESTPATHSTRUCT; +BOOL WINAPI StrRetToStrNA(char *, DWORD, STRRET *, const ITEMIDLIST *); +BOOL WINAPI StrRetToStrNW(WCHAR *, DWORD, STRRET *, const ITEMIDLIST *); + #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 881832c5185..61c2ff4069f 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,12 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */ -/* - string functions -*/ -BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); -BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); - /**************************************************************************** * Memory Routines */ -- 2.34.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106908 Your paranoid android. === debian11 (32 bit report) === shell32: shelllink.c:772: Test failed: dirty (0x00000000) shelllink.c:772: Test failed: got 0x00000001 shelllink.c:772: Test failed: Didn't expect NULL Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x6a2e908d).
participants (2)
-
Marvin -
Zebediah Figura