wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Bruno Jesus : ws2_32: Add a couple of options to sockopt debug.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 958ed34f16cb1b669744865972c1e9ead025399f URL: http://source.winehq.org/git/wine.git/?a=commit;h=958ed34f16cb1b66974486597… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 23 20:15:33 2015 +0800 ws2_32: Add a couple of options to sockopt debug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 +++- include/winsock.h | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9e8510d..d31f0b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -373,6 +373,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_SO_SNDBUF); DEBUG_SOCKOPT(WS_SO_SNDTIMEO); DEBUG_SOCKOPT(WS_SO_TYPE); + DEBUG_SOCKOPT(WS_SO_UPDATE_CONNECT_CONTEXT); } break; @@ -409,6 +410,7 @@ static inline const char *debugstr_sockopt(int level, int optname) switch(optname) { DEBUG_SOCKOPT(WS_IP_ADD_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IP_DONTFRAGMENT); DEBUG_SOCKOPT(WS_IP_DROP_MEMBERSHIP); DEBUG_SOCKOPT(WS_IP_HDRINCL); DEBUG_SOCKOPT(WS_IP_MULTICAST_IF); @@ -416,10 +418,10 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IP_MULTICAST_TTL); DEBUG_SOCKOPT(WS_IP_OPTIONS); DEBUG_SOCKOPT(WS_IP_PKTINFO); + DEBUG_SOCKOPT(WS_IP_RECEIVE_BROADCAST); DEBUG_SOCKOPT(WS_IP_TOS); DEBUG_SOCKOPT(WS_IP_TTL); DEBUG_SOCKOPT(WS_IP_UNICAST_IF); - DEBUG_SOCKOPT(WS_IP_DONTFRAGMENT); } break; diff --git a/include/winsock.h b/include/winsock.h index 50237e8..cf9adf5 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -730,16 +730,18 @@ typedef struct WS(WSAData) # define IP_TTL 7 # define IP_TOS 8 # define IP_DONTFRAGMENT 9 +# define IP_RECEIVE_BROADCAST 22 # else -# define WS_IP_OPTIONS 1 -# define WS_IP_MULTICAST_IF 2 -# define WS_IP_MULTICAST_TTL 3 -# define WS_IP_MULTICAST_LOOP 4 -# define WS_IP_ADD_MEMBERSHIP 5 -# define WS_IP_DROP_MEMBERSHIP 6 -# define WS_IP_TTL 7 -# define WS_IP_TOS 8 -# define WS_IP_DONTFRAGMENT 9 +# define WS_IP_OPTIONS 1 +# define WS_IP_MULTICAST_IF 2 +# define WS_IP_MULTICAST_TTL 3 +# define WS_IP_MULTICAST_LOOP 4 +# define WS_IP_ADD_MEMBERSHIP 5 +# define WS_IP_DROP_MEMBERSHIP 6 +# define WS_IP_TTL 7 +# define WS_IP_TOS 8 +# define WS_IP_DONTFRAGMENT 9 +# define WS_IP_RECEIVE_BROADCAST 22 # endif #endif

1 0

