Re: d3drm: Merge Direct3DRMCreate with its implementation.

[Christian Costa]

What the hell is the purpose of this patch ?

d3drm.c is for the IDirect3DRMx objects implementations and there will 
be a file for each other object.
Direct3DRMCreate is just an entry point and BTW many wine DirectX dlls 
are implemented this way because
some objects can be also created using the class factory.
And why are you removing the d3drm_private.h file at all ?
More generally, is it really necessary to do some clean-up while I'm 
doing some work on this dll ?

Christian

Dmitry Timoshkov a écrit :
> dlls/d3drm/d3drm.c         |   11 ++++++-----
>  dlls/d3drm/d3drm_main.c    |   16 ----------------
>  dlls/d3drm/d3drm_private.h |   31 -------------------------------
>  3 files changed, 6 insertions(+), 52 deletions(-)
>  delete mode 100644 dlls/d3drm/d3drm_private.h
>
> diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
> index a0d7d3f..ae80d46 100644
> --- a/dlls/d3drm/d3drm.c
> +++ b/dlls/d3drm/d3drm.c
> @@ -27,20 +27,21 @@
>
> #include "winbase.h"
>  #include "wingdi.h"
> -
>
> -#include "d3drm_private.h"
>  #include "d3drm.h"
>
> WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
>
> typedef struct {
> - IDirect3DRM lpVtbl;
> - const IDirect3DRMVtbl *lpVtbl;
> LONG ref;
>
> } IDirect3DRMImpl;
>
> static const struct IDirect3DRMVtbl Direct3DRM_Vtbl;
>
> -HRESULT Direct3DRM_create(LPDIRECT3DRM* ppDirect3DRM)
> +/***********************************************************************
> -
> -
>          (D3DRM.@)
> - */
>
> +HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM)
>  {
>      IDirect3DRMImpl* object;
>
> @@ -53,7 +54,7 @@ HRESULT Direct3DRM_create(LPDIRECT3DRM* ppDirect3DRM)
>          return E_OUTOFMEMORY;
>      }
> - object->lpVtbl.lpVtbl = &Direct3DRM_Vtbl;
> -
>
> object->lpVtbl = &Direct3DRM_Vtbl;
> object->ref = 1;
>
> *ppDirect3DRM = (IDirect3DRM*)object;
>
> diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c
> index 38a6a6c..d38159d 100644
> --- a/dlls/d3drm/d3drm_main.c
> +++ b/dlls/d3drm/d3drm_main.c
> @@ -20,12 +20,6 @@
>  #include <stdarg.h>
>  #include "windef.h"
>  #include "winbase.h"
> -#include "wingdi.h"
> -#include "d3drm.h"
> -#include "d3drm_private.h"
> -#include "wine/debug.h"
> -
>
> -WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
>
> /***********************************************************************
> -
> DllMain  (D3DRM.@)
>
> @@ -42,13 +36,3 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
>      }
>      return TRUE;
>  }
> -
>
> -/***********************************************************************
> -
> -
>          (D3DRM.@)
> - */
>
> -HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM)
> -{
> - TRACE("(%p)\n", ppDirect3DRM);
> -
> - return Direct3DRM_create(ppDirect3DRM);
>
> -}
> diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
> deleted file mode 100644
> index 091b076..0000000
> --- a/dlls/d3drm/d3drm_private.h
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -/*
> -
> -
>  Direct3DRM private interfaces (D3DRM.DLL)
> -
> -
> -
> - Copyright 2010 Christian Costa
> -
> -
> -
> - This file contains the (internal) driver registration functions,
> -
> - driver enumeration APIs and DirectDraw creation functions.
> -
> -
> -
> - This library is free software; you can redistribute it and/or
> -
> - modify it under the terms of the GNU Lesser General Public
> -
> - License as published by the Free Software Foundation; either
> -
> - version 2.1 of the License, or (at your option) any later version.
> -
> -
> -
> - This library is distributed in the hope that it will be useful,
> -
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> -
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -
> - Lesser General Public License for more details.
> -
> -
> -
> - You should have received a copy of the GNU Lesser General Public
> -
> - License along with this library; if not, write to the Free Software
> -
> - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
> - */
> -
>
> -#ifndef __D3DRM_PRIVATE_INCLUDED__
> -#define __D3DRM_PRIVATE_INCLUDED__
> -
>
> -#include "d3drm.h"
> -
>
> -HRESULT Direct3DRM_create(LPDIRECT3DRM* ppDirect3DRM);
> -
>
> -#endif /* __D3DRM_PRIVATE_INCLUDED__ */

