[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    Re: [PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType. (try 5)
From:       Christian Costa <titan.costa () gmail ! com>
Date:       2012-10-25 8:41:15
Message-ID: CAMo6X8Y+FByN1a8vWTuPWEej=-2ssHWBCuSCgMLknoTpVDntHQ () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


2012/10/25 Nikolay Sivov <bunglehead@gmail.com>

> On 10/25/2012 10:34, Christian Costa wrote:
>
>> ---
>>   dlls/d3dx9_36/xfile.c |   14 ++++++++++++--
>>   1 file changed, 12 insertions(+), 2 deletions(-)
>>
>> diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c
>> index a1e0596..4c216da 100644
>> --- a/dlls/d3dx9_36/xfile.c
>> +++ b/dlls/d3dx9_36/xfile.c
>> @@ -154,9 +154,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_Unlock(**ID3DXFileData
>> *iface)
>>     static HRESULT WINAPI ID3DXFileDataImpl_GetType(**ID3DXFileData
>> *iface, GUID *guid)
>>   {
>> -    FIXME("(%p)->(%p): stub\n", iface, guid);
>> +    ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface)**;
>> +    const GUID *dxfile_guid;
>> +    HRESULT ret;
>>   -    return E_NOTIMPL;
>> +    TRACE("(%p)->(%p)\n", iface, guid);
>> +
>> +    ret = IDirectXFileData_GetType(This-**>dxfile_object, &dxfile_guid);
>> +    if (ret != S_OK)
>> +        return ret;
>> +
>> +    *guid = *dxfile_guid;
>> +
>> +    return S_OK;
>>   }
>>
>>
> Why not simply forward to  IDirectXFileData here? What is all the
> surrounding code for?
>
>
>
> IDirectXFileData_GetType returns a pointer to a GUID (GUID**)
whereas ID3DXFileData_GetType fill the GUID (GUID*) hence this code.

[Attachment #5 (text/html)]

<br><br><div class="gmail_quote">2012/10/25 Nikolay Sivov <span dir="ltr">&lt;<a \
href="mailto:bunglehead@gmail.com" \
target="_blank">bunglehead@gmail.com</a>&gt;</span><br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> <div class="HOEnZb"><div class="h5">On 10/25/2012 10:34, \
Christian Costa wrote:<br> <blockquote class="gmail_quote" style="margin:0 0 0 \
                .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
  dlls/d3dx9_36/xfile.c |   14 ++++++++++++--<br>
  1 file changed, 12 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c<br>
index a1e0596..4c216da 100644<br>
--- a/dlls/d3dx9_36/xfile.c<br>
+++ b/dlls/d3dx9_36/xfile.c<br>
@@ -154,9 +154,19 @@ static HRESULT WINAPI \
ID3DXFileDataImpl_Unlock(<u></u>ID3DXFileData *iface)<br>  static HRESULT WINAPI \
ID3DXFileDataImpl_GetType(<u></u>ID3DXFileData *iface, GUID *guid)<br>  {<br>
-    FIXME(&quot;(%p)-&gt;(%p): stub\n&quot;, iface, guid);<br>
+    ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface)<u></u>;<br>
+    const GUID *dxfile_guid;<br>
+    HRESULT ret;<br>
  -    return E_NOTIMPL;<br>
+    TRACE(&quot;(%p)-&gt;(%p)\n&quot;, iface, guid);<br>
+<br>
+    ret = IDirectXFileData_GetType(This-<u></u>&gt;dxfile_object, \
&amp;dxfile_guid);<br> +    if (ret != S_OK)<br>
+        return ret;<br>
+<br>
+    *guid = *dxfile_guid;<br>
+<br>
+    return S_OK;<br>
  }<br>
  <br>
</blockquote></div></div>
Why not simply forward to  IDirectXFileData here? What is all the surrounding code \
for?<br> <br>
<br>
<br>
</blockquote></div>IDirectXFileData_GetType returns a pointer to a GUID (GUID**) \
whereas ID3DXFileData_GetType fill the GUID (GUID*) hence this \
code.<div><br></div><div><br></div>





[prev in list] [next in list] [prev in thread] [next in thread]