Re: [ros-dev] [ros-diffs] [hbelusca] 66538: [SHLWAPI]: Remove some Wine madness. CORE-8936.

[Thomas Faber]

Hmm what's the point of this? If it doesn't break anything, let's not
create a ROS-diff?


On 2015-03-02 02:15, hbelusca(a)svn.reactos.org wrote:
>   Author: hbelusca
>  Date: Mon Mar  2 01:15:00 2015
>  New Revision: 66538
>  
>  URL: http://svn.reactos.org/svn/reactos?rev=66538&view=rev
>  Log:
>  [SHLWAPI]: Remove some Wine madness. CORE-8936.
>  
>  Modified:
>      trunk/reactos/dll/win32/shlwapi/path.c
>  
>  Modified: trunk/reactos/dll/win32/shlwapi/path.c
>  URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r…
>  ==============================================================================
>  --- trunk/reactos/dll/win32/shlwapi/path.c	[iso-8859-1] (original)
>  +++ trunk/reactos/dll/win32/shlwapi/path.c	[iso-8859-1] Mon Mar  2 01:15:00 2015
>  @@ -21,22 +21,7 @@
>   
>   #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)
>  -
>  -/* 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;
>  +int WINAPI IsNetDrive(int drive);
>   
>   HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD);
>   
>  @@ -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);
>   }
>   
>   /*************************************************************************
>  
>