July 2016 - Wine-Devel - list.winehq.org

i need yor help
by achbarrr＠gmail.com July 22, 2016

July 22, 2016

hello everyone i need your help i want wine for android why because i work in corel and photosop and msoffice but i want to do it on touchly os like android because my finger do best on it please send me an mail or email for that wine for android please

1 0

Re: [PATCH 2/2] winex11: track glx windows per thread
by Alexandre Julliard July 21, 2016

July 21, 2016

Miklós Máté <mtmkls(a)gmail.com> writes: > XCloseDisplay in thread_detach() closes all X windows, but the GLX windows > remain, and become zombies. If a new X window is created with the same XID, > Mesa refuses to attach a GLX window to it because of the zombie. Observed > in the ddraw test. Is there a reason that creating the GLX window on the window thread wouldn't work? -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH] ws2_32: Implement InetNtopW.
by Bruno Jesus July 21, 2016

July 21, 2016

On Thu, Jul 21, 2016 at 2:46 PM, Philipp Hoppermann <plata(a)mailbox.org> wrote: > Fixes "unimplemented function WS2_32.dll.InetNtopW" Hi, thanks for the patch. > At the moment, this fix just calls inet_ntop Unfortunately you can't do that. inet_ntop replies in char, not WCHAR. Please see how InetPtonW is implemented [1], by following its example you will be able to implement the function properly using WS_inet_ntop. http://source.winehq.org/git/wine.git/commitdiff/af8c79343ce9eb24e223607ec2… > Signed-off-by: Philipp Hoppermann <plata(a)mailbox.org> > --- > dlls/ws2_32/socket.c | 8 ++++++++ > dlls/ws2_32/ws2_32.spec | 1 + > 2 files changed, 9 insertions(+) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index b0af3d7..0622060 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -7934,6 +7934,14 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) > } > > /*********************************************************************** > +* InetNtopW (WS2_32.@) > +*/ > +PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR stringBuf, SIZE_T stringBufSize) Please change stringBuf to buffer and stringBufSize to buffer_len.

1 0

Re: ole32: Use debugstr_guid() in TRACE() messages.
by Michael Stefaniuc July 21, 2016

July 21, 2016

Hello Andrey! On 07/21/2016 05:57 PM, Andrey Gusev wrote: > > ole32-Use-debugstr_guid-in-TRACE-messages.txt > > > From d360a701eee8b8cf715059d630163a7a21dc3222 Mon Sep 17 00:00:00 2001 > Message-Id: <d360a701eee8b8cf715059d630163a7a21dc3222.1469116606.git.andrey.goosev(a)gma…> > From: Andrey Gusev <andrey.goosev(a)gmail.com> > Date: Thu, 21 Jul 2016 18:56:32 +0300 > Subject: [PATCH] ole32: Use debugstr_guid() in TRACE() messages. > > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/ole32/classmoniker.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c > index 1bcf58f..00c2f42 100644 > --- a/dlls/ole32/classmoniker.c > +++ b/dlls/ole32/classmoniker.c > @@ -231,7 +231,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, > IClassActivator *pActivator; > HRESULT hr; > > - TRACE("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); > + TRACE("(%p,%p,%s,%p)\n", pbc, pmkToLeft, debugstr_guid(riid), ppvResult); > > bindopts.cbStruct = sizeof(bindopts); > IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts); > @@ -264,7 +264,7 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, > REFIID riid, > VOID** ppvResult) > { > - TRACE("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); > + TRACE("(%p,%p,%s,%p)\n",pbc, pmkToLeft, debugstr_guid(riid), ppvResult); > return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); > } > > @@ -586,7 +586,7 @@ static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID > > ClassMoniker *This = impl_from_IROTData(iface); > > - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); > + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); While you work on this please fix also the whitespace issues in those lines: Space after ',' and line length should not exceed around 100 chars. > > return IMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); > } > -- 2.5.5 bye michael

1 0

Re: [PATCH 4/4] hnetcfg: Add stubbed INetFwPolicy2 interface
by Nikolay Sivov July 21, 2016

July 21, 2016

