wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Józef Kucia : wined3d: Set default sampler filtering to NEAREST.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 519717459d29d5e8419e4b45c0ffdcecd004a05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=519717459d29d5e8419e4b45c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 25 10:57:23 2016 +0100 wined3d: Set default sampler filtering to NEAREST. 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> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c058881..046b04d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -790,11 +790,13 @@ static void create_default_sampler(struct wined3d_device *device) { GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); checkGLcall("glGenSamplers"); + GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); + GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST)); if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT)); - checkGLcall("glSamplerParamteri"); } + checkGLcall("glSamplerParamteri"); } else {

1 0

Józef Kucia : wined3d: Add EXT_texture_integer extension.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 5b9400ff77d905a68ccaf42c35a6b0453b0ee92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9400ff77d905a68ccaf42c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 25 10:57:20 2016 +0100 wined3d: Add EXT_texture_integer 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> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1b90854..4928647 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -194,6 +194,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, + {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, @@ -3408,6 +3409,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, + {EXT_TEXTURE_INTEGER, MAKEDWORD_VERSION(3, 0)}, /* We don't want to enable EXT_GPU_SHADER4: even though similar * functionality is available in core GL 3.0 / GLSL 1.30, it's different * enough that reusing the same flag for the new features hurts more diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index eabea36..b13c551 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -128,6 +128,7 @@ enum wined3d_gl_extension EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC, + EXT_TEXTURE_INTEGER, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SNORM,

1 0

Nikolay Sivov : d2d1: Support underlined text in DrawTextLayout().
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 43664072457b16e7351f6599200a6b7c12cc8875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43664072457b16e7351f65992… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 22:29:51 2016 +0300 d2d1: Support underlined text in DrawTextLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ec2fec1..7c8a43f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1661,10 +1661,25 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) { - FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; + struct d2d_draw_text_layout_ctx *context = ctx; + float min_thickness; + D2D1_RECT_F rect; + + TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n", iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); - return E_NOTIMPL; + /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ + min_thickness = 96.0f / (render_target->dpi_y * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)); + + rect.left = baseline_origin_x; + rect.top = baseline_origin_y + underline->offset; + rect.right = baseline_origin_x + underline->width; + rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness); + + ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, context->brush); + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx,

1 0

Jactry Zeng : winecfg: Use better shortcut keys.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: f80a3f6c25bbba3348611149e6c3a48dfdeaeeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80a3f6c25bbba3348611149e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 18 16:59:45 2016 +0800 winecfg: Use better shortcut keys. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 40 +++++++++++++++++++++++++++++----------- po/bg.po | 37 +++++++++++++++++++++++++++---------- po/ca.po | 40 +++++++++++++++++++++++++++++----------- po/cs.po | 40 +++++++++++++++++++++++++++++----------- po/da.po | 38 ++++++++++++++++++++++++++++---------- po/de.po | 40 +++++++++++++++++++++++++++++----------- po/el.po | 25 +++++++++++++++---------- po/en.po | 38 +++++++++++++++++++++----------------- po/en_US.po | 38 +++++++++++++++++++++----------------- po/eo.po | 38 +++++++++++++++++++++++++++----------- po/es.po | 40 +++++++++++++++++++++++++++++----------- po/fa.po | 22 +++++++++++++--------- po/fi.po | 40 +++++++++++++++++++++++++++++----------- po/fr.po | 40 +++++++++++++++++++++++++++++----------- po/he.po | 24 ++++++++++++++---------- po/hi.po | 22 +++++++++++++--------- po/hr.po | 40 +++++++++++++++++++++++++++++----------- po/hu.po | 37 +++++++++++++++++++++++++++---------- po/it.po | 37 +++++++++++++++++++++++++++---------- po/ja.po | 38 +++++++++++++++++++++----------------- po/ko.po | 38 +++++++++++++++++++++----------------- po/lt.po | 40 +++++++++++++++++++++++++++++----------- po/ml.po | 22 +++++++++++++--------- po/nb_NO.po | 40 +++++++++++++++++++++++++++++----------- po/nl.po | 40 +++++++++++++++++++++++++++++----------- po/or.po | 22 +++++++++++++--------- po/pa.po | 22 +++++++++++++--------- po/pl.po | 40 +++++++++++++++++++++++++++++----------- po/pt_BR.po | 40 +++++++++++++++++++++++++++++----------- po/pt_PT.po | 40 +++++++++++++++++++++++++++++----------- po/rm.po | 25 +++++++++++++++---------- po/ro.po | 40 +++++++++++++++++++++++++++++----------- po/ru.po | 40 +++++++++++++++++++++++++++++----------- po/sk.po | 40 ++++++++++++++++++++++++++++------------ po/sl.po | 37 +++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 25 +++++++++++++++---------- po/sr_RS(a)latin.po | 37 +++++++++++++++++++++++++++---------- po/sv.po | 40 +++++++++++++++++++++++++++++----------- po/te.po | 22 +++++++++++++--------- po/th.po | 25 +++++++++++++++---------- po/tr.po | 38 ++++++++++++++++++++++++++++---------- po/uk.po | 40 +++++++++++++++++++++++++++++----------- po/wa.po | 22 +++++++++++++--------- po/wine.pot | 22 +++++++++++++--------- po/zh_CN.po | 38 +++++++++++++++++++++----------------- po/zh_TW.po | 38 +++++++++++++++++++++----------------- programs/winecfg/winecfg.rc | 18 +++++++++--------- 47 files changed, 1081 insertions(+), 524 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f80a3f6c25bbba3348611…

1 0

Austin English : msdrm: Add stub dll.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 9a75a2f7eb5038842c37f5aa16becf8492801d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a75a2f7eb5038842c37f5aa1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 5 22:07:46 2016 -0600 msdrm: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msdrm/Makefile.in | 4 +++ dlls/msdrm/main.c | 40 +++++++++++++++++++++++ dlls/msdrm/msdrm.spec | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 136 insertions(+) diff --git a/configure b/configure index 0bcb3af..6edecf6 100755 --- a/configure +++ b/configure @@ -1176,6 +1176,7 @@ enable_msctfp enable_msdaps enable_msdelta enable_msdmo +enable_msdrm enable_msftedit enable_msg711_acm enable_msgsm32_acm @@ -17667,6 +17668,7 @@ wine_fn_config_dll msdaps enable_msdaps clean wine_fn_config_dll msdelta enable_msdelta wine_fn_config_dll msdmo enable_msdmo implib wine_fn_config_test dlls/msdmo/tests msdmo_test +wine_fn_config_dll msdrm enable_msdrm wine_fn_config_dll msftedit enable_msftedit wine_fn_config_dll msg711.acm enable_msg711_acm wine_fn_config_dll msgsm32.acm enable_msgsm32_acm diff --git a/configure.ac b/configure.ac index 2c18819..853277f 100644 --- a/configure.ac +++ b/configure.ac @@ -3036,6 +3036,7 @@ WINE_CONFIG_DLL(msdaps,,[clean]) WINE_CONFIG_DLL(msdelta) WINE_CONFIG_DLL(msdmo,,[implib]) WINE_CONFIG_TEST(dlls/msdmo/tests) +WINE_CONFIG_DLL(msdrm) WINE_CONFIG_DLL(msftedit) WINE_CONFIG_DLL(msg711.acm) WINE_CONFIG_DLL(msgsm32.acm) diff --git a/dlls/msdrm/Makefile.in b/dlls/msdrm/Makefile.in new file mode 100644 index 0000000..ada79d5 --- /dev/null +++ b/dlls/msdrm/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msdrm.dll + +C_SRCS = \ + main.c diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c new file mode 100644 index 0000000..9e6d2e9 --- /dev/null +++ b/dlls/msdrm/main.c @@ -0,0 +1,40 @@ +/* + * msdrm.dll + * + * Copyright 2016 Austin English + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec new file mode 100644 index 0000000..5d4d3d6 --- /dev/null +++ b/dlls/msdrm/msdrm.spec @@ -0,0 +1,89 @@ +@ stub DRMAcquireAdvisories +@ stub DRMAcquireIssuanceLicenseTemplate +@ stub DRMAcquireLicense +@ stub DRMActivate +@ stub DRMAddLicense +@ stub DRMAddRightWithUser +@ stub DRMAttest +@ stub DRMCheckSecurity +@ stub DRMClearAllRights +@ stub DRMCloseEnvironmentHandle +@ stub DRMCloseHandle +@ stub DRMClosePubHandle +@ stub DRMCloseQueryHandle +@ stub DRMCloseSession +@ stub DRMConstructCertificateChain +@ stub DRMCreateBoundLicense +@ stub DRMCreateClientSession +@ stub DRMCreateEnablingBitsDecryptor +@ stub DRMCreateEnablingBitsEncryptor +@ stub DRMCreateEnablingPrincipal +@ stub DRMCreateIssuanceLicense +@ stub DRMCreateLicenseStorageSession +@ stub DRMCreateRight +@ stub DRMCreateUser +@ stub DRMDecode +@ stub DRMDeconstructCertificateChain +@ stub DRMDecrypt +@ stub DRMDeleteLicense +@ stub DRMDuplicateEnvironmentHandle +@ stub DRMDuplicateHandle +@ stub DRMDuplicatePubHandle +@ stub DRMDuplicateSession +@ stub DRMEncode +@ stub DRMEncrypt +@ stub DRMEnumerateLicense +@ stub DRMGetApplicationSpecificData +@ stub DRMGetBoundLicenseAttribute +@ stub DRMGetBoundLicenseAttributeCount +@ stub DRMGetBoundLicenseObject +@ stub DRMGetBoundLicenseObjectCount +@ stub DRMGetCertificateChainCount +@ stub DRMGetClientVersion +@ stub DRMGetEnvironmentInfo +@ stub DRMGetInfo +@ stub DRMGetIntervalTime +@ stub DRMGetIssuanceLicenseInfo +@ stub DRMGetIssuanceLicenseTemplate +@ stub DRMGetMetaData +@ stub DRMGetNameAndDescription +@ stub DRMGetOwnerLicense +@ stub DRMGetProcAddress +@ stub DRMGetRevocationPoint +@ stub DRMGetRightExtendedInfo +@ stub DRMGetRightInfo +@ stub DRMGetSecurityProvider +@ stub DRMGetServiceLocation +@ stub DRMGetSignedIssuanceLicense +@ stub DRMGetSignedIssuanceLicenseEx +@ stub DRMGetTime +@ stub DRMGetUnboundLicenseAttribute +@ stub DRMGetUnboundLicenseAttributeCount +@ stub DRMGetUnboundLicenseObject +@ stub DRMGetUnboundLicenseObjectCount +@ stub DRMGetUsagePolicy +@ stub DRMGetUserInfo +@ stub DRMGetUserRights +@ stub DRMGetUsers +@ stub DRMInitEnvironment +@ stub DRMIsActivated +@ stub DRMIsWindowProtected +@ stub DRMLoadLibrary +@ stub DRMParseUnboundLicense +@ stub DRMRegisterContent +@ stub DRMRegisterProtectedWindow +@ stub DRMRegisterRevocationList +@ stub DRMRepair +@ stub DRMSetApplicationSpecificData +@ stub DRMSetGlobalOptions +@ stub DRMSetIntervalTime +@ stub DRMSetMetaData +@ stub DRMSetNameAndDescription +@ stub DRMSetRevocationPoint +@ stub DRMSetUsagePolicy +@ stub DRMVerify +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub __AddMachineCertToLicenseStore

1 0

Alex Henrie : kernel32: Set error if dstlen < 0 in codepage conversion functions.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 6e841fdb75807c159b1f9775be42d0ea11dd8216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e841fdb75807c159b1f9775b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 23 21:56:59 2015 -0700 kernel32: Set error if dstlen < 0 in codepage conversion functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/tests/codepage.c | 48 +++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8ecbb0c..d7619db 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2152,7 +2152,7 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, const union cptable *table; int ret; - if (!src || !srclen || (!dst && dstlen)) + if (!src || !srclen || (!dst && dstlen) || dstlen < 0) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -2368,7 +2368,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, const union cptable *table; int ret, used_tmp; - if (!src || !srclen || (!dst && dstlen)) + if (!src || !srclen || (!dst && dstlen) || dstlen < 0) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 54f62ae..6718a3b 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winnls.h" +static const char foobarA[] = "foobar"; static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; static void test_destination_buffer(void) @@ -144,48 +145,57 @@ static void test_negative_source_length(void) static void test_negative_dest_length(void) { int len, i; - static char buf[LONGBUFLEN]; + static WCHAR bufW[LONGBUFLEN]; + static char bufA[LONGBUFLEN]; static WCHAR originalW[LONGBUFLEN]; static char originalA[LONGBUFLEN]; DWORD theError; /* Test return on -1 dest length */ SetLastError( 0xdeadbeef ); - memset(buf,'x',sizeof(buf)); - len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buf, -1, NULL, NULL); - todo_wine { - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "WideCharToMultiByte(destlen -1): len=%d error=%x\n", len, GetLastError()); - } + memset(bufA,'x',sizeof(bufA)); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, bufA, -1, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, + "WideCharToMultiByte(destlen -1): len=%d error=%x\n", len, GetLastError()); + + SetLastError( 0xdeadbeef ); + memset(bufW,'x',sizeof(bufW)); + len = MultiByteToWideChar(CP_ACP, 0, foobarA, -1, bufW, -1); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, + "MultiByteToWideChar(destlen -1): len=%d error=%x\n", len, GetLastError()); /* Test return on -1000 dest length */ SetLastError( 0xdeadbeef ); - memset(buf,'x',sizeof(buf)); - len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buf, -1000, NULL, NULL); - todo_wine { - ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "WideCharToMultiByte(destlen -1000): len=%d error=%x\n", len, GetLastError()); - } + memset(bufA,'x',sizeof(bufA)); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, bufA, -1000, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, + "WideCharToMultiByte(destlen -1000): len=%d error=%x\n", len, GetLastError()); + + SetLastError( 0xdeadbeef ); + memset(bufW,'x',sizeof(bufW)); + len = MultiByteToWideChar(CP_ACP, 0, foobarA, -1000, bufW, -1); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, + "MultiByteToWideChar(destlen -1000): len=%d error=%x\n", len, GetLastError()); /* Test return on INT_MAX dest length */ SetLastError( 0xdeadbeef ); - memset(buf,'x',sizeof(buf)); - len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buf, INT_MAX, NULL, NULL); - ok(len == 7 && !lstrcmpA(buf, "foobar") && GetLastError() == 0xdeadbeef, + memset(bufA,'x',sizeof(bufA)); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, bufA, INT_MAX, NULL, NULL); + ok(len == 7 && !lstrcmpA(bufA, "foobar") && GetLastError() == 0xdeadbeef, "WideCharToMultiByte(destlen INT_MAX): len=%d error=%x\n", len, GetLastError()); /* Test return on INT_MAX dest length and very long input */ SetLastError( 0xdeadbeef ); - memset(buf,'x',sizeof(buf)); + memset(bufA,'x',sizeof(bufA)); for (i=0; i < LONGBUFLEN - 1; i++) { originalW[i] = 'Q'; originalA[i] = 'Q'; } originalW[LONGBUFLEN-1] = 0; originalA[LONGBUFLEN-1] = 0; - len = WideCharToMultiByte(CP_ACP, 0, originalW, -1, buf, INT_MAX, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, originalW, -1, bufA, INT_MAX, NULL, NULL); theError = GetLastError(); - ok(len == LONGBUFLEN && !lstrcmpA(buf, originalA) && theError == 0xdeadbeef, + ok(len == LONGBUFLEN && !lstrcmpA(bufA, originalA) && theError == 0xdeadbeef, "WideCharToMultiByte(srclen %d, destlen INT_MAX): len %d error=%x\n", LONGBUFLEN, len, theError); }

