February 2019 - Wine-Commits

Matteo Bruni : d3d11/tests: Simplify test_cb_relative_addressing() a bit.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: ecacc39f09cbe94a3bab0086775817bac301fb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecacc39f09cbe94a3bab0086… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 11 18:21:06 2019 +0100 d3d11/tests: Simplify test_cb_relative_addressing() a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3c870c2..27b0775 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14816,10 +14816,6 @@ static void test_cb_relative_addressing(void) ID3D11Device *device; HRESULT hr; - static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = - { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, - }; static const DWORD vs_code[] = { #if 0 @@ -14932,10 +14928,6 @@ float4 main(const ps_in v) : SV_TARGET device = test_context.device; context = test_context.immediate_context; - hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), - vs_code, sizeof(vs_code), &test_context.input_layout); - ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); - colors_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(colors), &colors); index_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(index), NULL);

1 0

Michael Stefaniuc : d3d10core/tests: Remove useless casts to self.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 4f698de563181363235a5a0b3922fe764fc33921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f698de563181363235a5a0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 11 22:34:57 2019 +0100 d3d10core/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 5b8e7e1..9c322ed 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1648,7 +1648,7 @@ static void test_create_texture1d(void) desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, (ID3D10Texture1D **)&texture); + hr = ID3D10Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D10Texture1D_Release(texture); @@ -1979,7 +1979,7 @@ static void test_create_texture2d(void) desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; desc.MiscFlags = tests[i].misc_flags; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), @@ -2223,7 +2223,7 @@ static void test_create_texture3d(void) { desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; - hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, (ID3D10Texture3D **)&texture); + hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -7634,8 +7634,8 @@ static void test_cube_maps(void) { for (j = 0; j < ARRAY_SIZE(data); ++j) data[j] = sub_resource_idx; - ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, sub_resource_idx, NULL, - data, texture_desc.Width * sizeof(*data), 0); + ID3D10Device_UpdateSubresource(device, texture, sub_resource_idx, NULL, data, + texture_desc.Width * sizeof(*data), 0); } expected_result.y = expected_result.z = 0.0f;

1 0

Michael Stefaniuc : d3dxof: Remove useless casts.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 9781b5433cd4b708c0f537aa0b5608ff4157f04c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9781b5433cd4b708c0f537aa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 18:29:26 2019 +0100 d3dxof: Remove useless casts. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f7724ec..6f93bfe 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1208,13 +1208,13 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_WORD) { - *(((WORD*)(buf->pdata + buf->cur_pos_data))) = (WORD)(*(DWORD*)buf->value); - buf->cur_pos_data += 2; + *(WORD *)(buf->pdata + buf->cur_pos_data) = *(DWORD *)buf->value; + buf->cur_pos_data += 2; } else if (pt->members[i].type == TOKEN_DWORD) { - *(((DWORD*)(buf->pdata + buf->cur_pos_data))) = (DWORD)(*(DWORD*)buf->value); - buf->cur_pos_data += 4; + *(DWORD *)(buf->pdata + buf->cur_pos_data) = *(DWORD *)buf->value; + buf->cur_pos_data += 4; } else { @@ -1230,8 +1230,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_FLOAT) { - *(((float*)(buf->pdata + buf->cur_pos_data))) = (float)(*(float*)buf->value); - buf->cur_pos_data += 4; + *(float *)(buf->pdata + buf->cur_pos_data) = *(float *)buf->value; + buf->cur_pos_data += 4; } else {

1 0

Alexandre Julliard : ntdll: Reimplement init_user_process_params() using RtlCreateProcessParametersEx().
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 7a122604eaad3d3cda9468fa024286df1d77729f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a122604eaad3d3cda9468fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 11:13:57 2019 +0100 ntdll: Reimplement init_user_process_params() using RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 104 ++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 115 ------------------------------------------------ 3 files changed, 98 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a122604eaad3d3cda94…

1 0

Alexandre Julliard : ntdll: Hardcode the path of the windows directory for redirects.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: c0f693f6fcd065d0c3683eb2acee3aa23e463547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0f693f6fcd065d0c3683eb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 20:17:28 2019 +0100 ntdll: Hardcode the path of the windows directory for redirects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 2719958..b46c2a6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2269,25 +2269,16 @@ done: */ static void init_redirects(void) { - UNICODE_STRING nt_name; - ANSI_STRING unix_name; - NTSTATUS status; + static const char windows_dir[] = "/dosdevices/c:/windows"; + const char *config_dir = wine_get_config_dir(); + char *dir; struct stat st; unsigned int i; - if (!RtlDosPathNameToNtPathName_U( user_shared_data->NtSystemRoot, &nt_name, NULL, NULL )) - { - ERR( "can't convert %s\n", debugstr_w(user_shared_data->NtSystemRoot) ); - return; - } - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); - if (status) - { - ERR( "cannot open %s (%x)\n", debugstr_w(user_shared_data->NtSystemRoot), status ); - return; - } - if (!stat( unix_name.Buffer, &st )) + if (!(dir = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof(windows_dir) ))) return; + strcpy( dir, config_dir ); + strcat( dir, windows_dir ); + if (!stat( dir, &st )) { windir.dev = st.st_dev; windir.ino = st.st_ino; @@ -2295,11 +2286,12 @@ static void init_redirects(void) for (i = 0; i < nb_redirects; i++) { if (!redirects[i].dos_target) continue; - redirects[i].unix_target = get_redirect_target( unix_name.Buffer, redirects[i].dos_target ); + redirects[i].unix_target = get_redirect_target( dir, redirects[i].dos_target ); TRACE( "%s -> %s\n", debugstr_w(redirects[i].source), redirects[i].unix_target ); } } - RtlFreeAnsiString( &unix_name ); + else ERR( "%s: %s\n", dir, strerror(errno) ); + RtlFreeHeap( GetProcessHeap(), 0, dir ); }

