wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Hans Leidekker : iphlpapi: Add tests for GetExtendedTcpTable.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: d2dbd9bdac15cf270bffdca9d54e12cf39a563fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dbd9bdac15cf270bffdca9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:44 2012 +0200 iphlpapi: Add tests for GetExtendedTcpTable. --- dlls/iphlpapi/tests/iphlpapi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0cbfb31..ec388a3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -66,6 +66,7 @@ typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG) typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); +typedef DWORD (WINAPI *GetExtendedTcpTableFunc)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -87,6 +88,7 @@ static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; static NotifyAddrChangeFunc gNotifyAddrChange = NULL; static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; +static GetExtendedTcpTableFunc gGetExtendedTcpTable = NULL; static void loadIPHlpApi(void) { @@ -130,6 +132,8 @@ static void loadIPHlpApi(void) hLibrary, "NotifyAddrChange"); gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( hLibrary, "CancelIPChangeNotify"); + gGetExtendedTcpTable = (GetExtendedTcpTableFunc)GetProcAddress( + hLibrary, "GetExtendedTcpTable"); } } @@ -154,6 +158,7 @@ static void freeIPHlpApi(void) gGetUdpTable = NULL; gNotifyAddrChange = NULL; gCancelIPChangeNotify = NULL; + gGetExtendedTcpTable = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -970,6 +975,39 @@ static void test_GetAdaptersAddresses(void) HeapFree(GetProcessHeap(), 0, ptr); } +static void test_GetExtendedTcpTable(void) +{ + DWORD ret, size; + MIB_TCPTABLE *table; + MIB_TCPTABLE_OWNER_PID *table_pid; + + if (!gGetExtendedTcpTable) + { + win_skip("GetExtendedTcpTable not available\n"); + return; + } + ret = gGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + size = 0; + ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = gGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; + ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = gGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); +} + START_TEST(iphlpapi) { @@ -987,6 +1025,7 @@ START_TEST(iphlpapi) testWin2KFunctions(); test_GetAdaptersAddresses(); + test_GetExtendedTcpTable(); freeIPHlpApi(); } }

1 0

Hans Leidekker : iphlpapi: Add support for TCP_TABLE_OWNER_PID_ALL in GetExtendedTcpTable.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: e78ac4711cf9166478cccacaa771cdc4158083ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78ac4711cf9166478cccacaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:32 2012 +0200 iphlpapi: Add support for TCP_TABLE_OWNER_PID_ALL in GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 26 ++++- dlls/iphlpapi/ipstats.c | 242 +++++++++++++++++++++++++++++++++------- dlls/iphlpapi/ipstats.h | 2 + 3 files changed, 224 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e78ac4711cf9166478ccc…

1 0