1 0

Anton Baskanov : user32: Correctly update caret state in the server in SetCaretPos.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 92205565607bdcca256d0dd15cc52dfe01f4eed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92205565607bdcca256d0dd15… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 17:39:02 2015 +0100 user32: Correctly update caret state in the server in SetCaretPos. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 8 ++++---- include/wine/server_protocol.h | 9 ++++++++- server/protocol.def | 9 ++++++++- server/queue.c | 11 +++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 53bb5b4..686dade 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -86,7 +86,7 @@ static void CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT_PTR id, DWORD cti req->x = 0; req->y = 0; req->hide = 0; - req->state = -1; /* toggle current state */ + req->state = CARET_STATE_TOGGLE; if ((ret = !wine_server_call( req ))) { hwnd = wine_server_ptr_handle( reply->full_handle ); @@ -256,7 +256,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) req->x = x; req->y = y; req->hide = 0; - req->state = 1; + req->state = CARET_STATE_ON_IF_MOVED; if ((ret = !wine_server_call_err( req ))) { hwnd = wine_server_ptr_handle( reply->full_handle ); @@ -300,7 +300,7 @@ BOOL WINAPI HideCaret( HWND hwnd ) req->x = 0; req->y = 0; req->hide = 1; - req->state = 0; + req->state = CARET_STATE_OFF; if ((ret = !wine_server_call_err( req ))) { hwnd = wine_server_ptr_handle( reply->full_handle ); @@ -339,7 +339,7 @@ BOOL WINAPI ShowCaret( HWND hwnd ) req->x = 0; req->y = 0; req->hide = -1; - req->state = 1; + req->state = CARET_STATE_ON; if ((ret = !wine_server_call_err( req ))) { hwnd = wine_server_ptr_handle( reply->full_handle ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 61e6d3f..a870874 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4222,6 +4222,13 @@ struct set_caret_info_reply #define SET_CARET_POS 0x01 #define SET_CARET_HIDE 0x02 #define SET_CARET_STATE 0x04 +enum caret_state +{ + CARET_STATE_OFF, + CARET_STATE_ON, + CARET_STATE_TOGGLE, + CARET_STATE_ON_IF_MOVED +}; @@ -6157,6 +6164,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 500 +#define SERVER_PROTOCOL_VERSION 501 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 2819382..cde8f63 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2968,7 +2968,7 @@ enum coords_relative int x; /* caret x position */ int y; /* caret y position */ int hide; /* increment for hide count (can be negative to show it) */ - int state; /* caret state (1=on, 0=off, -1=toggle current state) */ + int state; /* caret state (see below) */ @REPLY user_handle_t full_handle; /* handle to the current caret window */ rectangle_t old_rect; /* previous caret rectangle */ @@ -2978,6 +2978,13 @@ enum coords_relative #define SET_CARET_POS 0x01 /* set the caret position from x,y */ #define SET_CARET_HIDE 0x02 /* increment the caret hide count */ #define SET_CARET_STATE 0x04 /* set the caret on/off state */ +enum caret_state +{ + CARET_STATE_OFF, /* off */ + CARET_STATE_ON, /* on */ + CARET_STATE_TOGGLE, /* toggle current state */ + CARET_STATE_ON_IF_MOVED /* on if the position differs, unchanged otherwise */ +}; /* Set a window hook */ diff --git a/server/queue.c b/server/queue.c index 3099e12..7fe0d03 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3039,8 +3039,15 @@ DECL_HANDLER(set_caret_info) } if (req->flags & SET_CARET_STATE) { - if (req->state == -1) input->caret_state = !input->caret_state; - else input->caret_state = !!req->state; + switch (req->state) + { + case CARET_STATE_OFF: input->caret_state = 0; break; + case CARET_STATE_ON: input->caret_state = 1; break; + case CARET_STATE_TOGGLE: input->caret_state = !input->caret_state; break; + case CARET_STATE_ON_IF_MOVED: + if (req->x != reply->old_rect.left || req->y != reply->old_rect.top) input->caret_state = 1; + break; + } } }

1 0

Francois Gouget : bcrypt: Add a trailing '\n' to a WARN() call.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 5d9d6e494fff4556818ba4c5b8ff53ac76490aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9d6e494fff4556818ba4c5b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 24 19:52:00 2016 +0100 bcrypt: Add a trailing '\n' to a WARN() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4871f20..e6da379 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -584,7 +584,7 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu return get_hash_property( hash->alg_id, prop, buffer, count, res ); } default: - WARN( "unknown magic %08x", object->magic ); + WARN( "unknown magic %08x\n", object->magic ); return STATUS_INVALID_HANDLE; } }

1 0

Francois Gouget : mshtml/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 288a200bd2d1a69a01bc827a93f2fd17865113a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=288a200bd2d1a69a01bc827a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 24 19:51:14 2016 +0100 mshtml/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2940cee..7b5b395 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1420,7 +1420,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) hres = IHTMLElement_getAttribute(elem, bstr, 2, &val); ok(hres == S_OK, "getAttribute failed: %08x\n", hres); - ok(V_VT(&val) == VT_BSTR, "V_VT(val) = %u, expected VT_BSTR", V_VT(&val)); + ok(V_VT(&val) == VT_BSTR, "V_VT(val) = %u, expected VT_BSTR\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "null"), "V_BSTR(val) = %s, expected \"null\"\n", wine_dbgstr_w(V_BSTR(&val))); VariantClear(&val);

1 0

Francois Gouget : bcrypt/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 25 Jan '16

25 Jan '16

Module: wine Branch: master Commit: 1b403596f6f892b001c424483133d2e488233595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b403596f6f892b001c424483… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 24 19:50:49 2016 +0100 bcrypt/tests: Add a trailing '\n' to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 721221c..edf478c 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -92,7 +92,7 @@ static void test_sha1(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); @@ -171,7 +171,7 @@ static void test_sha256(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); @@ -250,7 +250,7 @@ static void test_sha384(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); @@ -330,7 +330,7 @@ static void test_sha512(void) alg = NULL; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(alg != NULL, "alg not set"); + ok(alg != NULL, "alg not set\n"); len = size = 0xdeadbeef; ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016