oleacc: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
0f47bb66a6
commit
0ed304e990
|
@ -2,6 +2,8 @@ MODULE = oleacc.dll
|
||||||
IMPORTLIB = oleacc
|
IMPORTLIB = oleacc
|
||||||
IMPORTS = uuid oleaut32 ole32 user32 rpcrt4
|
IMPORTS = uuid oleaut32 ole32 user32 rpcrt4
|
||||||
|
|
||||||
|
EXTRADLLFLAGS = -mno-cygwin
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
client.c \
|
client.c \
|
||||||
main.c \
|
main.c \
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
|
|
||||||
#include "oleacc_private.h"
|
#include "oleacc_private.h"
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/heap.h"
|
#include "wine/heap.h"
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#include "oleacc_private.h"
|
#include "oleacc_private.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
|
WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
|
||||||
|
@ -114,7 +113,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid)
|
||||||
TRACE("got window class: %s\n", debugstr_w(class_name));
|
TRACE("got window class: %s\n", debugstr_w(class_name));
|
||||||
|
|
||||||
for(i=0; i<ARRAY_SIZE(builtin_classes); i++) {
|
for(i=0; i<ARRAY_SIZE(builtin_classes); i++) {
|
||||||
if(!strcmpiW(class_name, builtin_classes[i].name)) {
|
if(!wcsicmp(class_name, builtin_classes[i].name)) {
|
||||||
accessible_create ret;
|
accessible_create ret;
|
||||||
|
|
||||||
ret = (objid==OBJID_CLIENT ?
|
ret = (objid==OBJID_CLIENT ?
|
||||||
|
@ -198,13 +197,13 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo
|
||||||
if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)))
|
if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)))
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
p = atom_str + ARRAY_SIZE(lresult_atom_prefix);
|
p = atom_str + ARRAY_SIZE(lresult_atom_prefix);
|
||||||
proc_id = strtoulW(p, &p, 16);
|
proc_id = wcstoul(p, &p, 16);
|
||||||
if(*p != ':')
|
if(*p != ':')
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) );
|
server_mapping = ULongToHandle( wcstoul(p+1, &p, 16) );
|
||||||
if(*p != ':')
|
if(*p != ':')
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
size = strtoulW(p+1, &p, 16);
|
size = wcstoul(p+1, &p, 16);
|
||||||
if(*p != 0)
|
if(*p != 0)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
|
@ -320,7 +319,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix));
|
memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix));
|
||||||
sprintfW(atom_str+ARRAY_SIZE(lresult_atom_prefix), atom_fmt, GetCurrentProcessId(),
|
swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(),
|
||||||
HandleToUlong(mapping), stat.cbSize.u.LowPart);
|
HandleToUlong(mapping), stat.cbSize.u.LowPart);
|
||||||
atom = GlobalAddAtomW(atom_str);
|
atom = GlobalAddAtomW(atom_str);
|
||||||
if(!atom) {
|
if(!atom) {
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
|
|
||||||
#include "oleacc_private.h"
|
#include "oleacc_private.h"
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/heap.h"
|
#include "wine/heap.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue