November 2020 - Wine-Commits

Michael Stefaniuc : msidb: Use wide-char string literals.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 803994792a535d4bc873c9f939a0a6ba3c6fce09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=803994792a535d4bc873c9f9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 10 22:50:33 2020 +0100 msidb: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msidb/main.c | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index ceca6df0fe7..2a18f855445 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -229,13 +229,10 @@ static const WCHAR *basenameW( const WCHAR *filename ) static int add_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR insert_command[] = - {'I','N','S','E','R','T',' ','I','N','T','O',' ','_','S','t','r','e','a','m','s',' ', - '(','N','a','m','e',',',' ','D','a','t','a',')',' ','V','A','L','U','E','S',' ','(','?',',',' ','?',')',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, insert_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"INSERT INTO _Streams (Name, Data) VALUES (?, ?)", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -290,13 +287,10 @@ static int add_streams( struct msidb_state *state ) static int kill_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR delete_command[] = - {'D','E','L','E','T','E',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', - 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, delete_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"DELETE FROM _Streams WHERE Name = ?", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -345,9 +339,6 @@ static int kill_streams( struct msidb_state *state ) static int extract_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const WCHAR select_command[] = - {'S','E','L','E','C','T',' ','D','a','t','a',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', - 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; HANDLE file = INVALID_HANDLE_VALUE; MSIHANDLE view = 0, record = 0; DWORD read_size, write_size; @@ -362,7 +353,7 @@ static int extract_stream( struct msidb_state *state, const WCHAR *stream_filena ERR( "Failed to open destination file %s.\n", wine_dbgstr_w(stream_filename) ); goto cleanup; } - ret = MsiDatabaseOpenViewW( state->database_handle, select_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"SELECT Data FROM _Streams WHERE Name = ?", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -449,8 +440,6 @@ static int import_table( struct msidb_state *state, const WCHAR *table_path ) static int import_tables( struct msidb_state *state ) { - const WCHAR idt_ext[] = { '.','i','d','t',0 }; - const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) @@ -460,7 +449,7 @@ static int import_tables( struct msidb_state *state ) WCHAR *ext; /* permit specifying tables with wildcards ('Feature*') */ - if (wcsstr( table_name, wildcard ) != NULL) + if (wcsstr( table_name, L"*" ) != NULL) { WIN32_FIND_DATAW f; HANDLE handle; @@ -484,7 +473,7 @@ static int import_tables( struct msidb_state *state ) if (f.cFileName[0] == '.' && f.cFileName[1] == '.' && !f.cFileName[2]) continue; if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; if ((ext = PathFindExtensionW( f.cFileName )) == NULL) continue; - if (lstrcmpW( ext, idt_ext ) != 0) continue; + if (lstrcmpW( ext, L".idt" ) != 0) continue; if (!import_table( state, f.cFileName )) { FindClose( handle ); @@ -495,10 +484,10 @@ static int import_tables( struct msidb_state *state ) continue; } /* permit specifying tables by filename (*.idt) */ - if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, idt_ext ) != 0) + if ((ext = PathFindExtensionW( table_name )) == NULL || lstrcmpW( ext, L".idt" ) != 0) { - const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - swprintf( table_path, ARRAY_SIZE(table_path), format, table_name ); + /* truncate to 8 characters */ + swprintf( table_path, ARRAY_SIZE(table_path), L"%.8s.idt", table_name ); table_name = table_path; } if (!import_table( state, table_name )) @@ -509,9 +498,7 @@ static int import_tables( struct msidb_state *state ) static int export_table( struct msidb_state *state, const WCHAR *table_name ) { - const WCHAR format_dos[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ - const WCHAR format_full[] = { '%','s','.','i','d','t',0 }; - const WCHAR *format = (state->short_filenames ? format_dos : format_full); + const WCHAR *format = (state->short_filenames ? L"%.8s.idt" : L"%s.idt"); WCHAR table_path[MAX_PATH]; UINT ret; @@ -527,14 +514,10 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) static int export_all_tables( struct msidb_state *state ) { - static const WCHAR summary_information[] = - {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; - static const WCHAR query_command[] = - {'S','E','L','E','C','T',' ','N','a','m','e',' ','F','R','O','M',' ','_','T','a','b','l','e','s',0}; MSIHANDLE view = 0; UINT ret; - ret = MsiDatabaseOpenViewW( state->database_handle, query_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, L"SELECT Name FROM _Tables", &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Tables table.\n" ); @@ -581,7 +564,7 @@ static int export_all_tables( struct msidb_state *state ) } ret = ERROR_SUCCESS; /* the _SummaryInformation table is not listed in _Tables */ - if (!export_table( state, summary_information )) + if (!export_table( state, L"_SummaryInformation" )) { ret = ERROR_FUNCTION_FAILED; goto cleanup; @@ -598,12 +581,11 @@ cleanup: static int export_tables( struct msidb_state *state ) { - const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { - if (lstrcmpW( data->name, wildcard ) == 0) + if (lstrcmpW( data->name, L"*" ) == 0) { if (!export_all_tables( state )) return 0; /* failed, do not commit changes */

1 0

Michael Stefaniuc : icinfo: Use wide-char string literals.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 3c4860b93db6f949a5a72a961cffd5a688605a0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c4860b93db6f949a5a72a96… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 10 22:50:34 2020 +0100 icinfo: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 58 +++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index cbf7c675b03..25b847b5a36 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -58,40 +58,18 @@ int __cdecl wmain(int argc, WCHAR* argv[]) { int i, n=0,doabout=0,doconfigure=0; - static const WCHAR header[] = {'C','u','r','r','e','n','t','l','y',' ','i','n','s','t','a','l','l','e','d',' ', - 'V','i','d','e','o',' ','C','o','m','p','r','e','s','s','o','r','s',':','\n',0}; - static const WCHAR close_flags[] = {')','\n',0}; - static const WCHAR s_fmt[] = {'%','s',0}; - static const WCHAR sspc_fmt[] = {'%','s',' ',0}; - static const WCHAR fcc_fmt[] = {'%','c','%','c','%','c','%','c','.','%','c','%','c','%','c','%','c',':',' ','%','s','\n',0}; - static const WCHAR desc_fmt[] = {'\t','s','z','D','e','s','c','r','i','p','t','i','o','n',':',' ','%','s','\n',0}; - static const WCHAR flags_fmt[] = {'\t','d','w','F','l','a','g','s',':',' ','0','x','%','0','8','x',' ','(',0}; - static const WCHAR version_fmt[] = {'\t','d','w','V','e','r','s','i','o','n',':',' ','0','x','%','0','8','x','\n',0}; - static const WCHAR versicm_fmt[] = {'\t','d','w','V','e','r','s','i','o','n','I','C','M',':',' ','0','x','%','0','8','x','\n',0}; - static const WCHAR VIDCF_QUALITY_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y',0}; - static const WCHAR VIDCF_CRUNCH_W[] = {'V','I','D','C','F','_','C','R','U','N','C','H',0}; - static const WCHAR VIDCF_TEMPORAL_W[] = {'V','I','D','C','F','_','T','E','M','P','O','R','A','L',0}; - static const WCHAR VIDCF_COMPRESSFRAMES_W[] = {'V','I','D','C','F','_','C','O','M','P','R','E','S','S','F','R','A','M','E','S',0}; - static const WCHAR VIDCF_DRAW_W[] = {'V','I','D','C','F','_','D','R','A','W',0}; - static const WCHAR VIDCF_FASTTEMPORALC_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','C',0}; - static const WCHAR VIDCF_FASTTEMPORALD_W[] = {'V','I','D','C','F','_','F','A','S','T','T','E','M','P','O','R','A','L','D',0}; - static const WCHAR VIDCF_QUALITYTIME_W[] = {'V','I','D','C','F','_','Q','U','A','L','I','T','Y','T','I','M','E',0}; - static const WCHAR about[] = {'-','a','b','o','u','t','\0'}; - static const WCHAR configure[] = {'-','c','o','n','f','i','g','u','r','e','\0'}; - static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; - for (i = 1; i < argc; i++) { - if (!lstrcmpW(argv[i], about)) + if (!lstrcmpW(argv[i], L"-about")) doabout = 1; - else if (!lstrcmpW(argv[i], configure)) + else if (!lstrcmpW(argv[i], L"-configure")) doconfigure = 1; else { - mywprintf(unk_opt_fmt, argv[i]); + mywprintf(L"Unknown option: %s\n", argv[i]); return -1; } } - mywprintf(s_fmt, header); + mywprintf(L"%s", L"Currently installed Video Compressors:\n"); while (1) { ICINFO ii; HIC hic; @@ -106,25 +84,25 @@ int __cdecl wmain(int argc, WCHAR* argv[]) continue; } - mywprintf(fcc_fmt, + mywprintf(L"%c%c%c%c.%c%c%c%c: %s\n", LOBYTE(ii.fccType),LOBYTE(ii.fccType>>8),LOBYTE(ii.fccType>>16),LOBYTE(ii.fccType>>24), LOBYTE(ii.fccHandler),LOBYTE(ii.fccHandler>>8),LOBYTE(ii.fccHandler>>16),LOBYTE(ii.fccHandler>>24), ii.szName); - mywprintf(flags_fmt,ii.dwFlags); + mywprintf(L"\tdwFlags: 0x%08x (",ii.dwFlags); - if (ii.dwFlags & VIDCF_QUALITY) mywprintf(sspc_fmt, VIDCF_QUALITY_W); - if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(sspc_fmt, VIDCF_CRUNCH_W); - if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(sspc_fmt, VIDCF_TEMPORAL_W); - if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(sspc_fmt, VIDCF_COMPRESSFRAMES_W); - if (ii.dwFlags & VIDCF_DRAW) mywprintf(sspc_fmt, VIDCF_DRAW_W); - if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALC_W); - if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(sspc_fmt, VIDCF_FASTTEMPORALD_W); - if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(sspc_fmt, VIDCF_QUALITYTIME_W); + if (ii.dwFlags & VIDCF_QUALITY) mywprintf(L"%s ", L"VIDCF_QUALITY"); + if (ii.dwFlags & VIDCF_CRUNCH) mywprintf(L"%s ", L"VIDCF_CRUNCH"); + if (ii.dwFlags & VIDCF_TEMPORAL) mywprintf(L"%s ", L"VIDCF_TEMPORAL"); + if (ii.dwFlags & VIDCF_COMPRESSFRAMES) mywprintf(L"%s ", L"VIDCF_COMPRESSFRAMES"); + if (ii.dwFlags & VIDCF_DRAW) mywprintf(L"%s ", L"VIDCF_DRAW"); + if (ii.dwFlags & VIDCF_FASTTEMPORALC) mywprintf(L"%s ", L"VIDCF_FASTTEMPORALC"); + if (ii.dwFlags & VIDCF_FASTTEMPORALD) mywprintf(L"%s ", L"VIDCF_FASTTEMPORALD"); + if (ii.dwFlags & VIDCF_QUALITYTIME) mywprintf(L"%s ", L"VIDCF_QUALITYTIME"); - mywprintf(s_fmt, close_flags); - mywprintf(version_fmt,ii.dwVersion); - mywprintf(versicm_fmt,ii.dwVersionICM); - mywprintf(desc_fmt,ii.szDescription); + mywprintf(L"%s", L")\n"); + mywprintf(L"\tdwVersion: 0x%08x\n", ii.dwVersion); + mywprintf(L"\tdwVersionICM: 0x%08x\n", ii.dwVersionICM); + mywprintf(L"\tszDescription: %s\n", ii.szDescription); if (doabout) ICAbout(hic,0); if (doconfigure && ICQueryConfigure(hic)) ICConfigure(hic,0);

1 0

Paul Gofman : wininet: Correctly return error status from InternetSetFilePointer() stub.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 67295a7844b94ccbfce85dbee22a76f12c9f5b36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67295a7844b94ccbfce85dbe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 11 13:17:30 2020 +0300 wininet: Correctly return error status from InternetSetFilePointer() stub. Fixes Freestyle 2: Street Basketball update check failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 4 +++- dlls/wininet/tests/http.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fb02488934d..91bff2ece93 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2096,7 +2096,9 @@ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); - return FALSE; + + SetLastError(ERROR_INTERNET_INVALID_OPERATION); + return INVALID_SET_FILE_POINTER; } /*********************************************************************** diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fc984f6d33d..a5f5215f584 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -590,6 +590,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; + DWORD contents_length, accepts_ranges; + BOOL not_supported; trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); @@ -816,10 +818,23 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,&index); trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); if(test->flags & TESTF_COMPRESSED) + { ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); + contents_length = 0; + } + else + { + contents_length = atoi(buffer); + } ok(!res || index == 1, "Index was not incremented although result is %x (index = %u)\n", res, index); + length = 64; + *buffer = 0; + res = HttpQueryInfoA(hor,HTTP_QUERY_ACCEPT_RANGES,&buffer,&length,0x0); + trace("Option HTTP_QUERY_ACCEPT_RANGES -> %i %s (%u)\n",res,buffer,GetLastError()); + accepts_ranges = res && !strcmp(buffer, "bytes"); + length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; @@ -830,6 +845,26 @@ static void InternetReadFile_test(int flags, const test_data_t *test) buffer[length]=0; trace("Option HTTP_QUERY_CONTENT_ENCODING -> %i %s\n",res,buffer); + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_END, 0); + not_supported = length == INVALID_SET_FILE_POINTER + && GetLastError() == ERROR_INTERNET_INVALID_OPERATION; + if (accepts_ranges) + todo_wine ok((length == contents_length && (GetLastError() == ERROR_SUCCESS + || broken(GetLastError() == 0xdeadbeef))) || broken(not_supported), + "Got unexpected length %#x, GetLastError() %u, contents_length %u, accepts_ranges %#x.\n", + length, GetLastError(), contents_length, accepts_ranges); + else + ok(not_supported, "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + + if (length != INVALID_SET_FILE_POINTER) + { + SetLastError(0xdeadbeef); + length = InternetSetFilePointer(hor, 0, NULL, FILE_BEGIN, 0); + ok(!length && (GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef)), + "Got unexpected length %#x, GetLastError() %u.\n", length, GetLastError()); + } + SetLastError(0xdeadbeef); res = InternetReadFile(NULL, buffer, 100, &length); ok(!res, "InternetReadFile should have failed\n");

1 0

Nikolay Sivov : mf/evr: Handle user events from the presenter.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: d2ce23f4610aff53cc5992c9116c20fa146966ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ce23f4610aff53cc5992c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 11 16:36:47 2020 +0300 mf/evr: Handle user events from the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index a77372977c7..d01bb0f06f1 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1743,6 +1743,15 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); } } + else if (event >= EC_USER) + { + PROPVARIANT code; + + code.vt = VT_I4; + code.lVal = event; + hr = IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, MERendererEvent, + &GUID_NULL, S_OK, &code); + } else { WARN("Unhandled event %d.\n", event);

1 0

Alexandre Julliard : setupapi: Add a few more dirids.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 354aabd77e4ff3747446b2402de89d804001bd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=354aabd77e4ff3747446b240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:02:34 2020 +0100 setupapi: Add a few more dirids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/dirid.c | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index d1bffe9d01e..ec263d9f181 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -56,14 +56,13 @@ static const WCHAR *csidl_dirids[MAX_CSIDL_DIRID-MIN_CSIDL_DIRID+1]; static const WCHAR *get_unknown_dirid(void) { static WCHAR *unknown_dirid; - static const WCHAR unknown_str[] = {'\\','u','n','k','n','o','w','n',0}; if (!unknown_dirid) { - UINT len = GetSystemDirectoryW( NULL, 0 ) + lstrlenW(unknown_str); + UINT len = GetSystemDirectoryW( NULL, 0 ) + lstrlenW(L"\\unknown"); if (!(unknown_dirid = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; GetSystemDirectoryW( unknown_dirid, len ); - lstrcatW( unknown_dirid, unknown_str ); + lstrcatW( unknown_dirid, L"\\unknown" ); } return unknown_dirid; } @@ -73,17 +72,6 @@ static const WCHAR *get_csidl_dir(DWORD csidl); /* create the string for a system dirid */ static const WCHAR *create_system_dirid( int dirid ) { - static const WCHAR Null[] = {0}; - static const WCHAR C_Root[] = {'C',':','\\',0}; - static const WCHAR Drivers[] = {'\\','d','r','i','v','e','r','s',0}; - static const WCHAR Inf[] = {'\\','i','n','f',0}; - static const WCHAR Help[] = {'\\','h','e','l','p',0}; - static const WCHAR Fonts[] = {'\\','f','o','n','t','s',0}; - static const WCHAR Viewers[] = {'\\','v','i','e','w','e','r','s',0}; - static const WCHAR System[] = {'\\','s','y','s','t','e','m',0}; - static const WCHAR Spool[] = {'\\','s','p','o','o','l',0}; - static const WCHAR UserProfile[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; - WCHAR buffer[MAX_PATH+32], *str; int len; DWORD needed; @@ -91,7 +79,7 @@ static const WCHAR *create_system_dirid( int dirid ) switch(dirid) { case DIRID_NULL: - return Null; + return L""; case DIRID_WINDOWS: GetWindowsDirectoryW( buffer, MAX_PATH ); break; @@ -100,45 +88,52 @@ static const WCHAR *create_system_dirid( int dirid ) break; case DIRID_DRIVERS: GetSystemDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Drivers ); + lstrcatW( buffer, L"\\drivers" ); break; case DIRID_INF: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Inf ); + lstrcatW( buffer, L"\\inf" ); break; case DIRID_HELP: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Help ); + lstrcatW( buffer, L"\\help" ); break; case DIRID_FONTS: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Fonts ); + lstrcatW( buffer, L"\\fonts" ); break; case DIRID_VIEWERS: GetSystemDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Viewers ); + lstrcatW( buffer, L"\\viewers" ); + break; + case DIRID_COLOR: + GetSystemDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\drivers\\color" ); break; case DIRID_APPS: - return C_Root; /* FIXME */ + return L"C:\\"; /* FIXME */ case DIRID_SHARED: GetWindowsDirectoryW( buffer, MAX_PATH ); break; case DIRID_BOOT: - return C_Root; /* FIXME */ + return L"C:\\"; /* FIXME */ case DIRID_SYSTEM16: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, System ); + lstrcatW( buffer, L"\\system" ); break; case DIRID_SPOOL: - case DIRID_SPOOLDRIVERS: /* FIXME */ GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Spool ); + lstrcatW( buffer, L"\\spool" ); + break; + case DIRID_SPOOLDRIVERS: + GetWindowsDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\drivers" ); break; case DIRID_USERPROFILE: - if (GetEnvironmentVariableW( UserProfile, buffer, MAX_PATH )) break; + if (GetEnvironmentVariableW( L"USERPROFILE", buffer, MAX_PATH )) break; return get_csidl_dir(CSIDL_PROFILE); case DIRID_LOADER: - return C_Root; /* FIXME */ + return L"C:\\"; /* FIXME */ case DIRID_PRINTPROCESSOR: if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer), &needed)) { @@ -146,7 +141,6 @@ static const WCHAR *create_system_dirid( int dirid ) return get_unknown_dirid(); } break; - case DIRID_COLOR: /* FIXME */ default: FIXME( "unknown dirid %d\n", dirid ); return get_unknown_dirid();