Hans Leidekker : server: Include the Unix pid in the snapshot_next_process reply.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: d1b6cf93795adf96519d48343b6ff5d3fbe86324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b6cf93795adf96519d48343… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:35:17 2012 +0200 server: Include the Unix pid in the snapshot_next_process reply. --- include/wine/server_protocol.h | 4 +++- server/process.c | 1 + server/process.h | 1 + server/protocol.def | 1 + server/request.h | 3 ++- server/snapshot.c | 1 + server/trace.c | 1 + 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0e989da..41e8e28 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2052,7 +2052,9 @@ struct next_process_reply int threads; int priority; int handles; + int unix_pid; /* VARARG(filename,unicode_str); */ + char __pad_36[4]; }; @@ -5646,6 +5648,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 431 +#define SERVER_PROTOCOL_VERSION 432 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index de3b594..6a5f4b1 100644 --- a/server/process.c +++ b/server/process.c @@ -847,6 +847,7 @@ struct process_snapshot *process_snap( int *count ) ptr->count = process->obj.refcount; ptr->priority = process->priority; ptr->handles = get_handle_table_count(process); + ptr->unix_pid = process->unix_pid; grab_object( process ); ptr++; } diff --git a/server/process.h b/server/process.h index 93ec6c7..976dd38 100644 --- a/server/process.h +++ b/server/process.h @@ -90,6 +90,7 @@ struct process_snapshot int threads; /* number of threads */ int priority; /* priority class */ int handles; /* number of handles */ + int unix_pid; /* Unix pid */ }; #define CPU_FLAG(cpu) (1 << (cpu)) diff --git a/server/protocol.def b/server/protocol.def index 80c0cd3..31a3b0d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1577,6 +1577,7 @@ enum char_info_mode int threads; /* number of threads */ int priority; /* process priority */ int handles; /* number of handles */ + int unix_pid; /* Unix pid */ VARARG(filename,unicode_str); /* file name of main exe */ @END diff --git a/server/request.h b/server/request.h index 5b45cf9..8f93085 100644 --- a/server/request.h +++ b/server/request.h @@ -1161,7 +1161,8 @@ C_ASSERT( FIELD_OFFSET(struct next_process_reply, ppid) == 16 ); C_ASSERT( FIELD_OFFSET(struct next_process_reply, threads) == 20 ); C_ASSERT( FIELD_OFFSET(struct next_process_reply, priority) == 24 ); C_ASSERT( FIELD_OFFSET(struct next_process_reply, handles) == 28 ); -C_ASSERT( sizeof(struct next_process_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct next_process_reply, unix_pid) == 32 ); +C_ASSERT( sizeof(struct next_process_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct next_thread_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct next_thread_request, reset) == 16 ); C_ASSERT( sizeof(struct next_thread_request) == 24 ); diff --git a/server/snapshot.c b/server/snapshot.c index bc48922..dd00bd1 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -117,6 +117,7 @@ static int snapshot_next_process( struct snapshot *snapshot, struct next_process reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; + reply->unix_pid = ptr->process->unix_pid; if ((exe_module = get_process_exe_module( ptr->process )) && exe_module->filename) { data_size_t len = min( exe_module->namelen, get_reply_max_size() ); diff --git a/server/trace.c b/server/trace.c index cfef963..4318a34 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1969,6 +1969,7 @@ static void dump_next_process_reply( const struct next_process_reply *req ) fprintf( stderr, ", threads=%d", req->threads ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", handles=%d", req->handles ); + fprintf( stderr, ", unix_pid=%d", req->unix_pid ); dump_varargs_unicode_str( ", filename=", cur_size ); }

1 0

