September 2013 - Wine-Commits

Alexandre Julliard : server: Trigger a repaint on layered windows the first time the attributes are set .
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: f9c76be08437c8360722374066a672d8338b0e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c76be08437c836072237406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 14 13:53:08 2013 +0200 server: Trigger a repaint on layered windows the first time the attributes are set. --- server/window.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index e141f93..1696fce 100644 --- a/server/window.c +++ b/server/window.c @@ -2794,12 +2794,16 @@ DECL_HANDLER(set_window_layered_info) if (win->ex_style & WS_EX_LAYERED) { + int was_layered = win->is_layered; + if (req->flags & LWA_ALPHA) win->alpha = req->alpha; else if (!win->is_layered) win->alpha = 0; /* alpha init value is 0 */ win->color_key = req->color_key; win->layered_flags = req->flags; win->is_layered = 1; + /* repaint since we know now it's not going to use UpdateLayeredWindow */ + if (!was_layered) redraw_window( win, 0, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME ); } else set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); }

1 0

Stefan Dösinger : wined3d: Move tex_unit_map and friends into the context.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 112617f00bb59d71da9113361396c11681564ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112617f00bb59d71da9113361… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:18 2013 +0200 wined3d: Move tex_unit_map and friends into the context. --- dlls/wined3d/arb_program_shader.c | 8 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 236 +++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 231 +--------------------------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 5 +- dlls/wined3d/nvidia_texture_shader.c | 9 +- dlls/wined3d/state.c | 25 ++--- dlls/wined3d/surface.c | 7 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 32 +++--- 12 files changed, 279 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=112617f00bb59d71da911…

1 0

