July 2017 - Wine-Commits - list.winehq.org

André Hentschel : hidclass.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 403458720e1520e260cec50caa27ed7485a4b1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403458720e1520e260cec50ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:54 2017 +0100 hidclass.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 902b8a2b6d3393c5af52af5b84166634153436a1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hidclass.sys/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b241016..fe79212 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -22,6 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "hid.h" #include "wine/unicode.h" #include "winreg.h" @@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device entry = RemoveHeadList(&ext->irp_queue); while(entry != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED; IoCompleteRequest(irp, IO_NO_INCREMENT); entry = RemoveHeadList(&ext->irp_queue); @@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) while(entry != &ext->irp_queue) { int ptr; - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); @@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) else { TRACE_(hid_report)("Queue irp\n"); - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); rc = STATUS_PENDING; } HeapFree(GetProcessHeap(), 0, packet);

1 0

Józef Kucia : wined3d: Do not pass LOD to texelFetch( ) for buffer resources.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 3588c533b043bbab1938801d6518bb43776570db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3588c533b043bbab1938801d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:32 2017 +0100 wined3d: Do not pass LOD to texelFetch() for buffer resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 65089c395dbb44eb4f2bf8a7722092254d277549) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8d208e..fedc216 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4908,10 +4908,12 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) /* FIXME: The current implementation does not handle multisample textures correctly. */ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; + BOOL has_lod_param; if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -4919,12 +4921,20 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = WINED3D_SAMPLER_DEFAULT; + if (resource_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", resource_idx); + return; + } + has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER; + shader_glsl_get_sample_function(ins->ctx, resource_idx, sampler_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); + sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, &ins->texel_offset, "%s", coord_param.param_str); + NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, + "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

André Hentschel : winebus.sys: Fix compilation on systems that don't support nameless structs.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: d6a45f2ce6543bc06f5bd2f007bd4472b7827f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a45f2ce6543bc06f5bd2f00… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 25 22:14:58 2017 +0100 winebus.sys: Fix compilation on systems that don't support nameless structs. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1afcfc77d376916466035ab5c085dcb8201ecd03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ed95435..978540b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS @@ -303,7 +304,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) EnterCriticalSection(&ext->report_cs); while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irp->IoStatus.u.Status = STATUS_CANCELLED; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); @@ -525,7 +526,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } else { - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry); status = STATUS_PENDING; } LeaveCriticalSection(&ext->report_cs); @@ -613,7 +614,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { IO_STACK_LOCATION *irpsp; TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); irpsp = IoGetCurrentIrpStackLocation(irp); irp->IoStatus.u.Status = deliver_last_report(ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

Józef Kucia : wined3d: Add ARB_texture_buffer_object extension.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: d2819469f8dbb128b1f77ef174ad6661b1acb47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2819469f8dbb128b1f77ef17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:29 2017 +0100 wined3d: Add ARB_texture_buffer_object extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83057194569d014f01f79a6f7f93604c1ab52f76) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7954248..fbae9c1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -154,6 +154,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, + {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, @@ -2788,6 +2789,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetSynciv) USE_GL_FUNC(glIsSync) USE_GL_FUNC(glWaitSync) + /* GL_ARB_texture_buffer_object */ + USE_GL_FUNC(glTexBufferARB) /* GL_ARB_texture_compression */ USE_GL_FUNC(glCompressedTexImage2DARB) USE_GL_FUNC(glCompressedTexImage3DARB) @@ -3160,6 +3163,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */ USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */ USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */ @@ -3281,6 +3285,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); + MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT); MAP_GL_FUNCTION(glTexSubImage3D, glTexSubImage3DEXT); MAP_GL_FUNCTION(glUniform1f, glUniform1fARB); @@ -3625,6 +3630,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_COPY_BUFFER, MAKEDWORD_VERSION(3, 1)}, {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, + {ARB_TEXTURE_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cb1647c..84c49c3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -87,6 +87,7 @@ enum wined3d_gl_extension ARB_STENCIL_TEXTURING, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, + ARB_TEXTURE_BUFFER_OBJECT, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC,

1 0

Andrey Gusev : d3dx11: Add D3DX11FilterTexture stub.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: d79933bfab5ffb8aca85dd2426ef8b0b6bb91d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79933bfab5ffb8aca85dd242… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Apr 9 21:17:15 2017 +0300 d3dx11: Add D3DX11FilterTexture stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e2bbb210a5973341adc9c88943da6ecebb9d9bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.c | 7 +++++++ dlls/d3dx11_43/d3dx11_43.spec | 2 +- include/d3dx11tex.h | 23 +++++++++++++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 815c162..12d4429 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -26,7 +26,7 @@ @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stub D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory diff --git a/dlls/d3dx11_43/d3dx11_43.c b/dlls/d3dx11_43/d3dx11_43.c index 201f3fb..4bf4998 100644 --- a/dlls/d3dx11_43/d3dx11_43.c +++ b/dlls/d3dx11_43/d3dx11_43.c @@ -61,6 +61,13 @@ BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) return FALSE; } +HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter) +{ + FIXME("context %p, texture %p, src_level %u, filter %#x stub!\n", context, texture, src_level, filter); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) { diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 452e513..a4e85af 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -26,7 +26,7 @@ @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump -@ stub D3DX11FilterTexture +@ stdcall D3DX11FilterTexture(ptr ptr long long) @ stub D3DX11GetImageInfoFromFileA @ stub D3DX11GetImageInfoFromFileW @ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 16b280a..584a3bd 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -21,6 +21,27 @@ #ifndef __D3DX11TEX_H__ #define __D3DX11TEX_H__ +typedef enum D3DX11_FILTER_FLAG +{ + D3DX11_FILTER_NONE = 0x00000001, + D3DX11_FILTER_POINT = 0x00000002, + D3DX11_FILTER_LINEAR = 0x00000003, + D3DX11_FILTER_TRIANGLE = 0x00000004, + D3DX11_FILTER_BOX = 0x00000005, + + D3DX11_FILTER_MIRROR_U = 0x00010000, + D3DX11_FILTER_MIRROR_V = 0x00020000, + D3DX11_FILTER_MIRROR_W = 0x00040000, + D3DX11_FILTER_MIRROR = 0x00070000, + + D3DX11_FILTER_DITHER = 0x00080000, + D3DX11_FILTER_DITHER_DIFFUSION = 0x00100000, + + D3DX11_FILTER_SRGB_IN = 0x00200000, + D3DX11_FILTER_SRGB_OUT = 0x00400000, + D3DX11_FILTER_SRGB = 0x00600000, +} D3DX11_FILTER_FLAG; + typedef enum D3DX11_IMAGE_FILE_FORMAT { D3DX11_IFF_BMP = 0, @@ -93,6 +114,8 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter); + HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult);

1 0

Sebastian Lackner : mmdevapi: Use InitOnce to initialize audio drivers.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: db393739a7f6646da896a9f23a0b9262e49e55b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db393739a7f6646da896a9f23… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 17 09:34:25 2017 +0100 mmdevapi: Use InitOnce to initialize audio drivers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit db0518507a595fbad33e47c1afe54edcf6a50b5d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 110c802..4246758 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -109,7 +109,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) return TRUE; } -static BOOL init_driver(void) +static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { static const WCHAR drv_value[] = {'A','u','d','i','o',0}; @@ -120,9 +120,6 @@ static BOOL init_driver(void) HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list; - if(drvs.module) - return TRUE; - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ DWORD size = sizeof(reg_list); @@ -276,10 +273,11 @@ static IClassFactoryImpl MMDEVAPI_CF[] = { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; unsigned int i = 0; TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!init_driver()){ + if(!InitOnceExecuteOnce(&init_once, init_driver, NULL, NULL)) { ERR("Driver initialization failed\n"); return E_FAIL; }

1 0

Piotr Caban : ucrtbase: Add __initialize_lconv_for_unsigned_char implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: b561a262b26fa53d4db415264e6362ed004603f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b561a262b26fa53d4db415264… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 22 14:37:45 2017 +0100 ucrtbase: Add __initialize_lconv_for_unsigned_char implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b0a58f217db73e3664ca4f7d5adf492ce91d015) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 60c588b..12bbbe6 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl ___lc_locale_name_func() ucrtbase.___lc_locale_name_func @ cdecl ___mb_cur_max_func() ucrtbase.___mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func @ stub __pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5da253b..c75d75e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -91,7 +91,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex

1 0

Hugh McMaster : regedit: Select the targeted treeview item on right mouse click.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 95f2e76bd4bc3bf875ca87414f26d07561efef01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f2e76bd4bc3bf875ca87414… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:36 2017 +0000 regedit: Select the targeted treeview item on right mouse click. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab0d0c6ee4325670f66a68af4f06fbd9acbb6151) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/childwnd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 74e30f8..b24e358 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -363,9 +363,14 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_CONTEXTMENU: { - int x = GET_X_LPARAM(lParam); - int y = GET_Y_LPARAM(lParam); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, x, y, 0, hFrameWnd, NULL); + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; + TVHITTESTINFO ht; + ht.pt = pt; + ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt); + if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) + SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hFrameWnd, NULL); } case WM_KEYDOWN:

