wine-devel September 2018

wine-devel@winehq.org

70 participants
627 discussions

[PATCH] winemac: Allow Command to be mapped to Ctrl.
by Ricky Zhou 12 Sep '18

12 Sep '18

Adds the following registry options, which configure the Mac driver to map Command to Ctrl: HKEY_CURRENT_USER\Software\Wine\Mac Driver\LeftCommandIsCtrl HKEY_CURRENT_USER\Software\Wine\Mac Driver\RightCommandIsCtrl Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35351 Signed-off-by: Ricky Zhou <ricky(a)rzhou.org> --- dlls/winemac.drv/cocoa_window.m | 38 ++++++++++++++++++++------------- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 7 ++++++ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4143d147df..6eacf43151 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -140,22 +140,30 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) *modifiers &= ~NX_ALTERNATEMASK; } -static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers) +static inline NSUInteger adjusted_modifiers_for_settings(NSUInteger modifiers) { fix_device_modifiers_by_generic(&modifiers); - if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK)) - { - modifiers |= NX_DEVICELCMDKEYMASK; - modifiers &= ~NX_DEVICELALTKEYMASK; - } - if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK)) - { - modifiers |= NX_DEVICERCMDKEYMASK; - modifiers &= ~NX_DEVICERALTKEYMASK; - } - fix_generic_modifiers_by_device(&modifiers); + NSUInteger new_modifiers = modifiers & ~(NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK | + NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK); - return modifiers; + // The MACDRV keyboard driver translates Alt modifiers in hotkeys to + // Command. For example, a call to user32!RegisterHotKey for Alt-c + // translates to a call to RegisterEventHotKey for Command-c. + // + // If the Option modifier should behave like Alt in Windows, rewrite + // it to Command. + if (modifiers & NX_DEVICELALTKEYMASK) + new_modifiers |= left_option_is_alt ? NX_DEVICELCMDKEYMASK : NX_DEVICELALTKEYMASK; + if (modifiers & NX_DEVICERALTKEYMASK) + new_modifiers |= right_option_is_alt ? NX_DEVICERCMDKEYMASK : NX_DEVICERALTKEYMASK; + + if (modifiers & NX_DEVICELCMDKEYMASK) + new_modifiers |= left_command_is_ctrl ? NX_DEVICELCTLKEYMASK : NX_DEVICELCMDKEYMASK; + if (modifiers & NX_DEVICERCMDKEYMASK) + new_modifiers |= right_command_is_ctrl ? NX_DEVICERCTLKEYMASK : NX_DEVICERCMDKEYMASK; + + fix_generic_modifiers_by_device(&new_modifiers); + return new_modifiers; } @@ -2059,7 +2067,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] pressed:[theEvent type] == NSKeyDown - modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags]) + modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags]) event:theEvent]; } @@ -2679,7 +2687,7 @@ - (void) flagsChanged:(NSEvent *)theEvent { NX_DEVICERCMDKEYMASK, kVK_RightCommand }, }; - NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]); + NSUInteger modifierFlags = adjusted_modifiers_for_settings([theEvent modifierFlags]); NSUInteger changed; int i, last_changed; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6bad7903f6..011b1ffd37 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -159,6 +159,8 @@ extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; +extern int left_command_is_ctrl DECLSPEC_HIDDEN; +extern int right_command_is_ctrl DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int use_precise_scrolling DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 7abeea9db8..8759e58641 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,8 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +int left_command_is_ctrl = 0; +int right_command_is_ctrl = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; @@ -172,6 +174,11 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "LeftCommandIsCtrl", buffer, sizeof(buffer))) + left_command_is_ctrl = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "RightCommandIsCtrl", buffer, sizeof(buffer))) + right_command_is_ctrl = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) allow_software_rendering = IS_OPTION_TRUE(buffer[0]); -- 2.18.0

2 2

Re: [PATCH] mpr: Implement WNetClearConnections().
by Pierre Schweitzer 12 Sep '18

12 Sep '18

Hi, May I know why this patch wasn't merged? Thanks in advance. Cheers, Pierre Pierre Schweitzer <pierre(a)reactos.org> wrote on Sun, September 9th, 2018, 3:58 PM: > Hi, > > Please find attached a patch implements an undocumented Windows MPR API > that is used on logoff to disconnect any network share connection. > Implementation based on: > https://git.reactos.org/?p=reactos.git;a=blob;f=base/applications/network/n… > Successfully tested in: https://jira.reactos.org/browse/CORE-15012 > > Cheers,

1 0

[PATCH] ole32: Release marshal data before removing apartment from list.
by Sergio Gómez Del Real 12 Sep '18

12 Sep '18

