mirror of
https://github.com/reactos/reactos.git
synced 2024-10-06 09:24:11 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=33064
This commit is contained in:
parent
48094f5e9f
commit
34243f06b8
|
@ -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>
|
||||
<?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>
|
||||
|
|
|
@ -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 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf)
|
|||
}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) {
|
||||
|
|
Loading…
Reference in a new issue