Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHLWAPI]: Update the ros-diff.

Browse source 
svn path=/trunk/; revision=66539
This commit is contained in:
Hermès Bélusca-Maïto 2015-03-02 01:23:55 +00:00
parent 811fcc6a66
commit e83e0a084f
1 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
reactos/dll/win32/shlwapi/shlwapi_ros.diff
View file

@ -2,6 +2,31 @@ Index: path.c
===================================================================
--- path.c (working copy)
+++ path.c (working copy)
@@ -21,23 +21,8 @@
#include "precomp.h"
-/* Get a function pointer from a DLL handle */
-#define GET_FUNC(func, module, name, fail) \
- do { \
- if (!func) { \
- if (!SHLWAPI_h##module && !(SHLWAPI_h##module = LoadLibraryA(#module ".dll"))) return fail; \
- func = (fn##func)GetProcAddress(SHLWAPI_h##module, name); \
- if (!func) return fail; \
- } \
- } while (0)
+int WINAPI IsNetDrive(int drive);
-/* DLL handles for late bound calls */
-static HMODULE SHLWAPI_hshell32;
-
-/* Function pointers for GET_FUNC macro; these need to be global because of gcc bug */
-typedef BOOL (WINAPI *fnpIsNetDrive)(int);
-static fnpIsNetDrive pIsNetDrive;
-
HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD);
static inline WCHAR* heap_strdupAtoW(LPCSTR str)
@@ -2186,7 +2186,7 @@
{
TRACE("(%s)\n",debugstr_a(lpszPath));
@ -20,3 +45,23 @@ Index: path.c
return TRUE;
return FALSE;
}
@@ -3699,8 +3684,7 @@
dwDriveNum = PathGetDriveNumberA(lpszPath);
if (dwDriveNum == -1)
return FALSE;
- GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */
- return pIsNetDrive(dwDriveNum);
+ return IsNetDrive(dwDriveNum);
}
/*************************************************************************
@@ -3721,8 +3705,7 @@
dwDriveNum = PathGetDriveNumberW(lpszPath);
if (dwDriveNum == -1)
return FALSE;
- GET_FUNC(pIsNetDrive, shell32, (LPCSTR)66, FALSE); /* ord 66 = shell32.IsNetDrive */
- return pIsNetDrive(dwDriveNum);
+ return IsNetDrive(dwDriveNum);
}
/*************************************************************************