For local servers, we are first removing the apartment from the list and then calling CoReleaseMarshalData(). This last function actually depends on the apartment still being in the list (because of apartment_findfromoxid()). The result is that CoReleaseMarshalData() is failing, as can be seen in marshal.ok tests. I only moved part of the code inside the critical section to keep it as small as possible. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/compobj.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 66b1683d98..bae5941438 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1169,6 +1169,7 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) DWORD apartment_release(struct apartment *apt) { DWORD ret; + LocalServer *local_server = NULL; EnterCriticalSection(&csApartment); @@ -1187,6 +1188,16 @@ DWORD apartment_release(struct apartment *apt) apt->being_destroyed = TRUE; if (apt == MTA) MTA = NULL; else if (apt == MainApartment) MainApartment = NULL; + /* we must release marshal data before removing apartment from its list */ + if(apt->local_server) { + LARGE_INTEGER zero; + local_server = apt->local_server; + + memset(&zero, 0, sizeof(zero)); + IStream_Seek(local_server->marshal_stream, zero, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(local_server->marshal_stream); + } + list_remove(&apt->entry); } @@ -1198,13 +1209,8 @@ DWORD apartment_release(struct apartment *apt) TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); - if(apt->local_server) { - LocalServer *local_server = apt->local_server; - LARGE_INTEGER zero; - - memset(&zero, 0, sizeof(zero)); - IStream_Seek(local_server->marshal_stream, zero, STREAM_SEEK_SET, NULL); - CoReleaseMarshalData(local_server->marshal_stream); + if (local_server) + { IStream_Release(local_server->marshal_stream); local_server->marshal_stream = NULL; -- 2.17.1

2 1

[PATCH 4/4] wsdapi: Send Probe Matches message via UDP unicast.
by Owen Rudge 12 Sep '18

12 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-)

2 1

[PATCH] webservices: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 12 Sep '18

12 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/channel.c | 4 ++-- dlls/webservices/error.c | 4 ++-- dlls/webservices/heap.c | 4 ++-- dlls/webservices/listener.c | 4 ++-- dlls/webservices/msg.c | 6 +++--- dlls/webservices/proxy.c | 4 ++-- dlls/webservices/reader.c | 4 ++-- dlls/webservices/string.c | 2 +- dlls/webservices/url.c | 20 ++++++++++---------- dlls/webservices/writer.c | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5963faf00d..0cd8b910e8 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -236,14 +236,14 @@ struct channel ULONG read_buflen; ULONG read_size; ULONG prop_count; - struct prop prop[sizeof(channel_props)/sizeof(channel_props[0])]; + struct prop prop[ARRAY_SIZE( channel_props )]; }; #define CHANNEL_MAGIC (('C' << 24) | ('H' << 16) | ('A' << 8) | 'N') static struct channel *alloc_channel(void) { - static const ULONG count = sizeof(channel_props)/sizeof(channel_props[0]); + static const ULONG count = ARRAY_SIZE( channel_props ); struct channel *ret; ULONG size = sizeof(*ret) + prop_size( channel_props, count ); diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index e4292db5bf..780040e51e 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -42,14 +42,14 @@ struct error ULONG magic; CRITICAL_SECTION cs; ULONG prop_count; - struct prop prop[sizeof(error_props)/sizeof(error_props[0])]; + struct prop prop[ARRAY_SIZE( error_props )]; }; #define ERROR_MAGIC (('E' << 24) | ('R' << 16) | ('R' << 8) | 'O') static struct error *alloc_error(void) { - static const ULONG count = sizeof(error_props)/sizeof(error_props[0]); + static const ULONG count = ARRAY_SIZE( error_props ); struct error *ret; ULONG size = sizeof(*ret) + prop_size( error_props, count ); diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index e44cf72e74..93e647abc6 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -46,7 +46,7 @@ struct heap SIZE_T max_size; SIZE_T allocated; ULONG prop_count; - struct prop prop[sizeof(heap_props)/sizeof(heap_props[0])]; + struct prop prop[ARRAY_SIZE( heap_props )]; }; #define HEAP_MAGIC (('H' << 24) | ('E' << 16) | ('A' << 8) | 'P') @@ -177,7 +177,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro static struct heap *alloc_heap(void) { - static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); + static const ULONG count = ARRAY_SIZE( heap_props ); struct heap *ret; ULONG size = sizeof(*ret) + prop_size( heap_props, count ); diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 357a1c6a53..0189059aa7 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -113,14 +113,14 @@ struct listener } udp; } u; ULONG prop_count; - struct prop prop[sizeof(listener_props)/sizeof(listener_props[0])]; + struct prop prop[ARRAY_SIZE( listener_props )]; }; #define LISTENER_MAGIC (('L' << 24) | ('I' << 16) | ('S' << 8) | 'T') static struct listener *alloc_listener(void) { - static const ULONG count = sizeof(listener_props)/sizeof(listener_props[0]); + static const ULONG count = ARRAY_SIZE( listener_props ); struct listener *ret; ULONG size = sizeof(*ret) + prop_size( listener_props, count ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 19a107629c..07063460be 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -83,7 +83,7 @@ struct msg WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_send; WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_receive; ULONG prop_count; - struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; + struct prop prop[ARRAY_SIZE( msg_props )]; }; #define MSG_MAGIC (('M' << 24) | ('E' << 16) | ('S' << 8) | 'S') @@ -91,7 +91,7 @@ struct msg static struct msg *alloc_msg(void) { - static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); + static const ULONG count = ARRAY_SIZE( msg_props ); struct msg *ret; ULONG size = sizeof(*ret) + prop_size( msg_props, count ); @@ -1785,7 +1785,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) case WS_ENVELOPE_VERSION_SOAP_1_2: { static const WCHAR actionW[] = {'a','c','t','i','o','n','=','"'}; - ULONG len_action = sizeof(actionW)/sizeof(actionW[0]); + ULONG len_action = ARRAY_SIZE( actionW ); if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) break; diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index da30cb027a..5122892704 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -48,14 +48,14 @@ struct proxy WS_SERVICE_PROXY_STATE state; WS_CHANNEL *channel; ULONG prop_count; - struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; + struct prop prop[ARRAY_SIZE( proxy_props )]; }; #define PROXY_MAGIC (('P' << 24) | ('R' << 16) | ('O' << 8) | 'X') static struct proxy *alloc_proxy(void) { - static const ULONG count = sizeof(proxy_props)/sizeof(proxy_props[0]); + static const ULONG count = ARRAY_SIZE( proxy_props ); struct proxy *ret; ULONG size = sizeof(*ret) + prop_size( proxy_props, count ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 087ad0a9cc..296043fa25 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -397,14 +397,14 @@ struct reader const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; ULONG prop_count; - struct prop prop[sizeof(reader_props)/sizeof(reader_props[0])]; + struct prop prop[ARRAY_SIZE( reader_props )]; }; #define READER_MAGIC (('R' << 24) | ('E' << 16) | ('A' << 8) | 'D') static struct reader *alloc_reader(void) { - static const ULONG count = sizeof(reader_props)/sizeof(reader_props[0]); + static const ULONG count = ARRAY_SIZE( reader_props ); struct reader *ret; ULONG size = sizeof(*ret) + prop_size( reader_props, count ); diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 0bb77df946..42af8fd9c5 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -791,7 +791,7 @@ static const ULONG dict_sorted[] = const struct dictionary dict_builtin_static = { {{0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}, - (WS_XML_STRING *)dict_strings, sizeof(dict_strings)/sizeof(dict_strings[0]), TRUE}, + (WS_XML_STRING *)dict_strings, ARRAY_SIZE( dict_strings ), TRUE}, (ULONG *)dict_sorted }; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 465857aec4..731b74e7b4 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -39,19 +39,19 @@ static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; static WS_URL_SCHEME_TYPE scheme_type( const WCHAR *str, ULONG len ) { - if (len == sizeof(http)/sizeof(http[0]) && !memicmpW( str, http, sizeof(http)/sizeof(http[0]) )) + if (len == ARRAY_SIZE( http ) && !memicmpW( str, http, ARRAY_SIZE( http ))) return WS_URL_HTTP_SCHEME_TYPE; - if (len == sizeof(https)/sizeof(https[0]) && !memicmpW( str, https, sizeof(https)/sizeof(https[0]) )) + if (len == ARRAY_SIZE( https ) && !memicmpW( str, https, ARRAY_SIZE( https ))) return WS_URL_HTTPS_SCHEME_TYPE; - if (len == sizeof(nettcp)/sizeof(nettcp[0]) && !memicmpW( str, nettcp, sizeof(nettcp)/sizeof(nettcp[0]) )) + if (len == ARRAY_SIZE( nettcp ) && !memicmpW( str, nettcp, ARRAY_SIZE( nettcp ))) return WS_URL_NETTCP_SCHEME_TYPE; - if (len == sizeof(soapudp)/sizeof(soapudp[0]) && !memicmpW( str, soapudp, sizeof(soapudp)/sizeof(soapudp[0]) )) + if (len == ARRAY_SIZE( soapudp ) && !memicmpW( str, soapudp, ARRAY_SIZE( soapudp ))) return WS_URL_SOAPUDP_SCHEME_TYPE; - if (len == sizeof(netpipe)/sizeof(netpipe[0]) && !memicmpW( str, netpipe, sizeof(netpipe)/sizeof(netpipe[0]) )) + if (len == ARRAY_SIZE( netpipe ) && !memicmpW( str, netpipe, ARRAY_SIZE( netpipe ))) return WS_URL_NETPIPE_SCHEME_TYPE; return ~0u; @@ -271,23 +271,23 @@ static const WCHAR *scheme_str( WS_URL_SCHEME_TYPE scheme, ULONG *len ) switch (scheme) { case WS_URL_HTTP_SCHEME_TYPE: - *len = sizeof(http)/sizeof(http[0]); + *len = ARRAY_SIZE( http ); return http; case WS_URL_HTTPS_SCHEME_TYPE: - *len = sizeof(https)/sizeof(https[0]); + *len = ARRAY_SIZE( https ); return https; case WS_URL_NETTCP_SCHEME_TYPE: - *len = sizeof(nettcp)/sizeof(nettcp[0]); + *len = ARRAY_SIZE( nettcp ); return nettcp; case WS_URL_SOAPUDP_SCHEME_TYPE: - *len = sizeof(soapudp)/sizeof(soapudp[0]); + *len = ARRAY_SIZE( soapudp ); return soapudp; case WS_URL_NETPIPE_SCHEME_TYPE: - *len = sizeof(netpipe)/sizeof(netpipe[0]); + *len = ARRAY_SIZE( netpipe ); return netpipe; default: diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 95d4caddb9..ef8f9193a0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -92,14 +92,14 @@ struct writer WS_DYNAMIC_STRING_CALLBACK dict_cb; void *dict_cb_state; ULONG prop_count; - struct prop prop[sizeof(writer_props)/sizeof(writer_props[0])]; + struct prop prop[ARRAY_SIZE( writer_props )]; }; #define WRITER_MAGIC (('W' << 24) | ('R' << 16) | ('I' << 8) | 'T') static struct writer *alloc_writer(void) { - static const ULONG count = sizeof(writer_props)/sizeof(writer_props[0]); + static const ULONG count = ARRAY_SIZE( writer_props ); struct writer *ret; ULONG size = sizeof(*ret) + prop_size( writer_props, count ); -- 2.14.4

