November 2013 - Wine-Commits

Hans Leidekker : netapi32: Add support for remote computers in NetShareAdd.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 461eaca8a765875dccc6345825d5408b71420f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461eaca8a765875dccc634582… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:35:28 2013 +0100 netapi32: Add support for remote computers in NetShareAdd. --- dlls/netapi32/netapi32.c | 125 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 9ae040e..4223379 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -75,10 +75,13 @@ static void *libnetapi_ctx; static DWORD (*plibnetapi_init)(void **); static DWORD (*plibnetapi_free)(void *); static DWORD (*plibnetapi_set_debuglevel)(void *, const char *); +static DWORD (*plibnetapi_set_username)(void *, const char *); +static DWORD (*plibnetapi_set_password)(void *, const char *); static NET_API_STATUS (*pNetApiBufferAllocate)(unsigned int, void **); static NET_API_STATUS (*pNetApiBufferFree)(void *); static NET_API_STATUS (*pNetServerGetInfo)(const char *, unsigned int, unsigned char **); +static NET_API_STATUS (*pNetShareAdd)(const char *, unsigned int, unsigned char *, unsigned int *); static NET_API_STATUS (*pNetWkstaGetInfo)(const char *, unsigned int, unsigned char **); static BOOL libnetapi_init(void) @@ -103,10 +106,13 @@ static BOOL libnetapi_init(void) LOAD_FUNCPTR(libnetapi_init) LOAD_FUNCPTR(libnetapi_free) LOAD_FUNCPTR(libnetapi_set_debuglevel) + LOAD_FUNCPTR(libnetapi_set_username) + LOAD_FUNCPTR(libnetapi_set_password) LOAD_FUNCPTR(NetApiBufferAllocate) LOAD_FUNCPTR(NetApiBufferFree) LOAD_FUNCPTR(NetServerGetInfo) + LOAD_FUNCPTR(NetShareAdd) LOAD_FUNCPTR(NetWkstaGetInfo) #undef LOAD_FUNCPTR @@ -120,6 +126,17 @@ static BOOL libnetapi_init(void) ERR( "Failed to set debug level %u\n", status ); goto error; } + /* perform an anonymous login by default (avoids a password prompt) */ + if ((status = plibnetapi_set_username( libnetapi_ctx, "Guest" ))) + { + ERR( "Failed to set username %u\n", status ); + goto error; + } + if ((status = plibnetapi_set_password( libnetapi_ctx, "" ))) + { + ERR( "Failed to set password %u\n", status ); + goto error; + } return TRUE; error: @@ -204,6 +221,97 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf return status; } +struct share_info_2 +{ + const char *shi2_netname; + unsigned int shi2_type; + const char *shi2_remark; + unsigned int shi2_permissions; + unsigned int shi2_max_uses; + unsigned int shi2_current_uses; + const char *shi2_path; + const char *shi2_passwd; +}; + +static NET_API_STATUS share_info_2_to_samba( const BYTE *buf, unsigned char **bufptr ) +{ + struct share_info_2 *ret; + SHARE_INFO_2 *info = (SHARE_INFO_2 *)buf; + DWORD len = 0; + char *ptr; + + if (info->shi2_netname) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_netname, -1, NULL, 0, NULL, NULL ); + if (info->shi2_remark) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_remark, -1, NULL, 0, NULL, NULL ); + if (info->shi2_path) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_path, -1, NULL, 0, NULL, NULL ); + if (info->shi2_passwd) + len += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_passwd, -1, NULL, 0, NULL, NULL ); + if (!(ret = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret) + len ))) + return ERROR_OUTOFMEMORY; + + ptr = (char *)(ret + 1); + if (!info->shi2_netname) ret->shi2_netname = NULL; + else + { + ret->shi2_netname = ptr; + ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_netname, -1, ptr, len, NULL, NULL ); + } + ret->shi2_type = info->shi2_type; + if (!info->shi2_remark) ret->shi2_remark = NULL; + else + { + ret->shi2_remark = ptr; + ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_remark, -1, ptr, len, NULL, NULL ); + } + ret->shi2_permissions = info->shi2_permissions; + ret->shi2_max_uses = info->shi2_max_uses; + ret->shi2_current_uses = info->shi2_current_uses; + if (!info->shi2_path) ret->shi2_path = NULL; + else + { + ret->shi2_path = ptr; + ptr += WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_path, -1, ptr, len, NULL, NULL ); + } + if (!info->shi2_passwd) ret->shi2_passwd = NULL; + else + { + ret->shi2_passwd = ptr; + WideCharToMultiByte( CP_UNIXCP, 0, info->shi2_passwd, -1, ptr, len, NULL, NULL ); + } + *bufptr = (unsigned char *)ret; + return NERR_Success; +} + +static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigned char **bufptr ) +{ + switch (level) + { + case 2: return share_info_2_to_samba( buf, bufptr ); + default: + FIXME( "level %u not supported\n", level ); + return ERROR_NOT_SUPPORTED; + } +} + +static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err ) +{ + char *server = NULL; + unsigned char *info; + NET_API_STATUS status; + + if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY; + status = share_info_to_samba( level, buf, &info ); + if (!status) + { + status = pNetShareAdd( server, level, info, parm_err ); + HeapFree( GetProcessHeap(), 0, info ); + } + HeapFree( GetProcessHeap(), 0, server ); + return status; +} + struct wksta_info_100 { unsigned int wki100_platform_id; @@ -287,6 +395,11 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf ERR( "\n" ); return ERROR_NOT_SUPPORTED; } +static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err ) +{ + ERR( "\n" ); + return ERROR_NOT_SUPPORTED; +} static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) { ERR( "\n" ); @@ -652,7 +765,17 @@ NET_API_STATUS WINAPI NetShareGetInfo(LMSTR servername, LMSTR netname, NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err) { - FIXME("Stub (%s %d %p %p)\n", debugstr_w(servername), level, buf, parm_err); + BOOL local = NETAPI_IsLocalComputer( servername ); + + TRACE("%s %d %p %p\n", debugstr_w(servername), level, buf, parm_err); + + if (!local) + { + if (libnetapi_init()) return share_add( servername, level, buf, parm_err ); + FIXME( "remote computers not supported\n" ); + } + + FIXME("%s %d %p %p\n", debugstr_w(servername), level, buf, parm_err); return ERROR_NOT_SUPPORTED; }

