October 2015 - Wine-devel - list.winehq.org

Re: [PATCH 3/5] wined3d: make wined3d_swapchain_get_front_buffer_data work with wined3d_texture and sub_resource_idx
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 15:41, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > + if (!(sub_resource = wined3d_texture_get_sub_resource(dst_texture, sub_resource_idx)) || > + sub_resource->type != WINED3D_RTYPE_SURFACE) Not a big issue, but if you're resending the series anyway, we usually put the "||" on the next line. (Here and in patch 4/5.)

2 1

Re: [PATCH 5/5] wined3d: introduce a new wined3d_texture_blt function
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 15:41, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect_in, > + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect_in, DWORD flags, > + const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) > +{ > + struct wined3d_resource *dst_resource, *src_resource; > + > + TRACE("dst_texture %p, dst_sub_resource_idx %u, src_texture %p, src_sub_resource_idx %u.\n", > + dst_texture, dst_sub_resource_idx, src_texture, src_sub_resource_idx); > + > + dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx); > + src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx); > + > + if (!dst_resource || !src_resource) > + return WINED3DERR_INVALIDCALL; > + > + return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect_in, > + surface_from_resource(src_resource), src_rect_in, flags, fx, filter); > +} You can't assume src_resource and dst_resource are surfaces.

2 1

Re: [PATCH 1/5] d3d8: call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d8_device_GetFrontBuffer
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 15:41, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > - hr = wined3d_device_get_front_buffer_data(device->wined3d_device, 0, dst_impl->wined3d_surface); > + if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) > + hr = D3DERR_INVALIDCALL; > + else > + hr = wined3d_swapchain_get_front_buffer_data(swapchain, dst_impl->wined3d_surface); The timing is perhaps unfortunate, but since commit 20d5be042c577b8dfcca431fa4688cad192196df you can just use "device->implicit_swapchain->wined3d_swapchain" instead of calling wined3d_device_get_swapchain(). Something similar applies to patch 2/5.

1 0

Re: [PATCH 6/6] wined3d: Use non-deprecated texture sample builtins also in the fragment pipeline replacement shaders.
by Henri Verbeet 16 Oct '15

16 Oct '15