André Hentschel : winedbg: Use better register names for ARM disassembling.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 51df30b25c56d8403978eebc7226184154ad5d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51df30b25c56d8403978eebc7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:14:47 2012 +0200 winedbg: Use better register names for ARM disassembling. --- programs/winedbg/be_arm.c | 72 +++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 34 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 52126ff..fbf6954 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -44,6 +44,11 @@ static BOOL db_display = FALSE; #define get_cond(ins) tbl_cond[(ins >> 28) & 0x0f] #define get_nibble(ins, num) ((ins >> (num * 4)) & 0x0f) +static char const tbl_regs[][4] = { + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", + "fp", "ip", "sp", "lr", "pc", "cpsr" +}; + static char const tbl_addrmode[][3] = { "da", "ia", "db", "ib" }; @@ -93,7 +98,7 @@ static UINT arm_disasm_branch(UINT inst) if (offset & 0x02000000) offset |= 0xfc000000; offset += 8; - dbg_printf("\n\tb%s%s\t#%d/0x%08x", link ? "l" : "", get_cond(inst), offset, offset); + dbg_printf("\n\tb%s%s\t#%d", link ? "l" : "", get_cond(inst), offset); return 0; } @@ -113,22 +118,21 @@ static UINT arm_disasm_dataprocessing(UINT inst) } dbg_printf("\n\t%s%s%s", tbl_dataops[opcode], condcodes ? "s" : "", get_cond(inst)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); if (no_op1) { if (immediate) - dbg_printf("\tr%u, #%u", get_nibble(inst, 3), - ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); + dbg_printf("#%u", ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); else - dbg_printf("\tr%u, r%u", get_nibble(inst, 3), get_nibble(inst, 0)); + dbg_printf("%s", tbl_regs[get_nibble(inst, 0)]); } else { if (immediate) - dbg_printf("\tr%u, r%u, #%u", get_nibble(inst, 3), get_nibble(inst, 4), + dbg_printf("%s, #%u", tbl_regs[get_nibble(inst, 4)], ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), - get_nibble(inst, 0)); + dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } return 0; } @@ -147,20 +151,20 @@ static UINT arm_disasm_singletrans(UINT inst) dbg_printf("\n\t%s%s%s%s", load ? "ldr" : "str", byte ? "b" : "", writeback ? "t" : "", get_cond(inst)); - dbg_printf("\tr%u, ", get_nibble(inst, 3)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); if (indexing) { if (immediate) - dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } else { if (immediate) - dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } return 0; } @@ -180,20 +184,20 @@ static UINT arm_disasm_halfwordtrans(UINT inst) dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - dbg_printf("\tr%u, ", get_nibble(inst, 3)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); if (indexing) { if (immediate) - dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } else { if (immediate) - dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); else - dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); } return 0; } @@ -213,13 +217,13 @@ static UINT arm_disasm_blocktrans(UINT inst) break; } - dbg_printf("\n\t%s%s%s\tr%u%s, {", load ? "ldm" : "stm", tbl_addrmode[addrmode], get_cond(inst), - get_nibble(inst, 4), writeback ? "!" : ""); + dbg_printf("\n\t%s%s%s\t%s%s, {", load ? "ldm" : "stm", tbl_addrmode[addrmode], get_cond(inst), + tbl_regs[get_nibble(inst, 4)], writeback ? "!" : ""); for (i=0;i<=15;i++) if ((inst>>i) & 1) { - if (i == last) dbg_printf("r%u", i); - else dbg_printf("r%u, ", i); + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); } dbg_printf("}%s", psr ? "^" : ""); return 0; @@ -241,8 +245,8 @@ static UINT arm_disasm_coproctrans(UINT inst) WORD load = (inst >> 20) & 0x01; WORD CP_Opc = (inst >> 21) & 0x07; - dbg_printf("\n\t%s%s\t%u, %u, r%u, cr%u, cr%u, {%u}", load ? "mrc" : "mcr", get_cond(inst), CPnum, - CP, get_nibble(inst, 3), CRn, CRm, CP_Opc); + dbg_printf("\n\t%s%s\t%u, %u, %s, cr%u, cr%u, {%u}", load ? "mrc" : "mcr", get_cond(inst), CPnum, + CP, tbl_regs[get_nibble(inst, 3)], CRn, CRm, CP_Opc); return 0; } @@ -275,9 +279,9 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) dbg_printf("\n\t%s%s%s", load ? "ldc" : "stc", translen ? "l" : "", get_cond(inst)); if (indexing) - dbg_printf("\t%u, cr%u, [r%u, #%d]%s", CPnum, CRd, get_nibble(inst, 4), offset, writeback?"!":""); + dbg_printf("\t%u, cr%u, [%s, #%d]%s", CPnum, CRd, tbl_regs[get_nibble(inst, 4)], offset, writeback?"!":""); else - dbg_printf("\t%u, cr%u, [r%u], #%d", CPnum, CRd, get_nibble(inst, 4), offset); + dbg_printf("\t%u, cr%u, [%s], #%d", CPnum, CRd, tbl_regs[get_nibble(inst, 4)], offset); return 0; } @@ -293,9 +297,9 @@ static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) if (h2) src += 8; if (op == 3) - dbg_printf("\n\tb%sx\tr%u", h1?"l":"", src); + dbg_printf("\n\tb%sx\t%s", h1?"l":"", tbl_regs[src]); else - dbg_printf("\n\t%s\tr%u, r%u", tbl_hiops_t[op], dst, src); + dbg_printf("\n\t%s\t%s, %s", tbl_hiops_t[op], tbl_regs[dst], tbl_regs[src]); return 0; } @@ -316,8 +320,8 @@ static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) for (i=0;i<=7;i++) if ((inst>>i) & 1) { - if (i == last) dbg_printf("r%u", i); - else dbg_printf("r%u, ", i); + if (i == last) dbg_printf("%s", tbl_regs[i]); + else dbg_printf("%s, ", tbl_regs[i]); } if (lrpc) dbg_printf(", %s", load ? "pc" : "lr"); @@ -356,29 +360,29 @@ static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) static WORD thumb_disasm_ldrpcrel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; - dbg_printf("\n\tldr\tr%u, [pc, #%u]", (inst >> 8) & 0x07, offset); + dbg_printf("\n\tldr\t%s, [pc, #%u]", tbl_regs[(inst >> 8) & 0x07], offset); return 0; } static WORD thumb_disasm_ldrsprel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; - dbg_printf("\n\t%s\tr%u, [sp, #%u]", (inst & 0x0800)?"ldr":"str", (inst >> 8) & 0x07, offset); + dbg_printf("\n\t%s\t%s, [sp, #%u]", (inst & 0x0800)?"ldr":"str", tbl_regs[(inst >> 8) & 0x07], offset); return 0; } static WORD thumb_disasm_ldrimm(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0x07c0) >> 6; - dbg_printf("\n\t%s%s\tr%u, [r%u, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", - inst & 0x07, (inst >> 3) & 0x07, (inst & 0x1000)?offset:(offset << 2)); + dbg_printf("\n\t%s%s\t%s, [%s, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", + tbl_regs[inst & 0x07], tbl_regs[(inst >> 3) & 0x07], (inst & 0x1000)?offset:(offset << 2)); return 0; } static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 11) & 0x03; - dbg_printf("\n\t%s\tr%u, #%u", tbl_immops_t[op], (inst >> 8) & 0x07, inst & 0xff); + dbg_printf("\n\t%s\t%s, #%u", tbl_immops_t[op], tbl_regs[(inst >> 8) & 0x07], inst & 0xff); return 0; }