1 0

Hans Leidekker : netapi32: Add support for remote computers in NetWkstaGetInfo.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: f3c78b1ba78fa4ae2ad698db6e2068fdbad4b225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c78b1ba78fa4ae2ad698db6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:34:29 2013 +0100 netapi32: Add support for remote computers in NetWkstaGetInfo. --- dlls/netapi32/netapi32.c | 90 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 84 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index e09c6ce..9ae040e 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -79,6 +79,7 @@ static DWORD (*plibnetapi_set_debuglevel)(void *, const char *); static NET_API_STATUS (*pNetApiBufferAllocate)(unsigned int, void **); static NET_API_STATUS (*pNetApiBufferFree)(void *); static NET_API_STATUS (*pNetServerGetInfo)(const char *, unsigned int, unsigned char **); +static NET_API_STATUS (*pNetWkstaGetInfo)(const char *, unsigned int, unsigned char **); static BOOL libnetapi_init(void) { @@ -106,6 +107,7 @@ static BOOL libnetapi_init(void) LOAD_FUNCPTR(NetApiBufferAllocate) LOAD_FUNCPTR(NetApiBufferFree) LOAD_FUNCPTR(NetServerGetInfo) + LOAD_FUNCPTR(NetWkstaGetInfo) #undef LOAD_FUNCPTR if ((status = plibnetapi_init( &libnetapi_ctx ))) @@ -202,6 +204,77 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf return status; } +struct wksta_info_100 +{ + unsigned int wki100_platform_id; + const char *wki100_computername; + const char *wki100_langroup; + unsigned int wki100_ver_major; + unsigned int wki100_ver_minor; +}; + +static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, BYTE **bufptr ) +{ + WKSTA_INFO_100 *ret; + struct wksta_info_100 *info = (struct wksta_info_100 *)buf; + DWORD len = 0; + WCHAR *ptr; + + if (info->wki100_computername) + len += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_computername, -1, NULL, 0 ); + if (info->wki100_langroup) + len += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_langroup, -1, NULL, 0 ); + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + (len * sizeof(WCHAR) )))) + return ERROR_OUTOFMEMORY; + + ptr = (WCHAR *)(ret + 1); + ret->wki100_platform_id = info->wki100_platform_id; + if (!info->wki100_computername) ret->wki100_computername = NULL; + else + { + ret->wki100_computername = ptr; + ptr += MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_computername, -1, ptr, len ); + } + if (!info->wki100_langroup) ret->wki100_langroup = NULL; + else + { + ret->wki100_langroup = ptr; + MultiByteToWideChar( CP_UNIXCP, 0, info->wki100_langroup, -1, ptr, len ); + } + ret->wki100_ver_major = info->wki100_ver_major; + ret->wki100_ver_minor = info->wki100_ver_minor; + *bufptr = (BYTE *)ret; + return NERR_Success; +} + +static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *buf, BYTE **bufptr ) +{ + switch (level) + { + case 100: return wksta_info_100_from_samba( buf, bufptr ); + default: + FIXME( "level %u not supported\n", level ); + return ERROR_NOT_SUPPORTED; + } +} + +static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) +{ + NET_API_STATUS status; + char *wksta = NULL; + unsigned char *buf = NULL; + + if (servername && !(wksta = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY; + status = pNetWkstaGetInfo( wksta, level, &buf ); + HeapFree( GetProcessHeap(), 0, wksta ); + if (!status) + { + status = wksta_info_from_samba( level, buf, bufptr ); + pNetApiBufferFree( buf ); + } + return status; +} + #else static BOOL libnetapi_init(void) @@ -214,6 +287,11 @@ static NET_API_STATUS server_getinfo( LMSTR servername, DWORD level, LPBYTE *buf ERR( "\n" ); return ERROR_NOT_SUPPORTED; } +static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *bufptr ) +{ + ERR( "\n" ); + return ERROR_NOT_SUPPORTED; +} #endif /* SONAME_LIBNETAPI */ @@ -1015,15 +1093,15 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, LPBYTE* bufptr) { NET_API_STATUS ret; + BOOL local = NETAPI_IsLocalComputer( servername ); TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); - if (servername) + + if (!local) { - if (!NETAPI_IsLocalComputer(servername)) - { - FIXME("remote computers not supported\n"); - return ERROR_INVALID_LEVEL; - } + if (libnetapi_init()) return wksta_getinfo( servername, level, bufptr ); + FIXME( "remote computers not supported\n" ); + return ERROR_INVALID_LEVEL; } if (!bufptr) return ERROR_INVALID_PARAMETER;

1 0

Henri Verbeet : wined3d: Don' t map the destination surface read-only in surface_convert_format().
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: c3da4ce08800d831e2419b1078b2ec0a7c7e8f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3da4ce08800d831e2419b107… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:10 2013 +0100 wined3d: Don't map the destination surface read-only in surface_convert_format(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 03403bd..f8c7cf8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3348,7 +3348,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_surface *so wined3d_texture_decref(ret); return NULL; } - if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0))) { ERR("Failed to lock the destination surface.\n"); wined3d_surface_unmap(source);

1 0

Henri Verbeet : wined3d: Create textures for converted surfaces.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 7c928b6c5cddbe5305ce0f3e98822520086ce922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c928b6c5cddbe5305ce0f3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:09 2013 +0100 wined3d: Create textures for converted surfaces. --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4cbd81..03403bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3310,23 +3310,13 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo return NULL; } -/***************************************************************************** - * surface_convert_format - * - * Creates a duplicate of a surface in a different format. Is used by Blt to - * blit between surfaces with different formats. - * - * Parameters - * source: Source surface - * fmt: Requested destination format - * - *****************************************************************************/ -static struct wined3d_surface *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) +static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) { struct wined3d_map_desc src_map, dst_map; const struct d3dfmt_converter_desc *conv; - struct wined3d_surface *ret = NULL; - HRESULT hr; + struct wined3d_texture *ret = NULL; + struct wined3d_resource_desc desc; + struct wined3d_surface *dst; conv = find_converter(source->resource.format->id, to_fmt); if (!conv) @@ -3337,35 +3327,39 @@ static struct wined3d_surface *surface_convert_format(struct wined3d_surface *so } /* FIXME: Multisampled conversion? */ - if (FAILED(hr = wined3d_surface_create(source->resource.device, source->resource.width, source->resource.height, - to_fmt, 0, WINED3D_POOL_SCRATCH, WINED3D_MULTISAMPLE_NONE, 0, + wined3d_resource_get_desc(&source->resource, &desc); + desc.format = to_fmt; + desc.usage = 0; + desc.pool = WINED3D_POOL_SCRATCH; + if (FAILED(wined3d_texture_create_2d(source->resource.device, &desc, 1, WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_DISCARD, NULL, &wined3d_null_parent_ops, &ret))) { ERR("Failed to create a destination surface for conversion.\n"); return NULL; } + dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0)); memset(&src_map, 0, sizeof(src_map)); memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(hr = wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) { ERR("Failed to lock the source surface.\n"); - wined3d_surface_decref(ret); + wined3d_texture_decref(ret); return NULL; } - if (FAILED(hr = wined3d_surface_map(ret, &dst_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, WINED3D_MAP_READONLY))) { ERR("Failed to lock the destination surface.\n"); wined3d_surface_unmap(source); - wined3d_surface_decref(ret); + wined3d_texture_decref(ret); return NULL; } conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, source->resource.width, source->resource.height); - wined3d_surface_unmap(ret); + wined3d_surface_unmap(dst); wined3d_surface_unmap(source); return ret; @@ -5945,7 +5939,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { int bpp, srcheight, srcwidth, dstheight, dstwidth, width; const struct wined3d_format *src_format, *dst_format; - struct wined3d_surface *orig_src = src_surface; + struct wined3d_texture *src_texture = NULL; struct wined3d_map_desc dst_map, src_map; const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; @@ -5971,13 +5965,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { if (dst_surface->resource.format->id != src_surface->resource.format->id) { - src_surface = surface_convert_format(src_surface, dst_format->id); - if (!src_surface) + if (!(src_texture = surface_convert_format(src_surface, dst_format->id))) { /* The conv function writes a FIXME */ WARN("Cannot convert source surface format to dest format.\n"); goto release; } + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0)); } wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY); src_format = src_surface->resource.format; @@ -6431,8 +6425,8 @@ release: if (src_surface && src_surface != dst_surface) wined3d_surface_unmap(src_surface); /* Release the converted surface, if any. */ - if (src_surface && src_surface != orig_src) - wined3d_surface_decref(src_surface); + if (src_texture) + wined3d_texture_decref(src_texture); return hr; }