1 0

Alexandre Julliard : ntdll: Use the current platform as processorArchitecture instead of a wildcard.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 6abf99b4803003812d4fcf7bf9effc99030cbec9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6abf99b4803003812d4fcf7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 10:59:39 2019 +0100 ntdll: Use the current platform as processorArchitecture instead of a wildcard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 08b6c50..ee1f764 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -570,6 +570,18 @@ struct actctx_loader static const xmlstr_t empty_xmlstr; +#ifdef __i386__ +static const WCHAR current_archW[] = {'x','8','6',0}; +#elif defined __x86_64__ +static const WCHAR current_archW[] = {'a','m','d','6','4',0}; +#elif defined __arm__ +static const WCHAR current_archW[] = {'a','r','m',0}; +#elif defined __aarch64__ +static const WCHAR current_archW[] = {'a','r','m','6','4',0}; +#else +static const WCHAR current_archW[] = {'n','o','n','e',0}; +#endif + static const WCHAR asmv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; static const WCHAR asmv2W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','2',0}; static const WCHAR asmv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; @@ -2197,6 +2209,7 @@ static void parse_dependent_assembly_elem( xmlbuf_t *xmlbuf, struct actctx_loade { parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai, &elem); /* store the newly found identity for later loading */ + if (ai.arch && !strcmpW(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); TRACE( "adding name=%s version=%s arch=%s\n", debugstr_w(ai.name), debugstr_version(&ai.version), debugstr_w(ai.arch) ); if (!add_dependent_assembly_id(acl, &ai)) set_error( xmlbuf ); @@ -3086,13 +3099,13 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) unsigned int data_pos = 0, data_len; char buffer[8192]; + if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; + if (!(lookup = RtlAllocateHeap( GetProcessHeap(), 0, (strlenW(ai->arch) + strlenW(ai->name) - + strlenW(ai->public_key) + 20) * sizeof(WCHAR) + + strlenW(ai->public_key) + strlenW(lang) + 20) * sizeof(WCHAR) + sizeof(lookup_fmtW) ))) return NULL; - - if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup );

1 0

