April 2012 - Wine-Commits - list.winehq.org

Christian Costa : d3drm: Pass the first requested interface when notifying the application.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: efba6cd03b4142333813c1f7e609c3df8d49959c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efba6cd03b4142333813c1f7e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:36:31 2012 +0200 d3drm: Pass the first requested interface when notifying the application. --- dlls/d3drm/d3drm.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3db6b9e..ba29e6e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1353,7 +1353,6 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc { BOOL requested = FALSE; HRESULT hr; - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder; TRACE("Found TID_D3DRMMesh\n"); @@ -1361,26 +1360,31 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) + { requested = TRUE; + break; + } if (requested) { + LPDIRECT3DRMMESHBUILDER3 meshbuilder; + FIXME("Load mesh data and notify application\n"); - hr = IDirect3DRM3_CreateMeshBuilder(iface, &pMeshBuilder); + hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) { - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + LPDIRECT3DRMOBJECT object = NULL; - hr = IDirect3DRMMeshBuilder3_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void**)&pMeshBuilder3); + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); if (SUCCEEDED(hr)) { - hr = load_mesh_data(pMeshBuilder3, pData); - IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); + hr = load_mesh_data(meshbuilder, pData); + if (SUCCEEDED(hr)) + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); } - if (SUCCEEDED(hr)) - LoadProc((LPDIRECT3DRMOBJECT)pMeshBuilder3, &IID_IDirect3DRMMeshBuilder, ArgLP); - IDirect3DRMMeshBuilder_Release(pMeshBuilder3); + IDirect3DRMMeshBuilder3_Release(meshbuilder); } if (FAILED(hr)) @@ -1391,7 +1395,6 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc { BOOL requested = FALSE; HRESULT hr; - LPDIRECT3DRMFRAME3 frame; TRACE("Found TID_D3DRMFrame\n"); @@ -1399,21 +1402,33 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) + { requested = TRUE; + break; + } if (requested) { + LPDIRECT3DRMFRAME3 frame; + FIXME("Fake frame data and notify application\n"); hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); if (SUCCEEDED(hr)) { - LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP); + LPDIRECT3DRMOBJECT object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } IDirect3DRMFrame3_Release(frame); } if (FAILED(hr)) - ERR("Cannot process mesh\n"); + ERR("Cannot process frame\n"); } }

1 0

André Hentschel : winedbg: Use better register names for ARM disassembling.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Hans Leidekker : server: Include the Unix pid in the snapshot_next_process reply.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Hans Leidekker : iphlpapi: Add support for TCP_TABLE_OWNER_PID_ALL in GetExtendedTcpTable.
by Alexandre Julliard April 16, 2012

April 16, 2012

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 : iphlpapi: Reimplement GetTcpTable on top of GetExtendedTcpTable.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: d4ebc5298f17aa749c675b494d0b09b510e45f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ebc5298f17aa749c675b494… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:36:00 2012 +0200 iphlpapi: Reimplement GetTcpTable on top of GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 22 +--------------------- 1 files changed, 1 insertions(+), 21 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2654571..961736f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1853,28 +1853,8 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo */ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret; - PMIB_TCPTABLE table; - TRACE("pTcpTable %p, pdwSize %p, bOrder %d\n", pTcpTable, pdwSize, bOrder); - - if (!pdwSize) return ERROR_INVALID_PARAMETER; - - ret = AllocateAndGetTcpTableFromStack(&table, bOrder, GetProcessHeap(), 0); - if (!ret) { - DWORD size = FIELD_OFFSET( MIB_TCPTABLE, table[table->dwNumEntries] ); - if (!pTcpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pTcpTable, table, size); - } - HeapFree(GetProcessHeap(), 0, table); - } - TRACE("returning %d\n", ret); - return ret; + return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); } /******************************************************************

1 0

Jacek Caban : mshtml: Added IHTMLStyle::removeAttribute implementation.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 0cad55aee9d85ccae6e5f820755fbe4eead8f3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cad55aee9d85ccae6e5f8207… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:49:09 2012 +0200 mshtml: Added IHTMLStyle::removeAttribute implementation. --- dlls/mshtml/htmlstyle.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1f8947c..0ac98b4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2748,9 +2748,57 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri LONG lFlags, VARIANT_BOOL *pfSuccess) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), - lFlags, pfSuccess); - return E_NOTIMPL; + const style_tbl_entry_t *style_entry; + nsAString name_str, ret_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); + + style_entry = lookup_style_tbl(strAttributeName); + if(!style_entry) { + DISPID dispid; + unsigned i; + + hres = IDispatchEx_GetDispID(&This->dispex.IDispatchEx_iface, strAttributeName, + (lFlags&1) ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + if(hres != S_OK) { + *pfSuccess = VARIANT_FALSE; + return S_OK; + } + + for(i=0; i < sizeof(style_tbl)/sizeof(*style_tbl); i++) { + if(dispid == style_tbl[i].dispid) + break; + } + + if(i == sizeof(style_tbl)/sizeof(*style_tbl)) + return remove_prop(&This->dispex, strAttributeName, pfSuccess); + style_entry = style_tbl+i; + } + + /* filter property is a special case */ + if(style_entry->dispid == DISPID_IHTMLSTYLE_FILTER) { + *pfSuccess = This->elem->filter && *This->elem->filter ? VARIANT_TRUE : VARIANT_FALSE; + heap_free(This->elem->filter); + This->elem->filter = NULL; + update_filter(This); + return S_OK; + } + + nsAString_InitDepend(&name_str, style_entry->name); + nsAString_Init(&ret_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *ret; + nsAString_GetData(&ret_str, &ret); + *pfSuccess = *ret ? VARIANT_TRUE : VARIANT_FALSE; + }else { + ERR("RemoveProperty failed: %08x\n", nsres); + } + nsAString_Finish(&name_str); + nsAString_Finish(&ret_str); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLStyle_toString(IHTMLStyle *iface, BSTR *String)

