November 2018 - Wine-Commits

Henri Verbeet : wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 74931f9217869f8cad6b0b686ea1085f048e9c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=74931f9217869f8cad6b0b68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:28:14 2018 +0330 wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- dlls/wined3d/texture.c | 6 ------ include/wine/wined3d.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7cb32a6..6d6f530 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4563,8 +4563,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.depth = 1; desc.size = 0; - hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, - &data, NULL, &wined3d_null_parent_ops, &texture); + hr = wined3d_texture_create(device, &desc, 1, 1, 0, &data, NULL, &wined3d_null_parent_ops, &texture); wined3d_resource_unmap(&cursor_image->resource, sub_resource_idx); if (FAILED(hr)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dbc256f..5b41d4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) - || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) - WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) @@ -3010,8 +3006,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return hr; } wined3d_resource_update_draw_binding(&texture->resource); - if (flags & WINED3D_TEXTURE_CREATE_MAPPABLE) - texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture->texture_ops = texture_ops; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40553f7..b0b1abc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1562,7 +1562,6 @@ enum wined3d_shader_type #define WINED3D_PALETTE_ALLOW_256 0x00000002 #define WINED3D_PALETTE_ALPHA 0x00000004 -#define WINED3D_TEXTURE_CREATE_MAPPABLE 0x00000001 #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008

1 0

Alexandre Julliard : user32: Fix wraparound check to avoid gcc optimization.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 7507541a5bac5a42558610acebd1cf70c02cc7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7507541a5bac5a42558610ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 20:17:30 2018 +0100 user32: Fix wraparound check to avoid gcc optimization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 95f5ac7..dd6142d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1611,8 +1611,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (cy < 0) cy = 0; SetRect( &rect, cs->x, cs->y, cs->x + cx, cs->y + cy ); /* check for wraparound */ - if (cs->x + cx < cs->x) rect.right = 0x7fffffff; - if (cs->y + cy < cs->y) rect.bottom = 0x7fffffff; + if (cs->x > 0x7fffffff - cx) rect.right = 0x7fffffff; + if (cs->y > 0x7fffffff - cy) rect.bottom = 0x7fffffff; if (!set_window_pos( hwnd, 0, SWP_NOZORDER | SWP_NOACTIVATE, &rect, &rect, NULL )) goto failed; /* send WM_NCCREATE */

1 0