Henri Verbeet : wined3d: Pass a resource to wined3d_resource_free_sysmem().
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: d1e44ff77595a0d60c409b22fdaf76771b1e6841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e44ff77595a0d60c409b22f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:25 2013 +0200 wined3d: Pass a resource to wined3d_resource_free_sysmem(). --- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/surface.c | 34 +++++++++------------------------- dlls/wined3d/volume.c | 6 ++---- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 19 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b61c3ce..de06ae8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -198,9 +198,8 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine } else { - wined3d_resource_free_sysmem(This->resource.heap_memory); + wined3d_resource_free_sysmem(&This->resource); This->resource.allocatedMemory = NULL; - This->resource.heap_memory = NULL; } return; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 78f35e9..a24db3c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -138,7 +138,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (size > wined3d_device_get_available_texture_mem(device)) { ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); return WINED3DERR_OUTOFVIDEOMEMORY; } adapter_adjust_memory(device->adapter, size); @@ -172,9 +172,8 @@ void resource_cleanup(struct wined3d_resource *resource) ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); resource->allocatedMemory = NULL; - resource->heap_memory = NULL; device_resource_released(resource->device, resource); } @@ -360,14 +359,15 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) return TRUE; } -void wined3d_resource_free_sysmem(void *mem) +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { - void **p = mem; + void **p = resource->heap_memory; - if (!mem) + if (!p) return; HeapFree(GetProcessHeap(), 0, *(--p)); + resource->heap_memory = NULL; } DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e40a65a..a48d0bf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -566,10 +566,7 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) - { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - } + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = NULL; surface->flags |= SFLAG_PBO; context_release(context); @@ -601,9 +598,8 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) return; - wined3d_resource_free_sysmem(surface->resource.heap_memory); + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = NULL; - surface->resource.heap_memory = NULL; surface_invalidate_location(surface, SFLAG_INSYSMEM); } @@ -1611,8 +1607,7 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) hr = surface_create_dib_section(surface); if (SUCCEEDED(hr)) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } @@ -1671,8 +1666,7 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D ERR("Failed to create dib section, hr %#x.\n", hr); return; } - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -2867,8 +2861,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem if (mem && mem != surface->resource.allocatedMemory) { - void *release = NULL; - /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) { @@ -2881,8 +2873,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem } else if (!(surface->flags & SFLAG_USERPTR)) { - release = surface->resource.heap_memory; - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); } surface->resource.allocatedMemory = mem; surface->flags |= SFLAG_USERPTR; @@ -2894,9 +2885,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem /* For client textures OpenGL has to be notified. */ if (surface->flags & SFLAG_CLIENT) surface_release_client_storage(surface); - - /* Now free the old memory if any. */ - wined3d_resource_free_sysmem(release); } else if (surface->flags & SFLAG_USERPTR) { @@ -3086,8 +3074,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); surface->resource.allocatedMemory = NULL; - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.width = width; surface->resource.height = height; @@ -3583,8 +3570,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) /* Use the DIB section from now on if we are not using a PBO. */ if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -5004,9 +4990,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) { - wined3d_resource_free_sysmem(dst_surface->resource.heap_memory); + wined3d_resource_free_sysmem(&dst_surface->resource); dst_surface->resource.allocatedMemory = NULL; - dst_surface->resource.heap_memory = NULL; } else { @@ -6933,8 +6918,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN if ((usage & WINED3DUSAGE_OWNDC) && !surface->hDC && SUCCEEDED(surface_create_dib_section(surface))) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 62c6ab9..4865c59 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -142,8 +142,7 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->resource.allocatedMemory = NULL; wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } @@ -702,8 +701,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->resource.allocatedMemory = NULL; volume->flags |= WINED3D_VFLAG_PBO; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbf6e78..07e8c9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1984,8 +1984,6 @@ struct wined3d_resource_ops void (*resource_unload)(struct wined3d_resource *resource); }; -void wined3d_resource_free_sysmem(void *mem) DECLSPEC_HIDDEN; - struct wined3d_resource { LONG ref; @@ -2025,6 +2023,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : libwine: Don' t add a user id to the server directory if not supported.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 876189a405e18ae7229093c391583eeb1447c53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=876189a405e18ae7229093c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 12:43:07 2013 +0200 libwine: Don't add a user id to the server directory if not supported. --- libs/wine/config.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 4e26212..d8c46be 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -36,7 +36,7 @@ #include "wine/library.h" static const char server_config_dir[] = "/.wine"; /* config dir relative to $HOME */ -static const char server_root_prefix[] = "/tmp/.wine-"; /* prefix for server root dir */ +static const char server_root_prefix[] = "/tmp/.wine"; /* prefix for server root dir */ static const char server_dir_prefix[] = "/server-"; /* prefix for server dir */ static char *bindir; @@ -220,16 +220,18 @@ static char *get_runtime_argvdir( const char *argv0 ) /* initialize the server directory value */ static void init_server_dir( dev_t dev, ino_t ino ) { - char *p; + char *p, *root; + #ifdef HAVE_GETUID - const unsigned int uid = getuid(); + root = xmalloc( sizeof(server_root_prefix) + 12 ); + sprintf( root, "%s-%u", server_root_prefix, getuid() ); #else - const unsigned int uid = 0; + root = xstrdup( server_root_prefix ); #endif - server_dir = xmalloc( sizeof(server_root_prefix) + 32 + sizeof(server_dir_prefix) + - 2*sizeof(dev) + 2*sizeof(ino) ); - sprintf( server_dir, "%s%u%s", server_root_prefix, uid, server_dir_prefix ); + server_dir = xmalloc( strlen(root) + sizeof(server_dir_prefix) + 2*sizeof(dev) + 2*sizeof(ino) + 2 ); + strcpy( server_dir, root ); + strcat( server_dir, server_dir_prefix ); p = server_dir + strlen(server_dir); if (dev != (unsigned long)dev) @@ -241,6 +243,7 @@ static void init_server_dir( dev_t dev, ino_t ino ) sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); else sprintf( p, "%lx", (unsigned long)ino ); + free( root ); } /* retrieve the default dll dir */

1 0

Alexandre Julliard : libwine: Use the argv[0] directory as bin directory only if all other methods fail.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 16c8ca8082c87621ea80203a482952f82188d267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c8ca8082c87621ea80203a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 12:34:44 2013 +0200 libwine: Use the argv[0] directory as bin directory only if all other methods fail. --- libs/wine/config.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index df5c33b..4e26212 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -152,16 +152,16 @@ static char *get_runtime_libdir(void) } /* return the directory that contains the main exe at run-time */ -static char *get_runtime_bindir( const char *argv0 ) +static char *get_runtime_exedir(void) { - char *p, *bindir, *cwd; - int len, size; - #ifdef EXE_LINK + char *p, *bindir; + int size; + for (size = 256; ; size *= 2) { int ret; - if (!(bindir = malloc( size ))) break; + if (!(bindir = malloc( size ))) return NULL; if ((ret = readlink( EXE_LINK, bindir, size )) == -1) break; if (ret != size) { @@ -175,6 +175,14 @@ static char *get_runtime_bindir( const char *argv0 ) } free( bindir ); #endif + return NULL; +} + +/* return the base directory from argv0 */ +static char *get_runtime_argvdir( const char *argv0 ) +{ + char *p, *bindir, *cwd; + int len, size; if (!(p = strrchr( argv0, '/' ))) return NULL; @@ -370,21 +378,32 @@ void wine_init_argv0_path( const char *argv0 ) if (!(basename = strrchr( argv0, '/' ))) basename = argv0; else basename++; - bindir = get_runtime_bindir( argv0 ); - libdir = get_runtime_libdir(); - + bindir = get_runtime_exedir(); if (bindir && !is_valid_bindir( bindir )) { build_dir = running_from_build_dir( bindir ); free( bindir ); bindir = NULL; } + + libdir = get_runtime_libdir(); if (libdir && !bindir && !build_dir) { build_dir = running_from_build_dir( libdir ); if (!build_dir) bindir = build_path( libdir, LIB_TO_BINDIR ); } + if (!libdir && !bindir && !build_dir) + { + bindir = get_runtime_argvdir( argv0 ); + if (bindir && !is_valid_bindir( bindir )) + { + build_dir = running_from_build_dir( bindir ); + free( bindir ); + bindir = NULL; + } + } + if (build_dir) { argv0_name = build_path( "loader/", basename );

1 0

Alexandre Julliard : msxml3: Don't use libxslt without libxml.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: b618910b845f33688016c3508df79b7306499532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b618910b845f33688016c3508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 10:20:50 2013 +0200 msxml3: Don't use libxslt without libxml. --- dlls/msxml3/main.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 46742ef..ae93ec9 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -161,15 +161,6 @@ static int wineXmlFileCloseCallback (void * context) return CloseHandle(context) ? 0 : -1; } -#endif - - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - - void* libxslt_handle = NULL; #ifdef SONAME_LIBXSLT # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL @@ -209,6 +200,15 @@ static void init_libxslt(void) #endif } +#endif /* HAVE_LIBXML2 */ + + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -230,12 +230,13 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) WARN("Failed to register callbacks\n"); schemasInit(); -#endif init_libxslt(); +#endif DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: if (reserved) break; +#ifdef HAVE_LIBXML2 #ifdef SONAME_LIBXSLT if (libxslt_handle) { @@ -243,7 +244,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) wine_dlclose(libxslt_handle, NULL, 0); } #endif -#ifdef HAVE_LIBXML2 /* Restore default Callbacks */ xmlCleanupInputCallbacks(); xmlRegisterDefaultInputCallbacks();