On 21.07.2016 12:09, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/hnetcfg/apps.c | 1 + > dlls/hnetcfg/hnetcfg.c | 5 + > dlls/hnetcfg/hnetcfg_private.h | 2 + > dlls/hnetcfg/policy.c | 332 +++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 340 insertions(+) > > diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c > index ea6d411..2b8d78c 100644 > --- a/dlls/hnetcfg/apps.c > +++ b/dlls/hnetcfg/apps.c > @@ -111,6 +111,7 @@ static REFIID tid_id[] = > &IID_INetFwOpenPort, > &IID_INetFwOpenPorts, > &IID_INetFwPolicy, > + &IID_INetFwPolicy2, > &IID_INetFwProfile > }; > > diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c > index fadd367..e56dbab 100644 > --- a/dlls/hnetcfg/hnetcfg.c > +++ b/dlls/hnetcfg/hnetcfg.c > @@ -113,6 +113,7 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = > static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; > static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; > static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; > +static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create }; > > BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) > { > @@ -151,6 +152,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) > { > cf = &fw_openport_cf.IClassFactory_iface; > } > + else if (IsEqualGUID( rclsid, &CLSID_NetFwPolicy2 )) > + { > + cf = &fw_policy2_cf.IClassFactory_iface; > + } > > if (!cf) return CLASS_E_CLASSNOTAVAILABLE; > return IClassFactory_QueryInterface( cf, iid, ppv ); > diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h > index bb3f3aa..812d970 100644 > --- a/dlls/hnetcfg/hnetcfg_private.h > +++ b/dlls/hnetcfg/hnetcfg_private.h > @@ -24,6 +24,7 @@ enum type_id > INetFwOpenPort_tid, > INetFwOpenPorts_tid, > INetFwPolicy_tid, > + INetFwPolicy2_tid, > INetFwProfile_tid, > last_tid > }; > @@ -33,6 +34,7 @@ void release_typelib(void) DECLSPEC_HIDDEN; > > HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; > HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; > +HRESULT NetFwPolicy2_create(IUnknown *, void **) DECLSPEC_HIDDEN; It makes sense to test first if those two both support INetFwPolicy and INetFwPolicy2.

1 0

Re: [PATCH 3/4] hnetcfg: Register NetFwPolicy2 interface
by Nikolay Sivov July 21, 2016

July 21, 2016

On 21.07.2016 12:09, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/hnetcfg/hnetcfg.idl | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl > index 9934f6a..763529a 100644 > --- a/dlls/hnetcfg/hnetcfg.idl > +++ b/dlls/hnetcfg/hnetcfg.idl > @@ -43,3 +43,11 @@ coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; } > uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5) > ] > coclass NetFwOpenPort { interface INetFwOpenPort; } > + > +[ > + helpstring("HNetCfg.FwPolicy2"), > + progid("HNetCfg.FwPolicy2"), > + threading(both), > + uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) > +] > +coclass NetFwPolicy2 { interface INetFwPolicy2; } > This doesn't have to be a separate patch.

1 0

Re: ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified
by Alexandre Julliard July 21, 2016

July 21, 2016