Alexandre Julliard : wineandroid: Enable some Java compiler warnings.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 4e21bb44e4cd403d4ae618a12d01e8af50c3fa8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e21bb44e4cd403d4ae618a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:41:33 2018 +0100 wineandroid: Enable some Java compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 +- dlls/wineandroid.drv/build.gradle.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 4cfe8e0..8013b3a 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -729,7 +729,7 @@ public class WineActivity extends Activity { Log.i( LOGTAG, String.format( "view key event win %08x action %d keycode %d (%s)", window.hwnd, event.getAction(), event.getKeyCode(), - event.keyCodeToString( event.getKeyCode() )));; + KeyEvent.keyCodeToString( event.getKeyCode() )));; boolean ret = wine_keyboard_event( window.hwnd, event.getAction(), event.getKeyCode(), event.getMetaState() ); if (!ret) ret = super.dispatchKeyEvent(event); diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 7271c49..3fba34a 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -56,6 +56,11 @@ tasks.whenTaskAdded { t -> } } +tasks.withType(JavaCompile) +{ + options.compilerArgs << "-Xlint" +} + android { compileSdkVersion 25

1 0

Andrey Gusev : slc: Add SLGetLicensingStatusInformation stub.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 92f38bc8790cbfb31badf97a211ed890ac00c1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f38bc8790cbfb31badf97a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 22 20:43:30 2018 +0200 slc: Add SLGetLicensingStatusInformation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46172 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/slc.c | 8 ++++++++ dlls/slc/slc.spec | 2 +- include/slerror.h | 1 + include/slpublic.h | 22 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 7b7a6c6..ffecaa0 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -31,6 +31,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(slc); +HRESULT WINAPI SLGetLicensingStatusInformation(HSLC handle, const SLID *app, const SLID *product, + LPCWSTR name, UINT *count, SL_LICENSING_STATUS **status) +{ + FIXME("(%p %p %p %s %p %p) stub\n", handle, app, product, debugstr_w(name), count, status ); + + return SL_E_RIGHT_NOT_CONSUMED; +} + HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size) { FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size ); diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index e4289d3..57e5572 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -16,7 +16,7 @@ @ stub SLGetLicense @ stub SLGetLicenseFileId @ stub SLGetLicenseInformation -@ stub SLGetLicensingStatusInformation +@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr) @ stub SLGetPKeyId @ stub SLGetPKeyInformation @ stub SLGetPolicyInformation diff --git a/include/slerror.h b/include/slerror.h index 8b45d99..4980a96 100644 --- a/include/slerror.h +++ b/include/slerror.h @@ -19,6 +19,7 @@ #ifndef __WINE_SLERROR_H #define __WINE_SLERROR_H +#define SL_E_RIGHT_NOT_CONSUMED 0xC004F002 #define SL_E_VALUE_NOT_FOUND 0xC004F012 #define SL_E_RIGHT_NOT_GRANTED 0xC004F013 #define SL_E_DATATYPE_MISMATCHED 0xC004F01E diff --git a/include/slpublic.h b/include/slpublic.h index dc02f3c..97fa8c7 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,6 +29,8 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif +typedef GUID SLID; + typedef PVOID HSLC; typedef enum _tagSLDATATYPE @@ -41,6 +43,26 @@ typedef enum _tagSLDATATYPE SL_DATA_SUM = 100, } SLDATATYPE; +typedef enum _tagSLLICENSINGSTATUS +{ + SL_LICENSING_STATUS_UNLICENSED, + SL_LICENSING_STATUS_LICENSED, + SL_LICENSING_STATUS_IN_GRACE_PERIOD, + SL_LICENSING_STATUS_NOTIFICATION, + SL_LICENSING_STATUS_LAST +} SLLICENSINGSTATUS; + +typedef struct _tagSL_LICENSING_STATUS +{ + SLID SkuId; + SLLICENSINGSTATUS eStatus; + DWORD dwGraceTime; + DWORD dwTotalGraceDays; + HRESULT hrReason; + UINT64 qwValidityExpiration; +} SL_LICENSING_STATUS; + +SLCAPI HRESULT WINAPI SLGetLicensingStatusInformation(HSLC, const SLID*, const SLID*, LPCWSTR, UINT*, SL_LICENSING_STATUS**); SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); SLCAPI HRESULT WINAPI SLOpen(HSLC*);

1 0

Daniel Ansorregui : wined3d: Simplify "glsl_generate_ffp" texture projection.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 5a961e8de7f3b0ffb812f6f8e0972345084fce24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a961e8de7f3b0ffb812f6f8… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Sat Nov 24 20:13:32 2018 +0000 wined3d: Simplify "glsl_generate_ffp" texture projection. This is to simplify the code before adding the FETCH4 modifications. No change is intended in the shader generation. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 63 ++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ad59e97..5f1a866 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9869,65 +9869,34 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: - if (proj) - { - texture_function = "texture1DProj"; - coord_mask = "xw"; - } - else - { - texture_function = "texture1D"; - coord_mask = "x"; - } + texture_function = "texture1D"; + coord_mask = "x"; break; case WINED3D_GL_RES_TYPE_TEX_2D: - if (proj) - { - texture_function = "texture2DProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2D"; - coord_mask = "xy"; - } + texture_function = "texture2D"; + coord_mask = "xy"; break; case WINED3D_GL_RES_TYPE_TEX_3D: - if (proj) - { - texture_function = "texture3DProj"; - coord_mask = "xyzw"; - } - else - { - texture_function = "texture3D"; - coord_mask = "xyz"; - } + texture_function = "texture3D"; + coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_CUBE: texture_function = "textureCube"; coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_RECT: - if (proj) - { - texture_function = "texture2DRectProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2DRect"; - coord_mask = "xy"; - } + texture_function = "texture2DRect"; + coord_mask = "xy"; break; default: FIXME("Unhandled texture type %#x.\n", settings->op[stage].tex_type); texture_function = ""; coord_mask = "xyzw"; + proj = FALSE; break; } if (!legacy_syntax) - texture_function = proj ? "textureProj" : "texture"; + texture_function = "texture"; if (stage > 0 && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP @@ -9959,8 +9928,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ret.%s%s);\n", + stage, texture_function, proj ? "Proj" : "", stage, coord_mask, proj ? "w" : ""); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -9968,13 +9937,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].%s%s);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage, coord_mask, proj ? "w" : ""); } string_buffer_sprintf(tex_reg_name, "tex%u", stage);

1 0

