[ros-diffs] [akhaldi] 62820: [D3DXOF] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Sat Apr 19 19:13:01 2014
New Revision: 62820

URL: http://svn.reactos.org/svn/reactos?rev=62820&view=rev
Log:
[D3DXOF]
* Sync with Wine 1.7.17.
CORE-8080

Added:
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof.rgs   (with props)
Modified:
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof.idl
    trunk/reactos/dll/directx/wine/d3dxof/main.c
    trunk/reactos/dll/directx/wine/d3dxof/parsing.c
    trunk/reactos/dll/directx/wine/d3dxof/version.rc
    trunk/reactos/media/doc/README.WINE
    trunk/reactos/media/inf/syssetup.inf

Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] Sat Apr 19 19:13:01 2014
@@ -176,7 +176,7 @@
     HGLOBAL resource_data;
     LPDXFILELOADRESOURCE lpdxflr = pvSource;
 
-    TRACE("Source in resource (module = %p, name = %s, type = %s\n",
lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType));
+    TRACE("Source in resource (module = %p, name = %s, type = %s)\n",
lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType));
 
     resource_info = FindResourceA(lpdxflr->hModule, lpdxflr->lpName,
lpdxflr->lpType);
     if (!resource_info)

Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.idl	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.idl	[iso-8859-1] Sat Apr 19 19:13:01
2014
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma makedep register
+
 [
     helpstring("DirectX File"),
     threading(both),

Added: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.rgs	(added)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.rgs	[iso-8859-1] Sat Apr 19 19:13:01
2014
@@ -0,0 +1,13 @@
+HKCR
+{
+    NoRemove Interface
+    {
+    }
+    NoRemove CLSID
+    {
+        '{4516EC43-8F20-11D0-9B6D-0000C0781BC3}' = s 'DirectX File'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both'
}
+        }
+    }
+}

Propchange: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.rgs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/directx/wine/d3dxof/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ma…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/main.c	[iso-8859-1] Sat Apr 19 19:13:01 2014
@@ -119,7 +119,7 @@
 static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock)
 {
     IClassFactoryImpl *This = impl_from_IClassFactory(iface);
-    FIXME("(%p)->(%d),stub!\n",This,dolock);
+    FIXME("(%p)->(%d), stub!\n",This,dolock);
     return S_OK;
 }
 

Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/parsing.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/parsing.c	[iso-8859-1] Sat Apr 19 19:13:01 2014
@@ -79,7 +79,7 @@
         (char)(fourcc >> 16), (char)(fourcc >> 24));
 }
 
-static const char* get_primitive_string(WORD token)
+static const char* get_primitive_string(DWORD token)
 {
   switch(token)
   {
@@ -499,11 +499,11 @@
   char tmp[512];
   DWORD pos = 0;
   char c;
-  BOOL error = 0;
+  BOOL error = FALSE;
   while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
   {
     if (!(((c >= 'a') && (c <= 'z')) || ((c >=
'A') && (c <= 'Z')) || ((c >= '0') && (c
<= '9')) || (c == '_') || (c == '-')))
-      error = 1;
+      error = TRUE;
     if (pos < sizeof(tmp))
         tmp[pos] = c;
     pos++;
@@ -531,7 +531,7 @@
   DWORD pos = 0;
   char c;
   float decimal;
-  BOOL dot = 0;
+  BOOL dot = FALSE;
 
   while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
   {
@@ -591,7 +591,7 @@
   char tmp[512];
   DWORD pos = 0;
   char c;
-  BOOL ok = 0;
+  BOOL ok = FALSE;
 
   if (*buf->buffer != '"')
     return FALSE;
@@ -601,7 +601,7 @@
     c = *(buf->buffer+pos+1);
     if (c == '"')
     {
-      ok = 1;
+      ok = TRUE;
       break;
     }
     if (pos < sizeof(tmp))
@@ -888,10 +888,10 @@
     case TOKEN_LPSTR:
     case TOKEN_UNICODE:
     case TOKEN_CSTRING:
-      ret = 1;
+      ret = TRUE;
       break;
     default:
-      ret = 0;
+      ret = FALSE;
       break;
   }
   return ret;
@@ -937,14 +937,14 @@
 
   while (1)
   {
-    BOOL array = 0;
+    BOOL array = FALSE;
     int nb_dims = 0;
     cur_member =
&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[idx_member];
 
     if (check_TOKEN(buf) == TOKEN_ARRAY)
     {
       get_TOKEN(buf);
-      array = 1;
+      array = TRUE;
     }
 
     if (check_TOKEN(buf) == TOKEN_NAME)

Modified: trunk/reactos/dll/directx/wine/d3dxof/version.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ve…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/version.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/version.rc	[iso-8859-1] Sat Apr 19 19:13:01
2014
@@ -23,4 +23,6 @@
 #define WINE_PRODUCTVERSION 5,0,2135,1
 #define WINE_PRODUCTVERSION_STR "5.0.2135.1"
 
-#include "wine/wine_common_ver.rc"
+1 WINE_REGISTRY d3dxof.rgs
+
+#include <wine/wine_common_ver.rc>

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Apr 19 19:13:01 2014
@@ -32,7 +32,7 @@
 reactos/dll/directx/wine/d3d9           # Synced to Wine-1.7.17
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.17
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.17
-reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.1
+reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.17
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.17
 reactos/dll/directx/wine/devenum        # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.1

Modified: trunk/reactos/media/inf/syssetup.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev…
==============================================================================
--- trunk/reactos/media/inf/syssetup.inf	[iso-8859-1] (original)
+++ trunk/reactos/media/inf/syssetup.inf	[iso-8859-1] Sat Apr 19 19:13:01 2014
@@ -42,6 +42,7 @@
 11,,comctl32.dll,2
 11,,cryptdlg.dll,1
 11,,cryptnet.dll,1
+11,,d3dxof.dll,1
 11,,ddraw.dll,1
 11,,devenum.dll,1
 11,,dinput.dll,1