August 2015 - Wine-commits - list.winehq.org

Hans Leidekker : netprofm: Support IDispatch on the list manager object.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 0335459f5f3c74dfba56a45cea251cd3b2988c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0335459f5f3c74dfba56a45ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:28 2015 +0200 netprofm: Support IDispatch on the list manager object. --- dlls/netprofm/list.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index ee0f7b7..6364515 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -374,6 +374,7 @@ static HRESULT WINAPI list_manager_QueryInterface( TRACE( "%p, %s, %p\n", mgr, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID_INetworkListManager ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface;

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkConnection.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 2d22baa6be75b05175c739e42807ab67fbb68bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d22baa6be75b05175c739e42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:51 2015 +0200 netprofm: Add a stub implementation of INetworkConnection. --- dlls/netprofm/list.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 6364515..b39856d 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -36,6 +36,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/list.h" #include "netprofm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(netprofm); @@ -50,12 +51,23 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +struct connection +{ + INetworkConnection INetworkConnection_iface; + LONG refs; + struct list entry; + GUID id; + VARIANT_BOOL connected_to_internet; + VARIANT_BOOL connected; +}; + struct list_manager { INetworkListManager INetworkListManager_iface; INetworkCostManager INetworkCostManager_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; + struct list connections; }; struct connection_point @@ -358,7 +370,16 @@ static ULONG WINAPI list_manager_Release( LONG refs = InterlockedDecrement( &mgr->refs ); if (!refs) { + struct list *ptr; + TRACE( "destroying %p\n", mgr ); + + while ((ptr = list_head( &mgr->connections ))) + { + struct connection *connection = LIST_ENTRY( ptr, struct connection, entry ); + list_remove( &connection->entry ); + INetworkConnection_Release( &connection->INetworkConnection_iface ); + } heap_free( mgr ); } return refs; @@ -583,6 +604,257 @@ static const struct IConnectionPointContainerVtbl cpc_vtbl = ConnectionPointContainer_FindConnectionPoint }; +static inline struct connection *impl_from_INetworkConnection( + INetworkConnection *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, INetworkConnection_iface ); +} + +static HRESULT WINAPI connection_QueryInterface( + INetworkConnection *iface, REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + + if (IsEqualIID( riid, &IID_INetworkConnection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + WARN( "interface not supported %s\n", debugstr_guid(riid) ); + *obj = NULL; + return E_NOINTERFACE; + } + INetworkConnection_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI connection_AddRef( + INetworkConnection *iface ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p\n", connection ); + return InterlockedIncrement( &connection->refs ); +} + +static ULONG WINAPI connection_Release( + INetworkConnection *iface ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + LONG refs; + + TRACE( "%p\n", connection ); + + if (!(refs = InterlockedDecrement( &connection->refs ))) + { + list_remove( &connection->entry ); + heap_free( connection ); + } + return refs; +} + +static HRESULT WINAPI connection_GetTypeInfoCount( + INetworkConnection *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetTypeInfo( + INetworkConnection *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetIDsOfNames( + INetworkConnection *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Invoke( + INetworkConnection *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetNetwork( + INetworkConnection *iface, + INetwork **ppNetwork ) +{ + FIXME( "%p, %p\n", iface, ppNetwork ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_IsConnectedToInternet( + INetworkConnection *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = connection->connected_to_internet; + return S_OK; +} + +static HRESULT WINAPI connection_get_IsConnected( + INetworkConnection *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = connection->connected; + return S_OK; +} + +static HRESULT WINAPI connection_GetConnectivity( + INetworkConnection *iface, + NLM_CONNECTIVITY *pConnectivity ) +{ + FIXME( "%p, %p\n", iface, pConnectivity ); + + *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + return S_OK; +} + +static HRESULT WINAPI connection_GetConnectionId( + INetworkConnection *iface, + GUID *pgdConnectionId ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pgdConnectionId ); + + *pgdConnectionId = connection->id; + return S_OK; +} + +static HRESULT WINAPI connection_GetAdapterId( + INetworkConnection *iface, + GUID *pgdAdapterId ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + FIXME( "%p, %p\n", iface, pgdAdapterId ); + + *pgdAdapterId = connection->id; + return S_OK; +} + +static HRESULT WINAPI connection_GetDomainType( + INetworkConnection *iface, + NLM_DOMAIN_TYPE *pDomainType ) +{ + FIXME( "%p, %p\n", iface, pDomainType ); + + *pDomainType = NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK; + return S_OK; +} + +static const struct INetworkConnectionVtbl connection_vtbl = +{ + connection_QueryInterface, + connection_AddRef, + connection_Release, + connection_GetTypeInfoCount, + connection_GetTypeInfo, + connection_GetIDsOfNames, + connection_Invoke, + connection_GetNetwork, + connection_get_IsConnectedToInternet, + connection_get_IsConnected, + connection_GetConnectivity, + connection_GetConnectionId, + connection_GetAdapterId, + connection_GetDomainType +}; + +static struct connection *create_connection( const GUID *id ) +{ + struct connection *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->INetworkConnection_iface.lpVtbl = &connection_vtbl; + ret->refs = 1; + ret->id = *id; + ret->connected = VARIANT_FALSE; + ret->connected_to_internet = VARIANT_FALSE; + list_init( &ret->entry ); + + return ret; +} + +static void init_networks( struct list_manager *mgr ) +{ + DWORD size = 0; + IP_ADAPTER_ADDRESSES *buf, *aa; + GUID id; + ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + + list_init( &mgr->connections ); + + ret = GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + if (!(buf = heap_alloc( size ))) return; + if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) return; + + memset( &id, 0, sizeof(id) ); + for (aa = buf; aa; aa = aa->Next) + { + struct connection *connection; + + id.Data1 = aa->IfIndex; + + if (!(connection = create_connection( &id ))) + goto done; + + if (aa->FirstUnicastAddress) + { + connection->connected = VARIANT_TRUE; + } + if (aa->FirstGatewayAddress) + { + connection->connected_to_internet = VARIANT_TRUE; + } + + list_add_tail( &mgr->connections, &connection->entry ); + } + +done: + heap_free( buf ); +} + HRESULT list_manager_create( void **obj ) { struct list_manager *mgr; @@ -593,6 +865,7 @@ HRESULT list_manager_create( void **obj ) mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl; + init_networks( mgr ); mgr->refs = 1; *obj = &mgr->INetworkListManager_iface;

1 0

Hans Leidekker : wininet: Don't trace the password in InternetConnectW.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ce90ed1b88bba8389aabfcb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:05:16 2015 +0200 wininet: Don't trace the password in InternetConnectW. --- dlls/wininet/internet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ee04f40..c64816e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1317,9 +1317,8 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, HINTERNET rc = NULL; DWORD res = ERROR_SUCCESS; - TRACE("(%p, %s, %i, %s, %s, %i, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), - nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), - dwService, dwFlags, dwContext); + TRACE("(%p, %s, %u, %s, %p, %u, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), + nServerPort, debugstr_w(lpszUserName), lpszPassword, dwService, dwFlags, dwContext); if (!lpszServerName) {

1 0

Stefan Dösinger : d3d9: Validate swap effect and backbuffer count.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: c4e4647ca59b211850cd609c1ad156f5cf5abe0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e4647ca59b211850cd609c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 21:50:55 2015 +0200 d3d9: Validate swap effect and backbuffer count. --- dlls/d3d9/device.c | 42 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/swapchain.c | 7 ------- include/wine/wined3d.h | 1 - 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0b1a77a..95d1e02 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -208,9 +208,25 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->PresentationInterval = swapchain_desc->swap_interval; } -static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, - const D3DPRESENT_PARAMETERS *present_parameters) +static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, + const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) { + D3DSWAPEFFECT highest_swapeffect = extended ? D3DSWAPEFFECT_FLIPEX : D3DSWAPEFFECT_COPY; + UINT highest_bb_count = extended ? 30 : 3; + + if (!present_parameters->SwapEffect || present_parameters->SwapEffect > highest_swapeffect) + { + WARN("Invalid swap effect %u passed.\n", present_parameters->SwapEffect); + return FALSE; + } + if (present_parameters->BackBufferCount > highest_bb_count + || (present_parameters->SwapEffect == D3DSWAPEFFECT_COPY + && present_parameters->BackBufferCount > 1)) + { + WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); + return FALSE; + } + swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -227,6 +243,8 @@ static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->swap_interval = present_parameters->PresentationInterval; swapchain_desc->auto_restore_display_mode = TRUE; + + return TRUE; } static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) @@ -533,7 +551,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID } wined3d_mutex_unlock(); - wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); + if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters, + device->d3d_parent->extended)) + return D3DERR_INVALIDCALL; if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = (IDirect3DSwapChain9 *)&object->IDirect3DSwapChain9Ex_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); @@ -648,6 +668,10 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.scanline_ordering = mode->ScanLineOrdering; } + if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, + device->d3d_parent->extended)) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); if (device->vertex_buffer) @@ -664,7 +688,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->index_buffer_size = 0; } - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) { @@ -3683,6 +3706,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (!swapchain_desc) { ERR("Failed to allocate wined3d parameters.\n"); + wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); return E_OUTOFMEMORY; @@ -3690,7 +3714,15 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], &parameters[i]); + if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], &parameters[i], + parent->extended)) + { + wined3d_device_release_focus_window(device->wined3d_device); + wined3d_device_decref(device->wined3d_device); + HeapFree(GetProcessHeap(), 0, swapchain_desc); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } } hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2801215..70f5d5c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -780,13 +780,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 HRESULT hr; UINT i; - if (desc->backbuffer_count > WINED3DPRESENT_BACK_BUFFER_MAX) - { - FIXME("The application requested %u back buffers, this is not supported.\n", - desc->backbuffer_count); - return WINED3DERR_INVALIDCALL; - } - if (desc->backbuffer_count > 1) { FIXME("The application requested more than one back buffer, this is not properly supported.\n" diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4d28bab..8970cd5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -804,7 +804,6 @@ enum wined3d_display_rotation #define WINED3DADAPTER_DEFAULT 0 #define WINED3DENUM_NO_WHQL_LEVEL 2 -#define WINED3DPRESENT_BACK_BUFFER_MAX 3 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000

1 0

Stefan Dösinger : d3d8: Validate swap effect and backbuffer count.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 8c91443f9d0c66d005d6a7eb97b348f1836f74a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c91443f9d0c66d005d6a7eb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 21:50:56 2015 +0200 d3d8: Validate swap effect and backbuffer count. --- dlls/d3d8/device.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 916f23f..8200119 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -188,9 +188,22 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; } -static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, +static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { + if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY) + { + WARN("Invalid swap effect %u passed.\n", present_parameters->SwapEffect); + return FALSE; + } + if (present_parameters->BackBufferCount > 3 + || (present_parameters->SwapEffect == D3DSWAPEFFECT_COPY + && present_parameters->BackBufferCount > 1)) + { + WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount); + return FALSE; + } + swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -207,6 +220,8 @@ static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->swap_interval = present_parameters->FullScreen_PresentationInterval; swapchain_desc->auto_restore_display_mode = TRUE; + + return TRUE; } /* Handle table functions */ @@ -585,7 +600,8 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if } wined3d_mutex_unlock(); - wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); + if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters)) + return D3DERR_INVALIDCALL; if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); @@ -650,6 +666,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; } + if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters)) + return D3DERR_INVALIDCALL; wined3d_mutex_lock(); @@ -666,7 +684,6 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, device->index_buffer_size = 0; } - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { @@ -3142,7 +3159,14 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, parameters); + if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, parameters)) + { + wined3d_device_release_focus_window(device->wined3d_device); + wined3d_device_decref(device->wined3d_device); + wined3d_mutex_unlock(); + HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + return D3DERR_INVALIDCALL; + } hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc); if (FAILED(hr))