Alexandre Julliard : wineandroid: Support for setting the cursor on Android >= N.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 61888e001279d28ba6e95c81b47db4e009148da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61888e001279d28ba6e95c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:11:44 2018 +0100 wineandroid: Support for setting the cursor on Android >= N. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 28 ++++ dlls/wineandroid.drv/android.h | 4 +- dlls/wineandroid.drv/build.gradle.in | 2 +- dlls/wineandroid.drv/device.c | 72 ++++++++ dlls/wineandroid.drv/window.c | 266 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 6 files changed, 371 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61888e001279d28ba6e9…

1 0

Zebediah Figura : ntoskrnl.exe: Implement KeWaitForSingleObject().
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 05b278675f4b213fe881bbc6175c09a812f3047c URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b278675f4b213fe881bbc6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 24 22:34:42 2018 -0600 ntoskrnl.exe: Implement KeWaitForSingleObject(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ------------- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e6ca5e9..c1cfb03 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2447,19 +2447,6 @@ VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) } /*********************************************************************** - * KeWaitForSingleObject (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, - KWAIT_REASON WaitReason, - KPROCESSOR_MODE WaitMode, - BOOLEAN Alertable, - PLARGE_INTEGER Timeout) -{ - FIXME( "stub: %p, %d, %d, %d, %p\n", Object, WaitReason, WaitMode, Alertable, Timeout ); - return STATUS_NOT_IMPLEMENTED; -} - -/*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) */ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 3e6fcd4..8011b56 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -114,6 +114,15 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], } /*********************************************************************** + * KeWaitForSingleObject (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForSingleObject( void *obj, KWAIT_REASON reason, + KPROCESSOR_MODE mode, BOOLEAN alertable, LARGE_INTEGER *timeout ) +{ + return KeWaitForMultipleObjects( 1, &obj, WaitAny, reason, mode, alertable, timeout, NULL ); +} + +/*********************************************************************** * KeInitializeEvent (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeEvent( PRKEVENT event, EVENT_TYPE type, BOOLEAN state ) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index dbbc5a1..522bb3f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1433,6 +1433,7 @@ LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG,void*[],WAIT_TYPE,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*,KWAIT_BLOCK*); +NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);

1 0

Zhiyi Zhang : kernelbase: Implement PathCchAppendEx.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 9bd8254a8510b62e2781e9aa0d716a915f4c8a91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bd8254a8510b62e2781e9aa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 26 10:31:34 2018 +0800 kernelbase: Implement PathCchAppendEx. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 25 +++++ dlls/kernelbase/tests/path.c | 123 +++++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 151 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9bd8254a8510b62e2781…

1 0

Zhiyi Zhang : kernelbase: Implement PathAllocCombine.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: abcfcb1d7eadabc67fd6d13989ebcae587d1dd34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abcfcb1d7eadabc67fd6d139… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 26 10:31:03 2018 +0800 kernelbase: Implement PathAllocCombine. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 57 ++++++++++ dlls/kernelbase/tests/path.c | 117 +++++++++++++++++++-- include/pathcch.h | 1 + 5 files changed, 166 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=abcfcb1d7eadabc67fd6…

1 0

Dmitry Timoshkov : user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 96d0af52eb0d14084397647b974c5efebb59d0f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d0af52eb0d14084397647b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Nov 25 20:58:00 2018 +0300 user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. This patch also changes the logic to get the control style with WM_GETDLGCODE instead of GetWindowLong to make the message test pass. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9255a46..9a011ba 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -309,7 +309,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, SendMessageW( hWnd, BM_SETCHECK, !(state & BST_CHECKED), 0 ); break; case BS_AUTORADIOBUTTON: - SendMessageW( hWnd, BM_SETCHECK, TRUE, 0 ); + BUTTON_CheckAutoRadioButton( hWnd ); break; case BS_AUTO3STATE: SendMessageW( hWnd, BM_SETCHECK, @@ -475,8 +475,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, set_button_state( hWnd, (state & ~3) | wParam ); paint_button( hWnd, btn_type, ODA_SELECT ); } - if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) - BUTTON_CheckAutoRadioButton( hWnd ); break; case BM_GETSTATE: @@ -961,13 +959,12 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) parent = GetParent(hwnd); /* make sure that starting control is not disabled or invisible */ - start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE ); + start = sibling = hwnd; do { if (!sibling) break; - if ((hwnd != sibling) && - ((GetWindowLongW( sibling, GWL_STYLE) & BS_TYPEMASK) == BS_AUTORADIOBUTTON)) - SendMessageW( sibling, BM_SETCHECK, BST_UNCHECKED, 0 ); + if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); }

1 0