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

Hans Leidekker : webservices: Implement WsReadBody.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 23a64ca074021bfda46f6287aaa529d6e8f66774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a64ca074021bfda46f6287a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:34 2016 +0200 webservices: Implement WsReadBody. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 17 ++++++++ dlls/webservices/tests/msg.c | 90 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 + 4 files changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 27dbddd..4a47fd3 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -616,6 +616,23 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) } /************************************************************************** + * WsReadBody [webservices.@] + */ +HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %p %08x %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !desc) return E_INVALIDARG; + if (msg->state != WS_MESSAGE_STATE_READING) return WS_E_INVALID_OPERATION; + + return WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); +} + +/************************************************************************** * WsInitializeMessage [webservices.@] */ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 99db9e6..0a8456a 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -962,6 +962,95 @@ static void test_WsReadEnvelopeEnd(void) WsFreeReader( reader ); } +static void test_WsReadBody(void) +{ + static const char xml[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<u xmlns=\"ns\"><val>1</val></u></s:Body></s:Envelope>"; + WS_HEAP *heap; + WS_MESSAGE *msg, *msg2; + WS_XML_READER *reader; + WS_MESSAGE_STATE state; + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"u"}; + WS_XML_STRING val = {3, (BYTE *)"val"}, ns = {2, (BYTE *)"ns"}; + WS_ELEMENT_DESCRIPTION desc; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + struct test + { + UINT32 val; + } test; + HRESULT hr; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadBody( NULL, NULL, 0, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadBody( msg2, NULL, 0, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, xml, strlen(xml) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadEnvelopeStart( msg2, reader, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadBody( msg2, NULL, WS_READ_REQUIRED_VALUE, heap, &test, sizeof(test), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &val; + f.ns = &ns; + f.type = WS_UINT32_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &localname; + s.typeNs = &ns; + + desc.elementLocalName = &localname2; + desc.elementNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + + memset( &test, 0, sizeof(test) ); + hr = WsReadBody( msg2, &desc, WS_READ_REQUIRED_VALUE, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test.val == 1, "got %u\n", test.val ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg2, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_READING, "got %u\n", state ); + + hr = WsReadEnvelopeEnd( msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeMessage( msg2 ); + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -979,4 +1068,5 @@ START_TEST(msg) test_WsRemoveCustomHeader(); test_WsReadEnvelopeStart(); test_WsReadEnvelopeEnd(); + test_WsReadBody(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a0f88ac..cda787d 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -103,7 +103,7 @@ @ stub WsPushBytes @ stub WsReadArray @ stub WsReadAttribute -@ stub WsReadBody +@ stdcall WsReadBody(ptr ptr long ptr ptr long ptr) @ stub WsReadBytes @ stub WsReadChars @ stub WsReadCharsUtf8 diff --git a/include/webservices.h b/include/webservices.h index dbaa5d1..5decf68 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1440,6 +1440,8 @@ HRESULT WINAPI WsOpenServiceProxy(WS_SERVICE_PROXY*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, + ULONG, WS_ERROR*); HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*);

1 0

Jacek Caban : rbtree.h: Store compare function instead of wine_rb_functions in wine_rb_tree.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: f5d7ee1a57f689311bcdea7679cc4c50a26657d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d7ee1a57f689311bcdea767… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:25 2016 +0200 rbtree.h: Store compare function instead of wine_rb_functions in wine_rb_tree. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index f13592e..528a494 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -44,7 +44,7 @@ struct wine_rb_functions struct wine_rb_tree { - const struct wine_rb_functions *functions; + int (*compare)(const void *key, const struct wine_rb_entry *entry); struct wine_rb_entry *root; }; @@ -131,7 +131,7 @@ static inline void wine_rb_postorder(struct wine_rb_tree *tree, wine_rb_traverse static inline int wine_rb_init(struct wine_rb_tree *tree, const struct wine_rb_functions *functions) { - tree->functions = functions; + tree->compare = functions->compare; tree->root = NULL; return 0; @@ -159,7 +159,7 @@ static inline struct wine_rb_entry *wine_rb_get(const struct wine_rb_tree *tree, struct wine_rb_entry *entry = tree->root; while (entry) { - int c = tree->functions->compare(key, entry); + int c = tree->compare(key, entry); if (!c) return entry; entry = c < 0 ? entry->left : entry->right; } @@ -175,7 +175,7 @@ static inline int wine_rb_put(struct wine_rb_tree *tree, const void *key, struct int c; parent = *iter; - c = tree->functions->compare(key, parent); + c = tree->compare(key, parent); if (!c) return -1; else if (c < 0) iter = &parent->left; else iter = &parent->right;

1 0

Jacek Caban : ntoskrnl.exe: Use static initializer for device_drivers.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: ccdbc176c0b131afad05395d152d78c6468da511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdbc176c0b131afad05395d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:33 2016 +0200 ntoskrnl.exe: Use static initializer for device_drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7c35d14..a2cbb74 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -90,32 +90,6 @@ struct wine_driver DRIVER_EXTENSION driver_extension; }; -static struct wine_rb_tree wine_drivers; - -static CRITICAL_SECTION drivers_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &drivers_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } -}; -static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - -static void *wine_drivers_rb_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static void *wine_drivers_rb_realloc( void *ptr, size_t size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); -} - -static void wine_drivers_rb_free( void *ptr ) -{ - HeapFree( GetProcessHeap(), 0, ptr ); -} - static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -124,13 +98,16 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry return RtlCompareUnicodeString( k, &driver->driver_obj.DriverName, FALSE ); } -static const struct wine_rb_functions wine_drivers_rb_functions = +static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; + +static CRITICAL_SECTION drivers_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = { - wine_drivers_rb_alloc, - wine_drivers_rb_realloc, - wine_drivers_rb_free, - wine_drivers_rb_compare, + 0, 0, &drivers_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } }; +static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ @@ -2447,7 +2424,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); - if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) return FALSE; #if defined(__i386__) || defined(__x86_64__) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif

1 0

Jacek Caban : winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: fe6a1d89919a86f2c1fcc1088f75d8486ffbdba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6a1d89919a86f2c1fcc1088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:41 2016 +0200 winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 34 ++---------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e0c6ba2..154b575 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -262,21 +262,6 @@ static int winemenubuilder_rb_string_compare(const void *key, const struct wine_ return strcmp((char*)key, t->string); } -static void *winemenubuilder_rb_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static void *winemenubuilder_rb_realloc(void *ptr, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); -} - -static void winemenubuilder_rb_free(void *ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} - static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context) { struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry); @@ -284,14 +269,6 @@ static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *contex HeapFree(GetProcessHeap(), 0, t); } -static const struct wine_rb_functions winemenubuilder_rb_functions = -{ - winemenubuilder_rb_alloc, - winemenubuilder_rb_realloc, - winemenubuilder_rb_free, - winemenubuilder_rb_string_compare, -}; - static void write_xml_text(FILE *file, const char *text) { int i; @@ -2538,19 +2515,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { static const WCHAR openW[] = {'o','p','e','n',0}; - struct wine_rb_tree mimeProgidTree; - struct list nativeMimeTypes; + struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; + struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; - if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions)) - { - WINE_ERR("wine_rb_init failed\n"); - return FALSE; - } - - list_init(&nativeMimeTypes); if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n");

