January 2013 - Wine-commits

Jacek Caban : iphlpapi: Added support for direct routes when using NET_RT_DUMP.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: fdcbd3137a6100da6520ecaf3b3b58b7d2d5a7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcbd3137a6100da6520ecaf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 2 15:33:28 2013 +0100 iphlpapi: Added support for direct routes when using NET_RT_DUMP. --- dlls/iphlpapi/ipstats.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a78424b..f8191ba 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1497,15 +1497,13 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw continue; } - /* Ignore all entries except for gateway routes which aren't - multicast */ - if (!(rtm->rtm_flags & RTF_GATEWAY) || - (rtm->rtm_flags & RTF_MULTICAST)) + /* Ignore gateway routes which are multicast */ + if ((rtm->rtm_flags & RTF_GATEWAY) && (rtm->rtm_flags & RTF_MULTICAST)) continue; memset( &row, 0, sizeof(row) ); row.dwForwardIfIndex = rtm->rtm_index; - row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; + row.u1.ForwardType = (rtm->rtm_flags & RTF_GATEWAY) ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; row.dwForwardMetric1 = rtm->rtm_rmx.rmx_hopcount; row.u2.ForwardProto = MIB_IPPROTO_LOCAL; @@ -1523,19 +1521,29 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw ADVANCE (addrPtr, sa); /* default routes are encoded by length-zero sockaddr */ - if (sa->sa_len == 0) + if (sa->sa_len == 0) { addr = 0; - else if (sa->sa_family != AF_INET) - { - WARN ("Received unsupported sockaddr family 0x%x\n", - sa->sa_family); - addr = 0; - } - else - { - struct sockaddr_in *sin = (struct sockaddr_in *)sa; - - addr = sin->sin_addr.s_addr; + }else { + switch(sa->sa_family) { + case AF_INET: { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + addr = sin->sin_addr.s_addr; + break; + } +#ifdef AF_LINK + case AF_LINK: + if(i == RTA_GATEWAY && row.u1.ForwardType == MIB_IPROUTE_TYPE_DIRECT) { + /* For direct route we may simply use dest addr as next hop */ + C_ASSERT(RTA_DST < RTA_GATEWAY); + addr = row.dwForwardDest; + break; + } + /* fallthrough */ +#endif + default: + WARN ("Received unsupported sockaddr family 0x%x\n", sa->sa_family); + addr = 0; + } } switch (i)

1 0

Alexandre Julliard : winex11: Add an option to disable shaping of layered window to work around compositor bugs .
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: defcfde17ccf27d8ea9693a79e7a9239cd604b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defcfde17ccf27d8ea9693a79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 18:09:34 2013 +0100 winex11: Add an option to disable shaping of layered window to work around compositor bugs. --- dlls/winex11.drv/bitblt.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 161fa73..84e8751 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1621,6 +1621,8 @@ static void update_surface_region( struct x11drv_window_surface *surface ) int x, y, start, width; HRGN rgn; + if (!shape_layered_windows) return; + if (!surface->is_argb && surface->color_key == CLR_INVALID) { XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0c462d6..707ee03 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -218,6 +218,7 @@ extern const int X11DRV_XROPfunction[]; extern int client_side_graphics DECLSPEC_HIDDEN; extern int client_side_with_render DECLSPEC_HIDDEN; +extern int shape_layered_windows DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_glx_driver(UINT) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ef6b1a9..329fea5 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -81,6 +81,7 @@ int private_color_map = 0; int primary_monitor = 0; int client_side_graphics = 1; int client_side_with_render = 1; +int shape_layered_windows = 1; int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -397,6 +398,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "UseXIM", buffer, sizeof(buffer) )) use_xim = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "ShapeLayeredWindows", buffer, sizeof(buffer) )) + shape_layered_windows = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "PrivateColorMap", buffer, sizeof(buffer) )) private_color_map = IS_OPTION_TRUE( buffer[0] );

1 0

