September 2015 - Wine-Commits

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

Sept. 15, 2015

Module: wine Branch: master Commit: d79de513f754dd7572b6fe3f3b7bfe51dafd1dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79de513f754dd7572b6fe3f3… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Sep 3 16:24:45 2015 -0600 wineps.drv: Add support for PostScript Format 2 custom glyph names. --- dlls/wineps.drv/download.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 7b99b33..30eb0db 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -644,6 +644,35 @@ static int get_post2_name_index(BYTE *post2header, DWORD size, WORD index) return GET_BE_WORD(post2header + offset); } +static void get_post2_custom_glyph_name(BYTE *post2header, DWORD size, WORD index, char *name) +{ + USHORT numberOfGlyphs = GET_BE_WORD(post2header); + int i, name_offset = (1 + numberOfGlyphs) * sizeof(USHORT); + BYTE name_length = 0; + + for(i = 0; i <= index; i++) + { + name_offset += name_length; + if(name_offset + sizeof(BYTE) > size) + { + FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", + name_offset + sizeof(BYTE), size); + return; + } + name_length = (post2header + name_offset)[0]; + if(name_offset + name_length > size) + { + FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", + name_offset + name_length, size); + return; + } + name_offset += sizeof(BYTE); + } + name_length = min(name_length, MAX_G_NAME); + memcpy(name, post2header + name_offset, name_length); + name[name_length] = 0; +} + void get_glyph_name(HDC hdc, WORD index, char *name) { struct @@ -703,7 +732,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) else if(glyphNameIndex < 258) get_standard_glyph_name(glyphNameIndex, name); else - FIXME("PostScript Format 2 custom glyphs are currently unsupported.\n"); + get_post2_custom_glyph_name(post2header, size, glyphNameIndex - 258, name); } else FIXME("PostScript Format %d.%d glyph names are currently unsupported.\n",

1 0

Aric Stewart : hidclass.sys: Implment IRP_MJ_CREATE and IRP_MJ_CLOSE for HID Devices.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 01aa7a6ec1cee0d55523fd72c2523db1b5ef6dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=01aa7a6ec1cee0d55523fd72c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 14 09:58:39 2015 -0500 hidclass.sys: Implment IRP_MJ_CREATE and IRP_MJ_CLOSE for HID Devices. --- dlls/hidclass.sys/buffer.c | 28 ++++++++++++++++++++++++++++ dlls/hidclass.sys/device.c | 22 ++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 4 ++++ dlls/hidclass.sys/main.c | 2 ++ 4 files changed, 56 insertions(+) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 6fbcc0d..c07632c 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -79,3 +79,31 @@ void RingBuffer_Destroy(struct ReportRingBuffer *ring) DeleteCriticalSection(&ring->lock); HeapFree(GetProcessHeap(), 0, ring); } + +UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) +{ + UINT idx; + EnterCriticalSection(&ring->lock); + for (idx = 0; idx < ring->pointer_alloc; idx++) + if (ring->pointers[idx] == -1) + break; + if (idx >= ring->pointer_alloc) + { + int count = idx = ring->pointer_alloc; + ring->pointer_alloc *= 2; + ring->pointers = HeapReAlloc(GetProcessHeap(), 0, ring->pointers, sizeof(int) * ring->pointer_alloc); + for( ;count < ring->pointer_alloc; count++) + ring->pointers[count] = -1; + } + ring->pointers[idx] = ring->start; + LeaveCriticalSection(&ring->lock); + return idx; +} + +void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) +{ + EnterCriticalSection(&ring->lock); + if (index < ring->pointer_alloc) + ring->pointers[index] = 0xffffffff; + LeaveCriticalSection(&ring->lock); +} diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 036ced2..0b27baa 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -351,3 +351,25 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) return rc; } + +NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + + TRACE("Open handle on device %p\n", device); + irp->Tail.Overlay.OriginalFileObject->FsContext = UlongToPtr(RingBuffer_AddPointer(ext->ring_buffer)); + irp->IoStatus.u.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + int ptr = PtrToUlong(irp->Tail.Overlay.OriginalFileObject->FsContext); + TRACE("Close handle on device %p\n", device); + RingBuffer_RemovePointer(ext->ring_buffer, ptr); + irp->IoStatus.u.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 645bba7..2005d8f 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -56,6 +56,8 @@ typedef struct _BASE_DEVICE_EXTENSTION { /* Minidriver Specific stuff will end up here */ } BASE_DEVICE_EXTENSION; +UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; +void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; @@ -79,6 +81,8 @@ 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_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; +NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index f11d7b4..1e0e802 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -69,6 +69,8 @@ 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_CREATE] = HID_Device_create; + registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close; driver->AddDevice = registration->DriverObject->DriverExtension->AddDevice; registration->DriverObject->DriverExtension->AddDevice = PNP_AddDevice;