1 0

André Hentschel : winedbg: Solve ARM disassembling fixmes.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: abc304f3091bc467889fe99f1af05b6aee9fb6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc304f3091bc467889fe99f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:12:07 2012 +0200 winedbg: Solve ARM disassembling fixmes. --- programs/winedbg/be_arm.c | 50 +++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3e4d8c5..52126ff 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -139,7 +139,7 @@ static UINT arm_disasm_singletrans(UINT inst) short writeback = (inst >> 21) & 0x01; short byte = (inst >> 22) & 0x01; short direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + short indexing = (inst >> 24) & 0x01; short immediate = !((inst >> 25) & 0x01); short offset = inst & 0x0fff; @@ -147,11 +147,21 @@ static UINT arm_disasm_singletrans(UINT inst) dbg_printf("\n\t%s%s%s%s", load ? "ldr" : "str", byte ? "b" : "", writeback ? "t" : "", get_cond(inst)); - if (immediate) - dbg_printf("\tr%u, [r%u, #%d]", get_nibble(inst, 3), get_nibble(inst, 4), offset); + dbg_printf("\tr%u, ", get_nibble(inst, 3)); + if (indexing) + { + if (immediate) + dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + } else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), - get_nibble(inst, 0)); + { + if (immediate) + dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + } return 0; } @@ -163,17 +173,28 @@ static UINT arm_disasm_halfwordtrans(UINT inst) short writeback = (inst >> 21) & 0x01; short immediate = (inst >> 22) & 0x01; short direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + short indexing = (inst >> 24) & 0x01; short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); if (!direction) offset *= -1; dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - if (immediate) - dbg_printf("\tr%u, r%u, #%d", get_nibble(inst, 3), get_nibble(inst, 4), offset); + dbg_printf("\tr%u, ", get_nibble(inst, 3)); + if (indexing) + { + if (immediate) + dbg_printf("[r%u, #%d]", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u, r%u]", get_nibble(inst, 4), get_nibble(inst, 0)); + } else - dbg_printf("\tr%u, r%u, r%u", get_nibble(inst, 3), get_nibble(inst, 4), get_nibble(inst, 0)); + { + if (immediate) + dbg_printf("[r%u], #%d", get_nibble(inst, 4), offset); + else + dbg_printf("[r%u], r%u", get_nibble(inst, 4), get_nibble(inst, 0)); + } return 0; } @@ -207,7 +228,7 @@ static UINT arm_disasm_blocktrans(UINT inst) static UINT arm_disasm_swi(UINT inst) { UINT comment = inst & 0x00ffffff; - dbg_printf("\n\tswi%s\t#%d/0x%08x", get_cond(inst), comment, comment); + dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); return 0; } @@ -244,16 +265,19 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) WORD CPnum = (inst >> 8) & 0x0f; WORD CRd = (inst >> 12) & 0x0f; WORD load = (inst >> 20) & 0x01; - /* FIXME: what to do with bit 21 (writeback) */ + WORD writeback = (inst >> 21) & 0x01; WORD translen = (inst >> 22) & 0x01; WORD direction = (inst >> 23) & 0x01; - /* FIXME: what to do with bit 24 (indexing) */ + WORD indexing = (inst >> 24) & 0x01; short offset = (inst & 0xff) << 2; if (!direction) offset *= -1; dbg_printf("\n\t%s%s%s", load ? "ldc" : "stc", translen ? "l" : "", get_cond(inst)); - dbg_printf("\t%u, cr%u, [r%u, #%d]", CPnum, CRd, get_nibble(inst, 4), offset); + if (indexing) + dbg_printf("\t%u, cr%u, [r%u, #%d]%s", CPnum, CRd, get_nibble(inst, 4), offset, writeback?"!":""); + else + dbg_printf("\t%u, cr%u, [r%u], #%d", CPnum, CRd, get_nibble(inst, 4), offset); return 0; }

1 0

André Hentschel : winedbg: Add long branch to Thumb disassembling.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 6a2f3e6cffcbbb605f837952dfd5014b1782397f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2f3e6cffcbbb605f837952d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 15 13:10:26 2012 +0200 winedbg: Add long branch to Thumb disassembling. --- programs/winedbg/be_arm.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8600256..3e4d8c5 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -3,7 +3,7 @@ * * Copyright 2000-2003 Marcus Meissner * 2004 Eric Pouech - * 2010, 2011 André Hentschel + * 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 @@ -257,7 +257,7 @@ static UINT arm_disasm_coprocdatatrans(UINT inst) return 0; } -static WORD thumb_disasm_hireg(WORD inst) +static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) { short dst = inst & 0x07; short src = (inst >> 3) & 0x07; @@ -276,7 +276,7 @@ static WORD thumb_disasm_hireg(WORD inst) return 0; } -static WORD thumb_disasm_blocktrans(WORD inst) +static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) { short lrpc = (inst >> 8) & 0x01; short load = (inst >> 11) & 0x01; @@ -302,34 +302,48 @@ static WORD thumb_disasm_blocktrans(WORD inst) return 0; } -static WORD thumb_disasm_swi(WORD inst) +static WORD thumb_disasm_longbl(WORD inst, ADDRESS64 *addr) +{ + WORD inst2; + UINT offset = (inst & 0x07ff) << 12; + + addr->Offset += 2; + inst2 = db_get_inst( memory_to_linear_addr(addr), 2 ); + if (!((inst2 & 0xf800) == 0xf800)) return inst; + + offset += (inst2 & 0x07ff) << 1; + dbg_printf("\tbl\t%08x", offset); + return 0; +} + +static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) { WORD comment = inst & 0x00ff; dbg_printf("\n\tswi\t#%d", comment); return 0; } -static WORD thumb_disasm_nop(WORD inst) +static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) { dbg_printf("\n\tnop"); return 0; } -static WORD thumb_disasm_ldrpcrel(WORD inst) +static WORD thumb_disasm_ldrpcrel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; dbg_printf("\n\tldr\tr%u, [pc, #%u]", (inst >> 8) & 0x07, offset); return 0; } -static WORD thumb_disasm_ldrsprel(WORD inst) +static WORD thumb_disasm_ldrsprel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; dbg_printf("\n\t%s\tr%u, [sp, #%u]", (inst & 0x0800)?"ldr":"str", (inst >> 8) & 0x07, offset); return 0; } -static WORD thumb_disasm_ldrimm(WORD inst) +static WORD thumb_disasm_ldrimm(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0x07c0) >> 6; dbg_printf("\n\t%s%s\tr%u, [r%u, #%u]", (inst & 0x0800)?"ldr":"str", (inst & 0x1000)?"b":"", @@ -337,7 +351,7 @@ static WORD thumb_disasm_ldrimm(WORD inst) return 0; } -static WORD thumb_disasm_immop(WORD inst) +static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 11) & 0x03; dbg_printf("\n\t%s\tr%u, #%u", tbl_immops_t[op], (inst >> 8) & 0x07, inst & 0xff); @@ -368,12 +382,13 @@ struct inst_thumb16 { WORD mask; WORD pattern; - WORD (*func)(WORD); + WORD (*func)(WORD, ADDRESS64*); }; static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4400, thumb_disasm_hireg }, { 0xf600, 0xb400, thumb_disasm_blocktrans }, + { 0xf800, 0xf000, thumb_disasm_longbl }, { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, { 0xf000, 0x9000, thumb_disasm_ldrsprel }, { 0xe000, 0x6000, thumb_disasm_ldrimm }, @@ -455,7 +470,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } else { - if (!t_ptr->func(tinst)) + if (!t_ptr->func(tinst, addr)) { dbg_printf("\n"); addr->Offset += size;

1 0

Bruno Jesus : ole32: Make sure StgIsStorageILockBytes tests real data.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 2cd2628c7ba43840d26f66070b08244eda181f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd2628c7ba43840d26f66070… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 15 05:07:11 2012 -0300 ole32: Make sure StgIsStorageILockBytes tests real data. --- dlls/ole32/storage32.c | 7 ++++--- dlls/ole32/tests/storage32.c | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f279ee5..f233b61 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7846,15 +7846,16 @@ HRESULT WINAPI StgSetTimes(OLECHAR const *str, FILETIME const *pctime, */ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) { - BYTE sig[8]; + BYTE sig[sizeof(STORAGE_magic)]; ULARGE_INTEGER offset; + ULONG read = 0; offset.u.HighPart = 0; offset.u.LowPart = 0; - ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), NULL); + ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), &read); - if (memcmp(sig, STORAGE_magic, sizeof(STORAGE_magic)) == 0) + if (read == sizeof(sig) && memcmp(sig, STORAGE_magic, sizeof(sig)) == 0) return S_OK; return S_FALSE; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b465269..bc0cc25 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -66,6 +66,9 @@ static void test_hglobal_storage_stat(void) r = CreateILockBytesOnHGlobal( NULL, TRUE, &ilb ); ok( r == S_OK, "CreateILockBytesOnHGlobal failed\n"); + r = StgIsStorageILockBytes( ilb ); + ok( r == S_FALSE, "StgIsStorageILockBytes should have failed\n"); + mode = STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE;/*0x1012*/ r = StgCreateDocfileOnILockBytes( ilb, mode, 0, &stg ); ok( r == S_OK, "StgCreateDocfileOnILockBytes failed\n"); @@ -73,6 +76,9 @@ static void test_hglobal_storage_stat(void) r = WriteClassStg( stg, &test_stg_cls ); ok( r == S_OK, "WriteClassStg failed\n"); + r = StgIsStorageILockBytes( ilb ); + ok( r == S_OK, "StgIsStorageILockBytes failed\n"); + memset( &stat, 0, sizeof stat ); r = IStorage_Stat( stg, &stat, 0 );

