dll/win32/comdlg32/comdlg32_ros.diff

   1 diff -prudN e:\Wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c
   2 --- e:\Wine\dlls\comdlg32/cdlg32.c      2013-10-26 22:24:27.508648000 +0100
   3 +++ e:\reactos\dll\win32\comdlg32/cdlg32.c      2014-03-05 11:46:06.260510700 +0100
   4 @@ -174,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 @@ -283,7 +268,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
  14   */
  15  HRESULT WINAPI DllRegisterServer(void)
  16  {
  17 -    return __wine_register_resources(COMDLG32_hInstance);
  18 +    return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);
  19  }
  20
  21  /***********************************************************************
  22 @@ -291,5 +276,7 @@ HRESULT WINAPI DllRegisterServer(void)
  23   */
  24  HRESULT WINAPI DllUnregisterServer(void)
  25  {
  26 -    return __wine_unregister_resources(COMDLG32_hInstance);
  27 +    return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);
  28  }
  29 +
  30 +#endif /* Win 7 */
  31
  32 diff -prudN e:\Wine\dlls\comdlg32/comdlg32.spec e:\reactos\dll\win32\comdlg32/comdlg32.spec
  33 --- e:\Wine\dlls\comdlg32/comdlg32.spec 2011-09-16 23:22:36.026770600 +0100
  34 +++ e:\reactos\dll\win32\comdlg32/comdlg32.spec 2012-02-15 22:32:22.456422900 +0100
  35 @@ -3,9 +3,9 @@
  36  @ stdcall ChooseFontA(ptr)
  37  @ stdcall ChooseFontW(ptr)
  38  @ stdcall CommDlgExtendedError()
  39 -@ stdcall -private DllGetClassObject(ptr ptr ptr)
  40 -@ stdcall -private DllRegisterServer()
  41 -@ stdcall -private DllUnregisterServer()
  42 +;@ stdcall -private DllGetClassObject(ptr ptr ptr) ; Win 7
  43 +;@ stdcall -private DllRegisterServer() ; Win 7
  44 +;@ stdcall -private DllUnregisterServer() ; Win 7
  45  @ stdcall FindTextA(ptr)
  46  @ stdcall FindTextW(ptr)
  47  @ stdcall GetFileTitleA(str ptr long)
  48
  49 diff -prudN e:\Wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c
  50 --- e:\Wine\dlls\comdlg32/itemdlg.c     2013-10-26 22:24:27.515652700 +0100
  51 +++ e:\reactos\dll\win32\comdlg32/itemdlg.c     2013-10-15 19:32:27.803008200 +0100
  52 @@ -18,6 +18,8 @@
  53   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  54   */
  55
  56 +#ifndef __REACTOS__ /* Win 7 */
  57 +
  58  #include <stdarg.h>
  59
  60  #define COBJMACROS
  61 @@ -3660,3 +3662,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn
  62  {
  63      return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE);
  64  }
  65 +
  66 +#endif /* Win 7 */