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

Henri Verbeet : wined3d: Keep a reference to the backbuffer textures instead of the surfaces in the swapchain.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: d3387cf77b056581ab5e82b33f11fc670dea67aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3387cf77b056581ab5e82b33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 20 13:20:03 2014 +0200 wined3d: Keep a reference to the backbuffer textures instead of the surfaces in the swapchain. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 12 ++++++++---- dlls/wined3d/surface.c | 7 ++++--- dlls/wined3d/swapchain.c | 29 +++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 31 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3387cf77b056581ab5e8…

1 0

Andrei Slăvoiu : wined3d: Replace vendor specific callbacks with generic code that uses vendor specific arrays.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 2c9c968a144a343b82ec2b01ade0888fb5b92d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9c968a144a343b82ec2b01a… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Wed Aug 13 23:00:05 2014 +0300 wined3d: Replace vendor specific callbacks with generic code that uses vendor specific arrays. --- dlls/wined3d/directx.c | 86 +++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fe98bab..9f00dcf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -88,6 +88,7 @@ enum wined3d_d3d_level WINED3D_D3D_LEVEL_9_SM3, WINED3D_D3D_LEVEL_10, WINED3D_D3D_LEVEL_11, + WINED3D_D3D_LEVEL_COUNT }; /* The d3d device ID */ @@ -2190,45 +2191,43 @@ intel_gl_vendor_table[] = {GL_VENDOR_MESA, "Mesa Intel driver", cards_intel, ARRAY_SIZE(cards_intel)}, }; -static enum wined3d_pci_device select_card_fallback_nvidia(const struct wined3d_gl_info *gl_info) +static const enum wined3d_pci_device +card_fallback_nvidia[] = { - enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); - if (d3d_level >= WINED3D_D3D_LEVEL_10) - return CARD_NVIDIA_GEFORCE_8800GTX; - if (d3d_level >= WINED3D_D3D_LEVEL_9_SM3) - return CARD_NVIDIA_GEFORCE_6800; - if (d3d_level >= WINED3D_D3D_LEVEL_9_SM2) - return CARD_NVIDIA_GEFORCEFX_5800; - if (d3d_level >= WINED3D_D3D_LEVEL_8) - return CARD_NVIDIA_GEFORCE3; - if (d3d_level >= WINED3D_D3D_LEVEL_7) - return CARD_NVIDIA_GEFORCE; - if (d3d_level >= WINED3D_D3D_LEVEL_6) - return CARD_NVIDIA_RIVA_TNT; - return CARD_NVIDIA_RIVA_128; -} - -static enum wined3d_pci_device select_card_fallback_amd(const struct wined3d_gl_info *gl_info) + CARD_NVIDIA_RIVA_128, /* D3D5 */ + CARD_NVIDIA_RIVA_TNT, /* D3D6 */ + CARD_NVIDIA_GEFORCE, /* D3D7 */ + CARD_NVIDIA_GEFORCE3, /* D3D8 */ + CARD_NVIDIA_GEFORCEFX_5800, /* D3D9_SM2 */ + CARD_NVIDIA_GEFORCE_6800, /* D3D9_SM3 */ + CARD_NVIDIA_GEFORCE_8800GTX, /* D3D10 */ + CARD_NVIDIA_GEFORCE_GTX470, /* D3D11 */ +}, +card_fallback_amd[] = { - enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); - if (d3d_level >= WINED3D_D3D_LEVEL_10) - return CARD_AMD_RADEON_HD2900; - if (d3d_level >= WINED3D_D3D_LEVEL_9_SM2) - return CARD_AMD_RADEON_9500; - if (d3d_level >= WINED3D_D3D_LEVEL_8) - return CARD_AMD_RADEON_8500; - if (d3d_level >= WINED3D_D3D_LEVEL_7) - return CARD_AMD_RADEON_7200; - return CARD_AMD_RAGE_128PRO; -} - -static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_gl_info *gl_info) + CARD_AMD_RAGE_128PRO, /* D3D5 */ + CARD_AMD_RAGE_128PRO, /* D3D6 */ + CARD_AMD_RADEON_7200, /* D3D7 */ + CARD_AMD_RADEON_8500, /* D3D8 */ + CARD_AMD_RADEON_9500, /* D3D9_SM2 */ + CARD_AMD_RADEON_X1600, /* D3D9_SM3 */ + CARD_AMD_RADEON_HD2900, /* D3D10 */ + CARD_AMD_RADEON_HD5600, /* D3D11 */ +}, +card_fallback_intel[] = { - enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); - if (d3d_level >= WINED3D_D3D_LEVEL_10) - return CARD_INTEL_G45; - return CARD_INTEL_915G; -} + CARD_INTEL_915G, /* D3D5 */ + CARD_INTEL_915G, /* D3D6 */ + CARD_INTEL_915G, /* D3D7 */ + CARD_INTEL_915G, /* D3D8 */ + CARD_INTEL_915G, /* D3D9_SM2 */ + CARD_INTEL_915G, /* D3D9_SM3 */ + CARD_INTEL_G45, /* D3D10 */ + CARD_INTEL_IVBD, /* D3D11 */ +}; +C_ASSERT(ARRAY_SIZE(card_fallback_nvidia) == WINED3D_D3D_LEVEL_COUNT); +C_ASSERT(ARRAY_SIZE(card_fallback_amd) == WINED3D_D3D_LEVEL_COUNT); +C_ASSERT(ARRAY_SIZE(card_fallback_intel) == WINED3D_D3D_LEVEL_COUNT); static enum wined3d_pci_device select_card_handler(const struct gl_vendor_selection *table, unsigned int table_size, enum wined3d_gl_vendor gl_vendor, const char *gl_renderer) @@ -2261,22 +2260,22 @@ static const struct const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ const struct gl_vendor_selection *gl_vendor_selection; unsigned int gl_vendor_count; - enum wined3d_pci_device (*select_card_fallback)(const struct wined3d_gl_info *gl_info); + const enum wined3d_pci_device *card_fallback; /* An array with D3D_LEVEL_COUNT elements */ } card_vendor_table[] = { {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, sizeof(amd_gl_vendor_table) / sizeof(*amd_gl_vendor_table), - select_card_fallback_amd}, + card_fallback_amd}, {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, sizeof(nvidia_gl_vendor_table) / sizeof(*nvidia_gl_vendor_table), - select_card_fallback_nvidia}, + card_fallback_nvidia}, {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, sizeof(vmware_gl_vendor_table) / sizeof(*vmware_gl_vendor_table), - select_card_fallback_amd}, + card_fallback_amd}, {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, sizeof(intel_gl_vendor_table) / sizeof(*intel_gl_vendor_table), - select_card_fallback_intel}, + card_fallback_intel}, }; @@ -2334,6 +2333,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * memory can be overruled using a registry setting. */ unsigned int i; + enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); enum wined3d_pci_device device; for (i = 0; i < (sizeof(card_vendor_table) / sizeof(*card_vendor_table)); ++i) @@ -2348,7 +2348,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * return device; TRACE("Unrecognized renderer %s, falling back to default.\n", debugstr_a(gl_renderer)); - return card_vendor_table[i].select_card_fallback(gl_info); + return card_vendor_table[i].card_fallback[d3d_level]; } FIXME("No card selector available for card vendor %04x (using GL_RENDERER %s).\n", @@ -2356,7 +2356,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * /* Default to generic Nvidia hardware based on the supported OpenGL extensions. */ *card_vendor = HW_VENDOR_NVIDIA; - return select_card_fallback_nvidia(gl_info); + return card_fallback_nvidia[d3d_level]; } static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info,