1 0

Huw Davies : winspool: Explicitly set CUPS options based on any job ticket lines, which otherwise get ignored by cupsPrintFile.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 30d18c116519a151a012c1199bae30490a2d5b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d18c116519a151a012c1199… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:42 2012 +0100 winspool: Explicitly set CUPS options based on any job ticket lines, which otherwise get ignored by cupsPrintFile. --- dlls/winspool.drv/info.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e958022..9b3c335 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -474,8 +474,10 @@ static void *cupshandle; #define CUPS_FUNCS \ DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile); #define DO_FUNC(f) static typeof(f) *p##f @@ -7617,6 +7619,37 @@ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) return r; } +#ifdef SONAME_LIBCUPS +/***************************************************************************** + * get_cups_jobs_ticket_options + * + * Explicitly set CUPS options based on any %cupsJobTicket lines. + * The CUPS scheduler only looks for these in Print-File requests, and since + * cupsPrintFile uses Create-Job / Send-Document, the ticket lines don't get + * parsed. + */ +static int get_cups_job_ticket_options( const char *file, int num_options, cups_option_t **options ) +{ + FILE *fp = fopen( file, "r" ); + char buf[257]; /* DSC max of 256 + '\0' */ + const char *ps_adobe = "%!PS-Adobe-"; + const char *cups_job = "%cupsJobTicket:"; + + if (!fp) return num_options; + if (!fgets( buf, sizeof(buf), fp )) goto end; + if (strncmp( buf, ps_adobe, strlen( ps_adobe ) )) goto end; + while (fgets( buf, sizeof(buf), fp )) + { + if (strncmp( buf, cups_job, strlen( cups_job ) )) break; + num_options = pcupsParseOptions( buf + strlen( cups_job ), num_options, options ); + } + +end: + fclose( fp ); + return num_options; +} +#endif + /***************************************************************************** * schedule_cups */ @@ -7628,6 +7661,8 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume char *unixname, *queue, *unix_doc_title; DWORD len; BOOL ret; + int num_options = 0, i; + cups_option_t *options = NULL; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; @@ -7640,8 +7675,16 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume unix_doc_title = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL); - TRACE("printing via cups\n"); - ret = pcupsPrintFile(queue, unixname, unix_doc_title, 0, NULL); + num_options = get_cups_job_ticket_options( unixname, num_options, &options ); + + TRACE( "printing via cups with options:\n" ); + for (i = 0; i < num_options; i++) + TRACE( "\t%d: %s = %s\n", i, options[i].name, options[i].value ); + + ret = pcupsPrintFile( queue, unixname, unix_doc_title, num_options, options ); + + pcupsFreeOptions( num_options, options ); + HeapFree(GetProcessHeap(), 0, unix_doc_title); HeapFree(GetProcessHeap(), 0, queue); HeapFree(GetProcessHeap(), 0, unixname);