1 0

Henri Verbeet : ddraw: Create textures for additional surfaces.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: afe5ceb7292c494e14bb1417d0e22234c0610b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe5ceb7292c494e14bb1417d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:08 2013 +0100 ddraw: Create textures for additional surfaces. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f924a09..a5422da 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3143,7 +3143,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { struct ddraw_surface *object2 = NULL; - if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object2, version))) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object2))) { if (version == 7) IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface);

1 0

Henri Verbeet : ddraw: Create textures for "standalone" surfaces.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 6ea9afe7011a65f6c7f67b303f13e672907a93f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea9afe7011a65f6c7f67b303… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:07 2013 +0100 ddraw: Create textures for "standalone" surfaces. --- dlls/ddraw/ddraw.c | 12 ++---------- dlls/ddraw/device.c | 8 +++++--- dlls/ddraw/surface.c | 19 ++++++++++++++++--- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6496ac3..f924a09 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3116,17 +3116,9 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) { - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) - { - WARN("Failed to create texture, hr %#x.\n", hr); - return hr; - } - } - else if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) - { - WARN("ddraw_create_surface failed, hr %#x.\n", hr); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } object->is_complex_root = TRUE; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b7511bc..874d78d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4668,14 +4668,16 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture); + struct wined3d_texture *wined3d_texture = NULL; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); - /* Texture may be NULL here */ + if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + wined3d_texture = surf->wined3d_texture; + wined3d_mutex_lock(); - hr = wined3d_device_set_texture(device->wined3d_device, - stage, surf ? surf->wined3d_texture : NULL); + hr = wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 808cd5f..5b34ec7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -484,6 +484,9 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); } + if (surface->wined3d_texture + && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + wined3d_texture_decref(surface->wined3d_texture); if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); } @@ -505,7 +508,8 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) wined3d_mutex_unlock(); return iface_count; } - if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ + /* If it's a texture, destroy the wined3d texture. */ + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) wined3d_texture_decref(This->wined3d_texture); else ddraw_surface_cleanup(This); @@ -5579,7 +5583,8 @@ static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *paren TRACE("texture %p.\n", texture); - ddraw_surface_cleanup(texture->root); + if (texture->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + ddraw_surface_cleanup(texture->root); HeapFree(GetProcessHeap(), 0, parent); } @@ -5632,11 +5637,19 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 * } else { - wined3d_desc.usage = WINED3DUSAGE_TEXTURE | WINED3DUSAGE_DYNAMIC; + wined3d_desc.usage = WINED3DUSAGE_DYNAMIC; + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_DEFAULT; } wined3d_desc.format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); + if (wined3d_desc.format == WINED3DFMT_UNKNOWN) + { + WARN("Unsupported / unknown pixelformat.\n"); + return DDERR_INVALIDPIXELFORMAT; + } + wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.pool = pool;