2 1

[v3 PATCH] d2d1: Return device context pointer for render targets.
by Nikolay Sivov 12 Sep '18

12 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/d2d1_private.h | 9 ++++++- dlls/d2d1/dc_render_target.c | 41 +++++++++++++++++------------- dlls/d2d1/device.c | 36 ++++++++++++++++++-------- dlls/d2d1/factory.c | 2 +- dlls/d2d1/hwnd_render_target.c | 32 ++++++++++++++---------- dlls/d2d1/wic_render_target.c | 43 +++++++++++++++++++------------- 7 files changed, 104 insertions(+), 61 deletions(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index c106e211d6..004dd2ed47 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -811,7 +811,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta } if (FAILED(hr = d2d_d3d_create_render_target(parent_target->factory, dxgi_surface, - (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, &dxgi_rt_desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1BitmapRenderTarget_iface, NULL, &dxgi_rt_desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface_Release(dxgi_surface); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e00b942797..aa078ed39c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -117,6 +117,11 @@ struct d2d_ps_cb struct d2d_brush_cb opacity_brush; }; +struct d2d_device_context_ops +{ + HRESULT (*device_context_present)(IUnknown *outer_unknown); +}; + struct d2d_device_context { ID2D1DeviceContext ID2D1DeviceContext_iface; @@ -125,6 +130,7 @@ struct d2d_device_context LONG refcount; IUnknown *outer_unknown; + const struct d2d_device_context_ops *ops; ID2D1Factory *factory; ID3D10Device *device; @@ -149,7 +155,8 @@ struct d2d_device_context }; HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, - const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) DECLSPEC_HIDDEN; + const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, + ID2D1RenderTarget **render_target) DECLSPEC_HIDDEN; HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN; struct d2d_wic_render_target diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index d5e4f47e6d..8e97e99b5d 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -24,17 +24,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_dc_render_target *render_target) +static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface); +} + +static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_dc_render_target *render_target = impl_from_IUnknown(outer_unknown); const RECT *dst_rect = &render_target->dst_rect; RECT empty_rect; HDC src_hdc; HRESULT hr; + if (!render_target->hdc) + return D2DERR_WRONG_STATE; + if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc))) { WARN("GetDC() failed, %#x.\n", hr); - return; + return S_OK; } BitBlt(render_target->hdc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, @@ -42,6 +51,8 @@ static void sync_bitmap(struct d2d_dc_render_target *render_target) SetRectEmpty(&empty_rect); IDXGISurface1_ReleaseDC(render_target->dxgi_surface, &empty_rect); + + return S_OK; } static inline struct d2d_dc_render_target *impl_from_ID2D1DCRenderTarget(ID2D1DCRenderTarget *iface) @@ -64,7 +75,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -524,14 +536,10 @@ static void STDMETHODCALLTYPE d2d_dc_render_target_PopLayer(ID2D1DCRenderTarget static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_Flush(ID2D1DCRenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_dc_render_target_SaveDrawingState(ID2D1DCRenderTarget *iface, @@ -595,17 +603,10 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_EndDraw(ID2D1DCRenderTarge D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - if (!render_target->hdc) - return D2DERR_WRONG_STATE; - - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_dc_render_target_GetPixelFormat(ID2D1DCRenderTarget *iface, @@ -813,6 +814,11 @@ static const struct ID2D1DCRenderTargetVtbl d2d_dc_render_target_vtbl = d2d_dc_render_target_BindDC, }; +static const struct d2d_device_context_ops d2d_dc_render_target_ops = +{ + d2d_dc_render_target_present, +}; + HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -868,7 +874,8 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID } if (FAILED(hr = d2d_d3d_create_render_target(factory, (IDXGISurface *)render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, &d2d_dc_render_target_ops, + desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); IDXGISurface1_Release(render_target->dxgi_surface); diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index bba4870dd4..dd33866c9f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -205,7 +205,7 @@ static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1Render static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceContext *iface, REFIID iid, void **out) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -220,10 +220,12 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceCo } else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) { - ID2D1GdiInteropRenderTarget_AddRef(&render_target->ID2D1GdiInteropRenderTarget_iface); - *out = &render_target->ID2D1GdiInteropRenderTarget_iface; + ID2D1GdiInteropRenderTarget_AddRef(&context->ID2D1GdiInteropRenderTarget_iface); + *out = &context->ID2D1GdiInteropRenderTarget_iface; return S_OK; } + else if (context->outer_unknown) + return IUnknown_QueryInterface(context->outer_unknown, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -1448,8 +1450,13 @@ static void STDMETHODCALLTYPE d2d_device_context_PopLayer(ID2D1DeviceContext *if static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + if (context->ops) + context->ops->device_context_present(context->outer_unknown); + return E_NOTIMPL; } @@ -1615,16 +1622,23 @@ static void STDMETHODCALLTYPE d2d_device_context_BeginDraw(ID2D1DeviceContext *i static HRESULT STDMETHODCALLTYPE d2d_device_context_EndDraw(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); if (tag1) - *tag1 = render_target->error.tag1; + *tag1 = context->error.tag1; if (tag2) - *tag2 = render_target->error.tag2; + *tag2 = context->error.tag2; - return render_target->error.code; + if (context->ops) + { + if (FAILED(hr = context->ops->device_context_present(context->outer_unknown))) + context->error.code = hr; + } + + return context->error.code; } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_device_context_GetPixelFormat(ID2D1DeviceContext *iface, @@ -2469,7 +2483,8 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe }; static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Factory *factory, - IDXGISurface *surface, IUnknown *outer_unknown, const D2D1_RENDER_TARGET_PROPERTIES *desc) + IDXGISurface *surface, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops, + const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_SUBRESOURCE_DATA buffer_data; D3D10_STATE_BLOCK_MASK state_mask; @@ -3357,6 +3372,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, render_target->outer_unknown = outer_unknown ? outer_unknown : (IUnknown *)&render_target->ID2D1DeviceContext_iface; + render_target->ops = ops; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { @@ -3555,7 +3571,7 @@ err: } HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, - const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) + const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { struct d2d_device_context *object; HRESULT hr; @@ -3563,7 +3579,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, desc))) + if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, ops, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index d2e53879e6..386734d26f 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -340,7 +340,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 { TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); - return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, desc, render_target); + return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, NULL, desc, render_target); } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 04d33536a6..976b926efa 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -24,12 +24,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void render_target_present(struct d2d_hwnd_render_target *render_target) +static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface); +} + +static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_hwnd_render_target *render_target = impl_from_IUnknown(outer_unknown); HRESULT hr; if (FAILED(hr = IDXGISwapChain_Present(render_target->swapchain, render_target->sync_interval, 0))) WARN("Present failed, %#x.\n", hr); + + return S_OK; } static inline struct d2d_hwnd_render_target *impl_from_ID2D1HwndRenderTarget(ID2D1HwndRenderTarget *iface) @@ -53,7 +61,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -516,14 +525,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Flush(ID2D1HwndRenderTar D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_hwnd_render_target_SaveDrawingState(ID2D1HwndRenderTarget *iface, @@ -587,14 +592,10 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_EndDraw(ID2D1HwndRenderT D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - render_target_present(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_hwnd_render_target_GetPixelFormat(ID2D1HwndRenderTarget *iface, @@ -776,6 +777,11 @@ static const struct ID2D1HwndRenderTargetVtbl d2d_hwnd_render_target_vtbl = d2d_hwnd_render_target_GetHwnd }; +static const struct d2d_device_context_ops d2d_hwnd_render_target_ops = +{ + d2d_hwnd_render_target_present, +}; + HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc) @@ -862,7 +868,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target render_target->ID2D1HwndRenderTarget_iface.lpVtbl = &d2d_hwnd_render_target_vtbl; hr = d2d_d3d_create_render_target(factory, dxgi_surface, (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface, - &dxgi_rt_desc, &render_target->dxgi_target); + &d2d_hwnd_render_target_ops, &dxgi_rt_desc, &render_target->dxgi_target); IDXGISurface_Release(dxgi_surface); if (FAILED(hr)) { diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 5642fd44ff..67a826f8ae 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -25,8 +25,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static void sync_bitmap(struct d2d_wic_render_target *render_target) +static inline struct d2d_wic_render_target *impl_from_IUnknown(IUnknown *iface) { + return CONTAINING_RECORD(iface, struct d2d_wic_render_target, ID2D1RenderTarget_iface); +} + +static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown) +{ + struct d2d_wic_render_target *render_target = impl_from_IUnknown(outer_unknown); D3D10_MAPPED_TEXTURE2D mapped_texture; ID3D10Resource *src_resource; IWICBitmapLock *bitmap_lock; @@ -41,7 +47,7 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) &IID_ID3D10Resource, (void **)&src_resource))) { ERR("Failed to get source resource interface, hr %#x.\n", hr); - return; + goto end; } ID3D10Texture2D_GetDevice(render_target->readback_texture, &device); @@ -56,28 +62,28 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) if (FAILED(hr = IWICBitmap_Lock(render_target->bitmap, &dst_rect, WICBitmapLockWrite, &bitmap_lock))) { ERR("Failed to lock destination bitmap, hr %#x.\n", hr); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetDataPointer(bitmap_lock, &dst_size, &dst))) { ERR("Failed to get data pointer, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = IWICBitmapLock_GetStride(bitmap_lock, &dst_pitch))) { ERR("Failed to get stride, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } if (FAILED(hr = ID3D10Texture2D_Map(render_target->readback_texture, 0, D3D10_MAP_READ, 0, &mapped_texture))) { ERR("Failed to map readback texture, hr %#x.\n", hr); IWICBitmapLock_Release(bitmap_lock); - return; + goto end; } src = mapped_texture.pData; @@ -91,6 +97,9 @@ static void sync_bitmap(struct d2d_wic_render_target *render_target) ID3D10Texture2D_Unmap(render_target->readback_texture, 0); IWICBitmapLock_Release(bitmap_lock); + +end: + return S_OK; } static inline struct d2d_wic_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) @@ -112,7 +121,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -574,14 +584,10 @@ static void STDMETHODCALLTYPE d2d_wic_render_target_PopLayer(ID2D1RenderTarget * static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_Flush(render_target->dxgi_target, tag1, tag2); } static void STDMETHODCALLTYPE d2d_wic_render_target_SaveDrawingState(ID2D1RenderTarget *iface, @@ -645,14 +651,10 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_EndDraw(ID2D1RenderTarget D2D1_TAG *tag1, D2D1_TAG *tag2) { struct d2d_wic_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - HRESULT hr; TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - hr = ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); - sync_bitmap(render_target); - - return hr; + return ID2D1RenderTarget_EndDraw(render_target->dxgi_target, tag1, tag2); } static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_wic_render_target_GetPixelFormat(ID2D1RenderTarget *iface, @@ -785,6 +787,11 @@ static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = d2d_wic_render_target_IsSupported, }; +static const struct d2d_device_context_ops d2d_wic_render_target_ops = +{ + d2d_wic_render_target_present, +}; + HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -875,7 +882,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, } if (FAILED(hr = d2d_d3d_create_render_target(factory, render_target->dxgi_surface, - (IUnknown *)&render_target->ID2D1RenderTarget_iface, desc, &render_target->dxgi_target))) + (IUnknown *)&render_target->ID2D1RenderTarget_iface, &d2d_wic_render_target_ops, desc, &render_target->dxgi_target))) { WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); ID3D10Texture2D_Release(render_target->readback_texture); -- 2.18.0

