Nikolay Sivov : shell32: Cleanup ReadCabinetState exports.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ee4c06410214e418d35cee3671460e2924059ba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ee4c06410214e418d35cee3671460e2924059ba

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Oct 20 16:16:54 2015 +0300

shell32: Cleanup ReadCabinetState exports.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/shell32.spec |  6 +++---
 dlls/shell32/shellord.c   | 15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 91a4138..93fd449 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -245,10 +245,10 @@
 
  650 stdcall -noname PathIsSameRoot(ptr ptr) PathIsSameRootAW
 
- 651 stdcall -noname ReadCabinetState(long long) # OldReadCabinetState
- 652 stdcall -noname WriteCabinetState(long)
+ 651 stdcall -noname @(ptr long) ReadCabinetState # OldReadCabinetState
+ 652 stdcall -noname WriteCabinetState(ptr)
  653 stdcall -noname PathProcessCommand(long long long long) PathProcessCommandAW
- 654 stdcall @(long long) shell32_654 # ReadCabinetState at 8
+ 654 stdcall ReadCabinetState(ptr long)
 
  660 stdcall -noname FileIconInit(long)
  680 stdcall IsUserAnAdmin()
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 7387520..60492de 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -1555,21 +1555,6 @@ BOOL WINAPI SHWaitForFileToOpen(
 }
 
 /************************************************************************
- *	@				[SHELL32.654]
- *
- * NOTES
- *  first parameter seems to be a pointer (same as passed to WriteCabinetState)
- *  second one could be a size (0x0c). The size is the same as the structure saved to
- *  HCU\Software\Microsoft\Windows\CurrentVersion\Explorer\CabinetState
- *  I'm (js) guessing: this one is just ReadCabinetState ;-)
- */
-HRESULT WINAPI shell32_654 (CABINETSTATE *cs, int length)
-{
-	TRACE("%p %d\n",cs,length);
-	return ReadCabinetState(cs,length);
-}
-
-/************************************************************************
  *	RLBuildListOfPaths			[SHELL32.146]
  *
  * NOTES