May 2017 - Wine-commits - list.winehq.org

Jacek Caban : rpcrt4: Wait for server threads to finish in RpcMgmtWaitServerListen.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 09e98be24350a7a8306cc6cd7302f94eae770afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e98be24350a7a8306cc6cd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:30:52 2017 +0200 rpcrt4: Wait for server threads to finish in RpcMgmtWaitServerListen. This fixes races when stopping manual listen RPC servers. It should fix races in Office applications as well as our services.exe (visible as CS error on prefix shutdown). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index bd47de6..c350c59 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1542,7 +1542,8 @@ RPC_STATUS WINAPI RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT */ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) { - HANDLE event; + RpcServerProtseq *protseq; + HANDLE event, wait_thread; TRACE("()\n"); @@ -1558,6 +1559,28 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) TRACE( "done waiting\n" ); EnterCriticalSection(&listen_cs); + /* wait for server threads to finish */ + while(1) + { + if (listen_count) + break; + + wait_thread = NULL; + EnterCriticalSection(&server_cs); + LIST_FOR_EACH_ENTRY(protseq, &protseqs, RpcServerProtseq, entry) + { + if ((wait_thread = protseq->server_thread)) + break; + } + LeaveCriticalSection(&server_cs); + if (!wait_thread) + break; + + TRACE("waiting for thread %u\n", GetThreadId(wait_thread)); + LeaveCriticalSection(&listen_cs); + WaitForSingleObject(wait_thread, INFINITE); + EnterCriticalSection(&listen_cs); + } if (listen_done_event == event) { listen_done_event = NULL;

1 0

Jacek Caban : rpcrt4/tests: Added more server stopping tests.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 18fb5d25f146c65f422ff03214d19ec7a3497487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18fb5d25f146c65f422ff0321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:31:04 2017 +0200 rpcrt4/tests: Added more server stopping tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 113 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index b42a78f..01a61ae 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -41,7 +41,7 @@ static const char *progname; static BOOL old_windows_version; -static HANDLE stop_event; +static HANDLE stop_event, stop_wait_event; static void (WINAPI *pNDRSContextMarshall2)(RPC_BINDING_HANDLE, NDR_SCONTEXT, void*, NDR_RUNDOWN, void*, ULONG); static NDR_SCONTEXT (WINAPI *pNDRSContextUnmarshall2)(RPC_BINDING_HANDLE, void*, ULONG, void*, ULONG); @@ -830,9 +830,18 @@ void __cdecl s_full_pointer_null_test(int *a, int *b) void __cdecl s_stop(void) { - ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); - ok(RPC_S_OK == RpcServerUnregisterIf(NULL, NULL, FALSE), "RpcServerUnregisterIf\n"); + if (!stop_wait_event) + { + ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); + ok(RPC_S_OK == RpcServerUnregisterIf(NULL, NULL, FALSE), "RpcServerUnregisterIf\n"); + } ok(SetEvent(stop_event), "SetEvent\n"); + if (stop_wait_event) + { + DWORD ret; + ret = WaitForSingleObject(stop_wait_event, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + } } static void @@ -1759,10 +1768,87 @@ server(void) stop_event = NULL; } +static DWORD WINAPI listen_test_client_thread(void *binding) +{ + RPC_STATUS status; + + status = RpcBindingFromStringBindingA(binding, &IServer_IfHandle); + ok(status == RPC_S_OK, "RpcBindingFromStringBinding\n"); + + test_is_server_listening(IServer_IfHandle, RPC_S_OK); + stop(); + trace("stopped\n"); + + status = RpcBindingFree(&IServer_IfHandle); + ok(status == RPC_S_OK, "RpcBindingFree\n"); + return 0; +} + +static DWORD WINAPI wait_listen_proc(void *arg) +{ + RPC_STATUS status; + + trace("waiting\n"); + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); + trace("done\n"); + + return 0; +} + +static void test_stop_wait_for_call(unsigned char *binding) +{ + HANDLE client_thread, wait_listen_thread; + RPC_STATUS status; + DWORD ret; + + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); + test_is_server_listening(NULL, RPC_S_OK); + + stop_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(stop_wait_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); + stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + wait_listen_thread = CreateThread(NULL, 0, wait_listen_proc, 0, 0, NULL); + ok(wait_listen_thread != NULL, "CreateThread failed\n"); + + client_thread = CreateThread(NULL, 0, listen_test_client_thread, binding, 0, NULL); + ok(client_thread != NULL, "CreateThread failed\n"); + CloseHandle(client_thread); + + ret = WaitForSingleObject(stop_event, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + + status = RpcMgmtStopServerListening(NULL); + ok(status == RPC_S_OK, "RpcMgmtStopServerListening\n"); + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); + + ret = WaitForSingleObject(wait_listen_thread, 500); + ok(WAIT_TIMEOUT == ret, "WaitForSingleObject\n"); + + SetEvent(stop_wait_event); + + ret = WaitForSingleObject(wait_listen_thread, 10000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject returned %u\n", ret); + + CloseHandle(wait_listen_thread); + + CloseHandle(stop_wait_event); + stop_wait_event = NULL; + CloseHandle(stop_event); + stop_event = NULL; +} + static void test_server_listening(void) { static unsigned char np[] = "ncacn_np"; + static unsigned char address_np[] = "\\\\."; static unsigned char pipe[] = PIPE "listen_test"; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char guid[] = "00000000-4114-0704-2302-000000000000"; + unsigned char *binding; RPC_STATUS status; status = RpcServerUseProtseqEpA(np, 0, pipe, NULL); @@ -1788,6 +1874,27 @@ static void test_server_listening(void) status = RpcMgmtWaitServerListen(); ok(status == RPC_S_NOT_LISTENING, "RpcMgmtWaitServerListening failed with status %d\n", status); + + /* test that server stop waits for a call in progress */ + status = RpcStringBindingComposeA(NULL, np, address_np, pipe, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose\n"); + + test_stop_wait_for_call(binding); + + status = RpcStringFreeA(&binding); + ok(status == RPC_S_OK, "RpcStringFree\n"); + + /* repeat the test using ncalrpc */ + status = RpcServerUseProtseqEpA(ncalrpc, 0, guid, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); + + status = RpcStringBindingComposeA(NULL, ncalrpc, NULL, guid, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose\n"); + + test_stop_wait_for_call(binding); + + status = RpcStringFreeA(&binding); + ok(status == RPC_S_OK, "RpcStringFree\n"); } static BOOL is_process_elevated(void)

1 0

Jacek Caban : urlmon.idl: Added IBindCallbackRedirect declaration.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 83a9ed2a74ba6aa86872c543943fc5ae388ecfa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a9ed2a74ba6aa86872c5439… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 19:22:48 2017 +0200 urlmon.idl: Added IBindCallbackRedirect declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/urlmon.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 35dee40..1f7205d 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2048,6 +2048,24 @@ interface IGetBindHandle : IUnknown [out] HANDLE *pRetHandle); } +/***************************************************************************** + * IBindCallbackRedirect interface + */ +[ + local, + object, + uuid(11c81bc2-121e-4ed5-b9c4-b430bd54f2c0), + pointer_default(unique) +] +interface IBindCallbackRedirect : IUnknown +{ + typedef [unique] IBindCallbackRedirect *LPBINDCALLBACKREDIRECT; + + HRESULT Redirect( + [in] LPCWSTR lpcUrl, + [out] VARIANT_BOOL *vbCancel); +} + cpp_quote("#define CONFIRMSAFETYACTION_LOADOBJECT 0x00000001") struct CONFIRMSAFETY