1 0

Bruno Jesus : ws2_32: Fix WSASocket return code for invalid combination of socket type and protocol .
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 5762067b20dc3b0cc8d9fecb1a99d3784dc0131d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5762067b20dc3b0cc8d9fecb1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:44:22 2013 -0300 ws2_32: Fix WSASocket return code for invalid combination of socket type and protocol. --- dlls/ws2_32/socket.c | 17 ++++++++++++++--- dlls/ws2_32/tests/sock.c | 3 --- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b591c5e..dafbeb4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5867,6 +5867,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, GROUP g, DWORD dwFlags) { SOCKET ret; + DWORD err; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -5929,16 +5930,26 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - if (GetLastError() == WSAEACCES) /* raw socket denied */ + err = GetLastError(); + if (err == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); else ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); - SetLastError(WSAESOCKTNOSUPPORT); + err = WSAESOCKTNOSUPPORT; + } + else + { + /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ + if (err == WSAEINVAL) + err = WSAESOCKTNOSUPPORT; + else if (err == WSAEOPNOTSUPP) + err = WSAEPROTONOSUPPORT; } - WARN("\t\tfailed!\n"); + WARN("\t\tfailed, error %d!\n", err); + SetLastError(err); return INVALID_SOCKET; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bc2bd10..40496ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1854,7 +1854,6 @@ todo_wine ok(WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); SetLastError(0xdeadbeef); @@ -1874,7 +1873,6 @@ todo_wine ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* SOCK_DGRAM does not support IPPROTO_TCP */ @@ -1882,7 +1880,6 @@ todo_wine ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA)

