September 2015 - Wine-Commits

Aric Stewart : hidclass.sys: Implement IRP_MJ_READ for HID Devices.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 1de389ae2bbfb254cda55bc41a4ec837a86ce94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de389ae2bbfb254cda55bc41… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 14 09:58:44 2015 -0500 hidclass.sys: Implement IRP_MJ_READ for HID Devices. --- dlls/hidclass.sys/buffer.c | 33 +++++++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 3 +++ dlls/hidclass.sys/main.c | 1 + 4 files changed, 80 insertions(+) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index c07632c..af59284 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -80,6 +80,39 @@ void RingBuffer_Destroy(struct ReportRingBuffer *ring) HeapFree(GetProcessHeap(), 0, ring); } +UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) +{ + return ring->buffer_size; +} + +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) +{ + void *ret = NULL; + + EnterCriticalSection(&ring->lock); + if (index >= ring->pointer_alloc || ring->pointers[index] == 0xffffffff) + { + LeaveCriticalSection(&ring->lock); + *size = 0; + return; + } + if (ring->pointers[index] == ring->end) + { + LeaveCriticalSection(&ring->lock); + *size = 0; + } + else + { + ret = &ring->buffer[ring->pointers[index] * ring->buffer_size]; + memcpy(output, ret, ring->buffer_size); + ring->pointers[index]++; + if (ring->pointers[index] == ring->size) + ring->pointers[index] = 0; + LeaveCriticalSection(&ring->lock); + *size = ring->buffer_size; + } +} + UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { UINT idx; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 0b27baa..46bd010 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -36,6 +36,7 @@ #include "devguid.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', '\\','H','I','D','#','%','p','&','%','p',0}; @@ -352,6 +353,48 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) return rc; } +NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) +{ + HID_XFER_PACKET *packet; + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + UINT buffer_size = RingBuffer_GetBufferSize(ext->ring_buffer); + NTSTATUS rc = STATUS_SUCCESS; + int ptr = -1; + + packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); + + irp->IoStatus.Information = 0; + RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); + + if (buffer_size) + { + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + TRACE_(hid_report)("Got Packet %p %i\n", packet->reportBuffer, packet->reportBufferLen); + if (irpsp->Parameters.Read.Length >= packet->reportBufferLen) + { + memcpy(irp->AssociatedIrp.SystemBuffer, packet->reportBuffer, packet->reportBufferLen); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } + else + { + TRACE_(hid_report)("Queue irp\n"); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + rc = STATUS_PENDING; + } + HeapFree(GetProcessHeap(), 0, packet); + + return rc; +} + NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 2005d8f..41b9937 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -58,6 +58,8 @@ typedef struct _BASE_DEVICE_EXTENSTION { UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; +void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; +UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; @@ -81,6 +83,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DE void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; +NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 1e0e802..4be4409 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -69,6 +69,7 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) registration->DriverObject->DriverUnload = UnloadDriver; registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; + registration->DriverObject->MajorFunction[IRP_MJ_READ] = HID_Device_read; registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close;

1 0

Hans Leidekker : webservices: Implement WsCreateReader and WsFreeReader.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: a3004d11de2ace91b4e9646741406e59b2dababf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3004d11de2ace91b4e964674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 11:15:06 2015 +0200 webservices: Implement WsCreateReader and WsFreeReader. --- dlls/webservices/reader.c | 111 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a0123aa..84802fc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -250,6 +250,117 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) heap_free( heap ); } +static const struct +{ + ULONG size; + BOOL readonly; +} +reader_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_DEPTH */ + { sizeof(BOOL), FALSE }, /* WS_XML_READER_PROPERTY_ALLOW_FRAGMENT */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_ATTRIBUTES */ + { sizeof(BOOL), FALSE }, /* WS_XML_READER_PROPERTY_READ_DECLARATION */ + { sizeof(WS_CHARSET), FALSE }, /* WS_XML_READER_PROPERTY_CHARSET */ + { sizeof(ULONGLONG), TRUE }, /* WS_XML_READER_PROPERTY_ROW */ + { sizeof(ULONGLONG), TRUE }, /* WS_XML_READER_PROPERTY_COLUMN */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_UTF8_TRIM_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_STREAM_BUFFER_SIZE */ + { sizeof(BOOL), TRUE }, /* WS_XML_READER_PROPERTY_IN_ATTRIBUTE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_STREAM_MAX_ROOT_MIME_PART_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_STREAM_MAX_MIME_HEADERS_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_MIME_PARTS */ + { sizeof(BOOL), FALSE }, /* WS_XML_READER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_NAMESPACES */ +}; + +struct reader +{ + ULONG prop_count; + WS_XML_READER_PROPERTY prop[sizeof(reader_props)/sizeof(reader_props[0])]; +}; + +static struct reader *alloc_reader(void) +{ + static const ULONG count = sizeof(reader_props)/sizeof(reader_props[0]); + struct reader *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_XML_READER_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += reader_props[i].size; + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ptr = (char *)&ret->prop[count]; + for (i = 0; i < count; i++) + { + ret->prop[i].value = ptr; + ret->prop[i].valueSize = reader_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_reader_prop( struct reader *reader, WS_XML_READER_PROPERTY_ID id, const void *value, ULONG size ) +{ + if (id >= reader->prop_count || size != reader_props[id].size || reader_props[id].readonly) + return E_INVALIDARG; + + memcpy( reader->prop[id].value, value, size ); + return S_OK; +} + +/************************************************************************** + * WsCreateReader [webservices.@] + */ +HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG count, + WS_XML_READER **handle, WS_ERROR *error ) +{ + struct reader *reader; + ULONG i, max_depth = 32, max_attrs = 128, max_ns = 32; + WS_CHARSET charset = WS_CHARSET_UTF8; + BOOL read_decl = TRUE; + HRESULT hr; + + TRACE( "%p %u %p %p\n", properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (!(reader = alloc_reader())) return E_OUTOFMEMORY; + + set_reader_prop( reader, WS_XML_READER_PROPERTY_MAX_DEPTH, &max_depth, sizeof(max_depth) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, sizeof(max_attrs) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_READ_DECLARATION, &read_decl, sizeof(read_decl) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, sizeof(charset) ); + set_reader_prop( reader, WS_XML_READER_PROPERTY_MAX_NAMESPACES, &max_ns, sizeof(max_ns) ); + + for (i = 0; i < count; i++) + { + hr = set_reader_prop( reader, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) + { + heap_free( reader ); + return hr; + } + } + + *handle = (WS_XML_READER *)reader; + return S_OK; +} + +/************************************************************************** + * WsFreeReader [webservices.@] + */ +void WINAPI WsFreeReader( WS_XML_READER *handle ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p\n", handle ); + + if (!reader) return; + heap_free( reader ); +} + /************************************************************************** * WsGetErrorProperty [webservices.@] */ diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4cb35f6..7e0a86b 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -29,7 +29,7 @@ @ stub WsCreateMessage @ stub WsCreateMessageForChannel @ stub WsCreateMetadata -@ stub WsCreateReader +@ stdcall WsCreateReader(ptr long ptr ptr) @ stub WsCreateServiceEndpointFromTemplate @ stub WsCreateServiceHost @ stub WsCreateServiceProxy @@ -54,7 +54,7 @@ @ stub WsFreeListener @ stub WsFreeMessage @ stub WsFreeMetadata -@ stub WsFreeReader +@ stdcall WsFreeReader(ptr) @ stub WsFreeSecurityToken @ stub WsFreeServiceHost @ stub WsFreeServiceProxy

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: b5e3edbd3af7eafdb4ee2c9eca1dc392ea889b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e3edbd3af7eafdb4ee2c9ec… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Sep 14 19:31:04 2015 +0300 po: Update Finnish translation. --- po/fi.po | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4b1e2f6..e4a2bf2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7445,16 +7445,12 @@ msgid "&Convert..." msgstr "&Muunna..." #: oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Objekti" +msgstr "%1 %2 &Objekti" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Objekti" +msgstr "%1 &Objekti" #: oledlg.rc:33 oleview.rc:40 msgid "&Object"

1 0

Erich E. Hoover : wineps.drv: Add support for PostScript Format 1 glyph names.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: ce0fbe4f1e3054db6284dd5397c52b7dd6d182f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0fbe4f1e3054db6284dd539… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Sep 2 17:21:15 2015 -0600 wineps.drv: Add support for PostScript Format 1 glyph names. In order to generate a searchable PDF from a PostScript document the glyph names must follow Adobe's convention. --- dlls/wineps.drv/download.c | 321 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 318 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index e5b57f7..0c4c5a7 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -30,6 +30,8 @@ #include "winnls.h" #include "psdrv.h" +#include "data/agl.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -359,11 +361,324 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) return TRUE; } +static void get_standard_glyph_name(WORD index, char *name) +{ + static const GLYPHNAME nonbreakingspace = { -1, "nonbreakingspace" }; + static const GLYPHNAME nonmarkingreturn = { -1, "nonmarkingreturn" }; + static const GLYPHNAME notdef = { -1, ".notdef" }; + static const GLYPHNAME null = { -1, ".null" }; + /* These PostScript Format 1 glyph names are stored by glyph index, do not reorder them. */ + static const GLYPHNAME *glyph_table[] = { + &notdef, + &null, + &nonmarkingreturn, + GN_space, + GN_exclam, + GN_quotedbl, + GN_numbersign, + GN_dollar, + GN_percent, + GN_ampersand, + GN_quotesingle, + GN_parenleft, + GN_parenright, + GN_asterisk, + GN_plus, + GN_comma, + GN_hyphen, + GN_period, + GN_slash, + GN_zero, + GN_one, + GN_two, + GN_three, + GN_four, + GN_five, + GN_six, + GN_seven, + GN_eight, + GN_nine, + GN_colon, + GN_semicolon, + GN_less, + GN_equal, + GN_greater, + GN_question, + GN_at, + GN_A, + GN_B, + GN_C, + GN_D, + GN_E, + GN_F, + GN_G, + GN_H, + GN_I, + GN_J, + GN_K, + GN_L, + GN_M, + GN_N, + GN_O, + GN_P, + GN_Q, + GN_R, + GN_S, + GN_T, + GN_U, + GN_V, + GN_W, + GN_X, + GN_Y, + GN_Z, + GN_bracketleft, + GN_backslash, + GN_bracketright, + GN_asciicircum, + GN_underscore, + GN_grave, + GN_a, + GN_b, + GN_c, + GN_d, + GN_e, + GN_f, + GN_g, + GN_h, + GN_i, + GN_j, + GN_k, + GN_l, + GN_m, + GN_n, + GN_o, + GN_p, + GN_q, + GN_r, + GN_s, + GN_t, + GN_u, + GN_v, + GN_w, + GN_x, + GN_y, + GN_z, + GN_braceleft, + GN_bar, + GN_braceright, + GN_asciitilde, + GN_Adieresis, + GN_Aring, + GN_Ccedilla, + GN_Eacute, + GN_Ntilde, + GN_Odieresis, + GN_Udieresis, + GN_aacute, + GN_agrave, + GN_acircumflex, + GN_adieresis, + GN_atilde, + GN_aring, + GN_ccedilla, + GN_eacute, + GN_egrave, + GN_ecircumflex, + GN_edieresis, + GN_iacute, + GN_igrave, + GN_icircumflex, + GN_idieresis, + GN_ntilde, + GN_oacute, + GN_ograve, + GN_ocircumflex, + GN_odieresis, + GN_otilde, + GN_uacute, + GN_ugrave, + GN_ucircumflex, + GN_udieresis, + GN_dagger, + GN_degree, + GN_cent, + GN_sterling, + GN_section, + GN_bullet, + GN_paragraph, + GN_germandbls, + GN_registered, + GN_copyright, + GN_trademark, + GN_acute, + GN_dieresis, + GN_notequal, + GN_AE, + GN_Oslash, + GN_infinity, + GN_plusminus, + GN_lessequal, + GN_greaterequal, + GN_yen, + GN_mu, + GN_partialdiff, + GN_summation, + GN_product, + GN_pi, + GN_integral, + GN_ordfeminine, + GN_ordmasculine, + GN_Omega, + GN_ae, + GN_oslash, + GN_questiondown, + GN_exclamdown, + GN_logicalnot, + GN_radical, + GN_florin, + GN_approxequal, + GN_Delta, + GN_guillemotleft, + GN_guillemotright, + GN_ellipsis, + &nonbreakingspace, + GN_Agrave, + GN_Atilde, + GN_Otilde, + GN_OE, + GN_oe, + GN_endash, + GN_emdash, + GN_quotedblleft, + GN_quotedblright, + GN_quoteleft, + GN_quoteright, + GN_divide, + GN_lozenge, + GN_ydieresis, + GN_Ydieresis, + GN_fraction, + GN_currency, + GN_guilsinglleft, + GN_guilsinglright, + GN_fi, + GN_fl, + GN_daggerdbl, + GN_periodcentered, + GN_quotesinglbase, + GN_quotedblbase, + GN_perthousand, + GN_Acircumflex, + GN_Ecircumflex, + GN_Aacute, + GN_Edieresis, + GN_Egrave, + GN_Iacute, + GN_Icircumflex, + GN_Idieresis, + GN_Igrave, + GN_Oacute, + GN_Ocircumflex, + GN_apple, + GN_Ograve, + GN_Uacute, + GN_Ucircumflex, + GN_Ugrave, + GN_dotlessi, + GN_circumflex, + GN_tilde, + GN_macron, + GN_breve, + GN_dotaccent, + GN_ring, + GN_cedilla, + GN_hungarumlaut, + GN_ogonek, + GN_caron, + GN_Lslash, + GN_lslash, + GN_Scaron, + GN_scaron, + GN_Zcaron, + GN_zcaron, + GN_brokenbar, + GN_Eth, + GN_eth, + GN_Yacute, + GN_yacute, + GN_Thorn, + GN_thorn, + GN_minus, + GN_multiply, + GN_onesuperior, + GN_twosuperior, + GN_threesuperior, + GN_onehalf, + GN_onequarter, + GN_threequarters, + GN_franc, + GN_Gbreve, + GN_gbreve, + GN_Idotaccent, + GN_Scedilla, + GN_scedilla, + GN_Cacute, + GN_cacute, + GN_Ccaron, + GN_ccaron, + GN_dcroat + }; + snprintf(name, MAX_G_NAME + 1, "%s", glyph_table[index]->sz); +} + void get_glyph_name(HDC hdc, WORD index, char *name) { - /* FIXME */ - sprintf(name, "g%04x", index); - return; + struct + { + DWORD format; + DWORD italicAngle; + SHORT underlinePosition; + SHORT underlineThickness; + DWORD isFixedPitch; + DWORD minMemType42; + DWORD maxMemType42; + DWORD minMemType1; + DWORD maxMemType1; + } *post_header; + BYTE *post = NULL; + DWORD size; + + /* set a fallback name that is just 'g<index>' */ + snprintf(name, MAX_G_NAME + 1, "g%04x", index); + + /* attempt to obtain the glyph name from the 'post' table */ + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, NULL, 0); + if(size < sizeof(*post_header) || size == GDI_ERROR) + return; + post = HeapAlloc(GetProcessHeap(), 0, size); + if(!post) + return; + size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size); + if(size < sizeof(*post_header) || size == GDI_ERROR) + goto cleanup; + post_header = (typeof(post_header))(post); + /* note: only interested in the format for obtaining glyph names */ + post_header->format = GET_BE_DWORD(&post_header->format); + + /* now that we know the format of the 'post' table we can get the glyph name */ + if(post_header->format == MAKELONG(0, 1)) + { + if(index < 258) + get_standard_glyph_name(index, name); + else + WARN("Font uses PostScript Format 1, but non-standard glyph (%d) requested.\n", index); + } + else + FIXME("PostScript Format %d.%d glyph names are currently unsupported.\n", + HIWORD(post_header->format), LOWORD(post_header->format)); + +cleanup: + HeapFree(GetProcessHeap(), 0, post); } /****************************************************************************

1 0

Aric Stewart : hidclass.sys: Add USB Descriptor parsing.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: b7f43c99ee2c745c4c1316742948822b9b12f138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f43c99ee2c745c4c1316742… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 14 09:58:30 2015 -0500 hidclass.sys: Add USB Descriptor parsing. --- dlls/hidclass.sys/Makefile.in | 1 + dlls/hidclass.sys/descriptor.c | 1145 ++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 3 + dlls/hidclass.sys/pnp.c | 37 ++ 4 files changed, 1186 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7f43c99ee2c745c4c131…

1 0

Aric Stewart : hidclass.sys: Implement IRP_MJ_DEVICE_CONTROL for HID devices.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 28125d40c2a94c97c67ac5a4a15f505d9fb5fccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=28125d40c2a94c97c67ac5a4a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 14 09:58:35 2015 -0500 hidclass.sys: Implement IRP_MJ_DEVICE_CONTROL for HID devices. --- dlls/hidclass.sys/device.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 2 + dlls/hidclass.sys/main.c | 2 + 3 files changed, 159 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e8deb95..036ced2 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -196,3 +196,158 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device IoDeleteDevice(device); } + +static NTSTATUS handle_IOCTL_HID_GET_COLLECTION_INFORMATION(IRP *irp, BASE_DEVICE_EXTENSION *base) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) + { + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; + irp->IoStatus.Information = 0; + } + else + { + memcpy(irp->AssociatedIrp.SystemBuffer, &base->information, sizeof(HID_COLLECTION_INFORMATION)); + irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + return STATUS_SUCCESS; +} + +static NTSTATUS handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR(IRP *irp, BASE_DEVICE_EXTENSION *base) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < base->preparseData->dwSize) + { + irp->IoStatus.u.Status = STATUS_INVALID_BUFFER_SIZE; + irp->IoStatus.Information = 0; + } + else + { + memcpy(irp->UserBuffer, base->preparseData, base->preparseData->dwSize); + irp->IoStatus.Information = base->preparseData->dwSize; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + return STATUS_SUCCESS; +} + +static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, DWORD index) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + WCHAR buffer[127]; + NTSTATUS status; + + status = call_minidriver(IOCTL_HID_GET_STRING, device, &index, sizeof(index), buffer, sizeof(buffer)); + + if (status == STATUS_SUCCESS) + { + WCHAR *out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + int length = irpsp->Parameters.DeviceIoControl.OutputBufferLength/sizeof(WCHAR); + TRACE("got string %s from minidriver\n",debugstr_w(buffer)); + lstrcpynW(out_buffer, buffer, length); + irp->IoStatus.Information = (lstrlenW(buffer)+1) * sizeof(WCHAR); + } + irp->IoStatus.u.Status = status; + + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + NTSTATUS rc = STATUS_SUCCESS; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + BASE_DEVICE_EXTENSION *extension = device->DeviceExtension; + + irp->IoStatus.Information = 0; + + TRACE("device %p ioctl(%x)\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode); + + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: + TRACE("IOCTL_HID_GET_POLL_FREQUENCY_MSEC\n"); + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + irp->IoStatus.u.Status = STATUS_BUFFER_OVERFLOW; + irp->IoStatus.Information = 0; + break; + } + *((ULONG*)irp->AssociatedIrp.SystemBuffer) = extension->poll_interval; + irp->IoStatus.Information = sizeof(ULONG); + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + case IOCTL_HID_SET_POLL_FREQUENCY_MSEC: + { + ULONG poll_interval; + TRACE("IOCTL_HID_SET_POLL_FREQUENCY_MSEC\n"); + if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) + { + irp->IoStatus.u.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; + if (poll_interval == 0) + FIXME("Handle opportunistic reads\n"); + else if (poll_interval <= MAX_POLL_INTERVAL_MSEC) + { + extension->poll_interval = poll_interval; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } + case IOCTL_HID_GET_PRODUCT_STRING: + { + rc = handle_minidriver_string(device, irp, HID_STRING_ID_IPRODUCT); + break; + } + case IOCTL_HID_GET_MANUFACTURER_STRING: + { + rc = handle_minidriver_string(device, irp, HID_STRING_ID_IMANUFACTURER); + break; + } + case IOCTL_HID_GET_COLLECTION_INFORMATION: + { + rc = handle_IOCTL_HID_GET_COLLECTION_INFORMATION(irp, extension); + break; + } + case IOCTL_HID_GET_COLLECTION_DESCRIPTOR: + { + rc = handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR(irp, extension); + break; + } + case IOCTL_HID_GET_INPUT_REPORT: + { + HID_XFER_PACKET packet; + BYTE* buffer = ((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset; + + if (extension->preparseData->InputReports[0].reportID) + packet.reportId = buffer[0]; + else + packet.reportId = 0; + packet.reportBuffer = buffer; + packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + call_minidriver(IOCTL_HID_GET_INPUT_REPORT, device, NULL, 0, &packet, sizeof(packet)); + irp->IoStatus.Information = packet.reportBufferLen; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } + default: + { + ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; + FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + rc = STATUS_UNSUCCESSFUL; + break; + } + } + + if (rc != STATUS_PENDING) + IoCompleteRequest( irp, IO_NO_INCREMENT ); + + return rc; +} diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index bf10e0f..645bba7 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -78,6 +78,8 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DECLSPEC_HIDDEN; void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; +NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; + /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; void PNP_CleanupPNP(DRIVER_OBJECT *driver) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index a58d9834..f11d7b4 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -68,6 +68,8 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) driver->DriverUnload = registration->DriverObject->DriverUnload; registration->DriverObject->DriverUnload = UnloadDriver; + registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; + driver->AddDevice = registration->DriverObject->DriverExtension->AddDevice; registration->DriverObject->DriverExtension->AddDevice = PNP_AddDevice;

1 0

Dmitry Timoshkov : oleaut32: Use correct interface pointer.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 6c83dd2d99af05606d625aa40374484d0b376f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c83dd2d99af05606d625aa40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 15 11:35:57 2015 +0800 oleaut32: Use correct interface pointer. --- dlls/oleaut32/typelib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 650fa21..0891098 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7885,19 +7885,19 @@ static HRESULT WINAPI ITypeInfo_fnGetContainingTypeLib( ITypeInfo2 *iface, ITypeLib * *ppTLib, UINT *pIndex) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - + /* If a pointer is null, we simply ignore it, the ATL in particular passes pIndex as 0 */ if (pIndex) { *pIndex=This->index; TRACE("returning pIndex=%d\n", *pIndex); } - + if (ppTLib) { - *ppTLib=(LPTYPELIB )(This->pTypeLib); + *ppTLib = (ITypeLib *)&This->pTypeLib->ITypeLib2_iface; ITypeLib_AddRef(*ppTLib); TRACE("returning ppTLib=%p\n", *ppTLib); } - + return S_OK; }

