November 2018 - Wine-commits

Hans Leidekker : winhttp: Get rid of domain_t.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: 2ee89aa25780ff68a2fe06839e306bf70471a3a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee89aa25780ff68a2fe0683… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:08:59 2018 +0100 winhttp: Get rid of domain_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 37 ++++++++++++++++++++++++++++--------- dlls/winhttp/session.c | 8 +------- dlls/winhttp/winhttp_private.h | 9 +-------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 098db68..0a7f7f0 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -38,11 +38,18 @@ struct cookie WCHAR *path; }; -static domain_t *add_domain( session_t *session, WCHAR *name ) +struct domain { - domain_t *domain; + struct list entry; + WCHAR *name; + struct list cookies; +}; - if (!(domain = heap_alloc_zero( sizeof(domain_t) ))) return NULL; +static struct domain *add_domain( session_t *session, WCHAR *name ) +{ + struct domain *domain; + + if (!(domain = heap_alloc_zero( sizeof(struct domain) ))) return NULL; list_init( &domain->entry ); list_init( &domain->cookies ); @@ -54,7 +61,7 @@ static domain_t *add_domain( session_t *session, WCHAR *name ) return domain; } -static struct cookie *find_cookie( domain_t *domain, const WCHAR *path, const WCHAR *name ) +static struct cookie *find_cookie( struct domain *domain, const WCHAR *path, const WCHAR *name ) { struct list *item; struct cookie *cookie; @@ -71,7 +78,7 @@ static struct cookie *find_cookie( domain_t *domain, const WCHAR *path, const WC return NULL; } -static BOOL domain_match( const WCHAR *name, domain_t *domain, BOOL partial ) +static BOOL domain_match( const WCHAR *name, struct domain *domain, BOOL partial ) { TRACE("comparing %s with %s\n", debugstr_w(name), debugstr_w(domain->name)); @@ -94,7 +101,7 @@ static void delete_cookie( struct cookie *cookie ) free_cookie( cookie ); } -void delete_domain( domain_t *domain ) +static void delete_domain( struct domain *domain ) { struct cookie *cookie; struct list *item, *next; @@ -110,9 +117,21 @@ void delete_domain( domain_t *domain ) heap_free( domain ); } +void destroy_cookies( session_t *session ) +{ + struct list *item, *next; + struct domain *domain; + + LIST_FOR_EACH_SAFE( item, next, &session->cookie_cache ) + { + domain = LIST_ENTRY( item, struct domain, entry ); + delete_domain( domain ); + } +} + static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain_name, WCHAR *path ) { - domain_t *domain = NULL; + struct domain *domain = NULL; struct cookie *old_cookie; struct list *item; @@ -122,7 +141,7 @@ static BOOL add_cookie( session_t *session, struct cookie *cookie, WCHAR *domain LIST_FOR_EACH( item, &session->cookie_cache ) { - domain = LIST_ENTRY( item, domain_t, entry ); + domain = LIST_ENTRY( item, struct domain, entry ); if (domain_match( domain_name, domain, FALSE )) break; domain = NULL; } @@ -311,7 +330,7 @@ BOOL add_cookie_headers( request_t *request ) LIST_FOR_EACH( domain_cursor, &session->cookie_cache ) { - domain_t *domain = LIST_ENTRY( domain_cursor, domain_t, entry ); + struct domain *domain = LIST_ENTRY( domain_cursor, struct domain, entry ); if (domain_match( request->connect->servername, domain, TRUE )) { struct list *cookie_cursor; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b9d9ab8..d5896e1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -89,19 +89,13 @@ BOOL WINAPI WinHttpCheckPlatform( void ) static void session_destroy( object_header_t *hdr ) { session_t *session = (session_t *)hdr; - struct list *item, *next; - domain_t *domain; TRACE("%p\n", session); if (session->unload_event) SetEvent( session->unload_event ); if (session->cred_handle_initialized) FreeCredentialsHandle( &session->cred_handle ); + destroy_cookies( session ); - LIST_FOR_EACH_SAFE( item, next, &session->cookie_cache ) - { - domain = LIST_ENTRY( item, domain_t, entry ); - delete_domain( domain ); - } session->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &session->cs ); heap_free( session->agent ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2ea798b..7088400 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -66,13 +66,6 @@ struct _object_header_t struct list children; }; -typedef struct -{ - struct list entry; - WCHAR *name; - struct list cookies; -} domain_t; - typedef struct { struct list entry; LONG ref; @@ -295,7 +288,7 @@ int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; -void delete_domain( domain_t * ) DECLSPEC_HIDDEN; +void destroy_cookies( session_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Get rid of task_header_t.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: wine Branch: master Commit: b995ed00a742494dc68ed829afd51f052bada4d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b995ed00a742494dc68ed829… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 6 16:09:00 2018 +0100 winhttp: Get rid of task_header_t. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 30 +++++++++++++++--------------- dlls/winhttp/winhttp_private.h | 16 +++++++--------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d101023..7ce3def 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -177,13 +177,13 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static task_header_t *dequeue_task( request_t *request ) +static struct task_header *dequeue_task( request_t *request ) { - task_header_t *task; + struct task_header *task; EnterCriticalSection( &request->task_cs ); TRACE("%u tasks queued\n", list_count( &request->task_queue )); - task = LIST_ENTRY( list_head( &request->task_queue ), task_header_t, entry ); + task = LIST_ENTRY( list_head( &request->task_queue ), struct task_header, entry ); if (task) list_remove( &task->entry ); LeaveCriticalSection( &request->task_cs ); @@ -205,7 +205,7 @@ static DWORD CALLBACK task_proc( LPVOID param ) { case WAIT_OBJECT_0: { - task_header_t *task; + struct task_header *task; while ((task = dequeue_task( request ))) { task->proc( task ); @@ -231,7 +231,7 @@ static DWORD CALLBACK task_proc( LPVOID param ) return 0; } -static BOOL queue_task( task_header_t *task ) +static BOOL queue_task( struct task_header *task ) { request_t *request = task->request; @@ -2163,7 +2163,7 @@ end: return ret; } -static void task_send_request( task_header_t *task ) +static void task_send_request( struct task_header *task ) { send_request_t *s = (send_request_t *)task; send_request( s->hdr.request, s->headers, s->headers_len, s->optional, s->optional_len, s->total_len, s->context, TRUE ); @@ -2211,7 +2211,7 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade s->context = context; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)s ); + ret = queue_task( (struct task_header *)s ); } else ret = send_request( request, headers, headers_len, optional, optional_len, total_len, context, FALSE ); @@ -2690,7 +2690,7 @@ static BOOL receive_response( request_t *request, BOOL async ) return ret; } -static void task_receive_response( task_header_t *task ) +static void task_receive_response( struct task_header *task ) { receive_response_t *r = (receive_response_t *)task; receive_response( r->hdr.request, TRUE ); @@ -2727,7 +2727,7 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) r->hdr.proc = task_receive_response; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)r ); + ret = queue_task( (struct task_header *)r ); } else ret = receive_response( request, FALSE ); @@ -2761,7 +2761,7 @@ done: return TRUE; } -static void task_query_data_available( task_header_t *task ) +static void task_query_data_available( struct task_header *task ) { query_data_t *q = (query_data_t *)task; query_data_available( q->hdr.request, q->available, TRUE ); @@ -2799,7 +2799,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) q->available = available; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)q ); + ret = queue_task( (struct task_header *)q ); } else ret = query_data_available( request, available, FALSE ); @@ -2809,7 +2809,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return ret; } -static void task_read_data( task_header_t *task ) +static void task_read_data( struct task_header *task ) { read_data_t *r = (read_data_t *)task; read_data( r->hdr.request, r->buffer, r->to_read, r->read, TRUE ); @@ -2849,7 +2849,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L r->read = read; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)r ); + ret = queue_task( (struct task_header *)r ); } else ret = read_data( request, buffer, to_read, read, FALSE ); @@ -2881,7 +2881,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW return ret; } -static void task_write_data( task_header_t *task ) +static void task_write_data( struct task_header *task ) { write_data_t *w = (write_data_t *)task; write_data( w->hdr.request, w->buffer, w->to_write, w->written, TRUE ); @@ -2921,7 +2921,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write w->written = written; addref_object( &request->hdr ); - ret = queue_task( (task_header_t *)w ); + ret = queue_task( (struct task_header *)w ); } else ret = write_data( request, buffer, to_write, written, FALSE ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7088400..1fce4a9 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -214,18 +214,16 @@ typedef struct } creds[TARGET_MAX][SCHEME_MAX]; } request_t; -typedef struct _task_header_t task_header_t; - -struct _task_header_t +struct task_header { struct list entry; request_t *request; - void (*proc)( task_header_t * ); + void (*proc)( struct task_header * ); }; typedef struct { - task_header_t hdr; + struct task_header hdr; LPWSTR headers; DWORD headers_len; LPVOID optional; @@ -236,18 +234,18 @@ typedef struct typedef struct { - task_header_t hdr; + struct task_header hdr; } receive_response_t; typedef struct { - task_header_t hdr; + struct task_header hdr; LPDWORD available; } query_data_t; typedef struct { - task_header_t hdr; + struct task_header hdr; LPVOID buffer; DWORD to_read; LPDWORD read; @@ -255,7 +253,7 @@ typedef struct typedef struct { - task_header_t hdr; + struct task_header hdr; LPCVOID buffer; DWORD to_write; LPDWORD written;

1 0

Francois Gouget : testbot/build: Remove support for WineTest.pl' s build action.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: tools Branch: master Commit: 72fcc08819461d2a8bcc5b420570cda321fc25cd URL: https://source.winehq.org/git/tools.git/?a=commit;h=72fcc08819461d2a8bcc5b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 6 20:07:02 2018 +0100 testbot/build: Remove support for WineTest.pl's build action. It is an old name for testpatch and is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 078f01b..3d6c12e 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -192,7 +192,7 @@ my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--testpatch" or $Arg eq "build") + if ($Arg eq "--testpatch") { $Action = "testpatch"; }

1 0

Francois Gouget : testbot: Fix support for test=module.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: tools Branch: master Commit: 306389d89f4f1d4f9f293d6f906773b6701332aa URL: https://source.winehq.org/git/tools.git/?a=commit;h=306389d89f4f1d4f9f293d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 6 20:06:00 2018 +0100 testbot: Fix support for test=module. Check that the patched module has tests (Files field), not that it has patched test units (Units field). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 3d6c12e..516b18e 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -140,7 +140,7 @@ sub TestPatch($$) { # When given a module name WineTest runs all its tests. # But make sure the module actually has tests first! - push @TestList, $Module if (%{$TestInfo->{Units}}); + push @TestList, $Module if (%{$TestInfo->{Files}}); } else {

1 0

Francois Gouget : testbot: Rename the patched test units list to PatchedUnits to avoid confusion.
by Alexandre Julliard 06 Nov '18

06 Nov '18

Module: tools Branch: master Commit: 9a6df428657ffda9283f45da31c8bf096baa9708 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9a6df428657ffda9283f45d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 6 20:06:32 2018 +0100 testbot: Rename the patched test units list to PatchedUnits to avoid confusion. It is not a list of all the module's test units. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 4 ++-- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/web/Submit.pl | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 516b18e..6891faa 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -144,9 +144,9 @@ sub TestPatch($$) } else { - foreach my $Unit (sort keys %{$TestInfo->{Units}}) + foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) { - push @TestList, "$Module:$Unit"; + push @TestList, "$Module:$PatchedUnit"; } } } diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 0e17a70..6009264 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -405,7 +405,7 @@ sub GetPatchImpacts($) } } - $TestInfo->{Units} = {}; + $TestInfo->{PatchedUnits} = {}; foreach my $File (keys %{$TestInfo->{Files}}) { my $Base = $File; @@ -418,7 +418,7 @@ sub GetPatchImpacts($) if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) { - $TestInfo->{Units}->{$Base} = 1; + $TestInfo->{PatchedUnits}->{$Base} = 1; $Impacts->{ModuleUnitCount}++; } elsif ($TestInfo->{PatchedModule}) @@ -428,7 +428,7 @@ sub GetPatchImpacts($) } } - $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{Units}}); + $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{PatchedUnits}}); $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e621e88..8a22d3a 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -181,7 +181,7 @@ sub Submit($$$) foreach my $Module (sort keys %{$Impacts->{Tests}}) { my $TestInfo = $Impacts->{Tests}->{$Module}; - foreach my $Unit (sort keys %{$TestInfo->{Units}}) + foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) { foreach my $Bits ("32", "64") { @@ -236,7 +236,7 @@ sub Submit($$$) $Task->VM($VM); $Task->Timeout($SingleTimeout); $Task->Missions($TaskMissions->{Statement}); - $Task->CmdLineArg($Unit); + $Task->CmdLineArg($PatchedUnit); } } } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index bcb5458..85a12a0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -611,7 +611,7 @@ sub DetermineFileType($$) { $FileType = "patch"; $ExeBase = $TestInfo->{ExeBase}; - $TestUnit = (keys %{$TestInfo->{Units}})[0]; + $TestUnit = (keys %{$TestInfo->{PatchedUnits}})[0]; last; } }

1 0

Andrey Gusev : ntdll: Add WinSqmIncrementDWORD stub.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 0296edbee8a383d71199c581bb99eae74effa2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0296edbee8a383d71199c581… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 5 15:25:03 2018 +0200 ntdll: Add WinSqmIncrementDWORD stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45828 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index f2c0e14..bb75d9c 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -342,6 +342,14 @@ NTSTATUS WINAPI WinSqmEndSession(HANDLE session) } /********************************************************************* + * WinSqmIncrementDWORD (NTDLL.@) + */ +void WINAPI WinSqmIncrementDWORD(DWORD unk1, DWORD unk2, DWORD unk3) +{ + FIXME("(%d, %d, %d): stub\n", unk1, unk2, unk3); +} + +/********************************************************************* * WinSqmIsOptedIn (NTDLL.@) */ BOOL WINAPI WinSqmIsOptedIn(void) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87b5d70..3486a78 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1039,6 +1039,7 @@ @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmEndSession(long) +@ stdcall WinSqmIncrementDWORD(long long long) @ stdcall WinSqmIsOptedIn() @ stdcall WinSqmSetDWORD(ptr long long) @ stdcall WinSqmStartSession(ptr long long)

1 0

Andrey Gusev : api-ms-win-core-winrt-string-l1-1-1: Add dll.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: deb35e901ae20bb289bf66dbced78c9d99b21dfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb35e901ae20bb289bf66db… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 5 00:11:01 2018 +0200 api-ms-win-core-winrt-string-l1-1-1: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46085 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-winrt-string-l1-1-1.spec | 26 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 31 insertions(+) diff --git a/configure b/configure index 60ec989..5bf21e4 100755 --- a/configure +++ b/configure @@ -1028,6 +1028,7 @@ enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_registration_l1_1_0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 +enable_api_ms_win_core_winrt_string_l1_1_1 enable_api_ms_win_core_wow64_l1_1_0 enable_api_ms_win_core_wow64_l1_1_1 enable_api_ms_win_core_xstate_l1_1_0 @@ -19132,6 +19133,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core wine_fn_config_makefile dlls/api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_core_winrt_registration_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-winrt-string-l1-1-1 enable_api_ms_win_core_winrt_string_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-wow64-l1-1-0 enable_api_ms_win_core_wow64_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-wow64-l1-1-1 enable_api_ms_win_core_wow64_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-xstate-l1-1-0 enable_api_ms_win_core_xstate_l1_1_0 diff --git a/configure.ac b/configure.ac index 82a3c46..878fa4c 100644 --- a/configure.ac +++ b/configure.ac @@ -2984,6 +2984,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-registration-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-string-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-winrt-string-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-wow64-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-wow64-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-xstate-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in new file mode 100644 index 0000000..df4284a --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-string-l1-1-1.dll diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec b/dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec new file mode 100644 index 0000000..bb11ca2 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-1/api-ms-win-core-winrt-string-l1-1-1.spec @@ -0,0 +1,26 @@ +@ stub HSTRING_UserFree +@ stub HSTRING_UserFree64 +@ stub HSTRING_UserMarshal +@ stub HSTRING_UserMarshal64 +@ stub HSTRING_UserSize +@ stub HSTRING_UserSize64 +@ stub HSTRING_UserUnmarshal +@ stub HSTRING_UserUnmarshal64 +@ stdcall WindowsCompareStringOrdinal(ptr ptr ptr) combase.WindowsCompareStringOrdinal +@ stdcall WindowsConcatString(ptr ptr ptr) combase.WindowsConcatString +@ stdcall WindowsCreateString(wstr long ptr) combase.WindowsCreateString +@ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference +@ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString +@ stdcall WindowsDeleteStringBuffer(ptr) combase.WindowsDeleteStringBuffer +@ stdcall WindowsDuplicateString(ptr ptr) combase.WindowsDuplicateString +@ stdcall WindowsGetStringLen(ptr) combase.WindowsGetStringLen +@ stdcall WindowsGetStringRawBuffer(ptr ptr) combase.WindowsGetStringRawBuffer +@ stdcall WindowsIsStringEmpty(ptr) combase.WindowsIsStringEmpty +@ stdcall WindowsPreallocateStringBuffer(long ptr ptr) combase.WindowsPreallocateStringBuffer +@ stdcall WindowsPromoteStringBuffer(ptr ptr) combase.WindowsPromoteStringBuffer +@ stub WindowsReplaceString +@ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull +@ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring +@ stdcall WindowsSubstringWithSpecifiedLength(ptr long long ptr) combase.WindowsSubstringWithSpecifiedLength +@ stdcall WindowsTrimStringEnd(ptr ptr ptr) combase.WindowsTrimStringEnd +@ stdcall WindowsTrimStringStart(ptr ptr ptr) combase.WindowsTrimStringStart diff --git a/tools/make_specfiles b/tools/make_specfiles index 7d4a85b..545d436 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -445,6 +445,7 @@ my @dll_groups = "api-ms-win-core-winrt-registration-l1-1-0", "api-ms-win-core-winrt-roparameterizediid-l1-1-0", "api-ms-win-core-winrt-string-l1-1-0", + "api-ms-win-core-winrt-string-l1-1-1", ], [ "uxtheme",

1 0

Andrey Gusev : api-ms-win-core-processthreads-l1-1-3: Add dll.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 2f886e2d04a397690e7617455f85e5dc5fddee50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f886e2d04a397690e761745… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 5 13:53:04 2018 +0200 api-ms-win-core-processthreads-l1-1-3: Add dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46086 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-3.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 5bf21e4..9787693 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_processthreads_l1_1_2 +enable_api_ms_win_core_processthreads_l1_1_3 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_ansi_l1_1_0 @@ -19084,6 +19085,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-processenvironment-l1-2-0 enable_ap wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-processthreads-l1-1-3 enable_api_ms_win_core_processthreads_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-core-processtopology-obsolete-l1-1-0 enable_api_ms_win_core_processtopology_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-psapi-ansi-l1-1-0 enable_api_ms_win_core_psapi_ansi_l1_1_0 diff --git a/configure.ac b/configure.ac index 878fa4c..39a2310 100644 --- a/configure.ac +++ b/configure.ac @@ -2935,6 +2935,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processthreads-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processtopology-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-profile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-ansi-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in new file mode 100644 index 0000000..520db5c --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-3.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec new file mode 100644 index 0000000..3b57e1c --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -0,0 +1,10 @@ +@ stub GetProcessDefaultCpuSets +@ stub GetProcessInformation +@ stub GetSystemCpuSetInformation +@ stub GetThreadDescription +@ stub GetThreadSelectedCpuSets +@ stub SetProcessDefaultCpuSets +@ stub SetProcessInformation +@ stub SetThreadDescription +@ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor +@ stub SetThreadSelectedCpuSets diff --git a/tools/make_specfiles b/tools/make_specfiles index 545d436..aa5aad6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -302,6 +302,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-processthreads-l1-1-3", ], [ "kernel32",

1 0

Andrey Gusev : api-ms-win-ntuser-sysparams-l1-1-0: Add dll.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 03fd289bedfa920e7e4cb763d81ff41d787fe9ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fd289bedfa920e7e4cb763… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 5 17:33:28 2018 +0200 api-ms-win-ntuser-sysparams-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in | 1 + .../api-ms-win-ntuser-sysparams-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 9787693..7f9786f 100755 --- a/configure +++ b/configure @@ -1075,6 +1075,7 @@ enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +enable_api_ms_win_ntuser_sysparams_l1_1_0 enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -19181,6 +19182,7 @@ wine_fn_config_makefile dlls/api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l wine_fn_config_makefile dlls/api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-ntuser-sysparams-l1-1-0 enable_api_ms_win_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index 39a2310..efec221 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,6 +3031,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-mm-time-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-rectangle-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d1a573 --- /dev/null +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-ntuser-sysparams-l1-1-0.dll diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec new file mode 100644 index 0000000..587a495 --- /dev/null +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW +@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo +@ stub DisplayConfigSetDeviceInfo +@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors +@ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW +@ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW +@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) user32.GetDisplayConfigBufferSizes +@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW +@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics +@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig +@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW diff --git a/tools/make_specfiles b/tools/make_specfiles index aa5aad6..b05afb8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -389,6 +389,7 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-3-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", + "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1",

1 0

Alexandre Julliard : winebuild: Pass the -mfpu option to the compiler/ assembler.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 0fd533836b8cdea8b9a6af667bb3c1ffd053b3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd533836b8cdea8b9a6af66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 20:20:25 2018 +0100 winebuild: Pass the -mfpu option to the compiler/assembler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 2 ++ tools/winebuild/winebuild.man.in | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 90e8e34..fbc2cd9 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -361,6 +361,7 @@ extern struct strarray cc_command; extern struct strarray ld_command; extern struct strarray nm_command; extern char *cpu_option; +extern char *fpu_option; extern char *arch_option; extern const char *float_abi_option; extern int thumb_mode; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4656f9..70f381c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -88,6 +88,7 @@ struct strarray cc_command = { 0 }; struct strarray ld_command = { 0 }; struct strarray nm_command = { 0 }; char *cpu_option = NULL; +char *fpu_option = NULL; char *arch_option = NULL; #ifdef __SOFTFP__ const char *float_abi_option = "soft"; @@ -412,6 +413,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); + else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6e01f1a..95da175 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -386,6 +386,7 @@ struct strarray get_as_command(void) if (force_pointer_size) strarray_add_one( &args, (force_pointer_size == 8) ? "-m64" : "-m32" ); if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); + if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) ); return args; } @@ -420,6 +421,7 @@ struct strarray get_as_command(void) } if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); + if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); return args; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 89865ac..51ad544 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,7 +156,7 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP -.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfloat-abi= option +.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option Set code generation options for the assembler. .TP .BI \-M,\ --main-module= module

1 0