[COMCTL32][RAPPS]

- Mark Str* functions as private in comctl32, they should be imported from shlwapi instead
- Remove the associated hack in rapps
CORE-7786 #resolve

svn path=/trunk/; revision=62570

diff --git a/reactos/base/applications/rapps/rapps.h b/reactos/base/applications/rapps/rapps.h
index 269e7dd..6c87803 100644 (file)
--- a/reactos/base/applications/rapps/rapps.h
+++ b/reactos/base/applications/rapps/rapps.h
@@ -17,6 +17,7 @@
 #include <wincon.h>
 #include <richedit.h>
 #include <shlobj.h>
+#include <shlwapi.h>
 #include <stdio.h>
 #include <strsafe.h>
 

diff --git a/reactos/base/applications/rapps/winmain.c b/reactos/base/applications/rapps/winmain.c
index f88eb94..6fa869f 100644 (file)
--- a/reactos/base/applications/rapps/winmain.c
+++ b/reactos/base/applications/rapps/winmain.c
@@ -18,8 +18,6 @@ HIMAGELIST hImageTreeView = NULL;
 INT SelectedEnumType = ENUM_ALL_COMPONENTS;
 SETTINGS_INFO SettingsInfo;
 
-PCWSTR (WINAPI *pStrStrIW)(PCWSTR, PCWSTR);
-
 WCHAR szSearchPattern[MAX_STR_LEN] = L"";
 BOOL SearchEnabled = TRUE;
 
@@ -29,7 +27,7 @@ SearchPatternMatch(PCWSTR szHaystack, PCWSTR szNeedle)
     if (!*szNeedle)
         return TRUE;
     /* TODO: Improve pattern search beyond a simple case-insensitive substring search. */
-    return pStrStrIW(szHaystack, szNeedle) != NULL;
+    return StrStrIW(szHaystack, szNeedle) != NULL;
 }
 
 VOID
@@ -907,10 +905,6 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
     HANDLE hMutex = NULL;
     MSG Msg;
 
-    /* FIXME: CORE-7786 requires this to be loaded at runtime because we
-     *        would get comctl32's version otherwise */
-    pStrStrIW = (PVOID)GetProcAddress(GetModuleHandle(L"shlwapi"), "StrStrIW");
-
     switch (GetUserDefaultUILanguage())
     {
         case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):

diff --git a/reactos/dll/win32/comctl32/comctl32.spec b/reactos/dll/win32/comctl32/comctl32.spec
index 04dd54e..653efd7 100644 (file)
--- a/reactos/dll/win32/comctl32/comctl32.spec
+++ b/reactos/dll/win32/comctl32/comctl32.spec
@@ -62,32 +62,32 @@
 341 stdcall -noname SendNotify(long long long ptr)
 342 stdcall -noname SendNotifyEx(long long long ptr long)
 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr)
-350 stdcall -noname StrChrA(str str)
-351 stdcall -noname StrRChrA(str str long)
-352 stdcall -noname StrCmpNA(str str long)
-353 stdcall -noname StrCmpNIA(str str long)
-354 stdcall -noname StrStrA(str str)
-355 stdcall -noname StrStrIA(str str)
-356 stdcall -noname StrCSpnA(str str)
-357 stdcall -noname StrToIntA(str)
-358 stdcall -noname StrChrW(wstr long)
-359 stdcall -noname StrRChrW(wstr wstr long)
-360 stdcall -noname StrCmpNW(wstr wstr long)
-361 stdcall -noname StrCmpNIW(wstr wstr long)
-362 stdcall -noname StrStrW(wstr wstr)
-363 stdcall -noname StrStrIW(wstr wstr)
-364 stdcall -noname StrCSpnW(wstr wstr)
-365 stdcall -noname StrToIntW(wstr)
-366 stdcall -noname StrChrIA(str long)
-367 stdcall -noname StrChrIW(wstr long)
-368 stdcall -noname StrRChrIA(str str long)
-369 stdcall -noname StrRChrIW(wstr wstr long)
-372 stdcall -noname StrRStrIA(str str str)
-373 stdcall -noname StrRStrIW(wstr wstr wstr)
-374 stdcall -noname StrCSpnIA(str str)
-375 stdcall -noname StrCSpnIW(wstr wstr)
-376 stdcall -noname IntlStrEqWorkerA(long str str long)
-377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long)
+350 stdcall -noname -private StrChrA(str str)
+351 stdcall -noname -private StrRChrA(str str long)
+352 stdcall -noname -private StrCmpNA(str str long)
+353 stdcall -noname -private StrCmpNIA(str str long)
+354 stdcall -noname -private StrStrA(str str)
+355 stdcall -noname -private StrStrIA(str str)
+356 stdcall -noname -private StrCSpnA(str str)
+357 stdcall -noname -private StrToIntA(str)
+358 stdcall -noname -private StrChrW(wstr long)
+359 stdcall -noname -private StrRChrW(wstr wstr long)
+360 stdcall -noname -private StrCmpNW(wstr wstr long)
+361 stdcall -noname -private StrCmpNIW(wstr wstr long)
+362 stdcall -noname -private StrStrW(wstr wstr)
+363 stdcall -noname -private StrStrIW(wstr wstr)
+364 stdcall -noname -private StrCSpnW(wstr wstr)
+365 stdcall -noname -private StrToIntW(wstr)
+366 stdcall -noname -private StrChrIA(str long)
+367 stdcall -noname -private StrChrIW(wstr long)
+368 stdcall -noname -private StrRChrIA(str str long)
+369 stdcall -noname -private StrRChrIW(wstr wstr long)
+372 stdcall -noname -private StrRStrIA(str str str)
+373 stdcall -noname -private StrRStrIW(wstr wstr wstr)
+374 stdcall -noname -private StrCSpnIA(str str)
+375 stdcall -noname -private StrCSpnIW(wstr wstr)
+376 stdcall -noname -private IntlStrEqWorkerA(long str str long)
+377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long)
 382 stdcall -noname SmoothScrollWindow(ptr)
 383 stdcall -noname DoReaderMode(ptr)
 384 stdcall -noname SetPathWordBreakProc(ptr long)