1 0

Huw Davies : wineps: Add a helper to find a duplex entry.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 64edac40efb156156ccaac5d24d90caefdc20708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64edac40efb156156ccaac5d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:39 2012 +0100 wineps: Add a helper to find a duplex entry. --- dlls/wineps.drv/driver.c | 14 ++++++++++++++ dlls/wineps.drv/ps.c | 17 +++-------------- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c9c5b19..9443c66 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -67,6 +67,20 @@ PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } +DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ) +{ + DUPLEX *duplex; + WORD win_duplex = dm->dmPublic.dmFields & DM_DUPLEX ? dm->dmPublic.dmDuplex : 0; + + if (win_duplex == 0) return NULL; /* Not capable */ + + LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) + if (duplex->WinDuplex == win_duplex) + return duplex; + + return NULL; +} + /************************************************************************ * * PSDRV_MergeDevmodes diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index f4444e8..4aca6f1 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -303,8 +303,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) char *buf, *escaped_title; INPUTSLOT *slot = find_slot( physDev->pi->ppd, physDev->Devmode ); PAGESIZE *page = find_pagesize( physDev->pi->ppd, physDev->Devmode ); - DUPLEX *duplex; - int win_duplex; + DUPLEX *duplex = find_duplex( physDev->pi->ppd, physDev->Devmode ); int llx, lly, urx, ury; int ret, len; @@ -356,18 +355,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) if (page && page->InvocationString) PSDRV_WriteFeature( dev, "*PageSize", page->Name, page->InvocationString ); - win_duplex = physDev->Devmode->dmPublic.dmFields & DM_DUPLEX ? - physDev->Devmode->dmPublic.dmDuplex : 0; - LIST_FOR_EACH_ENTRY( duplex, &physDev->pi->ppd->Duplexes, DUPLEX, entry ) - { - if(duplex->WinDuplex == win_duplex) { - if(duplex->InvocationString) { - PSDRV_WriteFeature(dev, "*Duplex", duplex->Name, - duplex->InvocationString); - break; - } - } - } + if (duplex && duplex->InvocationString) + PSDRV_WriteFeature( dev, "*Duplex", duplex->Name, duplex->InvocationString ); write_spool( dev, psendsetup, strlen(psendsetup) ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index f314dd9..38e8306 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -403,6 +403,7 @@ extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); extern PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ); +extern DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ); /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0

André Hentschel : winedbg: Add long branch to Thumb disassembling.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Alexandre Julliard : gdi32: Add bounds tracking to all the DIB engine entry points.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 34457aa4c3bf445c7c95bf048422d37ac07a6bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34457aa4c3bf445c7c95bf048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 11 14:49:30 2012 +0200 gdi32: Add bounds tracking to all the DIB engine entry points. --- dlls/gdi32/dibdrv/bitblt.c | 5 +++ dlls/gdi32/dibdrv/dc.c | 31 +++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 71 ++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/dc.c | 18 +++++----- dlls/gdi32/tests/dib.c | 16 ++------- 6 files changed, 118 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34457aa4c3bf445c7c95b…

1 0

Jacek Caban : mshtml: Moved style_tbl lookup to separated function.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: a9c83385b59d510568a0cd73bb9693e7b0d235f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c83385b59d510568a0cd73b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:48:55 2012 +0200 mshtml: Moved style_tbl lookup to separated function. --- dlls/mshtml/htmlstyle.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4f94c5c..1f8947c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -173,10 +173,12 @@ static const WCHAR attrWordWrap[] = static const WCHAR attrZIndex[] = {'z','-','i','n','d','e','x',0}; -static const struct{ +typedef struct { const WCHAR *name; DISPID dispid; -} style_tbl[] = { +} style_tbl_entry_t; + +static const style_tbl_entry_t style_tbl[] = { {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, @@ -264,6 +266,26 @@ static const WCHAR valBlink[] = static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; +static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) +{ + int c, i, min = 0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; + + while(min <= max) { + i = (min+max)/2; + + c = strcmpW(style_tbl[i].name, name); + if(!c) + return style_tbl+i; + + if(c > 0) + max = i-1; + else + min = i+1; + } + + return NULL; +} + static LPWSTR fix_px_value(LPCWSTR val) { LPCWSTR ptr = val; @@ -2929,21 +2951,12 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { - int c, i, min=0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; - - while(min <= max) { - i = (min+max)/2; - - c = strcmpW(style_tbl[i].name, name); - if(!c) { - *dispid = style_tbl[i].dispid; - return S_OK; - } + const style_tbl_entry_t *style_entry; - if(c > 0) - max = i-1; - else - min = i+1; + style_entry = lookup_style_tbl(name); + if(style_entry) { + *dispid = style_entry->dispid; + return S_OK; } return DISP_E_UNKNOWNNAME;

1 0