1 0

Adam Martinson : ntdll: Implement FILE_PIPE_INFORMATION for NtQueryInformationFile.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 55e10e4ae26a9bf9a92f35c189c2a246103c09a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e10e4ae26a9bf9a92f35c18… Author: Adam Martinson <adam.r.martinson(a)gmail.com> Date: Mon Aug 11 16:22:02 2014 +0200 ntdll: Implement FILE_PIPE_INFORMATION for NtQueryInformationFile. --- dlls/ntdll/file.c | 22 ++++++++++++++++++++-- include/winternl.h | 11 +++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d2efcc1..2ae8bee 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1981,7 +1981,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_END_OF_FILE_INFORMATION), /* FileEndOfFileInformation */ 0, /* FileAlternateNameInformation */ sizeof(FILE_STREAM_INFORMATION)-sizeof(WCHAR), /* FileStreamInformation */ - 0, /* FilePipeInformation */ + sizeof(FILE_PIPE_INFORMATION), /* FilePipeInformation */ sizeof(FILE_PIPE_LOCAL_INFORMATION), /* FilePipeLocalInformation */ 0, /* FilePipeRemoteInformation */ sizeof(FILE_MAILSLOT_QUERY_INFORMATION), /* FileMailslotQueryInformation */ @@ -2032,7 +2032,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FilePipeLocalInformation) + if (class != FilePipeInformation && class != FilePipeLocalInformation) { if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) return io->u.Status; @@ -2146,6 +2146,24 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } } break; + case FilePipeInformation: + { + FILE_PIPE_INFORMATION* pi = ptr; + + SERVER_START_REQ( get_named_pipe_info ) + { + req->handle = wine_server_obj_handle( hFile ); + if (!(io->u.Status = wine_server_call( req ))) + { + pi->ReadMode = (reply->flags & NAMED_PIPE_MESSAGE_STREAM_READ) ? + FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; + pi->CompletionMode = (reply->flags & NAMED_PIPE_NONBLOCKING_MODE) ? + FILE_PIPE_COMPLETE_OPERATION : FILE_PIPE_QUEUE_OPERATION; + } + } + SERVER_END_REQ; + } + break; case FilePipeLocalInformation: { FILE_PIPE_LOCAL_INFORMATION* pli = ptr; diff --git a/include/winternl.h b/include/winternl.h index a95a016..95951e2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -623,6 +623,11 @@ typedef struct _FILE_MAILSLOT_SET_INFORMATION { LARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; +typedef struct _FILE_PIPE_INFORMATION { + ULONG ReadMode; + ULONG CompletionMode; +} FILE_PIPE_INFORMATION, *PFILE_PIPE_INFORMATION; + typedef struct _FILE_PIPE_LOCAL_INFORMATION { ULONG NamedPipeType; ULONG NamedPipeConfiguration; @@ -1602,6 +1607,12 @@ typedef struct _RTL_HANDLE_TABLE /* options for pipe's type */ #define FILE_PIPE_TYPE_MESSAGE 0x00000001 #define FILE_PIPE_TYPE_BYTE 0x00000000 +/* options for pipe's message mode */ +#define FILE_PIPE_MESSAGE_MODE 0x00000001 +#define FILE_PIPE_BYTE_STREAM_MODE 0x00000000 +/* options for pipe's blocking mode */ +#define FILE_PIPE_COMPLETE_OPERATION 0x00000001 +#define FILE_PIPE_QUEUE_OPERATION 0x00000000 /* and client / server end */ #define FILE_PIPE_SERVER_END 0x00000001 #define FILE_PIPE_CLIENT_END 0x00000000

1 0

Sebastian Lackner : server: Store pipe_flags in a separate variable for both server and client of named pipes.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 2e95f370d4a162b4f6955bc582fd8f551c79350a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e95f370d4a162b4f6955bc58… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 11 15:35:50 2014 +0200 server: Store pipe_flags in a separate variable for both server and client of named pipes. --- server/named_pipe.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 4b23ba2..d864478 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -77,6 +77,7 @@ struct pipe_server struct timeout_user *flush_poll; struct event *event; unsigned int options; /* pipe options */ + unsigned int pipe_flags; }; struct pipe_client @@ -85,6 +86,7 @@ struct pipe_client struct fd *fd; /* pipe file descriptor */ struct pipe_server *server; /* server that this client is connected to */ unsigned int flags; /* file flags */ + unsigned int pipe_flags; }; struct named_pipe @@ -737,7 +739,8 @@ static struct pipe_server *get_pipe_server_obj( struct process *process, return (struct pipe_server *) obj; } -static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options ) +static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options, + unsigned int pipe_flags ) { struct pipe_server *server; @@ -750,6 +753,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->flush_poll = NULL; server->options = options; + server->pipe_flags = pipe_flags; list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); @@ -762,7 +766,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned return server; } -static struct pipe_client *create_pipe_client( unsigned int flags ) +static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags ) { struct pipe_client *client; @@ -773,6 +777,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags ) client->fd = NULL; client->server = NULL; client->flags = flags; + client->pipe_flags = pipe_flags; return client; } @@ -822,7 +827,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } - if ((client = create_pipe_client( options ))) + if ((client = create_pipe_client( options, pipe->flags ))) { if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) { @@ -977,7 +982,7 @@ DECL_HANDLER(create_named_pipe) pipe->outsize = req->outsize; pipe->maxinstances = req->maxinstances; pipe->timeout = req->timeout; - pipe->flags = req->flags; + pipe->flags = req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; pipe->sharing = req->sharing; } else @@ -997,7 +1002,7 @@ DECL_HANDLER(create_named_pipe) clear_error(); /* clear the name collision */ } - server = create_pipe_server( pipe, req->options ); + server = create_pipe_server( pipe, req->options, req->flags ); if (server) { reply->handle = alloc_handle( current->process, server, req->access, req->attributes ); @@ -1026,7 +1031,7 @@ DECL_HANDLER(get_named_pipe_info) server = client->server; } - reply->flags = server->pipe->flags; + reply->flags = client ? client->pipe_flags : server->pipe_flags; reply->sharing = server->pipe->sharing; reply->maxinstances = server->pipe->maxinstances; reply->instances = server->pipe->instances;