1 0

Henri Verbeet : ddraw: Create textures for swapchain surfaces.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: d6f12fcdc81cfc40aaec57cf4e4b189500677154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f12fcdc81cfc40aaec57cf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:06 2013 +0100 ddraw: Create textures for swapchain surfaces. --- dlls/ddraw/ddraw.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1dafa1e..6496ac3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5143,14 +5143,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ DWORD flags, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - struct ddraw_texture *texture = container_parent; - DDSURFACEDESC2 desc = texture->surface_desc; struct ddraw_surface *ddraw_surface; + struct ddraw_texture *texture; + DDSURFACEDESC2 desc; HRESULT hr; TRACE("device_parent %p, container_parent %p, wined3d_desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, wined3d_desc, sub_resource_idx, flags, surface); + /* We have a swapchain texture. */ + if (container_parent == ddraw) + return wined3d_surface_create(ddraw->wined3d_device, wined3d_desc->width, wined3d_desc->height, + wined3d_desc->format, wined3d_desc->usage, wined3d_desc->pool, wined3d_desc->multisample_type, + wined3d_desc->multisample_quality, WINED3D_SURFACE_MAPPABLE, NULL, + &ddraw_null_wined3d_parent_ops, surface); + + texture = container_parent; + desc = texture->surface_desc; desc.dwWidth = wined3d_desc->width; desc.dwHeight = wined3d_desc->height; @@ -5179,6 +5188,8 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + struct wined3d_resource_desc texture_desc; + struct wined3d_texture *texture; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", @@ -5190,10 +5201,19 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic return E_FAIL; } - if (SUCCEEDED(hr = wined3d_surface_create(ddraw->wined3d_device, desc->width, desc->height, desc->format, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality, WINED3D_SURFACE_MAPPABLE, - ddraw, &ddraw_frontbuffer_parent_ops, surface))) - ddraw->wined3d_frontbuffer = *surface; + texture_desc = *desc; + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; + if (FAILED(hr = wined3d_texture_create_2d(ddraw->wined3d_device, &texture_desc, 1, + WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, &texture))) + { + WARN("Failed to create texture, hr %#x.\n", hr); + return hr; + } + + *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); + ddraw->wined3d_frontbuffer = *surface; + wined3d_surface_incref(*surface); + wined3d_texture_decref(texture); return hr; }