Bruno Jesus : msacm32: Remove dead code from acmFormatDetailsW.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: cff5c73e68e7a13a56b536f87bdd412e8061e20d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff5c73e68e7a13a56b536f87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 23 19:49:52 2015 +0800 msacm32: Remove dead code from acmFormatDetailsW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 1ab05ae..de07cba 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -400,13 +400,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; - ACMFORMATTAGDETAILSA aftd; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); - memset(&aftd, 0, sizeof(aftd)); - aftd.cbStruct = sizeof(aftd); - if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Stefan Dösinger : d3d8/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 876f7546ab5d513804a163bd1805c9b64932eaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876f7546ab5d513804a163bd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 23 13:21:35 2015 +0100 d3d8/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7029551..e3f6d2d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8503,6 +8503,75 @@ static void test_shademode(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + IDirect3DSurface8 *back, *multi; + ULONG refcount; + HWND window; + HRESULT hr; + D3DCOLOR color; + unsigned int x, y; + struct surface_readback rb; + BOOL all_zero = TRUE; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample init test.\n"); + goto done; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &back); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, FALSE, &multi); + ok(SUCCEEDED(hr), "Failed to create multisampled render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, multi, NULL, 0, back, NULL); + ok(SUCCEEDED(hr), "CopyRects failed, hr %#x.\n", hr); + + get_rt_readback(back, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!color_match(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_surface_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + IDirect3DSurface8_Release(multi); + IDirect3DSurface8_Release(back); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -8567,4 +8636,5 @@ START_TEST(visual) test_flip(); test_uninitialized_varyings(); test_shademode(); + test_multisample_init(); }

1 0

Stefan Dösinger : d3d9/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 04b41ade76427a117a6baebd312f964452c0f518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b41ade76427a117a6baebd3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:01:00 2015 +0100 d3d9/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b328b94..7ab751c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20391,6 +20391,75 @@ static void test_uninitialized_varyings(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + IDirect3DSurface9 *back, *multi; + ULONG refcount; + HWND window; + HRESULT hr; + D3DCOLOR color; + unsigned int x, y; + struct surface_readback rb; + BOOL all_zero = TRUE; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisample init test.\n"); + goto done; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &back); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &multi, NULL); + ok(SUCCEEDED(hr), "Failed to create multisampled render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, multi, NULL, back, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + + get_rt_readback(back, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; x++) + { + color = get_readback_color(&rb, x, y); + if (!color_match(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_surface_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + IDirect3DSurface9_Release(multi); + IDirect3DSurface9_Release(back); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -20511,4 +20580,5 @@ START_TEST(visual) test_depthbias(); test_flip(); test_uninitialized_varyings(); + test_multisample_init(); }

1 0

Stefan Dösinger : wined3d: Discard depth stencils on unload.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 369956a6fd140fa2176764bc036f1aee69184010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369956a6fd140fa2176764bc0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:59 2015 +0100 wined3d: Discard depth stencils on unload. Doing so is equivalent of setting WINED3D_LOCATION_DISCARDED when creating new depth stencil surfaces. It will only happen on the implicit depth stencil. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6a93de4..a8f7179 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1149,10 +1149,18 @@ static void surface_unload(struct wined3d_resource *resource) * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_prepare_system_memory(surface); - memset(surface->resource.heap_memory, 0, surface->resource.size); - surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); - surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM); + if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL) + { + surface_validate_location(surface, WINED3D_LOCATION_DISCARDED); + surface_invalidate_location(surface, ~WINED3D_LOCATION_DISCARDED); + } + else + { + surface_prepare_system_memory(surface); + memset(surface->resource.heap_memory, 0, surface->resource.size); + surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); + surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM); + } /* We also get here when the ddraw swapchain is destroyed, for example * for a mode switch. In this case this surface won't necessarily be

1 0

Stefan Dösinger : wined3d: Support loading renderbuffers in surface_load_location.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 61ad9284d0a6c140380669ca4ff4286856e620bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ad9284d0a6c140380669ca4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 22 01:00:58 2015 +0100 wined3d: Support loading renderbuffers in surface_load_location. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0a7112c..6a93de4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4084,16 +4084,23 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static void surface_multisample_resolve(struct wined3d_surface *surface, struct wined3d_context *context) +static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, + DWORD dst_location) { - RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + const RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + DWORD src_location; - if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) - ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", - surface); + if (surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE) + src_location = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (surface->locations & WINED3D_LOCATION_RB_RESOLVED) + src_location = WINED3D_LOCATION_RB_RESOLVED; + else if (surface->locations & WINED3D_LOCATION_TEXTURE_SRGB) + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else /* surface_blt_fbo will load the source location if necessary. */ + src_location = WINED3D_LOCATION_TEXTURE_RGB; surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, - surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect); + surface, src_location, &rect, surface, dst_location, &rect); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -4161,7 +4168,8 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; case WINED3D_LOCATION_RB_RESOLVED: - surface_multisample_resolve(surface, context); + case WINED3D_LOCATION_RB_MULTISAMPLE: + surface_load_renderbuffer(surface, context, location); break; case WINED3D_LOCATION_TEXTURE_RGB:

1 0

Jacek Caban : mshtml/tests: Fixed tests on win10.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: a2c6a2beb68cae239d72e012aa8d4af113b8aaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c6a2beb68cae239d72e012a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 23 12:18:22 2015 +0100 mshtml/tests: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 89834ac..87f17d6 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3566,7 +3566,7 @@ static HRESULT WINAPI DocObjectService_IsErrorUrl( LPCWSTR lpszUrl, BOOL *pfIsError) { - CHECK_EXPECT(IsErrorUrl); + CHECK_EXPECT2(IsErrorUrl); *pfIsError = FALSE; return S_OK; }

1 0