1 0

Sebastian Lackner : server: Implement set_named_pipe_info wineserver call for NtSetInformationFile/ FilePipeInformation.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 82ce3fdcfd1a5d8bfe24d58dcc51ddc3a1dea040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ce3fdcfd1a5d8bfe24d58dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 11 17:06:49 2014 +0200 server: Implement set_named_pipe_info wineserver call for NtSetInformationFile/FilePipeInformation. Based on a patch by Adam Martinson. --- dlls/ntdll/file.c | 23 +++++++++++++++++++++++ include/wine/server_protocol.h | 17 ++++++++++++++++- server/named_pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ server/protocol.def | 7 ++++++- server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 6 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2ae8bee..92d9829 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2335,6 +2335,29 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, else io->u.Status = STATUS_INVALID_PARAMETER_3; break; + case FilePipeInformation: + if (len >= sizeof(FILE_PIPE_INFORMATION)) + { + FILE_PIPE_INFORMATION *info = ptr; + + if ((info->CompletionMode | info->ReadMode) & ~1) + { + io->u.Status = STATUS_INVALID_PARAMETER; + break; + } + + SERVER_START_REQ( set_named_pipe_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = (info->CompletionMode ? NAMED_PIPE_NONBLOCKING_MODE : 0) | + (info->ReadMode ? NAMED_PIPE_MESSAGE_STREAM_READ : 0); + io->u.Status = wine_server_call( req ); + } + SERVER_END_REQ; + } + else io->u.Status = STATUS_INVALID_PARAMETER_3; + break; + case FileMailslotSetInformation: { FILE_MAILSLOT_SET_INFORMATION *info = ptr; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 57ab839..cc966f2 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3189,6 +3189,18 @@ struct get_named_pipe_info_reply }; +struct set_named_pipe_info_request +{ + struct request_header __header; + obj_handle_t handle; + unsigned int flags; + char __pad_20[4]; +}; +struct set_named_pipe_info_reply +{ + struct reply_header __header; +}; + struct create_window_request { @@ -5203,6 +5215,7 @@ enum request REQ_get_ioctl_result, REQ_create_named_pipe, REQ_get_named_pipe_info, + REQ_set_named_pipe_info, REQ_create_window, REQ_destroy_window, REQ_get_desktop_window, @@ -5464,6 +5477,7 @@ union generic_request struct get_ioctl_result_request get_ioctl_result_request; struct create_named_pipe_request create_named_pipe_request; struct get_named_pipe_info_request get_named_pipe_info_request; + struct set_named_pipe_info_request set_named_pipe_info_request; struct create_window_request create_window_request; struct destroy_window_request destroy_window_request; struct get_desktop_window_request get_desktop_window_request; @@ -5723,6 +5737,7 @@ union generic_reply struct get_ioctl_result_reply get_ioctl_result_reply; struct create_named_pipe_reply create_named_pipe_reply; struct get_named_pipe_info_reply get_named_pipe_info_reply; + struct set_named_pipe_info_reply set_named_pipe_info_reply; struct create_window_reply create_window_reply; struct destroy_window_reply destroy_window_reply; struct get_desktop_window_reply get_desktop_window_reply; @@ -5834,6 +5849,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 456 +#define SERVER_PROTOCOL_VERSION 457 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/named_pipe.c b/server/named_pipe.c index d864478..3750d25 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1046,3 +1046,41 @@ DECL_HANDLER(get_named_pipe_info) release_object(server); } } + +DECL_HANDLER(set_named_pipe_info) +{ + struct pipe_server *server; + struct pipe_client *client = NULL; + + server = get_pipe_server_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES ); + if (!server) + { + if (get_error() != STATUS_OBJECT_TYPE_MISMATCH) + return; + + clear_error(); + client = (struct pipe_client *)get_handle_obj( current->process, req->handle, + 0, &pipe_client_ops ); + if (!client) return; + server = client->server; + } + + if ((req->flags & ~(NAMED_PIPE_MESSAGE_STREAM_READ | NAMED_PIPE_NONBLOCKING_MODE)) || + ((req->flags & NAMED_PIPE_MESSAGE_STREAM_READ) && !(server->pipe->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE))) + { + set_error( STATUS_INVALID_PARAMETER ); + } + else if (client) + { + client->pipe_flags = server->pipe->flags | req->flags; + } + else + { + server->pipe_flags = server->pipe->flags | req->flags; + } + + if (client) + release_object(client); + else + release_object(server); +} diff --git a/server/protocol.def b/server/protocol.def index a8c1fb9..c9270ea 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2294,7 +2294,7 @@ enum message_type #define NAMED_PIPE_NONBLOCKING_MODE 0x0004 #define NAMED_PIPE_SERVER_END 0x8000 - +/* Get named pipe information by handle */ @REQ(get_named_pipe_info) obj_handle_t handle; @REPLY @@ -2306,6 +2306,11 @@ enum message_type unsigned int insize; @END +/* Set named pipe information by handle */ +(a)REQ(set_named_pipe_info) + obj_handle_t handle; + unsigned int flags; +(a)END /* Create a window */ @REQ(create_window) diff --git a/server/request.h b/server/request.h index e25e327..c75a636 100644 --- a/server/request.h +++ b/server/request.h @@ -251,6 +251,7 @@ DECL_HANDLER(ioctl); DECL_HANDLER(get_ioctl_result); DECL_HANDLER(create_named_pipe); DECL_HANDLER(get_named_pipe_info); +DECL_HANDLER(set_named_pipe_info); DECL_HANDLER(create_window); DECL_HANDLER(destroy_window); DECL_HANDLER(get_desktop_window); @@ -511,6 +512,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_ioctl_result, (req_handler)req_create_named_pipe, (req_handler)req_get_named_pipe_info, + (req_handler)req_set_named_pipe_info, (req_handler)req_create_window, (req_handler)req_destroy_window, (req_handler)req_get_desktop_window, @@ -1536,6 +1538,9 @@ C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, instances) == 20 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, outsize) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, insize) == 28 ); C_ASSERT( sizeof(struct get_named_pipe_info_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_named_pipe_info_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_named_pipe_info_request, flags) == 16 ); +C_ASSERT( sizeof(struct set_named_pipe_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, owner) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, atom) == 20 ); diff --git a/server/trace.c b/server/trace.c index 4834354..cb8da0c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2776,6 +2776,12 @@ static void dump_get_named_pipe_info_reply( const struct get_named_pipe_info_rep fprintf( stderr, ", insize=%08x", req->insize ); } +static void dump_set_named_pipe_info_request( const struct set_named_pipe_info_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", flags=%08x", req->flags ); +} + static void dump_create_window_request( const struct create_window_request *req ) { fprintf( stderr, " parent=%08x", req->parent ); @@ -4226,6 +4232,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_ioctl_result_request, (dump_func)dump_create_named_pipe_request, (dump_func)dump_get_named_pipe_info_request, + (dump_func)dump_set_named_pipe_info_request, (dump_func)dump_create_window_request, (dump_func)dump_destroy_window_request, (dump_func)dump_get_desktop_window_request, @@ -4483,6 +4490,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_ioctl_result_reply, (dump_func)dump_create_named_pipe_reply, (dump_func)dump_get_named_pipe_info_reply, + NULL, (dump_func)dump_create_window_reply, NULL, (dump_func)dump_get_desktop_window_reply, @@ -4740,6 +4748,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_ioctl_result", "create_named_pipe", "get_named_pipe_info", + "set_named_pipe_info", "create_window", "destroy_window", "get_desktop_window",

1 0

Aric Stewart : dwrite: Implement Font File Loader registration.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: a254741b36108936fcb65a818da8dc756c46b602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a254741b36108936fcb65a818… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 12 14:11:30 2014 -0500 dwrite: Implement Font File Loader registration. --- dlls/dwrite/main.c | 55 ++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 566a6eb..3620718 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -365,6 +365,8 @@ struct dwritefactory{ IDWriteFontCollectionLoader **loaders; LONG loader_count; + IDWriteFontFileLoader **file_loaders; + LONG file_loader_count; }; static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *iface) @@ -412,6 +414,10 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) if (This->loaders[i]) IDWriteFontCollectionLoader_Release(This->loaders[i]); heap_free(This->loaders); + for (i = 0; i < This->file_loader_count; i++) + if (This->file_loaders[i]) + IDWriteFontFileLoader_Release(This->file_loaders[i]); + heap_free(This->file_loaders); heap_free(This); } @@ -554,16 +560,55 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory * static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { + int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%p): stub\n", This, loader); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, loader); + + if (!loader) + return E_INVALIDARG; + + for (i = 0; i < This->file_loader_count; i++) + if (This->file_loaders[i] == loader) + return DWRITE_E_ALREADYREGISTERED; + else if (This->file_loaders[i] == NULL) + break; + + if (i == This->file_loader_count) + { + IDWriteFontFileLoader **new_list = NULL; + int new_count = 0; + + new_count = This->file_loader_count * 2; + new_list = heap_realloc(This->file_loaders, new_count * sizeof(*This->file_loaders)); + + if (!new_list) + return E_OUTOFMEMORY; + else + { + This->file_loader_count = new_count; + This->file_loaders = new_list; + } + } + IDWriteFontFileLoader_AddRef(loader); + This->file_loaders[i] = loader; + + return S_OK; } static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { + int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%p): stub\n", This, loader); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, loader); + + for (i = 0; i < This->file_loader_count; i++) + if (This->file_loaders[i] == loader) break; + if (i == This->file_loader_count) + return E_INVALIDARG; + IDWriteFontFileLoader_Release(This->file_loaders[i]); + This->file_loaders[i] = NULL; + + return S_OK; } static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHAR const* family_name, @@ -687,6 +732,8 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno This->ref = 1; This->loader_count = 2; This->loaders = heap_alloc_zero(sizeof(*This->loaders) * 2); + This->file_loader_count = 2; + This->file_loaders = heap_alloc_zero(sizeof(*This->file_loaders) * 2); *factory = (IUnknown*)&This->IDWriteFactory_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 6366817..243af9f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -722,6 +722,64 @@ static void test_CustomFontCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); } +static HRESULT WINAPI fontfileloader_QueryInterface(IDWriteFontFileLoader *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFileLoader)) + { + *obj = iface; + IDWriteFontFileLoader_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI fontfileloader_AddRef(IDWriteFontFileLoader *iface) +{ + return 2; +} + +static ULONG WINAPI fontfileloader_Release(IDWriteFontFileLoader *iface) +{ + return 1; +} + +static HRESULT WINAPI fontfileloader_CreateStreamFromKey(IDWriteFontFileLoader *iface, const void *fontFileReferenceKey, UINT32 fontFileReferenceKeySize, IDWriteFontFileStream **fontFileStream) +{ + return 0x8faecafe; +} + +static const struct IDWriteFontFileLoaderVtbl dwritefontfileloadervtbl = { + fontfileloader_QueryInterface, + fontfileloader_AddRef, + fontfileloader_Release, + fontfileloader_CreateStreamFromKey +}; + +static void test_FontLoader(void) +{ + IDWriteFontFileLoader floader = { &dwritefontfileloadervtbl }; + IDWriteFontFileLoader floader2 = { &dwritefontfileloadervtbl }; + HRESULT hr; + + hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + + hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader2); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + START_TEST(font) { HRESULT hr; @@ -743,6 +801,7 @@ START_TEST(font) test_system_fontcollection(); test_ConvertFontFaceToLOGFONT(); test_CustomFontCollection(); + test_FontLoader(); IDWriteFactory_Release(factory); }

1 0

Aric Stewart : dwrite: Initial implementation of CreateCustomFontFileReference.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: bb9721bd2914174e30b5b85bc94eee350dd9beab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9721bd2914174e30b5b85bc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 12 14:11:34 2014 -0500 dwrite: Initial implementation of CreateCustomFontFileReference. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 112 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 16 ++++++- dlls/dwrite/tests/font.c | 17 +++++++ 4 files changed, 144 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8db35a3..fcc9b7f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -89,3 +89,4 @@ extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const W extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; extern void release_system_fontcollection(void) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; +extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0962784..afeca27 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -162,6 +162,15 @@ struct dwrite_fontface { LOGFONTW logfont; }; +struct dwrite_fontfile { + IDWriteFontFile IDWriteFontFile_iface; + LONG ref; + + IDWriteFontFileLoader *loader; + void *reference_key; + UINT32 key_size; +}; + static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); static inline struct dwrite_fontface *impl_from_IDWriteFontFace(IDWriteFontFace *iface) @@ -174,6 +183,11 @@ static inline struct dwrite_font *impl_from_IDWriteFont(IDWriteFont *iface) return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont_iface); } +static inline struct dwrite_fontfile *impl_from_IDWriteFontFile(IDWriteFontFile *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontfile, IDWriteFontFile_iface); +} + static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily(IDWriteFontFamily *iface) { return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily_iface); @@ -978,3 +992,101 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) return S_OK; } + +static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj) +{ + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFontFile)) + { + *obj = iface; + IDWriteFontFile_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefontfile_AddRef(IDWriteFontFile *iface) +{ + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritefontfile_Release(IDWriteFontFile *iface) +{ + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + IDWriteFontFileLoader_Release(This->loader); + heap_free(This->reference_key); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI dwritefontfile_GetReferenceKey(IDWriteFontFile *iface, const void **fontFileReferenceKey, UINT32 *fontFileReferenceKeySize) +{ + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); + TRACE("(%p)->(%p, %p)\n", This, fontFileReferenceKey, fontFileReferenceKeySize); + *fontFileReferenceKey = This->reference_key; + *fontFileReferenceKeySize = This->key_size; + + return S_OK; +} + +static HRESULT WINAPI dwritefontfile_GetLoader(IDWriteFontFile *iface, IDWriteFontFileLoader **fontFileLoader) +{ + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); + TRACE("(%p)->(%p)\n", This, fontFileLoader); + *fontFileLoader = This->loader; + IDWriteFontFileLoader_AddRef(This->loader); + + return S_OK; +} + +static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSupportedFontType, DWRITE_FONT_FILE_TYPE *fontFileType, DWRITE_FONT_FACE_TYPE *fontFaceType, UINT32 *numberOfFaces) +{ + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); + FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); + return E_NOTIMPL; +} + +static const IDWriteFontFileVtbl dwritefontfilevtbl = { + dwritefontfile_QueryInterface, + dwritefontfile_AddRef, + dwritefontfile_Release, + dwritefontfile_GetReferenceKey, + dwritefontfile_GetLoader, + dwritefontfile_Analyze, +}; + +HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) +{ + struct dwrite_fontfile *This; + + This = heap_alloc(sizeof(struct dwrite_fontfile)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl; + This->ref = 1; + IDWriteFontFileLoader_AddRef(loader); + This->loader = loader; + This->reference_key = heap_alloc(key_size); + memcpy(This->reference_key, reference_key, key_size); + This->key_size = key_size; + + *font_file = &This->IDWriteFontFile_iface; + + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3620718..f736301 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -509,9 +509,21 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *ifac static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, void const *reference_key, UINT32 key_size, IDWriteFontFileLoader *loader, IDWriteFontFile **font_file) { + int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%p %u %p %p): stub\n", This, reference_key, key_size, loader, font_file); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%p %u %p %p)\n", This, reference_key, key_size, loader, font_file); + + if (loader == NULL) + return E_INVALIDARG; + + for (i = 0; i < This->file_loader_count; i++) + if (This->file_loaders[i] == loader) break; + if (i == This->file_loader_count) + return E_INVALIDARG; + hr = create_font_file(loader, reference_key, key_size, font_file); + return hr; } static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 243af9f..4368bcf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -761,6 +761,8 @@ static void test_FontLoader(void) { IDWriteFontFileLoader floader = { &dwritefontfileloadervtbl }; IDWriteFontFileLoader floader2 = { &dwritefontfileloadervtbl }; + IDWriteFontFileLoader floader3 = { &dwritefontfileloadervtbl }; + IDWriteFontFile *ffile = NULL; HRESULT hr; hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); @@ -772,6 +774,21 @@ static void test_FontLoader(void) hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, &floader, &ffile); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IDWriteFontFile_Release(ffile); + + hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, &floader3, &ffile); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IDWriteFontFile_Release(ffile); + + hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, NULL, &ffile); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IDWriteFontFile_Release(ffile); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader);

