June 2016 - Wine-Commits - list.winehq.org

Andrey Gusev : server: Fix a typo in comment.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 9035e58e6758ebde3fbd010f868acbc4b251b635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9035e58e6758ebde3fbd010f8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 00:00:13 2016 +0300 server: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 4d275f0..93f785a 100644 --- a/server/console.c +++ b/server/console.c @@ -486,7 +486,7 @@ int free_console( struct process *process ) /* let process inherit the console from parent... this handle two cases : * 1/ generic console inheritance * 2/ parent is a renderer which launches process, and process should attach to the console - * renderered by parent + * rendered by parent */ void inherit_console(struct thread *parent_thread, struct process *process, obj_handle_t hconin) {

1 0

Andrey Gusev : urlmon/tests: Fix a typo in ok() message.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 805092f8f6a69677e8ca996cf447aac641b19039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805092f8f6a69677e8ca996cf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:53:58 2016 +0300 urlmon/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index dcf0970..40c0ca9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1636,7 +1636,7 @@ static void test_MkParseDisplayNameEx(void) ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, NULL, 0, &name); - ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(name, url9), "wrong display name %s\n", wine_dbgstr_w(name)); CoTaskMemFree(name);

1 0

YongHao Hu : msvcr120/tests: Add critical section test.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 7456d5e433363718b97189cdb076d9848533246d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7456d5e433363718b97189cdb… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Fri Jun 3 14:36:39 2016 +0200 msvcr120/tests: Add critical section test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 251 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7456d5e433363718b9718…

1 0

Andrey Gusev : kernel32/tests: Fix a typo in ok() messages.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 2f5d04aaeb2197af2cda519fcf692a47ba3f5804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5d04aaeb2197af2cda519fc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:50:20 2016 +0300 kernel32/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e0de3f9..034bdaa 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1644,7 +1644,7 @@ static void test_thread_actctx(void) handle = (void*)0xdeadbeef; b = pGetCurrentActCtx(&handle); - ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); /* without active context */ @@ -1663,7 +1663,7 @@ static void test_thread_actctx(void) handle = 0; b = pGetCurrentActCtx(&handle); - ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "no active context\n"); pReleaseActCtx(handle);

1 0

Andrey Gusev : advapi32: Fix a typo in comment.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 2c598e552341bed579de4aae5b3d1d618c6d5955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c598e552341bed579de4aae5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:40:12 2016 +0300 advapi32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index b2be5e3..01d5880 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2363,7 +2363,7 @@ BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) * MSDN documents this function as RtlGenRandom and declares it in ntsecapi.h * * PARAMS - * pbBufer [O] Pointer to memory to receive random bytes. + * pbBuffer [O] Pointer to memory to receive random bytes. * dwLen [I] Number of random bytes to fetch. * * RETURNS

1 0

Thomas Faber : wininet: Avoid buffer overrun in alloc_object.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 877a628aa620d034cf0195e43ac0f3c19f1beac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877a628aa620d034cf0195e43… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jun 2 14:36:53 2016 +0200 wininet: Avoid buffer overrun in alloc_object. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5c41664..d3d6a38 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -152,7 +152,7 @@ void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t si handle_table[handle] = ret; ret->valid_handle = TRUE; - while(handle_table[next_handle] && next_handle < handle_table_size) + while(next_handle < handle_table_size && handle_table[next_handle]) next_handle++; }

1 0

Nikolay Sivov : user32/tests: Some tests for EqualRect()/SetRect().
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 54f41ae3ebc58a43aad5efdcecbad3fa7ba65236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f41ae3ebc58a43aad5efdce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 2 20:40:33 2016 +0300 user32/tests: Some tests for EqualRect()/SetRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 1be709c..0f1cc58 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -112,8 +112,63 @@ static void test_SubtractRect(void) "(dest rect={%d, %d, %d, %d})\n", rect2.left, rect2.top, rect2.right, rect2.bottom); } +static void test_EqualRect(void) +{ + RECT rect1, rect2; + BOOL ret; + + SetRect(&rect1, 0, 0, 0, 0); + SetRect(&rect2, 1, 1, 1, 1); + + ret = EqualRect(NULL, NULL); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(&rect1, NULL); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(NULL, &rect2); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(&rect1, &rect2); + ok(!ret, "got %d\n", ret); + + SetRect(&rect1, 0, 0, 10, 10); + SetRect(&rect2, 10, 10, 0, 0); + + ret = EqualRect(&rect1, &rect2); + ok(!ret, "got %d\n", ret); + + ret = EqualRect(&rect1, &rect1); + ok(ret, "got %d\n", ret); + + rect2 = rect1; + ret = EqualRect(&rect1, &rect2); + ok(ret, "got %d\n", ret); +} + +static void test_SetRect(void) +{ + RECT rect; + BOOL ret; + + ret = SetRect(NULL, 0, 0, 0, 0); + ok(!ret, "got %d\n", ret); + + ret = SetRect(&rect, 1, 2, 3, 4); + ok(ret, "got %d\n", ret); + ok(rect.left == 1 && rect.top == 2 && rect.right == 3 && rect.bottom == 4, + "got wrong rectangle\n"); + + ret = SetRect(&rect, 10, 10, 5, 5); + ok(ret, "got %d\n", ret); + ok(rect.left == 10 && rect.top == 10 && rect.right == 5 && rect.bottom == 5, + "got wrong rectangle\n"); +} + START_TEST(uitools) { test_FillRect(); test_SubtractRect(); + test_EqualRect(); + test_SetRect(); }