1 0

Alexandre Julliard : wineusb.sys: Move wineusb.inf into the module resources.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 7caa127746fd880a263715879c9931fa67053fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7caa127746fd880a26371587… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:04:40 2020 +0100 wineusb.sys: Move wineusb.inf into the module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/Makefile.in | 2 ++ .../wineusb.inf.in => dlls/wineusb.sys/wineusb.inf | 0 dlls/wineusb.sys/wineusb.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 3 +-- loader/wine.inf.in | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index bac79f668e8..12441435eeb 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -6,3 +6,5 @@ EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ wineusb.c + +RC_SRCS = wineusb.rc diff --git a/loader/wineusb.inf.in b/dlls/wineusb.sys/wineusb.inf similarity index 100% rename from loader/wineusb.inf.in rename to dlls/wineusb.sys/wineusb.inf diff --git a/dlls/wineusb.sys/wineusb.rc b/dlls/wineusb.sys/wineusb.rc new file mode 100644 index 00000000000..f70eb0c6926 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wineusb.inf */ +1 WINE_DATA_FILE wineusb.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index 99d4a8349e8..7302c231915 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -8,8 +8,7 @@ SOURCES = \ wine.inf.in \ wine.man.in \ wine.pl.UTF-8.man.in \ - wine_info.plist.in \ - wineusb.inf.in + wine_info.plist.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c273a2f2821..da21245954e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4061,7 +4061,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" -wineusb.inf +wineusb.inf,"@wineusb.sys,-1" [NlsFiles] c_037.nls