1 0

Bruno Jesus : ws2_32: Make WS_EnterSingleProtocol return a boolean.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 78ca87a00baf08c577ea526a4cc91f5e9858006c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ca87a00baf08c577ea526a4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 16 01:44:03 2013 -0300 ws2_32: Make WS_EnterSingleProtocol return a boolean. --- dlls/ws2_32/socket.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c6b3593..b591c5e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1592,15 +1592,14 @@ static INT WS_DuplicateSocket(BOOL unicode, SOCKET s, DWORD dwProcessId, LPWSAPR * buffer. * * RETURNS - * 1 if a protocol was entered into the buffer. - * SOCKET_ERROR otherwise. + * TRUE if a protocol was entered into the buffer. * * BUGS * - only implemented for IPX, SPX, SPXII, TCP, UDP * - there is no check that the operating system supports the returned * protocols */ -static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) +static BOOL WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) { memset( info, 0, sizeof(WSAPROTOCOL_INFOW) ); info->iProtocol = protocol; @@ -1694,9 +1693,9 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) default: FIXME("unknown Protocol <0x%08x>\n", protocol); - return SOCKET_ERROR; + return FALSE; } - return 1; + return TRUE; } /***************************************************************************** @@ -1705,14 +1704,14 @@ static INT WS_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) * see function WS_EnterSingleProtocolW * */ -static INT WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) +static BOOL WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) { WSAPROTOCOL_INFOW infow; INT ret; memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); ret = WS_EnterSingleProtocolW( protocol, &infow ); - if (ret != SOCKET_ERROR) + if (ret) { /* convert the structure from W to A */ memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); @@ -1758,12 +1757,12 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I { if (unicode) { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ) != SOCKET_ERROR) + if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] )) items++; } else { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ) != SOCKET_ERROR) + if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] )) items++; } }

1 0

