[ros-diffs] [winesync] 33064: Autosyncing with Wine HEAD

[winesync at svn.reactos.org]

Author: winesync
Date: Sun Apr 20 11:01:17 2008
New Revision: 33064

URL: http://svn.reactos.org/svn/reactos?rev=33064&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/atl/atl.rbuild
    trunk/reactos/dll/win32/atl/registrar.c

Modified: trunk/reactos/dll/win32/atl/atl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rbuild?rev=33064&r1=33063&r2=33064&view=diff
==============================================================================
--- trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] Sun Apr 20 11:01:17 2008
@@ -1,27 +1,29 @@
-<module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true" entrypoint="0">
-        <importlibrary definition="atl.spec.def" />
-        <include base="atl">.</include>
-        <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
-        <define name="__WINESRC__" />
-        <define name="__USE_W32API" />
-        <define name="_WIN32_IE">0x600</define>
-        <define name="_WIN32_WINNT">0x600</define>
-        <define name="WINVER">0x501</define>
-        <library>wine</library>
-        <library>ole32</library>
-        <library>oleaut32</library>
-        <library>user32</library>
-        <library>gdi32</library>
-        <library>advapi32</library>
-        <library>kernel32</library>
-        <library>uuid</library>
-        <library>ntdll</library>
-        <file>atl_ax.c</file>
-        <file>atl_main.c</file>
-        <file>registrar.c</file>
-        <file>rsrc.rc</file>
-        <file>atliface.idl</file>
-        <include base="atl" root="intermediate">.</include>
-        <file>atl.spec</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true">
+	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+	<importlibrary definition="atl.spec.def" />
+	<include base="atl">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<define name="WINVER">0x600</define>
+	<define name="_WIN32_WINNT">0x600</define>
+	<file>atl_ax.c</file>
+	<file>atl_main.c</file>
+	<file>registrar.c</file>
+	<file>rsrc.rc</file>
+	<file>atliface.idl</file>
+	<include base="atl" root="intermediate">.</include>
+	<file>atl.spec</file>
+	<library>wine</library>
+	<library>ole32</library>
+	<library>oleaut32</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+</module>
+</group>

Modified: trunk/reactos/dll/win32/atl/registrar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?rev=33064&r1=33063&r2=33064&view=diff
==============================================================================
--- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Sun Apr 20 11:01:17 2008
@@ -27,7 +27,6 @@
 #include "winreg.h"
 #include "objbase.h"
 #include "oaidl.h"
-#include "string.h"
 
 #define ATL_INITGUID
 #include "atliface.h"
@@ -171,7 +170,7 @@
         }else {
             for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) {
                 if(rep_iter->key_len == iter-iter2
-                        && !memicmp(iter2, rep_iter->key, rep_iter->key_len))
+                        && !memicmpW(iter2, rep_iter->key, rep_iter->key_len))
                     break;
             }
             if(!rep_iter) {