1 0

Alexandre Julliard : winehid.sys: Move winehid.inf into the module resources.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 6aa7704cf66e677a5b1a15bfc2335c8fc29db916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa7704cf66e677a5b1a15bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:04:25 2020 +0100 winehid.sys: Move winehid.inf into the module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/Makefile.in | 2 ++ .../winehid.inf.in => dlls/winehid.sys/winehid.inf | 0 dlls/winehid.sys/winehid.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 1 - loader/wine.inf.in | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index b2363e75659..f9c7fdbbe38 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c + +RC_SRCS = winehid.rc diff --git a/loader/winehid.inf.in b/dlls/winehid.sys/winehid.inf similarity index 100% rename from loader/winehid.inf.in rename to dlls/winehid.sys/winehid.inf diff --git a/dlls/winehid.sys/winehid.rc b/dlls/winehid.sys/winehid.rc new file mode 100644 index 00000000000..a80fad837aa --- /dev/null +++ b/dlls/winehid.sys/winehid.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: winehid.inf */ +1 WINE_DATA_FILE winehid.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index 83aefa00861..99d4a8349e8 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,6 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ - winehid.inf.in \ wineusb.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e593117c83d..c273a2f2821 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4060,7 +4060,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [InfFiles] winebus.inf,"@winebus.sys,-1" -winehid.inf +winehid.inf,"@winehid.sys,-1" wineusb.inf [NlsFiles]