Michael Stefaniuc : crypt32: Remove useless cast to self.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: e02d441ebf0a91fbd9b5a8970cc3f28c5a5c7972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e02d441ebf0a91fbd9b5a897… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 11 22:34:59 2019 +0100 crypt32: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 27f4870..ce068f3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2582,7 +2582,7 @@ static BOOL CRYPT_AsnDecodeUnicodeString(const BYTE *pbEncoded, if (dataLen) { DWORD i; - LPWSTR str = *(LPWSTR *)pStr; + LPWSTR str = *pStr; assert(str); switch (pbEncoded[0])

1 0

Michael Stefaniuc : amstream: Remove useless cast to self.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 4749fa676790dc2a8f6e2ba0dec2de6e458a2ab9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4749fa676790dc2a8f6e2ba0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 11 22:34:56 2019 +0100 amstream: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index bc61597..4463eaa 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1543,7 +1543,7 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a object->parent = (IMediaStream*)parent; object->audio_data = audio_data; - *audio_stream_sample = (IAudioStreamSample*)&object->IAudioStreamSample_iface; + *audio_stream_sample = &object->IAudioStreamSample_iface; return S_OK; }

1 0

Alexandre Julliard : server: Create the windows directories at startup if necessary.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 156965eae9e5a5753127c35c83021016f81e0c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=156965eae9e5a5753127c35c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 20:20:33 2019 +0100 server: Create the windows directories at startup if necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 12 ------------ server/registry.c | 8 ++++++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 26c576e..df2d0d6 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1125,28 +1125,16 @@ done: /*********************************************************************** * init_windows_dirs - * - * Create the windows and system directories if necessary. */ static void init_windows_dirs(void) { static const WCHAR default_syswow64W[] = {'C',':','\\','w','i','n','d','o','w','s', '\\','s','y','s','w','o','w','6','4',0}; - if (!CreateDirectoryW( DIR_Windows, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) - ERR( "directory %s could not be created, error %u\n", - debugstr_w(DIR_Windows), GetLastError() ); - if (!CreateDirectoryW( DIR_System, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) - ERR( "directory %s could not be created, error %u\n", - debugstr_w(DIR_System), GetLastError() ); - if (is_win64 || is_wow64) /* SysWow64 is always defined on 64-bit */ { DIR_SysWow64 = default_syswow64W; memcpy( winevdm, default_syswow64W, sizeof(default_syswow64W) - sizeof(WCHAR) ); - if (!CreateDirectoryW( DIR_SysWow64, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) - ERR( "directory %s could not be created, error %u\n", - debugstr_w(DIR_SysWow64), GetLastError() ); } } diff --git a/server/registry.c b/server/registry.c index 9e6815d..dffa3ac 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1866,6 +1866,14 @@ void init_registry(void) /* start the periodic save timer */ set_periodic_save_timer(); + /* create windows directories */ + + if (!mkdir( "drive_c/windows", 0777 )) + { + mkdir( "drive_c/windows/system32", 0777 ); + if (prefix_type == PREFIX_64BIT) mkdir( "drive_c/windows/syswow64", 0777 ); + } + /* go back to the server dir */ if (fchdir( server_dir_fd ) == -1) fatal_error( "chdir to server dir: %s\n", strerror( errno )); }

1 0

Andrey Gusev : crypt32: Remove duplicate condition in CRYPT_AsnDecodeNameValueInternal().
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 15b7112d07dc4f13c90c03c3f1e6776e7727148a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b7112d07dc4f13c90c03c3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 11 16:29:23 2019 +0200 crypt32: Remove duplicate condition in CRYPT_AsnDecodeNameValueInternal(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d886abb..27f4870 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1588,15 +1588,12 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_VISIBLESTRING: case ASN_GENERALSTRING: value->Value.cbData = dataLen; - if (dataLen) - { - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - memcpy(value->Value.pbData, - pbEncoded + 1 + lenBytes, dataLen); - else - value->Value.pbData = (LPBYTE)pbEncoded + 1 + - lenBytes; - } + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + memcpy(value->Value.pbData, + pbEncoded + 1 + lenBytes, dataLen); + else + value->Value.pbData = (LPBYTE)pbEncoded + 1 + + lenBytes; break; case ASN_BMPSTRING: {

1 0