André Hentschel : winedbg: Add plain binary dataprocessing operators to Thumb2 disassembler.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 87fbe4ca107a8fffb8e37106aca1117e5d1ccb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fbe4ca107a8fffb8e37106a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 17:17:03 2013 +0100 winedbg: Add plain binary dataprocessing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 84 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a6f57f7..408dbcc 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1,7 +1,7 @@ /* * Debugger ARM specific functions * - * Copyright 2010-2012 André Hentschel + * Copyright 2010-2013 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1052,6 +1052,87 @@ static UINT thumb2_disasm_ldrnonword(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 20) & 0x1f; + WORD imm5 = ((inst >> 10) & 0x1c) + ((inst >> 6) & 0x03); + + if (op == 0) + { + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + if (get_nibble(inst, 4) == 15) + { + dbg_printf("\n\tadr\t%s, ", tbl_regs[get_nibble(inst, 2)]); + db_printsym(addr->Offset + offset + 4); + } + else + dbg_printf("\n\taddw\t%s, %s, #%u", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + } + + if (op == 4 || op == 12) + { + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0xf000) + + ((inst >> 4) & 0x0700) + (inst & 0xff); + dbg_printf("\n\t%s\t%s, #%u", op == 12 ? "movt" : "movw", tbl_regs[get_nibble(inst, 2)], + offset); + return 0; + } + + if (op == 10) + { + int offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + if (get_nibble(inst, 4) == 15) + { + offset *= -1; + dbg_printf("\n\tadr\t%s, ", tbl_regs[get_nibble(inst, 2)]); + db_printsym(addr->Offset + offset + 4); + } + else + dbg_printf("\n\tsubw\t%s, %s, #%u", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + } + + if (op == 16 || op == 18 || op == 24 || op == 26) + { + BOOL sign = op < 24; + WORD sh = (inst >> 21) & 0x01; + WORD sat = (inst & 0x1f); + if (sign) sat++; + if (imm5) + dbg_printf("\n\t%s\t%s, #%u, %s, %s #%u", sign ? "ssat" : "usat", + tbl_regs[get_nibble(inst, 2)], sat, tbl_regs[get_nibble(inst, 4)], + sh ? "asr" : "lsl", imm5); + else + dbg_printf("\n\t%s\t%s, #%u, %s", sign ? "ssat" : "usat", tbl_regs[get_nibble(inst, 2)], + sat, tbl_regs[get_nibble(inst, 4)]); + return 0; + } + + if (op == 20 || op == 28) + { + WORD width = (inst & 0x1f) + 1; + dbg_printf("\n\t%s\t%s, %s, #%u, #%u", op == 28 ? "ubfx" : "sbfx", + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], imm5, width); + return 0; + } + + if (op == 22) + { + WORD msb = (inst & 0x1f) + 1 - imm5; + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tbfc\t%s, #%u, #%u", tbl_regs[get_nibble(inst, 2)], imm5, msb); + else + dbg_printf("\n\tbfi\t%s, %s, #%u, #%u", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], imm5, msb); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1288,6 +1369,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, + { 0xfa008000, 0xf2000000, thumb2_disasm_dataprocessing }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

André Hentschel : winedbg: Add modified immediate dataprocessing operators to Thumb2 disassembler.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 0004788e96cfd5f81642bf430dfdd16353e59ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0004788e96cfd5f81642bf430… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 17:23:56 2013 +0100 winedbg: Add modified immediate dataprocessing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 408dbcc..9f6c824 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1133,6 +1133,79 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_dataprocessingmod(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 21) & 0x0f; + WORD sf = (inst >> 20) & 0x01; + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + + /* FIXME: use ThumbExpandImm_C */ + + switch (op) + { + case 0: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\ttst\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tand%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 1: + dbg_printf("\n\tbic%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 2: + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tmov%s\t%s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], offset); + else + dbg_printf("\n\torr%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 3: + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tmvn%s\t%s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], offset); + else + dbg_printf("\n\torn%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 4: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tteq\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\teor%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 8: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmn\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tadd%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 10: + dbg_printf("\n\tadc%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 11: + dbg_printf("\n\tsbc%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 13: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmp\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tsub%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 14: + dbg_printf("\n\trsb%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + default: + return inst; + } +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1370,6 +1443,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, { 0xfa008000, 0xf2000000, thumb2_disasm_dataprocessing }, + { 0xfa008000, 0xf0000000, thumb2_disasm_dataprocessingmod }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: bc17219a22a6b4384aa042f960a47b8541c47395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc17219a22a6b4384aa042f96… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Dec 29 09:41:35 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/po/lt.po b/po/lt.po index e741048..60c6956 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-12-21 19:24+0300\n" +"PO-Revision-Date: 2012-12-29 09:34+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10371,77 +10371,69 @@ msgstr "Šios tarnybos vykdomos:\n" #: netstat.rc:27 msgid "CLOSED" -msgstr "" +msgstr "NUTRAUKTAS" #: netstat.rc:28 msgid "LISTENING" -msgstr "" +msgstr "KLAUSOMASI" #: netstat.rc:29 msgid "SYN_SENT" -msgstr "" +msgstr "SYN_IŠSIŲSTAS" #: netstat.rc:30 msgid "SYN_RCVD" -msgstr "" +msgstr "SYN_GAUTAS" #: netstat.rc:31 msgid "ESTABLISHED" -msgstr "" +msgstr "UŽMEGZTAS" #: netstat.rc:32 msgid "FIN_WAIT1" -msgstr "" +msgstr "FIN_LAUKIMAS1" #: netstat.rc:33 msgid "FIN_WAIT2" -msgstr "" +msgstr "FIN_LAUKIMAS2" #: netstat.rc:34 msgid "CLOSE_WAIT" -msgstr "" +msgstr "NUTRAUKIMO_LAUKIMAS" #: netstat.rc:35 msgid "CLOSING" -msgstr "" +msgstr "NUTRAUKIAMA" #: netstat.rc:36 msgid "LAST_ACK" -msgstr "" +msgstr "PASKUTINIS_ACK" #: netstat.rc:37 msgid "TIME_WAIT" -msgstr "" +msgstr "PERIODO_LAUKIMAS" #: netstat.rc:38 msgid "DELETE_TCB" -msgstr "" +msgstr "TCB_PAŠALINTAS" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Vietinio tinklo ryšys" +msgstr "Aktyvūs ryšiai" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "Prot." #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Elektroninio pašto adresas" +msgstr "Vietinis adresas" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Adresas" +msgstr "Svetimas adresas" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "Būsena"

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8cd903aa102a5d1b1a455ee69b2a7ac46c81ab05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd903aa102a5d1b1a455ee69… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 31 11:31:04 2012 +0900 po: Update Korean translation. --- po/ko.po | 52 ++++++++++++++++++++++------------------------------ 1 files changed, 22 insertions(+), 30 deletions(-) diff --git a/po/ko.po b/po/ko.po index 23fc4b3..f256050 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10082,27 +10082,27 @@ msgstr "'%1'을 내부나 외부 명령어,나 배치 스크립트로 인식할 #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "0으로 나눈 에러가 발생했습니다.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "피연산자가 요구됩니다.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "예기치 않은 네트워크 오류.\n" +msgstr "연산자가 요구됩니다.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "괄호가 일치하지 않습니다\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"잘못된 형식의 숫자 - 십진수(12)나,\n" +"16진수(0x34)나 팔진수(056)중의 하나이어야 합니다.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10323,77 +10323,69 @@ msgstr "다음 서비스가 실행중임:\n" #: netstat.rc:27 msgid "CLOSED" -msgstr "" +msgstr "CLOSED" #: netstat.rc:28 msgid "LISTENING" -msgstr "" +msgstr "LISTENING" #: netstat.rc:29 msgid "SYN_SENT" -msgstr "" +msgstr "SYN_SENT" #: netstat.rc:30 msgid "SYN_RCVD" -msgstr "" +msgstr "SYN_RCVD" #: netstat.rc:31 msgid "ESTABLISHED" -msgstr "" +msgstr "ESTABLISHED" #: netstat.rc:32 msgid "FIN_WAIT1" -msgstr "" +msgstr "FIN_WAIT1" #: netstat.rc:33 msgid "FIN_WAIT2" -msgstr "" +msgstr "FIN_WAIT2" #: netstat.rc:34 msgid "CLOSE_WAIT" -msgstr "" +msgstr "CLOSE_WAIT" #: netstat.rc:35 msgid "CLOSING" -msgstr "" +msgstr "CLOSING" #: netstat.rc:36 msgid "LAST_ACK" -msgstr "" +msgstr "LAST_ACK" #: netstat.rc:37 msgid "TIME_WAIT" -msgstr "" +msgstr "TIME_WAIT" #: netstat.rc:38 msgid "DELETE_TCB" -msgstr "" +msgstr "DELETE_TCB" #: netstat.rc:40 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "랜 연결" +msgstr "활성화된 연결" #: netstat.rc:41 msgid "Proto" -msgstr "" +msgstr "프로토콜" #: netstat.rc:42 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "이메일 주소" +msgstr "지역 주소" #: netstat.rc:43 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "거리 주소" +msgstr "외부 주소" #: netstat.rc:44 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "상태"

1 0

Jacek Caban : atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 9704fcaf730547c7c55604d21adb1821edc8e9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9704fcaf730547c7c55604d21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 31 14:29:23 2012 +0100 atl100: Fixed NULL catmap handling in AtlRegisterClassCategoriesHelper. --- dlls/atl100/atl.c | 3 +++ dlls/atl100/tests/atl.c | 7 +++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index accc88c..1033952 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -429,6 +429,9 @@ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _AT TRACE("(%s %p %x)\n", debugstr_guid(clsid), catmap, reg); + if(!catmap) + return S_OK; + if(!catreg) { ICatRegister *new_catreg; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 35ef34b..c640003 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -154,6 +154,13 @@ static void test_regcat(void) test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Implemented Categories"); test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}\\Required Categories"); test_key_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + ok(RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}") == ERROR_SUCCESS, "Could not delete key\n"); + + hres = AtlRegisterClassCategoriesHelper(&CLSID_Test, NULL, TRUE); + ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); + + test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); } static void test_typelib(void)

1 0

Eric Pouech : winedbg: In 'info proc' command, list hierarchy of processus, and get rid of printing parent pid.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 00b6d8ebb129c1bd9090532cbc8beb531f46ec1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b6d8ebb129c1bd9090532cb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 31 15:10:50 2012 +0100 winedbg: In 'info proc' command, list hierarchy of processus, and get rid of printing parent pid. --- programs/winedbg/info.c | 95 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 80 insertions(+), 15 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bc59eed..fb60afe 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -449,30 +449,95 @@ void info_win32_window(HWND hWnd, BOOL detailed) dbg_printf("\n"); } +struct dump_proc_entry +{ + PROCESSENTRY32 proc; + unsigned children; /* index in dump_proc.entries of first child */ + unsigned sibling; /* index in dump_proc.entries of next sibling */ +}; + +struct dump_proc +{ + struct dump_proc_entry*entries; + unsigned count; + unsigned alloc; +}; + +static unsigned get_parent(const struct dump_proc* dp, unsigned idx) +{ + unsigned i; + + for (i = 0; i < dp->count; i++) + { + if (i != idx && dp->entries[i].proc.th32ProcessID == dp->entries[idx].proc.th32ParentProcessID) + return i; + } + return -1; +} + +static void dump_proc_info(const struct dump_proc* dp, unsigned idx, unsigned depth) +{ + struct dump_proc_entry* dpe; + for ( ; idx != -1; idx = dp->entries[idx].sibling) + { + assert(idx < dp->count); + dpe = &dp->entries[idx]; + dbg_printf("%c%08x %-8d ", + (dpe->proc.th32ProcessID == (dbg_curr_process ? + dbg_curr_process->pid : 0)) ? '>' : ' ', + dpe->proc.th32ProcessID, dpe->proc.cntThreads); + if (depth) + { + unsigned i; + for (i = 3 * (depth - 1); i > 0; i--) dbg_printf(" "); + dbg_printf("\\_ "); + } + dbg_printf("'%s'\n", dpe->proc.szExeFile); + dump_proc_info(dp, dpe->children, depth + 1); + } +} + void info_win32_processes(void) { HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); if (snap != INVALID_HANDLE_VALUE) { - PROCESSENTRY32 entry; - DWORD current = dbg_curr_process ? dbg_curr_process->pid : 0; - BOOL ok; + struct dump_proc dp; + unsigned i, first = -1; + BOOL ok; - entry.dwSize = sizeof(entry); - ok = Process32First(snap, &entry); + dp.count = 0; + dp.alloc = 16; + dp.entries = HeapAlloc(GetProcessHeap(), 0, sizeof(*dp.entries) * dp.alloc); + if (!dp.entries) return; + dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); + ok = Process32First(snap, &dp.entries[dp.count].proc); - dbg_printf(" %-8.8s %-8.8s %-8.8s %s (all id:s are in hex)\n", - "pid", "threads", "parent", "executable"); + /* fetch all process information into dp (skipping this debugger) */ while (ok) { - if (entry.th32ProcessID != GetCurrentProcessId()) - dbg_printf("%c%08x %-8d %08x '%s'\n", - (entry.th32ProcessID == current) ? '>' : ' ', - entry.th32ProcessID, entry.cntThreads, - entry.th32ParentProcessID, entry.szExeFile); - ok = Process32Next(snap, &entry); + if (dp.entries[dp.count].proc.th32ProcessID != GetCurrentProcessId()) + dp.entries[dp.count++].children = -1; + if (dp.count >= dp.alloc) + { + dp.entries = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc *= 2)); + if (!dp.entries) return; + } + dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); + ok = Process32Next(snap, &dp.entries[dp.count].proc); } CloseHandle(snap); + /* chain the siblings wrt. their parent */ + for (i = 0; i < dp.count; i++) + { + unsigned parent = get_parent(&dp, i); + unsigned *chain = parent == -1 ? &first : &dp.entries[parent].children; + dp.entries[i].sibling = *chain; + *chain = i; + } + dbg_printf(" %-8.8s %-8.8s %s (all id:s are in hex)\n", "pid", "threads", "executable"); + dump_proc_info(&dp, first, 0); + HeapFree(GetProcessHeap(), 0, dp.entries); } }

1 0

Andrew Eikum : wininet: Fail on URLs without a scheme.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: d6c0e8159b7aab54696dde71c07c077c0da75ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c0e8159b7aab54696dde71c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 31 14:33:20 2012 -0600 wininet: Fail on URLs without a scheme. --- dlls/wininet/internet.c | 210 ++++++++++++++++++++--------------------- dlls/wininet/tests/internet.c | 2 - dlls/wininet/tests/url.c | 23 ++++- 3 files changed, 123 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6c0e8159b7aab54696dd…

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATRIXHANDLE.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: d1b87e1378ff9ff2a85f39d4e1d3965d256a5ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b87e1378ff9ff2a85f39d4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:24 2013 +0100 ddraw: Avoid LPD3DMATRIXHANDLE. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fa6179f..6dbf3d8 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -952,7 +952,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) DWORD flags, D3DRECT *rect) PURE; STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; - STDMETHOD(CreateMatrix)(THIS_ LPD3DMATRIXHANDLE lpD3DMatHandle) PURE; + STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE;

1 0