January 2016 - Wine-Commits

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

Jan. 25, 2016

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 Jan. 25, 2016

Jan. 25, 2016

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 Jan. 25, 2016

Jan. 25, 2016

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

Sebastian Lackner : server: Add missing check for objattr variable in load_registry wineserver call ( Coverity).
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: a52a117f80330e1ad8c322f8282b1eabeafcf0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52a117f80330e1ad8c322f82… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 24 18:50:43 2016 +0100 server: Add missing check for objattr variable in load_registry wineserver call (Coverity). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/registry.c b/server/registry.c index 5723824..a35765c 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2187,6 +2187,8 @@ DECL_HANDLER(load_registry) const struct security_descriptor *sd; const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); + if (!objattr) return; + if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { set_error( STATUS_PRIVILEGE_NOT_HELD );

1 0

Nikolay Sivov : ctl3d32: Claim success in Ctl3dRegister().
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 28afe7fc04e1a069163c3c56f28a61df1a3b068b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28afe7fc04e1a069163c3c56f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 13:33:25 2016 +0300 ctl3d32: Claim success in Ctl3dRegister(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctl3d32/ctl3d32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ctl3d32/ctl3d32.c b/dlls/ctl3d32/ctl3d32.c index cbcb93d..6d3ceb0 100644 --- a/dlls/ctl3d32/ctl3d32.c +++ b/dlls/ctl3d32/ctl3d32.c @@ -75,7 +75,7 @@ BOOL WINAPI Ctl3dIsAutoSubclass(void) BOOL WINAPI Ctl3dRegister(HINSTANCE hInst) { - return FALSE; + return TRUE; } BOOL WINAPI Ctl3dSubclassCtl(HWND hwnd)

1 0

Nikolay Sivov : dwrite: Cluster text position is relative to initial run.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 91df67df0c1804c81e242e5281f1835e06f0fbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=91df67df0c1804c81e242e528… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:57 2016 +0300 dwrite: Cluster text position is relative to initial run. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9109924..b5f6aa8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -601,7 +601,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, } metrics->length = length; - position = stop_position; + position = run->descr.textPosition + stop_position; if (stop_glyph == run->glyphcount) breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; else {

1 0

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

Jan. 25, 2016

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

Sebastian Lackner : server: Avoid invalid memory access if creation of namespace fails in create_directory (Coverity).
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 9dab25c12483f7a684686bdb0f82bc523b6b0e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dab25c12483f7a684686bdb0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 24 18:50:56 2016 +0100 server: Avoid invalid memory access if creation of namespace fails in create_directory (Coverity). Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index de049ef..937ab89 100644 --- a/server/directory.c +++ b/server/directory.c @@ -192,7 +192,7 @@ static struct directory *create_directory( struct directory *root, const struct if (!(dir->entries = create_namespace( hash_size ))) { release_object( dir ); - dir = NULL; + return NULL; } if (sd) default_set_sd( &dir->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION );

1 0

Nikolay Sivov : dwrite: Update line breaking logic with Unicode 8.0.0 modifications.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 10b843bb22fa21e73943a19adb3109d1291899a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b843bb22fa21e73943a19ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:59 2016 +0300 dwrite: Update line breaking logic with Unicode 8.0.0 modifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a55b27f..094fb69 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -522,8 +522,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_BB: set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; - /* LB21a */ + /* LB21a, LB21b */ case b_HL: + /* LB21a */ if (i < count-1) switch (break_class[i+1]) { @@ -531,6 +532,9 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_BA: set_break_condition(i+1, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); } + /* LB21b */ + if (i > 0 && break_class[i-1] == b_SY) + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; /* LB22 */ case b_IN: @@ -540,6 +544,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B { case b_AL: case b_HL: + case b_EX: case b_ID: case b_IN: case b_NU:

1 0

Nikolay Sivov : dwrite: Fix off by one issue in line breaking rule LB21a.
by Alexandre Julliard Jan. 25, 2016

Jan. 25, 2016

Module: wine Branch: master Commit: 68c45de6ae48743bf813c35b4e2c9c0fbb8891d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c45de6ae48743bf813c35b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 24 18:10:58 2016 +0300 dwrite: Fix off by one issue in line breaking rule LB21a. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index af034d1..a55b27f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -524,7 +524,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB21a */ case b_HL: - if (i < count-2) + if (i < count-1) switch (break_class[i+1]) { case b_HY:

1 0