Nikolay Sivov : wldap32: Properly implement ldap_encode_sort_control[A, W] (Coverity).
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: d4d3bacac44334772863057dba792ab75d0bf7f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d3bacac44334772863057db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 12:56:39 2015 +0300 wldap32: Properly implement ldap_encode_sort_control[A, W] (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/wldap32/wldap32.h | 13 +++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index b0c9102..b9d7b3b 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -274,15 +274,37 @@ INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, return ret; } +static inline void bv_val_dup( const struct WLDAP32_berval *src, struct WLDAP32_berval *dst ) +{ + dst->bv_val = HeapAlloc( GetProcessHeap(), 0, src->bv_len ); + if (dst->bv_val) + { + memcpy( dst->bv_val, src->bv_val, src->bv_len ); + dst->bv_len = src->bv_len; + } + else + dst->bv_len = 0; +} + /*********************************************************************** * ldap_encode_sort_controlA (WLDAP32.@) * * See ldap_encode_sort_controlW. */ ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys, - PLDAPControlA control, BOOLEAN critical ) + PLDAPControlA ret, BOOLEAN critical ) { - return ldap_create_sort_controlA( ld, sortkeys, critical, &control ); + LDAPControlA *control; + ULONG result; + + if ((result = ldap_create_sort_controlA( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) + { + ret->ldctl_oid = strdupU(control->ldctl_oid); + bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); + ret->ldctl_iscritical = control->ldctl_iscritical; + ldap_control_freeA( control ); + } + return result; } /*********************************************************************** @@ -308,9 +330,19 @@ ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys * ldap_create_sort_control instead. */ ULONG CDECL ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys, - PLDAPControlW control, BOOLEAN critical ) + PLDAPControlW ret, BOOLEAN critical ) { - return ldap_create_sort_controlW( ld, sortkeys, critical, &control ); + LDAPControlW *control; + ULONG result; + + if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS) + { + ret->ldctl_oid = strdupW(control->ldctl_oid); + bv_val_dup( &control->ldctl_value, &ret->ldctl_value ); + ret->ldctl_iscritical = control->ldctl_iscritical; + ldap_control_freeW( control ); + } + return result; } /*********************************************************************** diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 00a85a3..55852a6 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; ULONG map_error( int ) DECLSPEC_HIDDEN; @@ -37,6 +39,17 @@ static inline char *strdupU( const char *src ) return dst; } +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); + if (dst) + strcpyW( dst, src ); + return dst; +} + static inline LPWSTR strAtoW( LPCSTR str ) { LPWSTR ret = NULL;

1 0

Hugh McMaster : kernel32: Remove un-needed VK_DEL entries from the console keymap.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: b1b05e62e9901284d0cca579498441a9821d4b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b05e62e9901284d0cca5794… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 23 20:58:38 2015 +1100 kernel32: Remove un-needed VK_DEL entries from the console keymap. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 1774739..db17508 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -850,7 +850,6 @@ static const KeyEntry EmacsStdKeyMap[] = {/*VK_HOME*/ 0x24, WCEL_MoveToBeg }, {/*VK_RIGHT*/0x27, WCEL_MoveRight }, {/*VK_LEFT*/ 0x25, WCEL_MoveLeft }, - {/*VK_DEL*/ 0x2e, WCEL_DeleteCurrChar }, {/*VK_INSERT*/0x2d, WCEL_ToggleInsert }, { 0, NULL } }; @@ -874,7 +873,6 @@ static const KeyEntry Win32StdKeyMap[] = {/*VK_END*/ 0x23, WCEL_MoveToEnd }, {/*VK_UP*/ 0x26, WCEL_MoveToPrevHist }, {/*VK_DOWN*/ 0x28, WCEL_MoveToNextHist }, - {/*VK_DEL*/ 0x2e, WCEL_DeleteCurrChar }, {/*VK_INSERT*/0x2d, WCEL_ToggleInsert }, {/*VK_F8*/ 0x77, WCEL_FindPrevInHist }, { 0, NULL }

1 0

Hugh McMaster : kernel32: Interpret Shift-Backspace as Backspace when using the Win32 keymap in wineconsole.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: bbe3c9cfbde5ba61a6e9b19394e6b189747a8be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe3c9cfbde5ba61a6e9b1939… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 23 20:58:37 2015 +1100 kernel32: Interpret Shift-Backspace as Backspace when using the Win32 keymap in wineconsole. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 0f3c2cd..1774739 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -892,6 +892,7 @@ static const KeyEntry Win32KeyMapCtrl[] = static const KeyMap Win32KeyMap[] = { {0, 0, StdKeyMap}, + {SHIFT_PRESSED, 0, StdKeyMap}, {0, 0, Win32StdKeyMap}, {RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrl}, {LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrl},

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015