1 0

Alexandre Julliard : winebus.sys: Move winebus.inf into the module resources.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 4650dff5c4a3998181e4516e1cc987852b0c3c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4650dff5c4a3998181e4516e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:04:06 2020 +0100 winebus.sys: Move winebus.inf into the module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 ++ .../winebus.inf.in => dlls/winebus.sys/winebus.inf | 0 dlls/winebus.sys/winebus.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 1 - loader/wine.inf.in | 2 +- tools/make_makefiles | 10 ++-------- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 3bdc1a5d58a..9011bbb6075 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -9,3 +9,5 @@ C_SRCS = \ bus_sdl.c \ bus_udev.c \ main.c + +RC_SRCS = winebus.rc diff --git a/loader/winebus.inf.in b/dlls/winebus.sys/winebus.inf similarity index 100% rename from loader/winebus.inf.in rename to dlls/winebus.sys/winebus.inf diff --git a/dlls/winebus.sys/winebus.rc b/dlls/winebus.sys/winebus.rc new file mode 100644 index 00000000000..4af55fb6f40 --- /dev/null +++ b/dlls/winebus.sys/winebus.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: winebus.inf */ +1 WINE_DATA_FILE winebus.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index e8c271f15d3..83aefa00861 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,6 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ - winebus.inf.in \ winehid.inf.in \ wineusb.inf.in diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 15f0634ca5c..e593117c83d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4059,7 +4059,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGa HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 [InfFiles] -winebus.inf +winebus.inf,"@winebus.sys,-1" winehid.inf wineusb.inf diff --git a/tools/make_makefiles b/tools/make_makefiles index a92987c2ab5..2d3c14cb2ec 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -73,7 +73,6 @@ my @source_vars = ( ); my (@makefiles, %makefiles); -my @inf_files; my @nls_files; sub dirname($) @@ -382,10 +381,6 @@ sub assign_sources_to_makefiles(@) { push @{${$make}{"=MANPAGES"}}, $name; } - elsif ($name =~ /\.inf\.in$/) - { - push @inf_files, $name unless $name eq "wine.inf.in"; - } elsif ($name =~ /\.in$/) { push @{${$make}{"=IN_SRCS"}}, $name; @@ -492,11 +487,10 @@ sub update_makefiles(@) sub update_wine_inf() { my @lines; - push @lines, "[InfFiles]", sort grep { s/\.in$//; } @inf_files; - push @lines, "\n[NlsFiles]", sort grep(!/^sort/, @nls_files); + push @lines, "[NlsFiles]", sort grep(!/^sort/, @nls_files); push @lines, "\n[SortFiles]", sort grep(/^sort/, @nls_files); push @lines, "\n[WineSourceDirs]\n"; - replace_in_file "loader/wine.inf.in", '^\[InfFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines ); + replace_in_file "loader/wine.inf.in", '^\[NlsFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines ); } my $git_dir = $ENV{GIT_DIR} || ".git";

1 0

Alexandre Julliard : setupapi: Add an extension to support file copies from module resources.
by Alexandre Julliard Nov. 11, 2020

Nov. 11, 2020

Module: wine Branch: master Commit: 5696c3c23d5be9f5ce57ef7e361d88722120da09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5696c3c23d5be9f5ce57ef7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:03:38 2020 +0100 setupapi: Add an extension to support file copies from module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index eebfe971546..7ed66c298d3 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -151,8 +152,11 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; - if (op->media) src_len += lstrlenW(op->media->root) + 1; - if (op->src_path) src_len += lstrlenW(op->src_path) + 1; + if (op->src_file[0] != '@') + { + if (op->media) src_len += lstrlenW(op->media->root) + 1; + if (op->src_path) src_len += lstrlenW(op->src_path) + 1; + } if (op->src_file) src_len += lstrlenW(op->src_file) + 1; if (op->dst_path) dst_len += lstrlenW(op->dst_path) + 1; if (op->dst_file) dst_len += lstrlenW(op->dst_file) + 1; @@ -170,7 +174,10 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) paths->Target = target = HeapAlloc( GetProcessHeap(), 0, dst_len ); } if (!source || !target) return FALSE; - concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); + if (op->src_file[0] != '@') + concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); + else + lstrcpyW( source, op->src_file ); concat_W( target, NULL, op->dst_path, op->dst_file ); paths->Win32Error = 0; paths->Flags = 0; @@ -1002,6 +1009,59 @@ static BOOL create_full_pathW(const WCHAR *path) return ret; } +static BOOL copy_file( LPCWSTR source, LPCWSTR target ) +{ + WCHAR module[MAX_PATH]; + HMODULE mod = NULL; + HRSRC res; + HGLOBAL data; + HANDLE handle; + DWORD size, written; + BOOL ret = FALSE; + int id = 0; + const WCHAR *p; + + TRACE( "%s -> %s\n", debugstr_w(source), debugstr_w(target) ); + + if (source[0] != '@') return CopyFileW( source, target, FALSE ); + + /* Wine extension: when the source of a file copy is in the format "@file.dll,-123" + * the source data is extracted from the corresponding file.dll resource */ + + source++; /* skip '@' */ + p = wcschr( source, ',' ); + if (!p || p - source >= MAX_PATH) + { + SetLastError( ERROR_RESOURCE_DATA_NOT_FOUND ); + return FALSE; + } + memcpy( module, source, (p - source) * sizeof(WCHAR) ); + module[p - source] = 0; + id = -wcstol( p + 1, NULL, 10 ); + if (id <= 0 || id > 0xffff || + !(mod = LoadLibraryExW( module, 0, LOAD_LIBRARY_AS_DATAFILE )) || + !(res = FindResourceW( mod, MAKEINTRESOURCEW(id), L"WINE_DATA_FILE" )) || + !(data = LoadResource( mod, res ))) + { + WARN( "failed to save %s #%d to %s\n", debugstr_w(module), -id, debugstr_w(target) ); + if (mod) FreeLibrary( mod ); + SetLastError( ERROR_RESOURCE_DATA_NOT_FOUND ); + return FALSE; + } + size = SizeofResource( mod, res ); + if ((handle = CreateFileW( target, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CREATE_ALWAYS, 0, 0 )) == INVALID_HANDLE_VALUE) + { + WARN( "failed to save %s #%d to %s\n", debugstr_w(module), -id, debugstr_w(target) ); + if (mod) FreeLibrary( mod ); + return FALSE; + } + ret = WriteFile( handle, LockResource(data), size, &written, NULL ) && written == size; + CloseHandle( handle ); + if (!ret) DeleteFileW( target ); + return ret; +} + static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) { @@ -1124,7 +1184,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (docopy) { - rc = CopyFileW(source,target,FALSE); + rc = copy_file( source, target ); if (!rc && GetLastError() == ERROR_SHARING_VIOLATION && (style & SP_COPY_IN_USE_NEEDS_REBOOT)) { @@ -1134,7 +1194,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (GetTempPathW(MAX_PATH, temp) && GetTempFileNameW(temp, L"SET", 0, temp_file)) { - rc = CopyFileW(source, temp_file, FALSE); + rc = copy_file( source, temp_file ); if (rc) rc = MoveFileExW(temp_file, target, MOVEFILE_DELAY_UNTIL_REBOOT); else

1 0

Dmitry Timoshkov : advapi32/tests: Fix compilation with PSDK compiler.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 65cab573abe748974f20195083d7bd3d64f63e7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cab573abe748974f201950… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 20:53:05 2020 +0300 advapi32/tests: Fix compilation with PSDK compiler. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f2e10671a47..54a8528bc21 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -336,7 +336,7 @@ static void test_LsaLookupSids(void) { WCHAR langW[32]; char user_buffer[64]; - LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + LSA_OBJECT_ATTRIBUTES attrs = {sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list;

1 0