1 0

Aric Stewart : winemac.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: 73bb165ba5b7611689034b968405d92fae65a1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bb165ba5b7611689034b968… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 13:29:46 2016 -0500 winemac.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 295c6cc..7681e8e 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -178,11 +178,11 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultClauseLen; - needed_size += lpcs->dwResultStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -271,6 +271,8 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) *(DWORD*)&newdata[current_offset] = len; current_offset += sizeof(DWORD); } + else + new_one->dwCompClauseLen = 0; /* CompStr */ new_one->dwCompStrLen = len; @@ -324,12 +326,12 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwCompAttrLen; needed_size += lpcs->dwCompClauseLen; - needed_size += lpcs->dwCompStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -411,6 +413,8 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) *(DWORD*)&newdata[current_offset] = len; current_offset += sizeof(DWORD); } + else + new_one->dwResultClauseLen = 0; /* ResultStr */ new_one->dwResultStrLen = len;

1 0

Aric Stewart : winex11.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields.
by Alexandre Julliard June 3, 2016

June 3, 2016

Module: wine Branch: master Commit: a357a29a5541d5c3c08ea484ae3d68d30af1faa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a357a29a5541d5c3c08ea484a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 13:29:24 2016 -0500 winex11.drv: Correct sizes in COMPOSITIONSTRING structure when updating fields. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index ee622c1..06576dd 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -217,11 +217,11 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultClauseLen; - needed_size += lpcs->dwResultStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -304,6 +304,8 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) *(DWORD*)(&newdata[current_offset]) = len; current_offset += sizeof(DWORD); } + else + new_one->dwCompClauseLen = 0; /* CompStr */ new_one->dwCompStrLen = len; @@ -359,12 +361,12 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) { needed_size += lpcs->dwCompReadAttrLen; needed_size += lpcs->dwCompReadClauseLen; - needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwCompAttrLen; needed_size += lpcs->dwCompClauseLen; - needed_size += lpcs->dwCompStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompStrLen * sizeof(WCHAR); needed_size += lpcs->dwResultReadClauseLen; - needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadStrLen * sizeof(WCHAR); needed_size += lpcs->dwPrivateSize; } rc = ImmCreateIMCC(needed_size); @@ -446,6 +448,8 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) *(DWORD*)(&newdata[current_offset]) = len; current_offset += sizeof(DWORD); } + else + new_one->dwResultClauseLen = 0; /* ResultStr */ new_one->dwResultStrLen = len;

1 0

Guillaume Charifi : wined3d: Add support for the ishr opcode.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 5840ea47e6a0d761acbd45cd5a59fbcebfb86326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5840ea47e6a0d761acbd45cd5… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Jun 2 12:46:54 2016 +0200 wined3d: Add support for the ishr opcode. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1093a36..6096555 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5291,6 +5291,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_INEG */ NULL, /* WINED3DSIH_ISHL */ NULL, + /* WINED3DSIH_ISHR */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 77b1de6..a60244b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3138,6 +3138,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DIV: op = "/"; break; case WINED3DSIH_IADD: op = "+"; break; case WINED3DSIH_ISHL: op = "<<"; break; + case WINED3DSIH_ISHR: op = ">>"; break; case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_OR: op = "|"; break; case WINED3DSIH_SUB: op = "-"; break; @@ -8602,6 +8603,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, /* WINED3DSIH_ISHL */ shader_glsl_binop, + /* WINED3DSIH_ISHR */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b41a509..6dffe33 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -123,6 +123,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INEG */ "ineg", /* WINED3DSIH_ISHL */ "ishl", + /* WINED3DSIH_ISHR */ "ishr", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index eb8e4e5..e9aa22a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -141,6 +141,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_INE = 0x27, WINED3D_SM4_OP_INEG = 0x28, WINED3D_SM4_OP_ISHL = 0x29, + WINED3D_SM4_OP_ISHR = 0x2a, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LD2DMS = 0x2e, @@ -651,6 +652,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_INE, WINED3DSIH_INE, "u", "ii"}, {WINED3D_SM4_OP_INEG, WINED3DSIH_INEG, "i", "i"}, {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "i", "ii"}, + {WINED3D_SM4_OP_ISHR, WINED3DSIH_ISHR, "i", "ii"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "f", "i"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "u", "iR"}, {WINED3D_SM4_OP_LD2DMS, WINED3DSIH_LD2DMS, "u", "iRi"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba28e51..879ea0b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -630,6 +630,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_INE, WINED3DSIH_INEG, WINED3DSIH_ISHL, + WINED3DSIH_ISHR, WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD,

1 0