dll/win32/comdlg32/comdlg32_ros.diff

   1 diff -pudN e:\wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c
   2 --- e:\wine\dlls\comdlg32/cdlg32.c      2016-11-16 17:28:42 +0100
   3 +++ e:\reactos\dll\win32\comdlg32/cdlg32.c      2015-08-27 22:02:19 +0100
   4 @@ -157,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void)
   5           return 0; /* we never set an error, so there isn't one */
   6  }
   7
   8 +#ifndef __REACTOS__ /* Win 7 */
   9 +
  10  /*************************************************************************
  11   * Implement the CommDlg32 class factory
  12   *
  13 @@ -266,7 +268,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
  14   */
  15  HRESULT WINAPI DllRegisterServer(void)
  16  {
  17 +#ifdef __REACTOS__
  18 +    return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);
  19 +#else
  20      return __wine_register_resources(COMDLG32_hInstance);
  21 +#endif
  22  }
  23
  24  /***********************************************************************
  25 @@ -274,5 +280,11 @@ HRESULT WINAPI DllRegisterServer(void)
  26   */
  27  HRESULT WINAPI DllUnregisterServer(void)
  28  {
  29 +#ifdef __REACTOS__
  30 +    return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);
  31 +#else
  32      return __wine_unregister_resources(COMDLG32_hInstance);
  33 +#endif
  34  }
  35 +
  36 +#endif /* Win 7 */
  37 diff -pudN e:\wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c
  38 --- e:\wine\dlls\comdlg32/itemdlg.c     2016-08-14 19:11:13 +0100
  39 +++ e:\reactos\dll\win32\comdlg32/itemdlg.c     2016-08-15 16:16:18 +0100
  40 @@ -18,6 +18,8 @@
  41   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  42   */
  43
  44 +#ifndef __REACTOS__ /* Win 7 */
  45 +
  46  #include <stdarg.h>
  47
  48  #define COBJMACROS
  49 @@ -4659,3 +4661,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn
  50  {
  51      return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE);
  52  }
  53 +
  54 +#endif /* Win 7 */