Matteo Bruni : wpp: Invert 'type' callback parameter value, to match comment.

Alexandre Julliard julliard at winehq.org
Wed Jun 13 16:08:34 CDT 2012


Module: wine
Branch: master
Commit: 8b0d3d9f9abf6cd4a690323f078ed74844ad2a14
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8b0d3d9f9abf6cd4a690323f078ed74844ad2a14

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Wed Jun 13 18:04:20 2012 +0200

wpp: Invert 'type' callback parameter value, to match comment.

---

 dlls/d3dcompiler_43/compiler.c |    2 +-
 libs/wpp/preproc.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c
index 1eb07ce..5159db8 100644
--- a/dlls/d3dcompiler_43/compiler.c
+++ b/dlls/d3dcompiler_43/compiler.c
@@ -193,7 +193,7 @@ static void *wpp_open_mem(const char *filename, int type)
         return NULL;
     }
     hr = ID3DInclude_Open(current_include,
-                          type ? D3D_INCLUDE_SYSTEM : D3D_INCLUDE_LOCAL,
+                          type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM,
                           filename, parent_include, (LPCVOID *)&desc->buffer,
                           &desc->size);
     if(FAILED(hr))
diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c
index 99934d6..b9d8443 100644
--- a/libs/wpp/preproc.c
+++ b/libs/wpp/preproc.c
@@ -517,7 +517,7 @@ void *pp_open_include(const char *name, const char *parent_name, char **newpath)
 
     if (!(path = wpp_callbacks->lookup(name, parent_name, includepath,
                                        nincludepath))) return NULL;
-    fp = wpp_callbacks->open(path, parent_name == NULL ? 1 : 0);
+    fp = wpp_callbacks->open(path, !!parent_name);
 
     if (fp)
     {




More information about the wine-cvs mailing list