1 0

Stefan Dösinger : d3d9/tests: Test presentation parameter combinations.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 9261bbb1a6fc4a416250472389ea9ae3281c00f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9261bbb1a6fc4a41625047238… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 21:50:57 2015 +0200 d3d9/tests: Test presentation parameter combinations. --- dlls/d3d9/tests/d3d9ex.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9261bbb1a6fc4a4162504…

1 0

Daniel Lehman : kernel32: Add Invariant string table.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 043c0c6c5a5f1ee51ca64be0498608cdfbe92979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043c0c6c5a5f1ee51ca64be04… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 25 23:08:04 2015 -0700 kernel32: Add Invariant string table. --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ivl.nls | 160 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 2 +- 3 files changed, 163 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 890c717..363e7ab 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -249,3 +249,5 @@ #include "nls/cor.nls" /* 0x0492 LANG_CORNISH, SUBLANG_DEFAULT */ #include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */ + +#include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */ diff --git a/dlls/kernel32/nls/ivl.nls b/dlls/kernel32/nls/ivl.nls new file mode 100644 index 0000000..8f34a08 --- /dev/null +++ b/dlls/kernel32/nls/ivl.nls @@ -0,0 +1,160 @@ +/* + * Locale definitions for Invariant + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_INVARIANT, SUBLANG_NEUTRAL +{ + LOCALE_FONTSIGNATURE L"\x00af\x8000\x38cb\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x8000\x01ff\x003f\x8000\xffff" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "1" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "0" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "437" + LOCALE_IDEFAULTCOUNTRY "1" + LOCALE_IDEFAULTEBCDICCODEPAGE "037" + LOCALE_IDEFAULTLANGUAGE "0409" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28591" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "007f" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "0" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "0" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "IVC" + LOCALE_SABBREVDAYNAME1 "Mon" + LOCALE_SABBREVDAYNAME2 "Tue" + LOCALE_SABBREVDAYNAME3 "Wed" + LOCALE_SABBREVDAYNAME4 "Thu" + LOCALE_SABBREVDAYNAME5 "Fri" + LOCALE_SABBREVDAYNAME6 "Sat" + LOCALE_SABBREVDAYNAME7 "Sun" + LOCALE_SABBREVLANGNAME "IVL" + LOCALE_SABBREVMONTHNAME1 "Jan" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Apr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Jun" + LOCALE_SABBREVMONTHNAME7 "Jul" + LOCALE_SABBREVMONTHNAME8 "Aug" + LOCALE_SABBREVMONTHNAME9 "Sep" + LOCALE_SABBREVMONTHNAME10 "Oct" + LOCALE_SABBREVMONTHNAME11 "Nov" + LOCALE_SABBREVMONTHNAME12 "Dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Invariant Country" + LOCALE_SCURRENCY L"\x00a4" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Monday" + LOCALE_SDAYNAME2 "Tuesday" + LOCALE_SDAYNAME3 "Wednesday" + LOCALE_SDAYNAME4 "Thursday" + LOCALE_SDAYNAME5 "Friday" + LOCALE_SDAYNAME6 "Saturday" + LOCALE_SDAYNAME7 "Sunday" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Invariant Country" + LOCALE_SENGCURRNAME "International Monetary Fund" + LOCALE_SENGLANGUAGE "Invariant Language" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "XDR" + LOCALE_SISO3166CTRYNAME "IV" + LOCALE_SISO639LANGNAME "iv" + LOCALE_SLANGUAGE "Invariant Language (Invariant Country)" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dddd, dd MMMM yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "January" + LOCALE_SMONTHNAME2 "February" + LOCALE_SMONTHNAME3 "March" + LOCALE_SMONTHNAME4 "April" + LOCALE_SMONTHNAME5 "May" + LOCALE_SMONTHNAME6 "June" + LOCALE_SMONTHNAME7 "July" + LOCALE_SMONTHNAME8 "August" + LOCALE_SMONTHNAME9 "September" + LOCALE_SMONTHNAME10 "October" + LOCALE_SMONTHNAME11 "November" + LOCALE_SMONTHNAME12 "December" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "" + LOCALE_SNATIVECTRYNAME "Invariant Country" + LOCALE_SNATIVECURRNAME "International Monetary Fund" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Invariant Language (Invariant Country)" + LOCALE_SNATIVELANGNAME "Invariant Language" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "dflt" + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "MM/dd/yyyy" + LOCALE_SSORTNAME "Math Alphanumerics" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "yyyy MMMM" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 51e2b07..c48a620 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2420,7 +2420,7 @@ static void test_LocaleNameToLCID(void) lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); - todo_wine ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); /* bad name */