1 0

Aric Stewart : dwrite: Beginning implementation of IDWriteFontFile_Analyze.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 366c40813ce8342191b974d81e5ddd1121cc1064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366c40813ce8342191b974d81… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 12 14:11:37 2014 -0500 dwrite: Beginning implementation of IDWriteFontFile_Analyze. --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/dwrite_private.h | 3 ++ dlls/dwrite/font.c | 25 ++++++++++++- dlls/dwrite/opentype.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 14 ++++++++ 5 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 9ee7181..c714419 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -7,4 +7,5 @@ C_SRCS = \ font.c \ gdiinterop.c \ layout.c \ - main.c + main.c \ + opentype.c diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fcc9b7f..64f55e2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -90,3 +90,6 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern void release_system_fontcollection(void) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; + +/* Opentype font table functions */ +extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index afeca27..0c75271 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1057,9 +1057,32 @@ static HRESULT WINAPI dwritefontfile_GetLoader(IDWriteFontFile *iface, IDWriteFo static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSupportedFontType, DWRITE_FONT_FILE_TYPE *fontFileType, DWRITE_FONT_FACE_TYPE *fontFaceType, UINT32 *numberOfFaces) { + HRESULT hr; + const void *font_data; + void *context; + IDWriteFontFileStream *stream; + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); - return E_NOTIMPL; + + *isSupportedFontType = FALSE; + *fontFileType = DWRITE_FONT_FILE_TYPE_UNKNOWN; + if (fontFaceType) + *fontFaceType = DWRITE_FONT_FACE_TYPE_UNKNOWN; + *numberOfFaces = 0; + + hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &stream); + if (FAILED(hr)) + return S_OK; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &font_data, 0, 28, &context); + if (SUCCEEDED(hr)) + { + hr = analyze_opentype_font(font_data, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + } + /* TODO: Further Analysis */ + IDWriteFontFileStream_Release(stream); + return S_OK; } static const IDWriteFontFileVtbl dwritefontfilevtbl = { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c new file mode 100644 index 0000000..538db98 --- /dev/null +++ b/dlls/dwrite/opentype.c @@ -0,0 +1,83 @@ +/* + * Methods for dealing with opentype font tables + * + * Copyright 2014 Aric Stewart 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 + */ + +#define COBJMACROS + +#include "dwrite.h" +#include "dwrite_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) + +#define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') +#define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))) +#endif + +typedef struct { + CHAR TTCTag[4]; + DWORD Version; + DWORD numFonts; + DWORD OffsetTable[1]; +} TTC_Header_V1; + +HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) +{ + /* TODO: Do font validation */ + const char* tag = font_data; + + *supported = FALSE; + *file_type = DWRITE_FONT_FILE_TYPE_UNKNOWN; + if (face_type) + *face_type = DWRITE_FONT_FACE_TYPE_UNKNOWN; + *font_count = 0; + + if (DWRITE_MAKE_OPENTYPE_TAG(tag[0], tag[1], tag[2], tag[3]) == MS_TTCF_TAG) + { + const TTC_Header_V1 *header = font_data; + *font_count = GET_BE_DWORD(header->numFonts); + *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION; + if (face_type) + *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION; + *supported = TRUE; + } + else if (GET_BE_DWORD(*(DWORD*)font_data) == 0x10000) + { + *font_count = 1; + *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE; + if (face_type) + *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE; + *supported = TRUE; + } + else if (DWRITE_MAKE_OPENTYPE_TAG(tag[0], tag[1], tag[2], tag[3]) == MS_OTTO_TAG) + { + *file_type = DWRITE_FONT_FILE_TYPE_CFF; + } + return S_OK; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4368bcf..44e7ee6 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -763,6 +763,10 @@ static void test_FontLoader(void) IDWriteFontFileLoader floader2 = { &dwritefontfileloadervtbl }; IDWriteFontFileLoader floader3 = { &dwritefontfileloadervtbl }; IDWriteFontFile *ffile = NULL; + BOOL support = 1; + DWRITE_FONT_FILE_TYPE type = 1; + DWRITE_FONT_FACE_TYPE face = 1; + UINT32 count = 1; HRESULT hr; hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); @@ -789,6 +793,16 @@ static void test_FontLoader(void) if (SUCCEEDED(hr)) IDWriteFontFile_Release(ffile); + hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, &floader, &ffile); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Analyze(ffile, &support, &type, &face, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(support == FALSE, "got %i\n", support); + ok(type == DWRITE_FONT_FILE_TYPE_UNKNOWN, "got %i\n", type); + ok(face == DWRITE_FONT_FACE_TYPE_UNKNOWN, "got %i\n", face); + ok(count == 0, "got %i\n", count); + IDWriteFontFile_Release(ffile); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader);

1 0

Aric Stewart : dwrite: Initial implementation of CreateFontFace.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 26977d4a4b3e6159072ae75e77a3e3b007bd3127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26977d4a4b3e6159072ae75e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Aug 16 20:40:48 2014 -0500 dwrite: Initial implementation of CreateFontFace. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 194 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 4 + 4 files changed, 166 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26977d4a4b3e6159072ae…

1 0

Shuai Meng : vbscript: Implemented Tan.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 11755f76fd6d6ee54e29a0170ad06685cb1541aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=11755f76fd6d6ee54e29a0170… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:11:54 2014 +0800 vbscript: Implemented Tan. --- dlls/vbscript/global.c | 10 ++++++++-- dlls/vbscript/tests/api.vbs | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index df95cc3..968d4e2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -693,8 +693,14 @@ static HRESULT Global_Sin(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Tan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + return return_double(res, tan(d)); } static HRESULT Global_Exp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 22c5f33..18a5ad4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1142,4 +1142,28 @@ Call ok(getVT(Sin(True)) = "VT_R8", "getVT(Sin(True)) = " & getVT(Sin(True))) Call ok(Approch(Sin(CByte(255)), -0.5063), "Sin(CByte(255)) = " & Sin(CByte(255))) Call ok(getVT(Sin(CByte(255))) = "VT_R8", "getVT(Sin(CByte(255))) = " & getVT(Sin(CByte(255)))) +Call ok(Approch(Tan(Empty), 0), "Tan(Empty) = " & Tan(Empty)) +Call ok(getVT(Tan(Empty)) = "VT_R8", "getVT(Tan(Empty)) = " & getVT(Tan(Empty))) +Call ok(Approch(Tan(PI / 6), Sqr(3) / 3), "Tan(PI / 6) = " & Tan(PI / 6)) +Call ok(getVT(Tan(PI / 6)) = "VT_R8", "getVT(Tan(PI / 6)) = " & getVT(Tan(PI / 6))) +Call ok(Approch(Tan(CCur(PI / 4)), 1), "Tan(CCur(PI / 4)) = " & Tan(CCur(PI / 4))) +Call ok(getVT(Tan(CCur(PI / 4))) = "VT_R8", "getVT(Tan(CCur(PI / 4))) = " & getVT(Tan(CCur(PI / 4)))) +Call ok(Approch(Tan(CSng(PI / 3)), Sqr(3)), "Tan(CSng(PI / 3)) = " & Tan(CSng(PI / 3))) +Call ok(getVT(Tan(CSng(PI / 3))) = "VT_R8", "getVT(Tan(CSng(PI))) = " & getVT(Tan(CSng(PI)))) +Call ok(Approch(Tan(PI), 0), "Tan(PI) = " & Tan(PI)) +Call ok(getVT(Tan(PI)) = "VT_R8", "getVT(Tan(PI)) = " & getVT(Tan(PI))) +Call ok(Approch(Tan(3 * PI / 4), -1), "Tan(3 * PI / 4) = " & Tan(3 * PI / 4)) +Call ok(getVT(Tan(3 * PI / 4)) = "VT_R8", "getVT(Tan(3 * PI / 4)) = " & getVT(Tan(3 * PI / 4))) +Call ok(Approch(Tan(5 * PI / 4), 1), "Tan(5 * PI / 4) = " & Tan(5 * PI / 4)) +Call ok(getVT(Tan(5 * PI / 4)) = "VT_R8", "getVT(Tan(5 * PI / 4)) = " & getVT(Tan(5 * PI / 4))) +Call ok(Approch(Tan(2 * PI), 0), "Tan(2 * PI) = " & Tan(2 * PI)) +Call ok(getVT(Tan(2 * PI)) = "VT_R8", "getVT(Tan(2 * PI)) = " & getVT(Tan(2 * PI))) +Call ok(Approch(Tan("-32768"), -2.4879), "Tan(""-32768"") = " & Tan("-32768")) +Call ok(getVT(Tan("-32768")) = "VT_R8", "getVT(Tan(""-32768"")) = " & getVT(Tan("-32768"))) +Call ok(Approch(Tan(False), 0), "Tan(False) = " & Tan(False)) +Call ok(getVT(Tan(False)) = "VT_R8", "getVT(Tan(False)) = " & getVT(Tan(False))) +Call ok(Approch(Tan(True), -1.5574), "Tan(True) = " & Tan(True)) +Call ok(getVT(Tan(True)) = "VT_R8", "getVT(Tan(True)) = " & getVT(Tan(True))) +Call ok(Approch(Tan(CByte(255)), 0.5872), "Tan(CByte(255)) = " & Tan(CByte(255))) +Call ok(getVT(Tan(CByte(255))) = "VT_R8", "getVT(Tan(CByte(255))) = " & getVT(Tan(CByte(255)))) Call reportSuccess()

1 0