Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 16:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=33064
This commit is contained in:
The Wine Synchronizer 2008-04-20 16:01:17 +00:00
parent 48094f5e9f
commit 34243f06b8
2 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

56
reactos/dll/win32/atl/atl.rbuild
View file

@ -1,27 +1,29 @@
<module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true" entrypoint="0"> <?xml version="1.0"?>
<importlibrary definition="atl.spec.def" /> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<include base="atl">.</include> <group>
<include base="ReactOS">include/reactos/wine</include> <module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true">
<define name="__REACTOS__" /> <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
<define name="__WINESRC__" /> <importlibrary definition="atl.spec.def" />
<define name="__USE_W32API" /> <include base="atl">.</include>
<define name="_WIN32_IE">0x600</define> <include base="ReactOS">include/reactos/wine</include>
<define name="_WIN32_WINNT">0x600</define> <define name="__WINESRC__" />
<define name="WINVER">0x501</define> <define name="WINVER">0x600</define>
<library>wine</library> <define name="_WIN32_WINNT">0x600</define>
<library>ole32</library> <file>atl_ax.c</file>
<library>oleaut32</library> <file>atl_main.c</file>
<library>user32</library> <file>registrar.c</file>
<library>gdi32</library> <file>rsrc.rc</file>
<library>advapi32</library> <file>atliface.idl</file>
<library>kernel32</library> <include base="atl" root="intermediate">.</include>
<library>uuid</library> <file>atl.spec</file>
<library>ntdll</library> <library>wine</library>
<file>atl_ax.c</file> <library>ole32</library>
<file>atl_main.c</file> <library>oleaut32</library>
<file>registrar.c</file> <library>user32</library>
<file>rsrc.rc</file> <library>gdi32</library>
<file>atliface.idl</file> <library>advapi32</library>
<include base="atl" root="intermediate">.</include> <library>kernel32</library>
<file>atl.spec</file> <library>uuid</library>
</module> <library>ntdll</library>
</module>
</group>

3
reactos/dll/win32/atl/registrar.c
View file

@ -27,7 +27,6 @@
#include "winreg.h" #include "winreg.h"
#include "objbase.h" #include "objbase.h"
#include "oaidl.h" #include "oaidl.h"
#include "string.h"
#define ATL_INITGUID #define ATL_INITGUID
#include "atliface.h" #include "atliface.h"
@ -171,7 +170,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf)
}else { }else {
for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) {
if(rep_iter->key_len == iter-iter2 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; break;
} }
if(!rep_iter) { if(!rep_iter) {