1 0

Martin Storsjo : ucrtbase: Hook up the _set_app_type, _set_new_handler and _set_new_mode functions.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 8c5057f33467510032519bd90bb696a0fbc4cba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5057f33467510032519bd90… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 26 10:24:30 2015 +0300 ucrtbase: Hook up the _set_app_type, _set_new_handler and _set_new_mode functions. These have changed function signature since msvcr120. _set_app_type used to be called __set_app_type, and the _set_new_* functions used to have C++ signatures. --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 5ae19b4..18ca9d4 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -20,7 +20,7 @@ @ stub _query_new_mode @ stub _realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc -@ stub _set_new_mode +@ cdecl _set_new_mode(long) ucrtbase._set_new_mode @ cdecl calloc(long long) ucrtbase.calloc @ cdecl free(ptr) ucrtbase.free @ cdecl malloc(long) ucrtbase.malloc diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 561340d..8e8fd08 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -66,13 +66,13 @@ @ stub _seh_filter_dll @ stub _seh_filter_exe @ cdecl _set_abort_behavior(long long) ucrtbase._set_abort_behavior -@ stub _set_app_type +@ cdecl _set_app_type(long) ucrtbase._set_app_type @ cdecl _set_controlfp(long long) ucrtbase._set_controlfp @ cdecl _set_doserrno(long) ucrtbase._set_doserrno @ cdecl _set_errno(long) ucrtbase._set_errno @ cdecl _set_error_mode(long) ucrtbase._set_error_mode @ cdecl _set_invalid_parameter_handler(ptr) ucrtbase._set_invalid_parameter_handler -@ stub _set_new_handler +@ cdecl _set_new_handler(ptr) ucrtbase._set_new_handler @ stub _set_thread_local_invalid_parameter_handler @ cdecl _seterrormode(long) ucrtbase._seterrormode @ cdecl _sleep(long) ucrtbase._sleep diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d6516d7..aacffb8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1881,15 +1881,15 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior -@ stub _set_app_type +@ cdecl _set_app_type(long) MSVCRT___set_app_type @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) -@ stub _set_new_handler -@ stub _set_new_mode +@ cdecl _set_new_handler(ptr) MSVCRT_set_new_handler +@ cdecl _set_new_mode(long) MSVCRT__set_new_mode @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ stub _set_se_translator