1 0

[PATCH] ntdll/tests: Handle case where process doesn't have its own DEP policy
by Alex Henrie 12 Sep '18

12 Sep '18

If neither MEM_EXECUTE_OPTION_ENABLE nor MEM_EXECUTE_OPTION_DISABLE is set in the ProcessExecuteFlags, the process is using the system DEP setting. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the test crashes on Windows Server 2008. --- dlls/ntdll/tests/info.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4257..e7b07e57af 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -38,6 +38,7 @@ static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); static BOOL is_wow64; @@ -96,6 +97,8 @@ static BOOL InitFunctionPtrs(void) pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + pGetSystemDEPPolicy = (void *)GetProcAddress(hkernel32, "GetSystemDEPPolicy"); + /* starting with Win7 */ pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); if (!pNtQuerySystemInformationEx) @@ -1851,7 +1854,7 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); trace("Process execute flags %08x\n", oldflags); - if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE)) { if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) { @@ -1859,6 +1862,12 @@ static void test_mapprotection(void) return; } + if (pGetSystemDEPPolicy && pGetSystemDEPPolicy() == AlwaysOn) + { + skip("System policy requires noexec\n"); + return; + } + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); reset_flags = TRUE; -- 2.19.0

1 0

[PATCH v2 1/4] msxml3: Allow creating floating attributes.
by Daniel Lehman 12 Sep '18