1 0

Huw Davies : winspool: Simplify cups function loading.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: b2accddffe37ea650cca2892367ff1e5dda12f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2accddffe37ea650cca28923… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:41 2012 +0100 winspool: Simplify cups function loading. --- dlls/winspool.drv/info.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a5b065c..e958022 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -469,12 +469,19 @@ static BOOL add_printer_driver(WCHAR *name) } #ifdef SONAME_LIBCUPS -static typeof(cupsFreeDests) *pcupsFreeDests; -static typeof(cupsGetDests) *pcupsGetDests; -static typeof(cupsGetPPD) *pcupsGetPPD; -static typeof(cupsPrintFile) *pcupsPrintFile; + static void *cupshandle; +#define CUPS_FUNCS \ + DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsGetDests); \ + DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsPrintFile); + +#define DO_FUNC(f) static typeof(f) *p##f +CUPS_FUNCS; +#undef DO_FUNC + static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -493,15 +500,9 @@ static BOOL CUPS_LoadPrinters(void) } TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); -#define DYNCUPS(x) \ - p##x = wine_dlsym(cupshandle, #x, NULL,0); \ - if (!p##x) return FALSE; - - DYNCUPS(cupsFreeDests); - DYNCUPS(cupsGetPPD); - DYNCUPS(cupsGetDests); - DYNCUPS(cupsPrintFile); -#undef DYNCUPS +#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); if (!p##x) return FALSE; + CUPS_FUNCS; +#undef DO_FUNC if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) {

