October 2012 - Wine-commits

Francois Gouget : shell32/tests: Add more ShellExecute() shortcut tests.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: ab654c63cf7bc16189f0f5464536c876f4a59c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab654c63cf7bc16189f0f5464… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:40:03 2012 +0200 shell32/tests: Add more ShellExecute() shortcut tests. --- dlls/shell32/tests/shlexec.c | 65 +++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3a7b124..6c0ff6c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -88,6 +88,9 @@ static void strcat_param(char* str, const char* name, const char* param) } } +static int _todo_wait = 0; +#define todo_wait for (_todo_wait = 1; _todo_wait; _todo_wait = 0) + static char shell_call[2048]=""; static int bad_shellexecute = 0; static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) @@ -130,7 +133,10 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L rc = SE_ERR_NOASSOC; } } - ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + if (!_todo_wait) + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + else todo_wine + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -151,7 +157,8 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L } static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, - LPCSTR parameters, LPCSTR directory) + LPCSTR parameters, LPCSTR directory, + LPCSTR class) { SHELLEXECUTEINFO sei; BOOL success; @@ -168,6 +175,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, strcat_param(shell_call, "file", file); strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "class", class); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call); @@ -182,7 +190,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, sei.nShow=SW_SHOWNORMAL; sei.hInstApp=NULL; /* Out */ sei.lpIDList=NULL; - sei.lpClass=NULL; + sei.lpClass=class; sei.hkeyClass=NULL; sei.dwHotKey=0; U(sei).hIcon=NULL; @@ -204,7 +212,10 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); } wait_rc=WaitForSingleObject(hEvent, 5000); - ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + if (!_todo_wait) + ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + else todo_wine + ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -943,12 +954,12 @@ static void test_lpFile_parsed(void) /* test SEE_MASK_DOENVSUBST works */ rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, - NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* quoted lpFile does not work on real win95 and nt4 */ rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, - NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL, NULL); ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, "%s failed: rc=%lu\n", shell_call, rc); } @@ -1752,20 +1763,34 @@ static void test_lnks(void) const filename_tests_t* test; INT_PTR rc; + /* Should open through our association */ sprintf(filename, "%s\\test_shortcut_shlexec.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, - GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); + todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); + todo_wine okChildPath("argvA4", filename); + + /* Should just run our executable */ sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, - GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 4); + okChildString("argvA3", "Lnk"); + + /* Lnk's ContextMenuHandler has priority over an explicit class */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); @@ -1783,7 +1808,7 @@ static void test_lnks(void) *c='/'; c++; } - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); @@ -1798,7 +1823,7 @@ static void test_lnks(void) sprintf(params+1, test->basename, tmpdir); strcat(params,"\""); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, params, - NULL); + NULL, NULL); if (rc > 32) rc=33; if ((test->todo & 0x1)==0) @@ -1854,7 +1879,7 @@ static void test_exes(void) /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL); + NULL, NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); @@ -1892,7 +1917,7 @@ static void test_exes_long(void) /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL); + NULL, NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", longparam); @@ -2069,7 +2094,7 @@ static void test_dde(void) ddeExec[0] = 0; dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); - rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL); + rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL, NULL); CloseHandle(dde_ready_event); if ((test->todo & 0x1)==0) { @@ -2186,7 +2211,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) assert(info && info->filename); PostThreadMessage(info->threadIdParent, WM_QUIT, - shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL), + shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL, NULL), 0L); ExitThread(0); } @@ -2458,11 +2483,11 @@ static void test_directory(void) sprintf(params, "shlexec \"%s\" Exec", child_file); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, NULL); + NULL, path_find_file_name(argv0), params, NULL, NULL); todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, newdir); + NULL, path_find_file_name(argv0), params, newdir, NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec");

1 0