1 0

Jacek Caban : winedevice: Use static initializer for wine_drivers.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: f40a9d61727914504bdfbc387e997614d35bda43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40a9d61727914504bdfbc387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:48 2016 +0200 winedevice: Use static initializer for wine_drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5011e4f..79d56ec 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -58,7 +58,13 @@ struct wine_driver WCHAR name[1]; }; -static struct wine_rb_tree wine_drivers; +static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); + return strcmpW( (const WCHAR *)key, driver->name ); +} + +static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; static CRITICAL_SECTION drivers_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -69,35 +75,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static void *wine_drivers_rb_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static void *wine_drivers_rb_realloc( void *ptr, size_t size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); -} - -static void wine_drivers_rb_free( void *ptr ) -{ - HeapFree( GetProcessHeap(), 0, ptr ); -} - -static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) -{ - const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); - return strcmpW( (const WCHAR *)key, driver->name ); -} - -static const struct wine_rb_functions wine_drivers_rb_functions = -{ - wine_drivers_rb_alloc, - wine_drivers_rb_realloc, - wine_drivers_rb_free, - wine_drivers_rb_compare, -}; - /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { @@ -534,8 +511,6 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) const WCHAR *driver_name = argv[0]; NTSTATUS status; - if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) - return; if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return; if (!(cleanup_group = CreateThreadpoolCleanupGroup()))