1 0

Jacek Caban : mshtmhst.idl: Added missing DOCHOSTUIFLAG values.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 1fbb661ed1745bdfdcd1287c730f63503ee3f13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbb661ed1745bdfdcd1287c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 19:51:31 2017 +0200 mshtmhst.idl: Added missing DOCHOSTUIFLAG values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmhst.idl | 54 +++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/include/mshtmhst.idl b/include/mshtmhst.idl index 344a88f..81b16ed 100644 --- a/include/mshtmhst.idl +++ b/include/mshtmhst.idl @@ -113,30 +113,36 @@ typedef enum tagDOCHOSTUIDBLCLK typedef enum tagDOCHOSTUIFLAG { - DOCHOSTUIFLAG_DIALOG = 0x00000001, - DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x00000002, - DOCHOSTUIFLAG_NO3DBORDER = 0x00000004, - DOCHOSTUIFLAG_SCROLL_NO = 0x00000008, - DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x00000010, - DOCHOSTUIFLAG_OPENNEWWIN = 0x00000020, - DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x00000040, - DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x00000080, - DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x00000100, - DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x00000200, - DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x00000400, - DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x00000800, - DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x00001000, - DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x00002000, - DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x00004000, - DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x00010000, - DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x00020000, - DOCHOSTUIFLAG_THEME = 0x00040000, - DOCHOSTUIFLAG_NOTHEME = 0x00080000, - DOCHOSTUIFLAG_NOPICS = 0x00100000, - DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x00200000, - DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x00400000, - DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x00800000, - DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x01000000 + DOCHOSTUIFLAG_DIALOG = 0x00000001, + DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x00000002, + DOCHOSTUIFLAG_NO3DBORDER = 0x00000004, + DOCHOSTUIFLAG_SCROLL_NO = 0x00000008, + DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x00000010, + DOCHOSTUIFLAG_OPENNEWWIN = 0x00000020, + DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x00000040, + DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x00000080, + DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x00000100, + DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x00000200, + DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x00000400, + DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x00000800, + DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x00001000, + DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x00002000, + DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x00004000, + DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x00010000, + DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x00020000, + DOCHOSTUIFLAG_THEME = 0x00040000, + DOCHOSTUIFLAG_NOTHEME = 0x00080000, + DOCHOSTUIFLAG_NOPICS = 0x00100000, + DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x00200000, + DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x00400000, + DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x00800000, + DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x01000000, + DOCHOSTUIFLAG_HOST_NAVIGATES = 0x02000000, + DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION = 0x04000000, + DOCHOSTUIFLAG_USE_WINDOWLESS_SELECTCONTROL = 0x08000000, + DOCHOSTUIFLAG_USE_WINDOWED_SELECTCONTROL = 0x10000000, + DOCHOSTUIFLAG_ENABLE_ACTIVEX_INACTIVATE_MODE = 0x20000000, + DOCHOSTUIFLAG_DPI_AWARE = 0x40000000 } DOCHOSTUIFLAG; [

1 0

Nikolay Sivov : comdlg32: Simplify notification helper.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: c4b133e231bb5e32814b35f9a5cd3ba930570aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b133e231bb5e32814b35f9a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 06:16:01 2017 +0300 comdlg32: Simplify notification helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 49 ++++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index da85260..fa4a0d0 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -853,38 +853,29 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) { FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwndParentDlg); - LRESULT hook_result = 0; + LRESULT hook_result; + OFNOTIFYW ofnNotify; - TRACE("%p 0x%04x\n",hwndParentDlg, uCode); + TRACE("%p %d\n", hwndParentDlg, uCode); - if(!fodInfos) return 0; + if (!fodInfos || !fodInfos->DlgInfos.hwndCustomDlg) + return 0; + + TRACE("CALL NOTIFY for %d\n", uCode); + + ofnNotify.hdr.hwndFrom = hwndParentDlg; + ofnNotify.hdr.idFrom = 0; + ofnNotify.hdr.code = uCode; + ofnNotify.lpOFN = fodInfos->ofnInfos; + ofnNotify.pszFile = NULL; + + if (fodInfos->unicode) + hook_result = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify); + else + hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify); + + TRACE("RET NOTIFY retval %#lx\n", hook_result); - if(fodInfos->DlgInfos.hwndCustomDlg) - { - TRACE("CALL NOTIFY for %x\n", uCode); - if(fodInfos->unicode) - { - OFNOTIFYW ofnNotify; - ofnNotify.hdr.hwndFrom=hwndParentDlg; - ofnNotify.hdr.idFrom=0; - ofnNotify.hdr.code = uCode; - ofnNotify.lpOFN = fodInfos->ofnInfos; - ofnNotify.pszFile = NULL; - hook_result = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); - } - else - { - OFNOTIFYA ofnNotify; - ofnNotify.hdr.hwndFrom=hwndParentDlg; - ofnNotify.hdr.idFrom=0; - ofnNotify.hdr.code = uCode; - ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos; - ofnNotify.pszFile = NULL; - hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify); - } - TRACE("RET NOTIFY\n"); - } - TRACE("Retval: 0x%08lx\n", hook_result); return hook_result; }