1 0

Hans Leidekker : webservices: Implement WsSetInput.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: cf8efc384a40502ae29c453dc8ce7f58392983d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8efc384a40502ae29c453dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 15 11:15:58 2015 +0200 webservices: Implement WsSetInput. --- dlls/webservices/reader.c | 58 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4f4d31c..7a811c7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -276,6 +276,8 @@ reader_props[] = struct reader { + const char *input_data; + ULONG input_size; ULONG prop_count; WS_XML_READER_PROPERTY prop[sizeof(reader_props)/sizeof(reader_props[0])]; }; @@ -407,6 +409,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!reader->input_data) return WS_E_INVALID_OPERATION; return get_reader_prop( reader, id, buf, size ); } @@ -423,3 +426,58 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co if (id == WS_ERROR_PROPERTY_LANGID) return WS_E_INVALID_OPERATION; return set_error_prop( error, id, value, size ); } + +/************************************************************************** + * WsSetInput [webservices.@] + */ +HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING *encoding, + const WS_XML_READER_INPUT *input, const WS_XML_READER_PROPERTY *properties, + ULONG count, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %p %p %u %p\n", handle, encoding, input, properties, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + switch (encoding->encodingType) + { + case WS_XML_READER_ENCODING_TYPE_TEXT: + { + WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; + if (text->charSet != WS_CHARSET_UTF8) + { + FIXME( "charset %u not supported\n", text->charSet ); + return E_NOTIMPL; + } + break; + } + default: + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + switch (input->inputType) + { + case WS_XML_READER_INPUT_TYPE_BUFFER: + { + WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + reader->input_data = buf->encodedData; + reader->input_size = buf->encodedDataSize; + break; + } + default: + FIXME( "input type %u not supported\n", input->inputType ); + return E_NOTIMPL; + } + + for (i = 0; i < count; i++) + { + hr = set_reader_prop( reader, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + + return S_OK; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 487c2af..6a81612 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -150,7 +150,7 @@ @ stub WsSetFaultErrorDetail @ stub WsSetFaultErrorProperty @ stub WsSetHeader -@ stub WsSetInput +@ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stub WsSetInputToBuffer @ stub WsSetListenerProperty @ stub WsSetMessageProperty