1 0

Huw Davies : wineps: Add a cups job ticket containing pagesize and duplex information.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 7af7c7869eaddbd8a199ba84b67cbb036011647d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af7c7869eaddbd8a199ba84b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:40 2012 +0100 wineps: Add a cups job ticket containing pagesize and duplex information. --- dlls/wineps.drv/ps.c | 67 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 4aca6f1..0312b36 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -34,8 +34,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +static const char psadobe[] = +"%!PS-Adobe-3.0\n"; + +static const char media[] = "%cupsJobTicket: media="; +static const char cups_one_sided[] = "%cupsJobTicket: sides=one-sided\n"; +static const char cups_two_sided_long[] = "%cupsJobTicket: sides=two-sided-long-edge\n"; +static const char cups_two_sided_short[] = "%cupsJobTicket: sides=two-sided-short-edge\n"; +static const char *cups_duplexes[3] = +{ + cups_one_sided, /* DMDUP_SIMPLEX */ + cups_two_sided_long, /* DMDUP_VERTICAL */ + cups_two_sided_short /* DMDUP_HORIZONTAL */ +}; + static const char psheader[] = /* title llx lly urx ury */ -"%%!PS-Adobe-3.0\n" "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" "%%%%BoundingBox: %d %d %d %d\n" @@ -296,6 +309,40 @@ done: return ret; } +struct ticket_info +{ + PAGESIZE *page; + DUPLEX *duplex; +}; + +static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) +{ + char buf[256]; + int len; + + if (info->page && info->page->InvocationString) + { + len = sizeof(media) + strlen( info->page->Name ) + 1; + if (len <= sizeof(buf)) + { + memcpy( buf, media, sizeof(media) ); + strcat( buf, info->page->Name ); + strcat( buf, "\n"); + write_spool( dev, buf, len - 1 ); + } + else + WARN( "paper name %s will be too long for DSC\n", info->page->Name ); + } + + if (info->duplex && info->duplex->InvocationString) + { + if (info->duplex->WinDuplex >= 1 && info->duplex->WinDuplex <= 3) + { + const char *str = cups_duplexes[ info->duplex->WinDuplex - 1 ]; + write_spool( dev, str, strlen( str ) ); + } + } +} INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) { @@ -306,9 +353,20 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DUPLEX *duplex = find_duplex( physDev->pi->ppd, physDev->Devmode ); int llx, lly, urx, ury; int ret, len; + struct ticket_info ticket_info = { page, duplex }; TRACE("%s\n", debugstr_w(title)); + len = strlen( psadobe ); + ret = write_spool( dev, psadobe, len ); + if (ret != len) + { + WARN("WriteSpool error\n"); + return 0; + } + + write_cups_job_ticket( dev, &ticket_info ); + escaped_title = escape_title(title); buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psheader) + strlen(escaped_title) + 30 ); @@ -330,13 +388,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) HeapFree(GetProcessHeap(), 0, escaped_title); len = strlen( buf ); - ret = write_spool( dev, buf, len ); + write_spool( dev, buf, len ); HeapFree( GetProcessHeap(), 0, buf ); - if (ret != len) - { - WARN("WriteSpool error\n"); - return 0; - } write_spool( dev, psbeginprolog, strlen(psbeginprolog) ); write_spool( dev, psprolog, strlen(psprolog) );

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
72
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 April 2012