On 15 October 2015 at 22:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -6259,7 +6259,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * > { > struct wined3d_string_buffer *buffer = &priv->shader_buffer; > BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; > - BOOL tempreg_used = FALSE, tfactor_used = FALSE; > + BOOL tempreg_used = FALSE, tfactor_used = FALSE, legacy_syntax = needs_legacy_glsl_syntax(gl_info); > const char *final_combiner_src = "ret"; > UINT lowest_disabled_stage; > GLuint shader_id; > @@ -6480,52 +6480,52 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * > case WINED3D_GL_RES_TYPE_TEX_1D: > if (proj) > { > - texture_function = "texture1DProj"; > + texture_function = legacy_syntax ? "texture1DProj" : "textureProj"; > coord_mask = "xw"; > } > else > { > - texture_function = "texture1D"; > + texture_function = legacy_syntax ? "texture1D" : "texture"; > coord_mask = "x"; > } > break; > case WINED3D_GL_RES_TYPE_TEX_2D: > if (proj) > { > - texture_function = "texture2DProj"; > + texture_function = legacy_syntax ? "texture2DProj" : "textureProj"; > coord_mask = "xyw"; > } > else > { > - texture_function = "texture2D"; > + texture_function = legacy_syntax ? "texture2D" : "texture"; > coord_mask = "xy"; > } > break; > case WINED3D_GL_RES_TYPE_TEX_3D: > if (proj) > { > - texture_function = "texture3DProj"; > + texture_function = legacy_syntax ? "texture3DProj" : "textureProj"; > coord_mask = "xyzw"; > } > else > { > - texture_function = "texture3D"; > + texture_function = legacy_syntax ? "texture3D" : "texture"; > coord_mask = "xyz"; > } > break; > case WINED3D_GL_RES_TYPE_TEX_CUBE: > - texture_function = "textureCube"; > + texture_function = legacy_syntax ? "textureCube" : "texture"; > coord_mask = "xyz"; > break; > case WINED3D_GL_RES_TYPE_TEX_RECT: > if (proj) > { > - texture_function = "texture2DRectProj"; > + texture_function = legacy_syntax ? "texture2DRectProj" : "textureProj"; > coord_mask = "xyw"; > } > else > { > - texture_function = "texture2DRect"; > + texture_function = legacy_syntax ? "texture2DRect" : "texture"; > coord_mask = "xy"; > } > break; It seems like it would be at least as readable to adjust "proj" for cube textures and then just do if (!needs_legacy_glsl_syntax(gl_info)) texture_function = proj ? "textureProj" : "texture";

1 0

xrdp wine drv
by Jay Sorg 15 Oct '15

15 Oct '15

I'm hacking on wine fork from github.com. My goal is to create a new driver for wine for xrdp. Similar to winemac.drv and winex11.drv but not to draw into a Mac or X11 window but an xrdp session. I don't want to have any X11 in the picture, strait from wine gdi into xrdp. Is anyone interested in this effort? Is there an example dummy driver for learning? Jay

2 2

Re: [1/3] scrrun: Implement filesys_DriveExists.
by Nikolay Sivov 15 Oct '15

15 Oct '15

On 15.10.2015 13:56, Joachim Priesner wrote: > + if (!pfExists) return E_POINTER; > + *pfExists = VARIANT_FALSE; > + len = SysStringLen(DriveSpec); > + if (len >= 1 && DriveSpec[0] >= 'A' && DriveSpec[0] <= 'Z' > + && (len < 2 || DriveSpec[1] == ':') > + && (len < 3 || DriveSpec[2] == '\\')) { > + WCHAR root[] = {toupperW(DriveSpec[0]), ':', '\\', 0}; > + *pfExists = GetDriveTypeW(root) != DRIVE_NO_ROOT_DIR ? VARIANT_TRUE : VARIANT_FALSE; > + } Not necessary wrong, but it'd be better if all that validation was GetDriveTypeW responsibility. I don't see many tests for it in kernel32/tests, could you please add some, so we can get rid of this extra logic? I haven't looked much at its implementation but it feels like DRIVE_UNKNOWN would also qualify as non-existent drive.

2 2

Re: [3/3] scrrun: Implement filesys_GetDrive for local drives.
by Nikolay Sivov 15 Oct '15

15 Oct '15

On 15.10.2015 13:56, Joachim Priesner wrote: > + DriveSpec[0] = toupperW(DriveSpec[0]); > + if (DriveSpec[0] < 'A' || DriveSpec[0] > 'Z' > + || (len >= 2 && DriveSpec[1] != ':') > + || (len == 3 && DriveSpec[2] != '\\')) > + return E_INVALIDARG; > + hr = filesys_DriveExists(iface, DriveSpec, &drive_exists); I'm not sure about that sanity check, the reason is that DriveExists doesn't fail on invalid drivespec? Also please use method wrappers internally, instead of calling implementation functions, I'm talking about filesys_DriveExists.

1 0

Reviewer assignments in the patch tracker
by Alexandre Julliard 15 Oct '15

15 Oct '15

Folks, I've now added support in the patch tracker to enable assigning a reviewer to a patch. If you get assigned a patch, you are expected to either reply with a sign-off, or send a comment to wine-devel (and please CC the patch author). Initially I'm only going to assign patches to people who have listed themselves as maintainers for the area that the patch modifies. A further step will be to gather a list of volunteers who are willing to be assigned patches for areas that don't have an active maintainer. I don't know what's the best mechanism for that, I was thinking we could have volunteer entries in MAINTAINERS, from which I would pick someone. I'd like to hear suggestions for other approaches. Also, currently you don't get a mail telling you that you have been assigned a patch, so you have to watch the patch tracker. I can add that feature if people think it would be useful and not too obnoxious. Please let me know. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [PATCH] dpnet: Add Server tests
by Stefan Dösinger 15 Oct '15

15 Oct '15

Just fyi, I want to take a closer look at this patch but didn't get around to it yet :-( . Stefan > Am 13.10.2015 um 11:05 schrieb Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dpnet/tests/server.c | 194 ++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 179 insertions(+), 15 deletions(-) > > diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c > index 8279666..9ed3ef3 100644 > --- a/dlls/dpnet/tests/server.c > +++ b/dlls/dpnet/tests/server.c > @@ -25,22 +25,84 @@ > /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ > static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; > static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; > +static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; > > -static BOOL nCreatePlayer; > -static BOOL nDestroyPlayer; > +static int create_cnt = 0; > +static int destroy_dnt = 0; > +static int indicate_cnt = 0; > +static IDirectPlay8Server *server = NULL; > +static IDirectPlay8Client* client = NULL; > +static HANDLE connect = NULL; > +static HANDLE hostenum = NULL; > +static HANDLE clientfinished = NULL; > +static DPN_APPLICATION_DESC hostdesc; > > -static HRESULT WINAPI DirectPlayMessageHandler(PVOID pvUserContext, DWORD dwMessageId, PVOID pMsgBuffer) > -{ > - trace("msgid: 0x%08x\n", dwMessageId); > +static IDirectPlay8Address *hostAddr = NULL; > +static IDirectPlay8Address *deviceAddr = NULL; > +static WCHAR session[255]; > > +static HRESULT WINAPI DirectPlayMessageHandler(void *pvUserContext, DWORD dwMessageId, void *pMsgBuffer) > +{ > switch(dwMessageId) > { > + case DPN_MSGID_INDICATE_CONNECT: > + trace("DPN_MSGID_CREATE_PLAYER\n"); > + indicate_cnt++; > + break; > case DPN_MSGID_CREATE_PLAYER: > - nCreatePlayer = TRUE; > + trace("DPN_MSGID_CREATE_PLAYER\n"); > + create_cnt++; > break; > case DPN_MSGID_DESTROY_PLAYER: > - nDestroyPlayer = TRUE; > + trace("DPN_MSGID_DESTROY_PLAYER\n"); > + destroy_dnt++; > break; > + default: > + trace("msgid: 0x%08x\n", dwMessageId); > + } > + > + return S_OK; > +} > + > +static HRESULT WINAPI DirectPlayClientMsHandler(void *context, DWORD dwMessageId, void *buffer) > +{ > + HRESULT hr; > + > + switch(dwMessageId) > + { > + case DPN_MSGID_ENUM_HOSTS_RESPONSE: > + { > + DPNMSG_ENUM_HOSTS_RESPONSE *host_msg; > + host_msg = (PDPNMSG_ENUM_HOSTS_RESPONSE)buffer; > + > + trace("DPN_MSGID_ENUM_HOSTS_RESPONSE\n"); > + > + hr = IDirectPlay8Address_Duplicate(host_msg->pAddressSender, &hostAddr); > + ok(hr == S_OK, "Failed to Duplicate Host Address\n"); > + > + hr = IDirectPlay8Address_Duplicate(host_msg->pAddressDevice, &deviceAddr); > + ok(hr == S_OK, "Failed to Duplicate Device Address\n"); > + > + memset(&hostdesc, 0, sizeof(DPN_APPLICATION_DESC)); > + memcpy(&hostdesc, host_msg->pApplicationDescription, sizeof(DPN_APPLICATION_DESC) ); > + > + lstrcpyW(session, host_msg->pApplicationDescription->pwszSessionName); > + > + trace("SessionName: %s\n", wine_dbgstr_w(session)); > + ok(!lstrcmpW(session, sessionname), "incorrect name %s\n", wine_dbgstr_w(session)); > + > + SetEvent(hostenum); > + break; > + } > + case DPN_MSGID_ASYNC_OP_COMPLETE: > + trace("DPN_MSGID_ASYNC_OP_COMPLETE\n"); > + break; > + case DPN_MSGID_CONNECT_COMPLETE: > + trace("DPN_MSGID_CONNECT_COMPLETE\n"); > + SetEvent(connect); > + break; > + default: > + trace("DirectPlayClientMsHandler: 0x%08x\n", dwMessageId); > } > > return S_OK; > @@ -49,7 +111,6 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID pvUserContext, DWORD dwMess > static void create_server(void) > { > HRESULT hr; > - IDirectPlay8Server *server = NULL; > > hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); > ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); > @@ -74,6 +135,10 @@ static void create_server(void) > hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); > ok(hr == S_OK, "got 0x%08x\n", hr); > > + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), > + DPNA_DATATYPE_STRING); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); > appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); > appdesc.dwFlags = DPNSESSION_CLIENT_SERVER; > @@ -83,16 +148,111 @@ static void create_server(void) > hr = IDirectPlay8Server_Host(server, &appdesc, &localaddr, 1, NULL, NULL, NULL, 0); > todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); > > - todo_wine ok(nCreatePlayer, "No DPN_MSGID_CREATE_PLAYER Message\n"); > - ok(!nDestroyPlayer, "Received DPN_MSGID_DESTROY_PLAYER Message\n"); > - > - hr = IDirectPlay8Server_Close(server, 0); > - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); > - > - todo_wine ok(nDestroyPlayer, "No DPN_MSGID_DESTROY_PLAYER Message\n"); > + todo_wine ok(create_cnt == 1, "No DPN_MSGID_CREATE_PLAYER Message\n"); > + ok(indicate_cnt == 0, "wrong indicate count (%d)\n", indicate_cnt); > > IDirectPlay8Address_Release(localaddr); > } > + } > +} > + > +static void create_client(void) > +{ > + HRESULT hr; > + IDirectPlay8Address *host = NULL; > + IDirectPlay8Address *device = NULL; > + DPN_APPLICATION_DESC appdesc; > + DWORD ret; > + DPNHANDLE async = 0; > + > + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); > + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); > + if(hr != S_OK) > + return; > + > + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); > + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); > + appdesc.guidApplication = appguid; > + > + connect = CreateEventA( NULL, TRUE, FALSE, NULL); > + hostenum = CreateEventA( NULL, TRUE, FALSE, NULL); > + > + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayClientMsHandler, 0); > + ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); > + > + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); > + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); > + > + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&device); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_SetSP(device, &CLSID_DP8SP_TCPIP); > + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), > + DPNA_DATATYPE_STRING); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&device); > + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Address_SetSP(device, &CLSID_DP8SP_TCPIP); > + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); > + > + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, device, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); > + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); > + todo_wine ok(async, "No Handle returned\n"); > + > + ret = WaitForSingleObject(hostenum, 2000); > + todo_wine ok(ret == WAIT_OBJECT_0, "Failed to get find host\n"); > + if(ret == WAIT_OBJECT_0) > + { > + DPNHANDLE handle = 0; > + > + hr = IDirectPlay8Client_Connect(client, &hostdesc, hostAddr, deviceAddr, NULL, NULL, NULL, 0, NULL, &handle, 0 ); > + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); > + > + ret = WaitForSingleObject(connect, 2000); > + todo_wine ok(ret == WAIT_OBJECT_0, "Connect failed.\n"); > + > + todo_wine ok(create_cnt == 1, "Wrong create player count (%d)\n", create_cnt); > + todo_wine ok(destroy_dnt == 0, "Wrong Destroy player count (%d)\n", destroy_dnt); > + todo_wine ok(indicate_cnt == 1, "wrong indicate count (%d)\n", indicate_cnt); > + } > + > + CloseHandle(connect); > + CloseHandle(hostenum); > + > + SetEvent(clientfinished); > + > + IDirectPlay8Address_Release(host); > + IDirectPlay8Address_Release(device); > +} > + > +static void cleanup(void) > +{ > + HRESULT hr; > + > + if(client) > + { > + IDirectPlay8Client_Close(client, 0); > + IDirectPlay8Client_Release(client); > + } > + > + if(hostAddr) > + IDirectPlay8Address_Release(hostAddr); > + if(deviceAddr) > + IDirectPlay8Address_Release(deviceAddr); > + > + if(server) > + { > + hr = IDirectPlay8Server_Close(server, 0); > + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); > + > + todo_wine ok(destroy_dnt == 2 || broken(destroy_dnt == 1), "Wrong Destroy player count (%d)\n", destroy_dnt); > > IDirectPlay8Server_Release(server); > } > @@ -109,5 +269,9 @@ START_TEST(server) > > create_server(); > > + create_client(); > + > + cleanup(); > + > CoUninitialize(); > } > -- > 2.6.1 > > >

1 0

Re: include/wine: make LegalCopyright match CompanyName (resend)
by Michael Stefaniuc 15 Oct '15

15 Oct '15

On 10/15/2015 01:02 PM, Austin English wrote: > Previous patch was dropped without comment. > > For https://bugs.winehq.org/show_bug.cgi?id=35659 > 0001-include-wine-make-LegalCopyright-match-CompanyName-r.txt > > > From 3430c0e8fceb605b42fc4424be03f1d8a745c365 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Thu, 15 Oct 2015 05:59:58 -0500 > Subject: [PATCH] include/wine: make LegalCopyright match CompanyName (resend) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/wine/wine_common_ver.rc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc > index 5938582..52024aa 100644 > --- a/include/wine/wine_common_ver.rc > +++ b/include/wine/wine_common_ver.rc > @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE > VALUE "FileDescription", WINE_FILEDESCRIPTION_STR > VALUE "FileVersion", WINE_FILEVERSION_STR > VALUE "InternalName", WINE_FILENAME > - VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" > + VALUE "LegalCopyright", "Microsoft Corporation" /* CATIA needs this in both CompanyName _and_ LegalCopyright */ CATIA needs that only to verify that the host has a certified OpenGL driver. So for compatibility reasons that needs to go only to opengl32.dll, we don't have to spread that around. And that's actually what focht proposed. bye michael

2 1