1 0

Qian Hong : urlmon: Accept uppercase extension name in AsyncInstallDistributionUnit.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: f96fde38316a9b9cf51c7b06e86bd2403a8cce55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96fde38316a9b9cf51c7b06e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Nov 13 06:31:17 2013 +0800 urlmon: Accept uppercase extension name in AsyncInstallDistributionUnit. --- dlls/urlmon/axinstall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index ca1aef6..7ee7d94 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -447,7 +447,7 @@ static HRESULT install_file(install_ctx_t *ctx, const WCHAR *cache_file) if(!ext) ext = ptr; - if(!strcmpW(ext, cab_extW)) { + if(!strcmpiW(ext, cab_extW)) { hres = install_cab_file(ctx); }else { FIXME("Unsupported extension %s\n", debugstr_w(ext));

1 0

Frédéric Delanoy : netapi32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: b7dc0021583ede4af0a0aa95fc929a64221e0895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dc0021583ede4af0a0aa95f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 22:11:10 2013 +0100 netapi32/tests: Use BOOL type where appropriate. --- dlls/netapi32/tests/access.c | 6 +++--- dlls/netapi32/tests/wksta.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index a8c43c3..b71e1c8 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -66,7 +66,7 @@ static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; -static int init_access_tests(void) +static BOOL init_access_tests(void) { DWORD dwSize; BOOL rc; @@ -77,14 +77,14 @@ static int init_access_tests(void) if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not available.\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(WCHAR); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static NET_API_STATUS create_test_user(void) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 5d1d8ac..ee3004e 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -44,7 +44,7 @@ static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; -static int init_wksta_tests(void) +static BOOL init_wksta_tests(void) { DWORD dwSize; BOOL rc; @@ -54,14 +54,14 @@ static int init_wksta_tests(void) rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(computer_name[0]); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static void run_get_comp_name_tests(void)

1 0

Dmitry Timoshkov : server: Make it possible for WaitCommEvent to detect recursive requests.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: a890d0f030a864d893646bd0c29dd761781bcdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a890d0f030a864d893646bd0c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 31 16:58:19 2013 +0900 server: Make it possible for WaitCommEvent to detect recursive requests. --- dlls/kernel32/tests/comm.c | 1 - dlls/ntdll/serial.c | 30 ++++++++++++++++++++++++++---- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/serial.c | 26 +++++++++++++++++++++++++- 5 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 1f88707..cbd276b 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -966,7 +966,6 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); CloseHandle(ovl_wait2.hEvent); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 04aacf0..b03ac61 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -381,7 +381,21 @@ static NTSTATUS get_timeouts(HANDLE handle, SERIAL_TIMEOUTS* st) return status; } -static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write) +static void stop_waiting( HANDLE handle ) +{ + NTSTATUS status; + + SERVER_START_REQ( set_serial_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = SERIALINFO_PENDING_WAIT; + if ((status = wine_server_call( req ))) + ERR("failed to clear waiting state: %#x\n", status); + } + SERVER_END_REQ; +} + +static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write, BOOL start_wait) { NTSTATUS status; @@ -389,6 +403,7 @@ static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD { req->handle = wine_server_obj_handle( hDevice ); req->flags = pending_write ? SERIALINFO_PENDING_WRITE : 0; + if (start_wait) req->flags |= SERIALINFO_PENDING_WAIT; if (!(status = wine_server_call( req ))) { *mask = reply->eventmask; @@ -940,7 +955,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) &new_irq_info, &commio->irq_info, new_mstat, commio->mstat, commio->pending_write); if (*commio->events) break; - get_wait_mask(commio->hDevice, &dummy, &cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL); + get_wait_mask(commio->hDevice, &dummy, &cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, FALSE); if (commio->cookie != cookie) { *commio->events = 0; @@ -959,6 +974,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) else commio->iosb->u.Status = STATUS_CANCELLED; } + stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); RtlFreeHeap(GetProcessHeap(), 0, commio); return 0; @@ -980,7 +996,12 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK commio->iosb = piosb; commio->hEvent = hEvent; commio->pending_write = 0; - get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL); + status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); + if (status) + { + RtlFreeHeap(GetProcessHeap(), 0, commio); + return status; + } /* We may never return, if some capabilities miss * Return error in that case @@ -1045,6 +1066,7 @@ error_caps: status = STATUS_INVALID_PARAMETER; #endif out_now: + stop_waiting(commio->hDevice); RtlFreeHeap(GetProcessHeap(), 0, commio); return status; } @@ -1175,7 +1197,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { - if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL))) + if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL, FALSE))) sz = sizeof(DWORD); } else diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 604affd..dc83806 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3083,6 +3083,7 @@ struct set_serial_info_reply #define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 +#define SERIALINFO_PENDING_WAIT 0x08 @@ -5845,6 +5846,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 451 +#define SERVER_PROTOCOL_VERSION 452 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 31b85f8..3c3b0b5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2239,6 +2239,7 @@ enum message_type #define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 +#define SERIALINFO_PENDING_WAIT 0x08 /* Create an async I/O */ diff --git a/server/serial.c b/server/serial.c index 25587a7..880f5e3 100644 --- a/server/serial.c +++ b/server/serial.c @@ -77,7 +77,8 @@ struct serial unsigned int eventmask; unsigned int generation; /* event mask change counter */ - unsigned int pending_write; + unsigned int pending_write : 1; + unsigned int pending_wait : 1; struct termios original; @@ -139,6 +140,7 @@ struct object *create_serial( struct fd *fd ) serial->eventmask = 0; serial->generation = 0; serial->pending_write = 0; + serial->pending_wait = 0; serial->fd = (struct fd *)grab_object( fd ); set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; @@ -205,6 +207,17 @@ DECL_HANDLER(get_serial_info) if ((serial = get_serial_obj( current->process, req->handle, 0 ))) { + if (req->flags & SERIALINFO_PENDING_WAIT) + { + if (serial->pending_wait) + { + release_object( serial ); + set_error( STATUS_INVALID_PARAMETER ); + return; + } + serial->pending_wait = 1; + } + /* timeouts */ reply->readinterval = serial->readinterval; reply->readconst = serial->readconst; @@ -231,6 +244,17 @@ DECL_HANDLER(set_serial_info) if ((serial = get_serial_obj( current->process, req->handle, 0 ))) { + if (req->flags & SERIALINFO_PENDING_WAIT) + { + if (!serial->pending_wait) + { + release_object( serial ); + set_error( STATUS_INVALID_PARAMETER ); + return; + } + serial->pending_wait = 0; + } + /* timeouts */ if (req->flags & SERIALINFO_SET_TIMEOUTS) {

1 0