Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 18:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[OLEACC] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-11-23 12:03:49 +01:00
parent b7076dc2bc
commit 4166e5040d
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dll/win32/oleacc/client.c
View file

@ -20,7 +20,6 @@
#include "oleacc_private.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "wine/heap.h"
@ -353,7 +352,7 @@ static HRESULT WINAPI Client_accLocation(IAccessible *iface, LONG *pxLeft,
if(!GetClientRect(This->hwnd, &rect))
return S_OK;
pt.x = rect.left,
pt.x = rect.left;
pt.y = rect.top;
MapWindowPoints(This->hwnd, NULL, &pt, 1);
*pxLeft = pt.x;

16
dll/win32/oleacc/main.c
View file

@ -27,11 +27,15 @@
#include "commctrl.h"
#include "rpcproxy.h"
#ifdef __REACTOS__
#include <wchar.h>
#include <winnls.h>
#endif
#include "initguid.h"
#include "oleacc_private.h"
#include "resource.h"
#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(oleacc);
@ -114,7 +118,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid)
TRACE("got window class: %s\n", debugstr_w(class_name));
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;
ret = (objid==OBJID_CLIENT ?
@ -198,13 +202,13 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo
if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)))
return E_FAIL;
p = atom_str + ARRAY_SIZE(lresult_atom_prefix);
proc_id = strtoulW(p, &p, 16);
proc_id = wcstoul(p, &p, 16);
if(*p != ':')
return E_FAIL;
server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) );
server_mapping = ULongToHandle( wcstoul(p+1, &p, 16) );
if(*p != ':')
return E_FAIL;
size = strtoulW(p+1, &p, 16);
size = wcstoul(p+1, &p, 16);
if(*p != 0)
return E_FAIL;
@ -320,7 +324,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
}
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), atom_fmt, GetCurrentProcessId(),
HandleToUlong(mapping), stat.cbSize.u.LowPart);
atom = GlobalAddAtomW(atom_str);
if(!atom) {

1
dll/win32/oleacc/window.c
View file

@ -20,7 +20,6 @@
#include "oleacc_private.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "wine/heap.h"

2
media/doc/README.WINE
View file

@ -141,7 +141,7 @@ dll/win32/objsel # Synced to WineStaging-4.18
dll/win32/odbc32 # Synced to WineStaging-4.18. Depends on port of Linux ODBC.
dll/win32/odbccp32 # Synced to WineStaging-4.18
dll/win32/ole32 # Synced to WineStaging-4.18
dll/win32/oleacc # Synced to WineStaging-4.0
dll/win32/oleacc # Synced to WineStaging-4.18
dll/win32/oleaut32 # Synced to WineStaging-4.0
dll/win32/olecli32 # Synced to WineStaging-3.3
dll/win32/oledlg # Synced to WineStaging-4.0