12 Sep '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/attribute.c | 9 ++++++++- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 637615b341..8eb2695128 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -50,6 +50,7 @@ typedef struct _domattr xmlnode node; IXMLDOMAttribute IXMLDOMAttribute_iface; LONG ref; + BOOL floating; } domattr; static const tid_t domattr_se_tids[] = { @@ -116,6 +117,11 @@ static ULONG WINAPI domattr_Release( if ( ref == 0 ) { destroy_xmlnode(&This->node); + if ( This->floating ) + { + xmlFreeNs( This->node.node->ns ); + xmlFreeNode( This->node.node ); + } heap_free( This ); } @@ -709,7 +715,7 @@ static dispex_static_data_t domattr_dispex = { domattr_iface_tids }; -IUnknown* create_attribute( xmlNodePtr attribute ) +IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating ) { domattr *This; @@ -719,6 +725,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->IXMLDOMAttribute_iface.lpVtbl = &domattr_vtbl; This->ref = 1; + This->floating = floating; init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->IXMLDOMAttribute_iface, &domattr_dispex); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6e00aa0116..4faeed400c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI domelem_getAttributeNode( if (attr) { - IUnknown *unk = create_attribute((xmlNodePtr)attr); + IUnknown *unk = create_attribute((xmlNodePtr)attr, FALSE); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 94ef66b23d..abc6ab3465 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -252,7 +252,7 @@ extern IUnknown *create_domdoc( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_xmldoc( void ) DECLSPEC_HIDDEN; extern IXMLDOMNode *create_node( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_element( xmlNodePtr ) DECLSPEC_HIDDEN; -extern IUnknown *create_attribute( xmlNodePtr ) DECLSPEC_HIDDEN; +extern IUnknown *create_attribute( xmlNodePtr, BOOL ) DECLSPEC_HIDDEN; extern IUnknown *create_text( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_pi( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_comment( xmlNodePtr ) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index bcb4181374..fc18935b69 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2271,7 +2271,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_element( node ); break; case XML_ATTRIBUTE_NODE: - pUnk = create_attribute( node ); + pUnk = create_attribute( node, FALSE ); break; case XML_TEXT_NODE: pUnk = create_text( node ); -- 2.17.1