1 0

Jacek Caban : winhttp: Don' t perform buffer size tests for components that don' t pass buffer in WinHttpCrackUrl.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 985443ed87a2dcb0bfbe8ba87ea85165391ad3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=985443ed87a2dcb0bfbe8ba87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 20:52:21 2016 +0200 winhttp: Don't perform buffer size tests for components that don't pass buffer in WinHttpCrackUrl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 4 ++- dlls/winhttp/url.c | 93 ++++++++++++++---------------------------------- 2 files changed, 30 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=985443ed87a2dcb0bfbe8…

1 0

Sebastian Lackner : services/tests: Add test for passing arguments to a service.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 328fbb68803c061d62a882fa7d37105dc3663085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328fbb68803c061d62a882fa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 08:45:26 2016 +0200 services/tests: Add test for passing arguments to a service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index b184bda..66b273c 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -98,9 +98,10 @@ static void WINAPI service_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d\n", argc); - if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); + service_ok(argc == 3, "argc = %u, expected 3\n", argc); + service_ok(!strcmp(argv[0], service_name), "argv[0] = '%s', expected '%s'\n", argv[0], service_name); + service_ok(!strcmp(argv[1], "param1"), "argv[1] = '%s', expected 'param1'\n", argv[1]); + service_ok(!strcmp(argv[2], "param2"), "argv[2] = '%s', expected 'param2'\n", argv[2]); service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -194,9 +195,8 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d\n", argc); - if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); + service_ok(argc == 1, "argc = %u, expected 1\n", argc); + service_ok(!strcmp(argv[0], service_name), "argv[0] = '%s', expected '%s'\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, no_stop_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -278,7 +278,7 @@ static void expect_event(const char *event_name) static DWORD WINAPI pipe_thread(void *arg) { - char buf[257], *ptr; + char buf[512], *ptr; DWORD read; BOOL res; @@ -320,6 +320,7 @@ static DWORD WINAPI pipe_thread(void *arg) static void test_service(void) { + static const char *argv[2] = {"param1", "param2"}; SC_HANDLE service_handle = register_service("simple_service"); SERVICE_STATUS_PROCESS status2; SERVICE_STATUS status; @@ -330,7 +331,7 @@ static void test_service(void) return; trace("starting...\n"); - res = StartServiceA(service_handle, 0, NULL); + res = StartServiceA(service_handle, 2, argv); ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle);

1 0

Sebastian Lackner : advapi32: Unify service startup and control handling.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 1c5affa205ffd71df1581d5ae898e2d8649af0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5affa205ffd71df1581d5ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 08:46:20 2016 +0200 advapi32: Unify service startup and control handling. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 65 ++++++++++++++++++++++---------------------- include/wine/svcctl.idl | 9 ++---- programs/services/rpc.c | 8 +++--- programs/services/services.c | 27 ++++++++---------- programs/services/services.h | 3 +- 5 files changed, 52 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5affa205ffd71df1581…

1 0

Alexandre Julliard : rpcss: Make rpcss a proper service.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 8df5add2d7aac41a9299c100cde7977b3549cfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df5add2d7aac41a9299c100c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 31 22:21:17 2016 +0900 rpcss: Make rpcss a proper service. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.c | 59 +++++++++++++++------- dlls/rpcrt4/rpc_epmap.c | 61 ++++++++++++++-------- loader/wine.inf.in | 12 ++++- programs/rpcss/Makefile.in | 4 +- programs/rpcss/rpcss_main.c | 120 +++++++++++++++++++++++++------------------- 5 files changed, 163 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8df5add2d7aac41a9299c…

1 0

Henri Verbeet : d3d11: Use wined3d_resource_map() in d3d10_buffer_Map().
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: cec2ff4f86025fba405ee1d17cd2042bb08391c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec2ff4f86025fba405ee1d17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:50 2016 +0200 d3d11: Use wined3d_resource_map() in d3d10_buffer_Map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 5a5e66e..a43b6be 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -303,6 +303,7 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + struct wined3d_map_desc wined3d_map_desc; HRESULT hr; TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); @@ -311,8 +312,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP FIXME("Ignoring map_flags %#x.\n", map_flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, - wined3d_map_flags_from_d3d11_map_type(map_type)); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + *data = wined3d_map_desc.data; wined3d_mutex_unlock(); return hr;

1 0