1 0

Alex Henrie : ntdll: Implement ProcessVmCounters for Linux.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 0b9b4335018a23f4ebde4701932780f1854fb4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9b4335018a23f4ebde47019… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 22:55:37 2017 -0600 ntdll: Implement ProcessVmCounters for Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bf7a97e5d3482d1ee4130d716f02b870df804040) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/process.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 5 +---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index adff826..72376de 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -131,6 +131,34 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) #endif } +#elif defined(linux) + +static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +{ + FILE *f; + char line[256]; + unsigned long value; + + f = fopen("/proc/self/status", "r"); + if (!f) return; + + while (fgets(line, sizeof(line), f)) + { + if (sscanf(line, "VmPeak: %lu", &value)) + pvmi->PeakVirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSize: %lu", &value)) + pvmi->VirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmHWM: %lu", &value)) + pvmi->PeakWorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmRSS: %lu", &value)) + pvmi->WorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSwap: %lu", &value)) + pvmi->PeakPagefileUsage = pvmi->PagefileUsage = (ULONG64)value * 1024; + } + + fclose(f); +} + #else static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 448bc64..35e25af 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1078,10 +1078,7 @@ static void test_query_process_vm(void) /* Check if we have some return values */ trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); - todo_wine - { - ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); - } + ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); } static void test_query_process_io(void)

1 0

Nikolay Sivov : regedit: Sort each of top level branches separately.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 8c54035a62ab902d8f8cd5d6bfc9aa4db5b5e171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c54035a62ab902d8f8cd5d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 17 18:09:53 2017 +0300 regedit: Sort each of top level branches separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a9bae9629c7496724fa5ed7fac222441df082024) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/treeview.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 89afddd..f94041a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -465,6 +465,17 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) return TRUE; } +static void treeview_sort_item(HWND hWnd, HTREEITEM item) +{ + HTREEITEM child = (HTREEITEM)SendMessageW(hWnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + while (child != NULL) { + treeview_sort_item(hWnd, child); + child = (HTREEITEM)SendMessageW(hWnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)child); + } + SendMessageW(hWnd, TVM_SORTCHILDREN, 0, (LPARAM)item); +} + BOOL RefreshTreeView(HWND hwndTV) { HTREEITEM hItem; @@ -481,12 +492,12 @@ BOOL RefreshTreeView(HWND hwndTV) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hRoot); while (hItem) { RefreshTreeItem(hwndTV, hItem); + treeview_sort_item(hwndTV, hItem); hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hItem); } SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); - SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0