1 0

Lauri Kenttä : ntdll/tests: Fix error message.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: b3d51fb78b5561c6fb605931a86f11d789525c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d51fb78b5561c6fb605931a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Sep 14 19:32:13 2015 +0300 ntdll/tests: Fix error message. --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 4903790..9a4ec48 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -877,10 +877,10 @@ static void test_RtlRandom(void) } /* if */ result = pRtlRandom(&seed); ok(result == result_expected, - "test: 0x%x%08x RtlUniform(&seed (seed == %x)) returns %x, expected %x\n", + "test: 0x%x%08x RtlRandom(&seed (seed == %x)) returns %x, expected %x\n", (DWORD)(num >> 32), (DWORD)num, seed_bak, result, result_expected); ok(seed == seed_expected, - "test: 0x%x%08x RtlUniform(&seed (seed == %x)) sets seed to %x, expected %x\n", + "test: 0x%x%08x RtlRandom(&seed (seed == %x)) sets seed to %x, expected %x\n", (DWORD)(num >> 32), (DWORD)num, seed_bak, result, seed_expected); } /* for */ }

1 0

Piotr Caban : msvcrt: Add _wctime32_s implementation.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: ecac39c19b8938066978f4c6b4a6e617d9ccf2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecac39c19b8938066978f4c6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 14 17:48:44 2015 +0200 msvcrt: Add _wctime32_s implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/time.c | 47 ++++++++++++++++++++++++++++++++++++- 8 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f9eae91..edff2c9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1525,9 +1525,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 51eddfb..9dda90a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1884,9 +1884,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 184c9b5..6e13eef 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1908,9 +1908,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ec97ad7..bc4d63b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1601,9 +1601,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) msvcr120._wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) msvcr120._wcsxfrm_l @ cdecl _wctime32(ptr) msvcr120._wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) msvcr120._wctime32_s @ cdecl _wctime64(ptr) msvcr120._wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) msvcr120._wctime64_s @ cdecl _wctomb_l(ptr long ptr) msvcr120._wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcr120._wctomb_s_l # extern _wctype diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fac2446..cc10014 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1205,9 +1205,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 479b88b..e5415c4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1180,9 +1180,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37b94e3..3bd47d2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1137,9 +1137,9 @@ @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 -# stub _wctime32_s(ptr long ptr) +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -# stub _wctime64_s(ptr long ptr) +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l # extern _wctype diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e52e1d8..7fed3b3 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1358,7 +1358,7 @@ int CDECL MSVCRT__wasctime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size, const str if (!MSVCRT_CHECK_PMT(mstm != NULL)) return MSVCRT_EINVAL; ret = MSVCRT_asctime_s(buffer, sizeof(buffer), mstm); - if(!ret) + if(ret) return ret; MultiByteToWideChar(CP_ACP, 0, buffer, -1, time, size); return 0; @@ -1469,6 +1469,51 @@ MSVCRT_wchar_t * CDECL MSVCRT__wctime(const MSVCRT___time32_t *time) #endif /********************************************************************* + * _wctime64_s (MSVCRT.@) + */ +int CDECL MSVCRT__wctime64_s(MSVCRT_wchar_t *buf, + MSVCRT_size_t size, const MSVCRT___time64_t *time) +{ + struct MSVCRT_tm tm; + int ret; + + if(!MSVCRT_CHECK_PMT(buf != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(size != 0)) return MSVCRT_EINVAL; + buf[0] = 0; + if(!MSVCRT_CHECK_PMT(time != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(*time >= 0)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(*time <= _MAX__TIME64_T)) return MSVCRT_EINVAL; + + ret = _localtime64_s(&tm, time); + if(ret != 0) + return ret; + + return MSVCRT__wasctime_s(buf, size, &tm); +} + +/********************************************************************* + * _wctime32_s (MSVCRT.@) + */ +int CDECL MSVCRT__wctime32_s(MSVCRT_wchar_t *buf, MSVCRT_size_t size, + const MSVCRT___time32_t *time) +{ + struct MSVCRT_tm tm; + int ret; + + if(!MSVCRT_CHECK_PMT(buf != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(size != 0)) return MSVCRT_EINVAL; + buf[0] = 0; + if(!MSVCRT_CHECK_PMT(time != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(*time >= 0)) return MSVCRT_EINVAL; + + ret = _localtime32_s(&tm, time); + if(ret != 0) + return ret; + + return MSVCRT__wasctime_s(buf, size, &tm); +} + +/********************************************************************* * _get_timezone (MSVCR100.@) */ int CDECL _get_timezone(LONG *timezone)

1 0