1 0

Martin Storsjo : ucrtbase: Hook up _crt_atexit.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 9303c6eeed57fc27b278f3e1399fd94ba29ddb0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9303c6eeed57fc27b278f3e13… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Aug 27 00:06:35 2015 +0300 ucrtbase: Hook up _crt_atexit. --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 8e8fd08..77afe01 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -29,7 +29,7 @@ @ cdecl _controlfp(long long) ucrtbase._controlfp @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @ stub _crt_at_quick_exit -@ stub _crt_atexit +@ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit @ stub _crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread @ cdecl _endthreadex(long) ucrtbase._endthreadex diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 3d79a4d..0f1343d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -326,6 +326,15 @@ int CDECL MSVCRT_atexit(void (*func)(void)) } /********************************************************************* + * _crt_atexit (UCRTBASE.@) + */ +int CDECL MSVCRT__crt_atexit(void (*func)(void)) +{ + TRACE("(%p)\n", func); + return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aacffb8..bb56408 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -241,7 +241,7 @@ @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit -@ stub _crt_atexit +@ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit @ stub _crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s

1 0

Nikolay Sivov : dwrite: Cleanup rendering interface with freetype.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Module: wine Branch: master Commit: 2c4ba8a0087d0145709cdf28692da879d47ecb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4ba8a0087d0145709cdf286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 27 08:38:50 2015 +0300 dwrite: Cleanup rendering interface with freetype. --- dlls/dwrite/dwrite_private.h | 14 +++++++-- dlls/dwrite/font.c | 71 +++++++++++++++++++++++++++----------------- dlls/dwrite/freetype.c | 58 ++++++++++++++++++------------------ 3 files changed, 84 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c4ba8a0087d0145709cd…

1 0