Francois Gouget : shell32/tests: Merge shlexec's test_exes_long() with the other parameter passing tests.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: e440a7d22cae7daa01513db643d05d0ab2321151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e440a7d22cae7daa01513db64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:43:13 2012 +0200 shell32/tests: Merge shlexec's test_exes_long() with the other parameter passing tests. Also remove the pointless noassoc test (duplicated from test_exes()). --- dlls/shell32/tests/shlexec.c | 52 +++++++++-------------------------------- 1 files changed, 12 insertions(+), 40 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6c0ff6c..cd5b578 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1197,7 +1197,7 @@ static void test_commandline2argv(void) static void test_argify(void) { - char fileA[MAX_PATH]; + char fileA[MAX_PATH], params[1024]; INT_PTR rc; sprintf(fileA, "%s\\test file.shlexec", tmpdir); @@ -1294,6 +1294,17 @@ static void test_argify(void) } } + /* Test with a long parameter */ + for (rc = 0; rc < MAX_PATH; rc++) + fileA[rc] = 'a' + rc % 26; + fileA[MAX_PATH-1] = '\0'; + sprintf(params, "shlexec \"%s\" %s", child_file, fileA); + + /* We need NOZONECHECKS on Win2003 to block a dialog */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", fileA); } static void test_filename(void) @@ -1901,44 +1912,6 @@ static void test_exes(void) } } -static void test_exes_long(void) -{ - char filename[MAX_PATH]; - char params[2024]; - char longparam[MAX_PATH]; - INT_PTR rc; - - for (rc = 0; rc < MAX_PATH; rc++) - longparam[rc]='a'+rc%26; - longparam[MAX_PATH-1]=0; - - - sprintf(params, "shlexec \"%s\" %s", child_file,longparam); - - /* We need NOZONECHECKS on Win2003 to block a dialog */ - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL, NULL); - ok(rc > 32, "%s returned %lu\n", shell_call, rc); - okChildInt("argcA", 4); - okChildString("argvA3", longparam); - - if (! skip_noassoc_tests) - { - sprintf(filename, "%s\\test file.noassoc", tmpdir); - if (CopyFile(argv0, filename, FALSE)) - { - rc=shell_execute(NULL, filename, params, NULL); - todo_wine { - ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%lu\n", shell_call, rc); - } - } - } - else - { - win_skip("Skipping shellexecute of file with unassociated extension\n"); - } -} - typedef struct { const char* command; @@ -2517,7 +2490,6 @@ START_TEST(shlexec) test_find_executable(); test_lnks(); test_exes(); - test_exes_long(); test_dde(); test_dde_default_app(); test_directory();

1 0

Francois Gouget : shell32/tests: Greatly expand the test_argify() tests.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 61f894c5764e724287db0ea84d204c6c6098a9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f894c5764e724287db0ea84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:47:09 2012 +0200 shell32/tests: Greatly expand the test_argify() tests. --- dlls/shell32/tests/shlexec.c | 323 +++++++++++++++++++++++++++++------------- 1 files changed, 227 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f894c5764e724287db0…

1 0

Jacek Caban : widl: Alloc big enough buffer in dup_basename to handle registration suffix.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: da0f33370a35fcadf743e2f56cdf7f71bd2e24db URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0f33370a35fcadf743e2f56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 12:05:26 2012 +0200 widl: Alloc big enough buffer in dup_basename to handle registration suffix. --- tools/widl/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index dc77ae8..9066887 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -159,8 +159,8 @@ char *dup_basename(const char *name, const char *ext) namelen = strlen(name); - /* +4 for later extension and +1 for '\0' */ - base = xmalloc(namelen +4 +1); + /* +6 for later extension (strlen("_r.rgs")) and +1 for '\0' */ + base = xmalloc(namelen +6 +1); strcpy(base, name); if(!strcasecmp(name + namelen-extlen, ext)) {

1 0

Jacek Caban : widl: Fixed fwrite error handling.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 430c3d0be2cb3478c6a308683695aef4f0480f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=430c3d0be2cb3478c6a308683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 12:05:45 2012 +0200 widl: Fixed fwrite error handling. --- tools/widl/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c75a6ac..d8b34d9 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -266,7 +266,7 @@ void write_regscript( const statement_list_t *stmts ) { FILE *f = fopen( regscript_name, "w" ); if (!f) error( "Could not open %s for output\n", regscript_name ); - if (fwrite( output_buffer, output_buffer_pos, 1, f ) != output_buffer_pos) + if (fwrite( output_buffer, 1, output_buffer_pos, f ) != output_buffer_pos) error( "Failed to write to %s\n", regscript_name ); if (fclose( f )) error( "Failed to write to %s\n", regscript_name );

1 0

André Hentschel : winedbg: Add preload operators for Thumb2 disassembler.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 13da3a92fd84b392a76cff6ba06cd716496fb8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13da3a92fd84b392a76cff6ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:33:03 2012 +0200 winedbg: Add preload operators for Thumb2 disassembler. --- programs/winedbg/be_arm.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index bad74d0..a3c5243 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -959,6 +959,39 @@ static UINT thumb2_disasm_ldrword(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_preload(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x03; + + if (!(op1 & 0x01) && !((inst >> 6) & 0x3f) && get_nibble(inst, 4) != 15) + { + WORD shift = (inst >> 4) & 0x03; + dbg_printf("\n\t%s\t[%s, %s", op1?"pli":"pld", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + if (shift) dbg_printf(", lsl #%u]", shift); + else dbg_printf("]"); + return 0; + } + + if (get_nibble(inst, 4) != 15) + { + dbg_printf("\n\t%s\t[%s, #%d]", (op1 & 0x02)?"pli":"pld", tbl_regs[get_nibble(inst, 4)], + (op1 & 0x01)?(inst & 0x0fff):(-1 * (inst & 0xff))); + return 0; + } + + if (get_nibble(inst, 4) == 15) + { + int offset = inst & 0x0fff; + if (!op1) offset *= -1; + dbg_printf("\n\t%s\t", (op1 & 0x02)?"pli":"pld"); + db_printsym(addr->Offset + offset + 4); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1105,6 +1138,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, { 0xff100000, 0xf8000000, thumb2_disasm_str }, { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, + { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

André Hentschel : winedbg: Add load non-word operators to Thumb2 disassembler.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: a0ae8b4bd286fd41f30c9e639c2dff8a0ef74b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ae8b4bd286fd41f30c9e639… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:34:46 2012 +0200 winedbg: Add load non-word operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a3c5243..3009e70 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -992,6 +992,68 @@ static UINT thumb2_disasm_preload(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_ldrnonword(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 23) & 0x03; + WORD hw = (inst >> 21) & 0x01; + + if (!(op1 & 0x01) && !((inst >> 6) & 0x3f) && get_nibble(inst, 4) != 15) + { + WORD shift = (inst >> 4) & 0x03; + dbg_printf("\n\t%s%s\t%s, [%s, %s", op1?"ldrs":"ldr", hw?"h":"b", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + if (shift) dbg_printf(", lsl #%u]", shift); + else dbg_printf("]"); + return 0; + } + + if (!(op1 & 0x01) && ((inst >> 8) & 0x0f) == 14 && get_nibble(inst, 4) != 15) + { + WORD offset = inst & 0xff; + dbg_printf("\n\t%s%s\t%s, [%s", op1?"ldrs":"ldr", hw?"ht":"bt", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + if (offset) dbg_printf(", #%u]", offset); + else dbg_printf("]"); + return 0; + } + + if (get_nibble(inst, 4) != 15) + { + int offset; + + dbg_printf("\n\t%s%s\t%s, [%s", (op1 & 0x02)?"ldrs":"ldr", hw?"h":"b", + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)]); + + if (op1 & 0x01) + { + dbg_printf(", #%u]", inst & 0x0fff); + return 0; + } + + offset = inst & 0xff; + if (!(inst & 0x0200)) offset *= -1; + + if (!(inst & 0x0400) && (inst & 0x0100)) dbg_printf("], #%i", offset); + else if (inst & 0x0400) dbg_printf(", #%i]%s", offset, (inst & 0x0100)?"!":""); + else return inst; + + return 0; + } + + if (get_nibble(inst, 4) == 15) + { + int offset = inst & 0x0fff; + if (!op1) offset *= -1; + dbg_printf("\n\t%s%s\t%s, ", (op1 & 0x02)?"ldrs":"ldr", hw?"h":"b", + tbl_regs[get_nibble(inst, 3)]); + db_printsym(addr->Offset + offset + 4); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1139,6 +1201,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff100000, 0xf8000000, thumb2_disasm_str }, { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, + { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

André Hentschel : winedbg: Simplify Coprocessor operators in the Thumb2 disassembler.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 86d0c87552b61baec1b63bfa85285801d68322d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d0c87552b61baec1b63bfa8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:35:43 2012 +0200 winedbg: Simplify Coprocessor operators in the Thumb2 disassembler. --- programs/winedbg/be_arm.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3009e70..2380f88 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1058,15 +1058,11 @@ static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; - if (opc2) - dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u, #%u", (inst & 0x10000000)?"2":"", - get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), - get_nibble(inst, 4), get_nibble(inst, 0), opc2); - else - dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"", - get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), - get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"", + get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), + get_nibble(inst, 4), get_nibble(inst, 0)); + if (opc2) dbg_printf(", #%u", opc2); return 0; } @@ -1075,15 +1071,11 @@ static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) WORD opc1 = (inst >> 21) & 0x07; WORD opc2 = (inst >> 5) & 0x07; - if (opc2) - dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u, #%u", (inst & 0x00100000)?"mrc":"mcr", - (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, - tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0), opc2); - else - dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr", - (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, - tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, + tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0)); + if (opc2) dbg_printf(", #%u", opc2); return 0; }

1 0

André Hentschel : winedbg: Adjust copyright to avoid confusions.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 096426f1f192dda0d0f6e9f07bb4102c47ced701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096426f1f192dda0d0f6e9f07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 17:40:31 2012 +0200 winedbg: Adjust copyright to avoid confusions. --- programs/winedbg/be_arm.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2380f88..85eb0ef 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1,9 +1,7 @@ /* * Debugger ARM specific functions * - * Copyright 2000-2003 Marcus Meissner - * 2004 Eric Pouech - * 2010-2012 André Hentschel + * Copyright 2010-2012 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Nikolay Sivov : dwrite: Store font family name in IDWriteFontFamily implementation.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 89561b9247c0f2a91667dfddb04c0e57d7628e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89561b9247c0f2a91667dfddb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 7 12:29:39 2012 -0400 dwrite: Store font family name in IDWriteFontFamily implementation. --- dlls/dwrite/dwrite_private.h | 17 +++++++++++++++++ dlls/dwrite/font.c | 34 ++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 27 +++++++++++++++++++++++++-- 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5c82453..d3af015 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -26,6 +28,21 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 892ee72..15e9d14 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; + + WCHAR *familyname; }; struct dwrite_font { @@ -222,7 +224,10 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->familyname); heap_free(This); + } return S_OK; } @@ -283,7 +288,7 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; -static HRESULT create_fontfamily(IDWriteFontFamily **family) +static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -294,6 +299,7 @@ static HRESULT create_fontfamily(IDWriteFontFamily **family) This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; + This->familyname = heap_strdupW(familyname); *family = &This->IDWriteFontFamily_iface; @@ -302,13 +308,37 @@ static HRESULT create_fontfamily(IDWriteFontFamily **family) HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { + const WCHAR* facename, *familyname; struct dwrite_font *This; IDWriteFontFamily *family; + OUTLINETEXTMETRICW *otm; HRESULT hr; + HFONT hfont; + HDC hdc; + int ret; *font = NULL; - hr = create_fontfamily(&family); + hfont = CreateFontIndirectW(logfont); + if (!hfont) return DWRITE_E_NOFONT; + + hdc = CreateCompatibleDC(0); + SelectObject(hdc, hfont); + + ret = GetOutlineTextMetricsW(hdc, 0, NULL); + otm = heap_alloc(ret); + otm->otmSize = ret; + ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); + + DeleteDC(hdc); + DeleteObject(hfont); + + facename = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFaceName); + familyname = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFamilyName); + TRACE("facename=%s, familyname=%s\n", debugstr_w(facename), debugstr_w(familyname)); + + hr = create_fontfamily(familyname, &family); + heap_free(otm); if (hr != S_OK) return hr; This = heap_alloc(sizeof(struct dwrite_font)); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 64fe390..229e2f7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -43,6 +43,7 @@ static IDWriteFactory *factory; static void test_CreateFontFromLOGFONT(void) { static const WCHAR arialW[] = {'A','r','i','a','l',0}; + static const WCHAR arialspW[] = {'A','r','i','a','l',' ',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; @@ -143,18 +144,40 @@ todo_wine logfont.lfWeight = FW_NORMAL; lstrcpyW(logfont.lfFaceName, blahW); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine +todo_wine { EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWidth = 12; logfont.lfWeight = FW_NORMAL; + lstrcpyW(logfont.lfFaceName, arialspW); + font = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine +todo_wine { EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + + font = (void*)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine { + EXPECT_HR(hr, DWRITE_E_NOFONT); + ok(font == NULL, "got %p\n", font); + if(font) IDWriteFont_Release(font); +} IDWriteGdiInterop_Release(interop); }

1 0