Piotr Caban <piotr(a)codeweavers.com> writes: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/ntdll/path.c | 2 +- > dlls/ntdll/tests/path.c | 9 +++++---- > 2 files changed, 6 insertions(+), 5 deletions(-) This is causing a test failure: ../../../tools/runtest -q -P wine -T ../../.. -M cmd.exe -p cmd.exe_test.exe.so batch && touch batch.ok batch.c:313: Test succeeded inside todo block: unexpected char 0x0 position -1 in line 983 (got 'c:\', wanted 'c:\') make[1]: *** [batch.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/6] msvcirt: Forward signed char exports to char functions directly
by Iván Matellanes July 21, 2016

July 21, 2016

Oops, I messed up the numbering, this one should say [3/3]. On 21/07/16 10:56, Iván Matellanes wrote: > signed char and char are equivalent in Visual C++, so specific functions for signed char are unnecessary. > > Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> > --- > dlls/msvcirt/msvcirt.c | 44 ++++++++++++++++---------------------------- > dlls/msvcirt/msvcirt.spec | 24 ++++++++++++------------ > 2 files changed, 28 insertions(+), 40 deletions(-)

1 0

Re: [PATCH 2/3] shell32: Implement FolderItems_Item.
by Nikolay Sivov July 21, 2016

July 21, 2016

On 21.07.2016 7:45, Alex Henrie wrote: > static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **ppid) > { > - FIXME("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); > + FolderItemsImpl *This = impl_from_FolderItems(iface); > + VARIANT path; > + struct list *node = list_head(&This->items); > + int i; > + > + TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), ppid); > > *ppid = NULL; > - return E_NOTIMPL; > + > + if (!node) > + return S_FALSE; > + > + for (i = 0; i < V_I4(&index); i++) > + { > + node = list_next(&This->items, node); > + if (!node) > + return S_FALSE; > + } If it's only using indexed access, list is not a right data type.

1 0

Re: [PATCH 1/3] shell32/tests: Add more tests for FolderItems.
by Nikolay Sivov July 21, 2016

July 21, 2016

On 21.07.2016 7:45, Alex Henrie wrote: > + for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) > + { > + switch (file_defs[i].type) > + { > + case DIRECTORY: > + r = CreateDirectoryA(file_defs[i].name, NULL); > + ok(r, "file_defs[%d]: CreateDirectory failed: %08x\n", i, GetLastError()); > + break; > + > + case SHORTCUT: > + sl = NULL; > + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (void**)&sl); > + ok(SUCCEEDED(r), "file_defs[%d]: CoCreateInstance failed: %08x\n", i, r); > + ok(!!sl, "sl is null\n"); > + > + shortcut = NULL; > + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&shortcut); > + ok(r == S_OK, "file_defs[%d]: IShellLink::QueryInterface failed: %08x\n", i, r); > + ok(!!shortcut, "file_defs[%d]: shortcut is null\n", i); > + > + MultiByteToWideChar(CP_ACP, 0, file_defs[i].name, -1, wstr, sizeof(wstr)/sizeof(WCHAR)); > + r = IPersistFile_Save(shortcut, wstr, FALSE); > + ok(r == S_OK, "file_defs[%d]: IPersistFile::Save failed: %08x\n", i, r); > + > + IPersistFile_Release(shortcut); > + IShellLinkA_Release(sl); If you're only interested in IPersistFile you can request it directly when calling CoCreateInstance(). > + r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); > + ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); > + ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n"); Second ok() is a bit meaningless, because it's expected to be consistent with previous return value test. I think it could be placed into if (r == S_OK), with broken() removed. > + > + bstr = NULL; > + r = FolderItem_get_Path(item, &bstr); > + ok(r == S_OK, "file_defs[%d]: FolderItem::get_Path failed: %08x\n", i, r); > + ok(!!bstr, "file_defs[%d]: bstr is null\n", i); > + > + bstr2 = NULL; > + r = FolderItem_get_Path(item, &bstr2); > + ok(r == S_OK, "file_defs[%d]: FolderItem::get_Path failed: %08x\n", i, r); > + ok(bstr2 != bstr, "file_defs[%d]: bstr and bstr2 are the same\n", i); > + SysFreeString(bstr2); This is a regular convention for [out] BSTR arguments. It only makes sense to explicitly test it if it differs from expected behavior. > + > + V_I4(&var) = sizeof(file_defs)/sizeof(file_defs[0]); > + item = NULL; > + r = FolderItems_Item(items, var, &item); > +todo_wine > + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); > + ok(!item, "item is not null\n"); > + > if (0) /* crashes on xp */ > { > r = FolderItems_get_Application(items, NULL); > @@ -422,12 +623,20 @@ todo_wine > ok(r == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", r); > } > > + verbs = (FolderItemVerbs*)0xdeadbeef; > r = FolderItems3_get_Verbs(items3, &verbs); > todo_wine > ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); > ok(!verbs, "verbs is not null\n"); > } > > + for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) > + { > + if (file_defs[i].type == DIRECTORY) > + RemoveDirectoryA(file_defs[i].name); > + else > + DeleteFileA(file_defs[i].name); > + } Could this cleanup be merged with one of the loops you have earlier? >

1 0