1 0

Nikolay Sivov : comdlg32: Improve tracing messages.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 1c1db33aba8a46cc634c56432d75a47585145a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1db33aba8a46cc634c56432… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 06:16:02 2017 +0300 comdlg32: Improve tracing messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 20 ++++++++++---------- dlls/comdlg32/filedlgbrowser.c | 9 +++------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index fa4a0d0..2ad7efa 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -765,7 +765,7 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) HANDLE hDlgTmpl = 0; HWND hChildDlg = 0; - TRACE("\n"); + TRACE("%p, %p\n", fodInfos, hwnd); /* * If OFN_ENABLETEMPLATEHANDLE is specified, the OPENFILENAME @@ -1038,7 +1038,7 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam) if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE; /* get the new dialog rectangle */ GetWindowRect( hwnd, &rc); - TRACE("Size from %d,%d to %d,%d\n", fodInfos->sizedlg.cx, fodInfos->sizedlg.cy, + TRACE("%p, size from %d,%d to %d,%d\n", hwnd, fodInfos->sizedlg.cx, fodInfos->sizedlg.cy, rc.right -rc.left, rc.bottom -rc.top); /* not initialized yet */ if( (fodInfos->sizedlg.cx == 0 && fodInfos->sizedlg.cy == 0) || @@ -2763,7 +2763,7 @@ static LRESULT FILEDLG95_SHELL_Init(HWND hwnd) { FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwnd); - TRACE("\n"); + TRACE("%p\n", hwnd); /* * Initialisation of the FileOpenDialogInfos structure @@ -2900,7 +2900,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) int nFilters = 0; /* number of filters */ int nFilterIndexCB; - TRACE("\n"); + TRACE("%p\n", hwnd); if(fodInfos->customfilter) { @@ -3133,7 +3133,7 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) TEXTMETRICW tm; LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos)); - TRACE("\n"); + TRACE("%p\n", hwndCombo); liInfos->iMaxIndentation = 0; @@ -3352,7 +3352,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) SFOLDER *tmpFolder; LookInInfos *liInfos; - TRACE("%08x\n", iInsertId); + TRACE("%p, %p, %d\n", hwnd, pidl, iInsertId); if(!pidl) return -1; @@ -3382,7 +3382,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) sizeof(sfi), SHGFI_DISPLAYNAME | SHGFI_PIDL | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED); - TRACE("-- Add %s attr=%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes); + TRACE("-- Add %s attr=0x%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes); if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM)) { @@ -3451,7 +3451,7 @@ int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl) int iItemPos; LookInInfos *liInfos; - TRACE("\n"); + TRACE("%p, %p\n", hwnd, pidl); iItemPos = FILEDLG95_LOOKIN_SearchItem(hwnd,(WPARAM)pidl,SEARCH_PIDL); @@ -4009,7 +4009,7 @@ static inline BOOL is_win16_looks(DWORD flags) */ BOOL WINAPI GetOpenFileNameA(OPENFILENAMEA *ofn) { - TRACE("flags %08x\n", ofn->Flags); + TRACE("flags 0x%08x\n", ofn->Flags); if (!valid_struct_size( ofn->lStructSize )) { @@ -4044,7 +4044,7 @@ BOOL WINAPI GetOpenFileNameA(OPENFILENAMEA *ofn) */ BOOL WINAPI GetOpenFileNameW(OPENFILENAMEW *ofn) { - TRACE("flags %08x\n", ofn->Flags); + TRACE("flags 0x%08x\n", ofn->Flags); if (!valid_struct_size( ofn->lStructSize )) { diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 85a3dd9..a225e9e 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -215,13 +215,11 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) /*************************************************************************** * IShellBrowserImpl_QueryInterface */ -static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, REFIID riid, void **ppvObj) { IShellBrowserImpl *This = impl_from_IShellBrowser(iface); - TRACE("(%p)\n\t%s\n", This, debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; @@ -241,7 +239,7 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, return S_OK; } - FIXME("Unknown interface requested\n"); + FIXME("unsupported interface, %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -272,7 +270,6 @@ static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) { COMDLG32_SHFree(This); TRACE("-- destroyed\n"); - return 0; } return ref; }

1 0

Alexandre Julliard : wineandroid: Add an initial GDI driver.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: e5069b1017359253ff2c5444c251d24b9e6682c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5069b1017359253ff2c5444c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 10:58:55 2017 +0200 wineandroid: Add an initial GDI driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 6 + dlls/wineandroid.drv/init.c | 239 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 4 +- 3 files changed, 248 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5069b1017359253ff2c5…

1 0

Alexandre Julliard : wineandroid: Initialize screen dimensions.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: a5904bc661a809caf4f85bae64fe8f08669c54ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5904bc661a809caf4f85bae6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:15:17 2017 +0200 wineandroid: Initialize screen dimensions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/android.h | 50 ++++++++++ dlls/wineandroid.drv/init.c | 156 +++++++++++++++++++++++++++++- dlls/wineandroid.drv/wineandroid.drv.spec | 5 + 4 files changed, 208 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 13ec433..dd3ad19 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,4 +1,5 @@ MODULE = wineandroid.drv +IMPORTS = user32 gdi32 C_SRCS = \ init.c diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h new file mode 100644 index 0000000..7c708f3 --- /dev/null +++ b/dlls/wineandroid.drv/android.h @@ -0,0 +1,50 @@ +/* + * Android driver definitions + * + * Copyright 2013 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ANDROID_H +#define __WINE_ANDROID_H + +#include <limits.h> +#include <stdarg.h> +#include <stdlib.h> +#include <jni.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/gdi_driver.h" + + +/************************************************************************** + * USER driver + */ + +extern unsigned int screen_width DECLSPEC_HIDDEN; +extern unsigned int screen_height DECLSPEC_HIDDEN; +extern RECT virtual_screen_rect DECLSPEC_HIDDEN; +extern MONITORINFOEXW default_monitor DECLSPEC_HIDDEN; + +extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; + +extern JavaVM *wine_get_java_vm(void); +extern jobject wine_get_java_object(void); + +#endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index da2a168..3a3ce80 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -28,13 +28,30 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/gdi_driver.h" +#include "android.h" +#include "wine/server.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(android); +unsigned int screen_width = 0; +unsigned int screen_height = 0; +RECT virtual_screen_rect = { 0, 0, 0, 0 }; + +MONITORINFOEXW default_monitor = +{ + sizeof(default_monitor), /* cbSize */ + { 0, 0, 0, 0 }, /* rcMonitor */ + { 0, 0, 0, 0 }, /* rcWork */ + MONITORINFOF_PRIMARY, /* dwFlags */ + { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 } /* szDevice */ +}; + +static const unsigned int screen_bpp = 32; /* we don't support other modes */ + +static int device_init_done; + typedef struct { struct gdi_physdev dev; @@ -42,6 +59,65 @@ typedef struct static const struct gdi_dc_funcs android_drv_funcs; + +/****************************************************************************** + * init_monitors + */ +void init_monitors( int width, int height ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT rect; + HWND hwnd = FindWindowW( trayW, NULL ); + + virtual_screen_rect.right = width; + virtual_screen_rect.bottom = height; + default_monitor.rcMonitor = default_monitor.rcWork = virtual_screen_rect; + + if (!hwnd || !IsWindowVisible( hwnd )) return; + if (!GetWindowRect( hwnd, &rect )) return; + if (rect.top) default_monitor.rcWork.bottom = rect.top; + else default_monitor.rcWork.top = rect.bottom; + TRACE( "found tray %p %s work area %s\n", hwnd, + wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &default_monitor.rcWork )); +} + + +/********************************************************************** + * fetch_display_metrics + */ +static void fetch_display_metrics(void) +{ + if (wine_get_java_vm()) return; /* for Java threads it will be set when the top view is created */ + + SERVER_START_REQ( get_window_rectangles ) + { + req->handle = wine_server_user_handle( GetDesktopWindow() ); + req->relative = COORDS_CLIENT; + if (!wine_server_call( req )) + { + screen_width = reply->window.right; + screen_height = reply->window.bottom; + } + } + SERVER_END_REQ; + + init_monitors( screen_width, screen_height ); + TRACE( "screen %ux%u\n", screen_width, screen_height ); +} + + +/********************************************************************** + * device_init + * + * Perform initializations needed upon creation of the first device. + */ +static void device_init(void) +{ + device_init_done = TRUE; + fetch_display_metrics(); +} + + /****************************************************************************** * create_android_physdev */ @@ -49,6 +125,8 @@ static ANDROID_PDEVICE *create_android_physdev(void) { ANDROID_PDEVICE *physdev; + if (!device_init_done) device_init(); + if (!(physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) ))) return NULL; return physdev; } @@ -92,6 +170,76 @@ static BOOL ANDROID_DeleteDC( PHYSDEV dev ) } +/*********************************************************************** + * ANDROID_GetDeviceCaps + */ +static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) +{ + switch(cap) + { + case HORZRES: return screen_width; + case VERTRES: return screen_height; + case DESKTOPHORZRES: return virtual_screen_rect.right - virtual_screen_rect.left; + case DESKTOPVERTRES: return virtual_screen_rect.bottom - virtual_screen_rect.top; + case BITSPIXEL: return screen_bpp; + default: + dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); + return dev->funcs->pGetDeviceCaps( dev, cap ); + } +} + + +/*********************************************************************** + * ANDROID_GetMonitorInfo + */ +BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) +{ + if (handle != (HMONITOR)1) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + info->rcMonitor = default_monitor.rcMonitor; + info->rcWork = default_monitor.rcWork; + info->dwFlags = default_monitor.dwFlags; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, default_monitor.szDevice ); + return TRUE; +} + + +/*********************************************************************** + * ANDROID_EnumDisplayMonitors + */ +BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) +{ + if (hdc) + { + POINT origin; + RECT limit, monrect; + + if (!GetDCOrgEx( hdc, &origin )) return FALSE; + if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; + + if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; + + monrect = default_monitor.rcMonitor; + OffsetRect( &monrect, -origin.x, -origin.y ); + if (IntersectRect( &monrect, &monrect, &limit )) + if (!proc( (HMONITOR)1, hdc, &monrect, lp )) + return FALSE; + } + else + { + RECT unused; + if (!rect || IntersectRect( &unused, &default_monitor.rcMonitor, rect )) + if (!proc( (HMONITOR)1, 0, &default_monitor.rcMonitor, lp )) + return FALSE; + } + return TRUE; +} + + static const struct gdi_dc_funcs android_drv_funcs = { NULL, /* pAbortDoc */ @@ -131,7 +279,7 @@ static const struct gdi_dc_funcs android_drv_funcs = NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ - NULL, /* pGetDeviceCaps */ + ANDROID_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontRealizationInfo */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 9e94320..1723bd4 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -1,3 +1,8 @@ # GDI driver @ cdecl wine_get_gdi_driver(long) ANDROID_get_gdi_driver + +# USER driver + +@ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors +@ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Alexandre Julliard : wineandroid: Add support for storing per-window driver information.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 2ecca0100817c3bf3c3d93b3ecb41e073621bcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecca0100817c3bf3c3d93b3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:22:20 2017 +0200 wineandroid: Add support for storing per-window driver information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/window.c | 233 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 3 + 3 files changed, 238 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index dd3ad19..f83d494 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -2,7 +2,8 @@ MODULE = wineandroid.drv IMPORTS = user32 gdi32 C_SRCS = \ - init.c + init.c \ + window.c IN_SRCS = \ build.gradle.in diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c new file mode 100644 index 0000000..f874458 --- /dev/null +++ b/dlls/wineandroid.drv/window.c @@ -0,0 +1,233 @@ +/* + * Window related functions + * + * Copyright 1993, 1994, 1995, 1996, 2001, 2013-2017 Alexandre Julliard + * Copyright 1993 David Metcalfe + * Copyright 1995, 1996 Alex Korobka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <fcntl.h> +#include <poll.h> +#include <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/unicode.h" + +#include "android.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(android); + +/* private window data */ +struct android_win_data +{ + HWND hwnd; /* hwnd that this private data belongs to */ + HWND parent; /* parent hwnd for child windows */ + RECT window_rect; /* USER window rectangle relative to parent */ + RECT whole_rect; /* X window rectangle for the whole window relative to parent */ + RECT client_rect; /* client area relative to parent */ +}; + +#define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) + +static CRITICAL_SECTION win_data_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &win_data_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": win_data_section") } +}; +static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static struct android_win_data *win_data_context[32768]; + +static inline int context_idx( HWND hwnd ) +{ + return LOWORD( hwnd ) >> 1; +} + + +/*********************************************************************** + * alloc_win_data + */ +static struct android_win_data *alloc_win_data( HWND hwnd ) +{ + struct android_win_data *data; + + if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) + { + data->hwnd = hwnd; + EnterCriticalSection( &win_data_section ); + win_data_context[context_idx(hwnd)] = data; + } + return data; +} + + +/*********************************************************************** + * free_win_data + */ +static void free_win_data( struct android_win_data *data ) +{ + win_data_context[context_idx( data->hwnd )] = NULL; + LeaveCriticalSection( &win_data_section ); + HeapFree( GetProcessHeap(), 0, data ); +} + + +/*********************************************************************** + * get_win_data + * + * Lock and return the data structure associated with a window. + */ +static struct android_win_data *get_win_data( HWND hwnd ) +{ + struct android_win_data *data; + + if (!hwnd) return NULL; + EnterCriticalSection( &win_data_section ); + if ((data = win_data_context[context_idx(hwnd)]) && data->hwnd == hwnd) return data; + LeaveCriticalSection( &win_data_section ); + return NULL; +} + + +/*********************************************************************** + * release_win_data + * + * Release the data returned by get_win_data. + */ +static void release_win_data( struct android_win_data *data ) +{ + if (data) LeaveCriticalSection( &win_data_section ); +} + + +/*********************************************************************** + * ANDROID_DestroyWindow + */ +void CDECL ANDROID_DestroyWindow( HWND hwnd ) +{ + struct android_win_data *data; + + if (!(data = get_win_data( hwnd ))) return; + + free_win_data( data ); +} + + +/*********************************************************************** + * create_win_data + * + * Create a data window structure for an existing window. + */ +static struct android_win_data *create_win_data( HWND hwnd, const RECT *window_rect, + const RECT *client_rect ) +{ + struct android_win_data *data; + HWND parent; + + if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop or HWND_MESSAGE */ + + if (parent != GetDesktopWindow()) + { + if (!(data = get_win_data( parent )) && + !(data = create_win_data( parent, NULL, NULL ))) + return NULL; + release_win_data( data ); + } + + if (!(data = alloc_win_data( hwnd ))) return NULL; + + data->parent = (parent == GetDesktopWindow()) ? 0 : parent; + + if (window_rect) + { + data->whole_rect = data->window_rect = *window_rect; + data->client_rect = *client_rect; + } + else + { + GetWindowRect( hwnd, &data->window_rect ); + MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); + data->whole_rect = data->window_rect; + GetClientRect( hwnd, &data->client_rect ); + MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); + } + return data; +} + + +/*********************************************************************** + * ANDROID_WindowPosChanging + */ +void CDECL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, + const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, + struct window_surface **surface ) +{ + struct android_win_data *data = get_win_data( hwnd ); + + TRACE( "win %p window %s client %s style %08x flags %08x\n", + hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), + GetWindowLongW( hwnd, GWL_STYLE ), swp_flags ); + + if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return; + + *visible_rect = *window_rect; + + release_win_data( data ); +} + + +/*********************************************************************** + * ANDROID_WindowPosChanged + */ +void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, + const RECT *window_rect, const RECT *client_rect, + const RECT *visible_rect, const RECT *valid_rects, + struct window_surface *surface ) +{ + struct android_win_data *data; + DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); + + if (!(data = get_win_data( hwnd ))) return; + + data->window_rect = *window_rect; + data->whole_rect = *visible_rect; + data->client_rect = *client_rect; + + release_win_data( data ); + + TRACE( "win %p window %s client %s style %08x flags %08x\n", + hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), new_style, swp_flags ); +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 1723bd4..b94c9f8 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -6,3 +6,6 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo +@ cdecl DestroyWindow(long) ANDROID_DestroyWindow +@ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging +@ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Alexandre Julliard : wineandroid: Register a JNI callback for reporting desktop size changes.
by Alexandre Julliard 31 May '17

31 May '17

Module: wine Branch: master Commit: 77d55905b1ee712d09e0e3ce7d6ddde46bde4cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d55905b1ee712d09e0e3ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:47:49 2017 +0200 wineandroid: Register a JNI callback for reporting desktop size changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 13 ++++++++ dlls/wineandroid.drv/init.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 11 +++++++ 3 files changed, 92 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 7c708f3..ab4a431 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdlib.h> #include <jni.h> +#include <android/log.h> #include "windef.h" #include "winbase.h" @@ -34,6 +35,15 @@ /************************************************************************** + * Android interface + */ + +#define DECL_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN +DECL_FUNCPTR( __android_log_print ); +#undef DECL_FUNCPTR + + +/************************************************************************** * USER driver */ @@ -44,6 +54,9 @@ extern MONITORINFOEXW default_monitor DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +/* JNI entry points */ +extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; + extern JavaVM *wine_get_java_vm(void); extern jobject wine_get_java_object(void); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 3a3ce80..406edf9 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -385,3 +385,71 @@ const struct gdi_dc_funcs * CDECL ANDROID_get_gdi_driver( unsigned int version ) } return &android_drv_funcs; } + + +static const JNINativeMethod methods[] = +{ + { "wine_desktop_changed", "(II)V", desktop_changed }, +}; + +#define DECL_FUNCPTR(f) typeof(f) * p##f = NULL +#define LOAD_FUNCPTR(lib, func) do { \ + if ((p##func = wine_dlsym( lib, #func, NULL, 0 )) == NULL) \ + { ERR( "can't find symbol %s\n", #func); return; } \ + } while(0) + +DECL_FUNCPTR( __android_log_print ); + +static void load_android_libs(void) +{ + void *liblog; + char error[1024]; + + if (!(liblog = wine_dlopen( "liblog.so", RTLD_GLOBAL, error, sizeof(error) ))) + { + ERR( "failed to load liblog.so: %s\n", error ); + return; + } + LOAD_FUNCPTR( liblog, __android_log_print ); +} + +#undef DECL_FUNCPTR +#undef LOAD_FUNCPTR + +static BOOL process_attach(void) +{ + jclass class; + jobject object = wine_get_java_object(); + JNIEnv *jni_env; + JavaVM *java_vm; + + if ((java_vm = wine_get_java_vm())) /* running under Java */ + { +#ifdef __i386__ + WORD old_fs = wine_get_fs(); +#endif + load_android_libs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + class = (*jni_env)->GetObjectClass( jni_env, object ); + (*jni_env)->RegisterNatives( jni_env, class, methods, sizeof(methods)/sizeof(methods[0]) ); + (*jni_env)->DeleteLocalRef( jni_env, class ); +#ifdef __i386__ + wine_set_fs( old_fs ); /* the Java VM hijacks %fs for its own purposes, restore it */ +#endif + } + return TRUE; +} + +/*********************************************************************** + * dll initialisation routine + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + return process_attach(); + } + return TRUE; +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f874458..e7c83b0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -134,6 +134,17 @@ static void release_win_data( struct android_win_data *data ) /*********************************************************************** + * desktop_changed + * + * JNI callback, runs in the context of the Java thread. + */ +void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) +{ + p__android_log_print( ANDROID_LOG_INFO, "wine", "desktop_changed: %ux%u", width, height ); +} + + +/*********************************************************************** * ANDROID_DestroyWindow */ void CDECL ANDROID_DestroyWindow( HWND hwnd )

1 0