Stefan Dösinger : wined3d: Move device_preload_textures into context.c.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: 59e0b841c7ce1f1f09baa38704f3d90883beb11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e0b841c7ce1f1f09baa3870… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:19 2013 +0200 wined3d: Move device_preload_textures into context.c. --- dlls/wined3d/context.c | 50 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 47 ------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a6f27dc..4f8021c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2787,6 +2787,54 @@ static void context_update_stream_info(struct wined3d_context *context, const st } /* Context activation is done by the caller. */ +static void context_preload_texture(struct wined3d_context *context, + const struct wined3d_state *state, unsigned int idx) +{ + struct wined3d_texture *texture; + enum WINED3DSRGB srgb; + + if (!(texture = state->textures[idx])) + return; + + srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; + texture->texture_ops->texture_preload(texture, context, srgb); +} + +/* Context activation is done by the caller. */ +static void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) +{ + unsigned int i; + + if (use_vs(state)) + { + for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + { + if (state->vertex_shader->reg_maps.sampler_type[i]) + context_preload_texture(context, state, MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(state)) + { + for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + { + if (state->pixel_shader->reg_maps.sampler_type[i]) + context_preload_texture(context, state, i); + } + } + else + { + WORD ffu_map = context->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + context_preload_texture(context, state, i); + } + } +} + +/* Context activation is done by the caller. */ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) { const struct wined3d_state *state = &device->state; @@ -2807,7 +2855,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ context_update_tex_unit_map(context, state); - device_preload_textures(device, context); + context_preload_textures(context, state); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); if (state->index_buffer) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e122f9..30dcc06 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -134,53 +134,6 @@ static enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_t } } -/* Context activation is done by the caller. */ -static void device_preload_texture(const struct wined3d_state *state, - struct wined3d_context *context, unsigned int idx) -{ - struct wined3d_texture *texture; - enum WINED3DSRGB srgb; - - if (!(texture = state->textures[idx])) return; - srgb = state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE] ? SRGB_SRGB : SRGB_RGB; - texture->texture_ops->texture_preload(texture, context, srgb); -} - -/* Context activation is done by the caller. */ -void device_preload_textures(const struct wined3d_device *device, struct wined3d_context *context) -{ - const struct wined3d_state *state = &device->state; - unsigned int i; - - if (use_vs(state)) - { - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) - { - if (state->vertex_shader->reg_maps.sampler_type[i]) - device_preload_texture(state, context, MAX_FRAGMENT_SAMPLERS + i); - } - } - - if (use_ps(state)) - { - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) - { - if (state->pixel_shader->reg_maps.sampler_type[i]) - device_preload_texture(state, context, i); - } - } - else - { - WORD ffu_map = context->fixed_function_usage_map; - - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (ffu_map & 1) - device_preload_texture(state, context, i); - } - } -} - BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_context **new_array; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 065183a..9b1ba42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1952,7 +1952,6 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; -void device_preload_textures(const struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Pass the context to surface_internal_preload.
by Alexandre Julliard Sept. 16, 2013

Sept. 16, 2013

Module: wine Branch: master Commit: f29c24f2de70807d1f4c9c24935ba634e56be276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29c24f2de70807d1f4c9c249… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 16 12:43:17 2013 +0200 wined3d: Pass the context to surface_internal_preload. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/surface.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c7194e4..ec4cb89 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7455,6 +7455,9 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; + /* Activate the destination context, set it up for blitting */ + context = context_acquire(device, dst_surface); + /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) @@ -7470,10 +7473,8 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, src_rect.bottom = src_surface->resource.height - src_rect.bottom; } else - surface_internal_preload(src_surface, SRGB_RGB); + surface_internal_preload(src_surface, context, SRGB_RGB); - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 43befb8..b69a520 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2123,7 +2123,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->render_offscreen) { - surface_internal_preload(rt, SRGB_RGB); + surface_internal_preload(rt, context, SRGB_RGB); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) @@ -2662,8 +2662,8 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d { /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) - surface_internal_preload(context->current_rt, SRGB_SRGB); - surface_internal_preload(context->current_rt, SRGB_RGB); + surface_internal_preload(context->current_rt, context, SRGB_SRGB); + surface_internal_preload(context->current_rt, context, SRGB_RGB); surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 66587a1..f988af9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2647,6 +2647,7 @@ DWORD CDECL wined3d_surface_get_priority(const struct wined3d_surface *surface) void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { + struct wined3d_context *context; TRACE("surface %p.\n", surface); if (!surface->resource.device->d3d_initialized) @@ -2655,7 +2656,9 @@ void CDECL wined3d_surface_preload(struct wined3d_surface *surface) return; } - surface_internal_preload(surface, SRGB_ANY); + context = context_acquire(surface->resource.device, NULL); + surface_internal_preload(surface, context, SRGB_ANY); + context_release(context); } void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) @@ -3687,16 +3690,12 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } -void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) +/* Context activation is done by the caller */ +void surface_internal_preload(struct wined3d_surface *surface, + struct wined3d_context *context, enum WINED3DSRGB srgb) { - struct wined3d_device *device = surface->resource.device; - struct wined3d_context *context; - TRACE("iface %p, srgb %#x.\n", surface, srgb); - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - if (surface->container) { struct wined3d_texture *texture = surface->container; @@ -3718,7 +3717,6 @@ void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB context->gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &surface->texture_name, &tmp); } } - context_release(context); } /* Read the framebuffer back into the surface */ @@ -4393,7 +4391,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, context, SRGB_RGB); /* Bind the target texture */ context_bind_texture(context, dst_target, dst_surface->texture_name); @@ -4501,14 +4499,14 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - surface_internal_preload(dst_surface, SRGB_RGB); + surface_internal_preload(dst_surface, context, SRGB_RGB); src_offscreen = surface_is_offscreen(src_surface); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; if (!noBackBufferBackup && !src_surface->texture_name) { /* Get it a description */ - surface_internal_preload(src_surface, SRGB_RGB); + surface_internal_preload(src_surface, context, SRGB_RGB); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -4791,14 +4789,15 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, src_rect = *src_rect_in; dst_rect = *dst_rect_in; + context = context_acquire(device, dst_surface); + gl_info = context->gl_info; + /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - surface_internal_preload(src_surface, SRGB_RGB); + surface_internal_preload(src_surface, context, SRGB_RGB); /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); - gl_info = context->gl_info; context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 125556e..93f18f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2252,7 +2252,8 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_internal_preload(struct wined3d_surface *surface, + struct wined3d_context *context, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN;

1 0