1 3

[PATCH 1/2] ntdll: Add dummy apiset to PEB.
by Alistair Leslie-Hughes 12 Sep '18

12 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/thread.c | 2 ++ include/Makefile.in | 1 + include/apiset.h | 38 ++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 include/apiset.h diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 59d64e1..c601cff 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -73,6 +73,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; +static API_SET_NAMESPACE_ARRAY apiset_map; static int nb_threads = 1; static RTL_CRITICAL_SECTION peb_lock; @@ -311,6 +312,7 @@ HANDLE thread_init(void) peb->FastPebLock = &peb_lock; peb->ProcessParameters = &params; + peb->ApiSetMap = &apiset_map; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; diff --git a/include/Makefile.in b/include/Makefile.in index ffecb98..4a6fe44 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amstream.idl \ amvideo.idl \ appcompatapi.h \ + apiset.h \ appmgmt.h \ appmodel.h \ asptlb.idl \ diff --git a/include/apiset.h b/include/apiset.h new file mode 100644 index 0000000..f55f804 --- /dev/null +++ b/include/apiset.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2017 Michael Müller + * + * 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 + */ +#ifndef _API_SET_H_ +#define _API_SET_H_ + +#include <windef.h> + +typedef struct _API_SET_NAMESPACE_ENTRY +{ + ULONG NameOffset; + ULONG NameLength; + ULONG DataOffset; +} API_SET_NAMESPACE_ENTRY, *PAPI_SET_NAMESPACE_ENTRY; + +typedef struct _API_SET_NAMESPACE_ARRAY +{ + ULONG Version; + ULONG Count; + API_SET_NAMESPACE_ENTRY Array[1]; +} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY; + +#endif + diff --git a/include/winternl.h b/include/winternl.h index dca8ff3..8b47948 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -23,6 +23,7 @@ #include <ntdef.h> #include <windef.h> +#include <apiset.h> #ifdef __cplusplus extern "C" { @@ -286,7 +287,7 @@ typedef struct _PEB ULONG EnvironmentUpdateCount; /* 028/050 */ PVOID KernelCallbackTable; /* 02c/058 */ ULONG Reserved[2]; /* 030/060 */ - PVOID /*PPEB_FREE_BLOCK*/ FreeList; /* 038/068 */ + PAPI_SET_NAMESPACE_ARRAY ApiSetMap; /* 038/068 */ ULONG TlsExpansionCounter; /* 03c/070 */ PRTL_BITMAP TlsBitmap; /* 040/078 */ ULONG TlsBitmapBits[2]; /* 044/080 */ -- 1.9.1