d3drm: Merge Direct3DRMCreate with its implementation.

[Dmitry Timoshkov]

Christian Costa  wrote:
> What the hell is the purpose of this patch ?

Isn't the subject clear enough? Please calm down.
> d3drm.c is for the IDirect3DRMx objects implementations and there will 
> be a file for each other object.

Once it's really needed you can create as much source files as you prefer.
> Direct3DRMCreate is just an entry point and BTW many wine DirectX dlls 
> are implemented this way because
> some objects can be also created using the class factory.

So far that's not needed.
> And why are you removing the d3drm_private.h file at all ?

Because it's not needed.
> More generally, is it really necessary to do some clean-up while I'm 
> doing some work on this dll ?

There is no need to quote the whole patch if you aren't going to comment on
it anyway.

d3drm: Merge Direct3DRMCreate with its implementation.

[Christian Costa]

Dmitry Timoshkov a écrit :
> Christian Costa  wrote:
> > What the hell is the purpose of this patch ?
>
> Isn't the subject clear enough? Please calm down.

Well yes and no. Why would you do that merge ? Direct3DRM_create is 
supposed to be
called by Direct3DRMCreate or from class factory (which is not 
implemented yet).
This is the way we used to do it for DirectX dlls. Is there something 
wrong with that ?
> > d3drm.c is for the IDirect3DRMx objects implementations and there will 
> > be a file for each other object.
>
> Once it's really needed you can create as much source files as you prefer.
> > Direct3DRMCreate is just an entry point and BTW many wine DirectX dlls 
> > are implemented this way because
> > some objects can be also created using the class factory.
>
> So far that's not needed.

Because it's not yet implemented ? Or because there is no app or game 
that use COM functions to create the object ?
> > And why are you removing the d3drm_private.h file at all ?
>
> Because it's not needed.
> > More generally, is it really necessary to do some clean-up while I'm 
> > doing some work on this dll ?
>
> There is no need to quote the whole patch if you aren't going to comment on
> it anyway.

I hope I've done some better comments this time.

I'm not again clean-up at all but this dll is almost empty and this is 
likely there will be some patches preparing
further submissions. Doing some clean-up between patches does not help much.

If I was a little rude, sorry for that.

d3drm: Merge Direct3DRMCreate with its implementation.

[Dmitry Timoshkov]

Christian Costa  wrote:
> I'm not again clean-up at all but this dll is almost empty and this is 
> likely there will be some patches preparing
> further submissions. Doing some clean-up between patches does not help much.

Main purpose of my patch was to replace a vtable in IDirect3DRMImpl by
a pointer, everything else was just a side effect of that change. Feel
free to do that in one of your next patches.

d3drm: Merge Direct3DRMCreate with its implementation.

[Christian Costa]

Dmitry Timoshkov a écrit :
> Christian Costa  wrote:
> > I'm not again clean-up at all but this dll is almost empty and this is 
> > likely there will be some patches preparing
> > further submissions. Doing some clean-up between patches does not help much.
>
> Main purpose of my patch was to replace a vtable in IDirect3DRMImpl by
> a pointer, everything else was just a side effect of that change. Feel
> free to do that in one of your next patches.

I've just sent a patch for it as well as for d3xof and amstream that had 
the same problem. Thanks for spotting.

Christian