winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2019
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
672 discussions
Start a n
N
ew thread
Matteo Bruni : d3d11/tests: Simplify test_cb_relative_addressing() a bit.
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Matteo Bruni : d3d9: Keep track of D3DUSAGE_AUTOGENMIPMAP textures in the d3d9 device.
by Alexandre Julliard
12 Feb '19
12 Feb '19
Module: wine Branch: master Commit: 4a6cf99a63547627b07ece5e44bcc734f4e27045 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4a6cf99a63547627b07ece5e…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 11 18:21:04 2019 +0100 d3d9: Keep track of D3DUSAGE_AUTOGENMIPMAP textures in the d3d9 device. 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/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 21 +++++++++++++++++++-- dlls/d3d9/stateblock.c | 16 +++++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 1032f8e..3fe0376 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -111,6 +111,8 @@ struct d3d9_device DWORD recording : 1; DWORD padding : 11; + DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ + unsigned int max_user_clip_planes; UINT implicit_swapchain_count; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 98ada03..6cc3f18 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -991,6 +991,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { device->recording = FALSE; + device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -2456,6 +2457,19 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (SUCCEEDED(hr) && !device->recording) + { + unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; + + if (i < D3D9_MAX_TEXTURE_UNITS) + { + if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } + } wined3d_mutex_unlock(); return hr; @@ -2700,10 +2714,13 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { struct wined3d_texture *texture; - unsigned int i, stage; + unsigned int i, stage, map; - for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + map = device->auto_mipmaps; + while (map) { + i = wined3d_bit_scan(&map); + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8431ef7..14f47d9 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -109,10 +109,12 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct wined3d_texture *wined3d_texture; + unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; enum wined3d_format_id format; + struct d3d9_texture *texture; struct d3d9_device *device; HRESULT hr; @@ -134,6 +136,18 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) } device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + device->auto_mipmaps = 0; + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + + if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + && (texture = wined3d_texture_get_parent(wined3d_texture)) + && texture->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } wined3d_mutex_unlock(); return D3D_OK;
1
0
0
0
Matteo Bruni : wined3d: Cleanup stateblock state before enumerating resources.
by Alexandre Julliard
12 Feb '19
12 Feb '19
Module: wine Branch: master Commit: c5f49c73f8cfd3bf8fb75b383fed456d1056e949 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c5f49c73f8cfd3bf8fb75b38…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 11 18:21:03 2019 +0100 wined3d: Cleanup stateblock state before enumerating resources. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=46617
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=46618
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/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b2f7e0..b823ada 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4894,6 +4894,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(device->cursor_texture); device->cursor_texture = NULL; } + wined3d_stateblock_state_cleanup(&device->stateblock_state); state_unbind_resources(&device->state); } @@ -5082,7 +5083,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); - wined3d_stateblock_state_cleanup(&device->stateblock_state); if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device);
1
0
0
0
Michael Stefaniuc : crypt32: Remove useless cast to self.
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Michael Stefaniuc : amstream: Remove useless cast to self.
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Alexandre Julliard : server: Create the windows directories at startup if necessary.
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Alexandre Julliard : ntdll: Hardcode the path of the windows directory for redirects.
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Alexandre Julliard : ntdll: Reimplement init_user_process_params() using RtlCreateProcessParametersEx().
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Alexandre Julliard : ntdll: Use the current platform as processorArchitecture instead of a wildcard.
by Alexandre Julliard
12 Feb '19
12 Feb '19
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
0
0
Nikolay Sivov : uiautomationcore: Return success from UiaRaiseAutomationEvent().
by Alexandre Julliard
11 Feb '19
11 Feb '19
Module: wine Branch: master Commit: d0727decdedb5aba250038458e0a28dec5687e50 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d0727decdedb5aba25003845…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 18:00:57 2019 +0300 uiautomationcore: Return success from UiaRaiseAutomationEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 31b7d3e..0730846 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -91,5 +91,5 @@ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id) { FIXME("(%p, %d): stub\n", provider, id); - return E_NOTIMPL; + return S_OK; }
1
0
0
0
← Newer
1
...
43
44
45
46
47
48
49
...
68
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Results per page:
10
25
50
100
200