1 0

[PATCH] mfplat: Forward IMFMediaType to IMFAttributes
by Alistair Leslie-Hughes 12 Sep '18

12 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 170 ++++++++++++++--------------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 9f381ef..1c10561 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1148,6 +1148,12 @@ static const IMFAttributesVtbl mfattributes_vtbl = mfattributes_CopyAllItems }; +static void init_attribute_object(mfattributes *object, UINT32 size) +{ + object->ref = 1; + object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; +} + /*********************************************************************** * MFCreateAttributes (mfplat.@) */ @@ -1161,10 +1167,9 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) if(!object) return E_OUTOFMEMORY; - object->ref = 1; - object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; - + init_attribute_object(object, size); *attributes = &object->IMFAttributes_iface; + return S_OK; } @@ -1335,8 +1340,8 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) typedef struct _mfmediatype { + mfattributes attributes; IMFMediaType IMFMediaType_iface; - LONG ref; } mfmediatype; static inline mfmediatype *impl_from_IMFMediaType(IMFMediaType *iface) @@ -1370,7 +1375,7 @@ static HRESULT WINAPI mediatype_QueryInterface(IMFMediaType *iface, REFIID riid, static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1380,7 +1385,7 @@ static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) static ULONG WINAPI mediatype_Release(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1395,269 +1400,179 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) static HRESULT WINAPI mediatype_GetItem(IMFMediaType *iface, REFGUID key, PROPVARIANT *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetItemType(IMFMediaType *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), type); - - return E_NOTIMPL; + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); } static HRESULT WINAPI mediatype_CompareItem(IMFMediaType *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, result); - - return E_NOTIMPL; + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); } static HRESULT WINAPI mediatype_Compare(IMFMediaType *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %p, %d, %p\n", This, attrs, type, result); - - return E_NOTIMPL; + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result); } static HRESULT WINAPI mediatype_GetUINT32(IMFMediaType *iface, REFGUID key, UINT32 *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetUINT64(IMFMediaType *iface, REFGUID key, UINT64 *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetDouble(IMFMediaType *iface, REFGUID key, double *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetGUID(IMFMediaType *iface, REFGUID key, GUID *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_GetStringLength(IMFMediaType *iface, REFGUID key, UINT32 *length) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), length); - - return E_NOTIMPL; + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); } static HRESULT WINAPI mediatype_GetString(IMFMediaType *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), value, size, length); - - return E_NOTIMPL; + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); } static HRESULT WINAPI mediatype_GetAllocatedString(IMFMediaType *iface, REFGUID key, WCHAR **value, UINT32 *length) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, length); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); } static HRESULT WINAPI mediatype_GetBlobSize(IMFMediaType *iface, REFGUID key, UINT32 *size) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), size); - - return E_NOTIMPL; + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); } static HRESULT WINAPI mediatype_GetBlob(IMFMediaType *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), buf, bufsize, blobsize); - - return E_NOTIMPL; + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); } static HRESULT WINAPI mediatype_GetAllocatedBlob(IMFMediaType *iface, REFGUID key, UINT8 **buf, UINT32 *size) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mediatype_GetUnknown(IMFMediaType *iface, REFGUID key, REFIID riid, void **ppv) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - - return E_NOTIMPL; + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); } static HRESULT WINAPI mediatype_SetItem(IMFMediaType *iface, REFGUID key, REFPROPVARIANT value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_DeleteItem(IMFMediaType *iface, REFGUID key) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s\n", This, debugstr_guid(key)); - - return E_NOTIMPL; + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); } static HRESULT WINAPI mediatype_DeleteAllItems(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mediatype_SetUINT32(IMFMediaType *iface, REFGUID key, UINT32 value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetUINT64(IMFMediaType *iface, REFGUID key, UINT64 value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - - return E_NOTIMPL; + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetDouble(IMFMediaType *iface, REFGUID key, double value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetGUID(IMFMediaType *iface, REFGUID key, REFGUID value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_guid(value)); - - return E_NOTIMPL; + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetString(IMFMediaType *iface, REFGUID key, const WCHAR *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_w(value)); - - return E_NOTIMPL; + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mediatype_SetBlob(IMFMediaType *iface, REFGUID key, const UINT8 *buf, UINT32 size) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p, %d\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mediatype_SetUnknown(IMFMediaType *iface, REFGUID key, IUnknown *unknown) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); - - return E_NOTIMPL; + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); } static HRESULT WINAPI mediatype_LockStore(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mediatype_UnlockStore(IMFMediaType *iface) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mediatype_GetCount(IMFMediaType *iface, UINT32 *items) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %p\n", This, items); - - if(items) - *items = 0; - - return E_NOTIMPL; + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); } static HRESULT WINAPI mediatype_GetItemByIndex(IMFMediaType *iface, UINT32 index, GUID *key, PROPVARIANT *value) { mfmediatype *This = impl_from_IMFMediaType(iface); - - FIXME("%p, %d, %p, %p\n", This, index, key, value); - - return E_NOTIMPL; + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); } static HRESULT WINAPI mediatype_CopyAllItems(IMFMediaType *iface, IMFAttributes *dest) @@ -1768,14 +1683,15 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type) if(!type) return E_INVALIDARG; - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; - object->ref = 1; + init_attribute_object(&object->attributes, 0); object->IMFMediaType_iface.lpVtbl = &mediatype_vtbl; *type = &object->IMFMediaType_iface; + return S_OK; } -- 1.9.1

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
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-devel September 2018