1 0

Vincent Povirk : shell32: Do nothing if we can' t convert PIDL to path in SHAddToRecentDocs.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 69d57ee72fb436270c52eac446f2deacb5de8e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d57ee72fb436270c52eac44… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 14 15:08:36 2015 -0500 shell32: Do nothing if we can't convert PIDL to path in SHAddToRecentDocs. --- dlls/shell32/shellord.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 914dc5a..7387520 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -876,7 +876,11 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) switch (uFlags) { case SHARD_PIDL: - SHGetPathFromIDListA(pv, doc_name); + if (!SHGetPathFromIDListA(pv, doc_name)) + { + WARN("can't get path from PIDL\n"); + return; + } break; case SHARD_PATHA:

1 0

Nikolay Sivov : oledlg: Fix menu item string format.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

1 0

Nikolay Sivov : regedit: When sorting by key type consistently compare types.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: a72482fd39ade6b846c52d9816f3b8e889467b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72482fd39ade6b846c52d981… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 15 00:02:32 2015 +0300 regedit: When sorting by key type consistently compare types. Otherwise when sorting by type for key with same type list get sorted by name. --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index d11d859..c0119ff 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -333,7 +333,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor if (g_columnToSort == ~0U) g_columnToSort = 0; - if (g_columnToSort == 1 && l->dwValType != r->dwValType) + if (g_columnToSort == 1) return g_invertSort ? (int)r->dwValType - (int)l->dwValType : (int)l->dwValType - (int)r->dwValType; if (g_columnToSort == 2) { /* FIXME: Sort on value */

1 0

Nikolay Sivov : regedit: Block sorting by key value.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: e428884c0c9e05d9f04aa058538c1fbf91de4669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e428884c0c9e05d9f04aa0585… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 15 00:01:21 2015 +0300 regedit: Block sorting by key value. --- programs/regedit/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 6559116..d11d859 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -337,6 +337,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor return g_invertSort ? (int)r->dwValType - (int)l->dwValType : (int)l->dwValType - (int)r->dwValType; if (g_columnToSort == 2) { /* FIXME: Sort on value */ + return 0; } return g_invertSort ? lstrcmpiW(r->name, l->name) : lstrcmpiW(l->name, r->name); }

1 0

Nikolay Sivov : configure: Add a symlink for wingding.ttf.
by Alexandre Julliard Sept. 15, 2015

Sept. 15, 2015

Module: wine Branch: master Commit: 3fb6817554f52320330a60b98a7543bf1881ab99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb6817554f52320330a60b98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 15 00:31:54 2015 +0300 configure: Add a symlink for wingding.ttf. --- configure | 4 +++- configure.ac | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index aeec729..00d3e5d 100755 --- a/configure +++ b/configure @@ -17133,7 +17133,8 @@ ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf +ac_config_links="$ac_config_links fonts/wingding.ttf:fonts/wingding.ttf" +test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf fonts/wingding.ttf fi ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls @@ -18909,6 +18910,7 @@ do "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; + "fonts/wingding.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/wingding.ttf:fonts/wingding.ttf" ;; "loader/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS loader/l_intl.nls:loader/l_intl.nls" ;; "po/LINGUAS") CONFIG_LINKS="$CONFIG_LINKS po/LINGUAS:po/LINGUAS" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; diff --git a/configure.ac b/configure.ac index ed7030f..135268f 100644 --- a/configure.ac +++ b/configure.ac @@ -2692,7 +2692,7 @@ test -n "$CROSSTARGET" || WINE_APPEND_RULE( [crosstest: @echo \"crosstest is not supported (mingw not installed?)\" && false]) -WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper)

1 0

André Hentschel : Add WWN 398
by Jeremy Newman Sept. 14, 2015

Sept. 14, 2015

Module: website Branch: master Commit: 9bb67e2cec80938ae70afb4f2960d3a5f2e4fc16 URL: http://source.winehq.org/git/website.git/?a=commit;h=9bb67e2cec80938ae70afb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 14 21:03:04 2015 +0200 Add WWN 398 --- news/de/2015091401.xml | 12 + news/en/2015091401.xml | 12 + wwn/en/wn20150914_398.xml | 638 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 662 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=9bb67e2cec80938ae7…

1 0

Hans Leidekker : webservices: Implement WsGetHeapProperty.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 9061ee4e8c78f058c15d3dc85b385a8d77a131a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9061ee4e8c78f058c15d3dc85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 14 14:04:27 2015 +0200 webservices: Implement WsGetHeapProperty. --- dlls/webservices/reader.c | 23 +++++++++++++ dlls/webservices/tests/reader.c | 72 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 3084fe5..a0123aa 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -200,6 +200,15 @@ static HRESULT set_heap_prop( struct heap *heap, WS_HEAP_PROPERTY_ID id, const v return S_OK; } +static HRESULT get_heap_prop( struct heap *heap, WS_HEAP_PROPERTY_ID id, void *buf, ULONG size ) +{ + if (id >= heap->prop_count || size != heap_props[id].size) + return E_INVALIDARG; + + memcpy( buf, heap->prop[id].value, heap->prop[id].valueSize ); + return S_OK; +} + /************************************************************************** * WsCreateHeap [webservices.@] */ @@ -254,6 +263,20 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo } /************************************************************************** + * WsGetHeapProperty [webservices.@] + */ +HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct heap *heap = (struct heap *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return get_heap_prop( heap, id, buf, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0db68a0..4b247d9 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -112,7 +112,79 @@ static void test_WsCreateError(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); } +static void test_WsCreateHeap(void) +{ + HRESULT hr; + WS_HEAP *heap; + WS_HEAP_PROPERTY prop; + SIZE_T max, trim, requested, actual; + ULONG size; + + hr = WsCreateHeap( 0, 0, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + heap = NULL; + hr = WsCreateHeap( 0, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( heap != NULL, "heap not set\n" ); + WsFreeHeap( heap ); + + hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + heap = NULL; + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( heap != NULL, "heap not set\n" ); + WsFreeHeap( heap ); + + hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + max = 0xdeadbeef; + size = sizeof(max); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_MAX_SIZE, &max, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max == 1 << 16, "got %u\n", (ULONG)max ); + + trim = 0xdeadbeef; + size = sizeof(trim); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_TRIM_SIZE, &trim, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( trim == 1 << 6, "got %u\n", (ULONG)trim ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !requested, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !actual, "got %u\n", (ULONG)actual ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE + 1, &actual, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( actual == 0xdeadbeef, "got %u\n", (ULONG)actual ); + WsFreeHeap( heap ); + + max = 1 << 16; + prop.id = WS_HEAP_PROPERTY_MAX_SIZE; + prop.value = &max; + prop.valueSize = sizeof(max); + hr = WsCreateHeap( 1 << 16, 1 << 6, &prop, 1, &heap, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 1, &heap, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); +} + START_TEST(reader) { test_WsCreateError(); + test_WsCreateHeap(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4136dcc..4cb35f6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -68,7 +68,7 @@ @ stub WsGetFaultErrorProperty @ stub WsGetHeader @ stub WsGetHeaderAttributes -@ stub WsGetHeapProperty +@ stdcall WsGetHeapProperty(ptr long ptr long ptr) @ stub WsGetListenerProperty @ stub WsGetMappedHeader @ stub WsGetMessageProperty

1 0

Hans Leidekker : webservices: Implement WsCreateHeap and WsFreeHeap.
by Alexandre Julliard Sept. 14, 2015

Sept. 14, 2015

Module: wine Branch: master Commit: 5db34f7da17fdd86fc797b3bbea8401fb51041db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db34f7da17fdd86fc797b3bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 14 14:04:01 2015 +0200 webservices: Implement WsCreateHeap and WsFreeHeap. --- dlls/webservices/reader.c | 91 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ac7de65..3084fe5 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -150,6 +150,97 @@ void WINAPI WsFreeError( WS_ERROR *handle ) heap_free( error ); } +static const struct +{ + ULONG size; + BOOL readonly; +} +heap_props[] = +{ + { sizeof(SIZE_T), FALSE }, /* WS_HEAP_PROPERTY_MAX_SIZE */ + { sizeof(SIZE_T), FALSE }, /* WS_HEAP_PROPERTY_TRIM_SIZE */ + { sizeof(SIZE_T), TRUE }, /* WS_HEAP_PROPERTY_REQUESTED_SIZE */ + { sizeof(SIZE_T), TRUE } /* WS_HEAP_PROPERTY_ACTUAL_SIZE */ +}; + +struct heap +{ + HANDLE handle; + ULONG prop_count; + WS_HEAP_PROPERTY prop[sizeof(heap_props)/sizeof(heap_props[0])]; +}; + +static struct heap *alloc_heap(void) +{ + static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); + struct heap *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_HEAP_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += heap_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 = heap_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_heap_prop( struct heap *heap, WS_HEAP_PROPERTY_ID id, const void *value, ULONG size ) +{ + if (id >= heap->prop_count || size != heap_props[id].size || heap_props[id].readonly) + return E_INVALIDARG; + + memcpy( heap->prop[id].value, value, size ); + return S_OK; +} + +/************************************************************************** + * WsCreateHeap [webservices.@] + */ +HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PROPERTY *properties, + ULONG count, WS_HEAP **handle, WS_ERROR *error ) +{ + struct heap *heap; + + TRACE( "%u %u %p %u %p %p\n", (ULONG)max_size, (ULONG)trim_size, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || count) return E_INVALIDARG; + if (!(heap = alloc_heap())) return E_OUTOFMEMORY; + + set_heap_prop( heap, WS_HEAP_PROPERTY_MAX_SIZE, &max_size, sizeof(max_size) ); + set_heap_prop( heap, WS_HEAP_PROPERTY_TRIM_SIZE, &trim_size, sizeof(trim_size) ); + + if (!(heap->handle = HeapCreate( 0, 0, max_size ))) + { + heap_free( heap ); + return E_OUTOFMEMORY; + } + + *handle = (WS_HEAP *)heap; + return S_OK; +} + +/************************************************************************** + * WsFreeHeap [webservices.@] + */ +void WINAPI WsFreeHeap( WS_HEAP *handle ) +{ + struct heap *heap = (struct heap *)handle; + + TRACE( "%p\n", handle ); + + if (!heap) return; + HeapDestroy( heap->handle ); + heap_free( heap ); +} + /************************************************************************** * WsGetErrorProperty [webservices.@] */ diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 0ff3c0d..4136dcc 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -24,7 +24,7 @@ @ stub WsCreateChannelForListener @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError -@ stub WsCreateHeap +@ stdcall WsCreateHeap(long long ptr long ptr ptr) @ stub WsCreateListener @ stub WsCreateMessage @ stub WsCreateMessageForChannel @@ -50,7 +50,7 @@ @ stub WsFlushWriter @ stub WsFreeChannel @ stdcall WsFreeError(ptr) -@ stub WsFreeHeap +@ stdcall WsFreeHeap(ptr) @ stub WsFreeListener @ stub WsFreeMessage @ stub WsFreeMetadata

1 0