November 2006 - Wine-commits

Francois Gouget : user32: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 37e25d5c0727a1947daf6d82cbcf30bf858658df URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e25d5c0727a1947daf6d82c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 27 19:21:34 2006 +0100 user32: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/user32/resources/user32_Pt.rc | 60 ++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/user32/resources/user32_Pt.rc b/dlls/user32/resources/user32_Pt.rc index 36419c0..d0ec87a 100644 --- a/dlls/user32/resources/user32_Pt.rc +++ b/dlls/user32/resources/user32_Pt.rc @@ -1,5 +1,6 @@ /* * Copyright 1997 Ricardo R. Massaro + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,28 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARD MENUITEM "&Put 'Debug mark' in debug log", 61762 } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Restaurar", 61728 + MENUITEM "&Mover", 61456 + MENUITEM "&Tamanho", 61440 + MENUITEM "Mi&nimizar", 61472 + MENUITEM "Ma&ximizar", 61488 + MENUITEM SEPARATOR + MENUITEM "&Fechar\tAlt-F4", 61536 + MENUITEM SEPARATOR + MENUITEM "&Alternar Para ...\tCtrl-Esc", 61744 + MENUITEM SEPARATOR + MENUITEM "&Acerca do WINE ...", 61761 + MENUITEM SEPARATOR + MENUITEM "&Colocar 'Marca de Depura��o' no registo de depura��o", 61762 +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE { POPUP "" @@ -50,6 +73,26 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCAR END } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "" + BEGIN + MENUITEM "&Voltar", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Recortar", WM_CUT + MENUITEM "&Copiar", WM_COPY + MENUITEM "Co&lar", WM_PASTE + MENUITEM "&Limpar", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Seleccionar &Tudo", EM_SETSEL + END +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN @@ -64,6 +107,9 @@ BEGIN PUSHBUTTON "&N�o", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selecionar Janela" @@ -74,6 +120,20 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 100, 35, 14 END +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Seleccionar Janela" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 120, 100, 35, 14 +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE {

1 0

Francois Gouget : shlwapi: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 26a7c0cd83738369c13c08389b8eb2060330ddc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a7c0cd83738369c13c08389… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 27 19:21:46 2006 +0100 shlwapi: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/shlwapi/shlwapi_Pt.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Pt.rc b/dlls/shlwapi/shlwapi_Pt.rc index 9724b55..92914a4 100644 --- a/dlls/shlwapi/shlwapi_Pt.rc +++ b/dlls/shlwapi/shlwapi_Pt.rc @@ -2,6 +2,7 @@ * Portuguese resources for shlwapi * * Copyright 2004 Marcelo Duarte + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,6 +35,25 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON L"&N�o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Erro!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "N�o &mostre esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&N�o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld bytes"

1 0

Alexandre Julliard : ntdll: Unset the WINESERVERSOCKET variable after we have retrieved it.
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: e0546309799148a93b467da20dc4d98a28ee33ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0546309799148a93b467da20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 20:05:56 2006 +0100 ntdll: Unset the WINESERVERSOCKET variable after we have retrieved it. --- dlls/ntdll/server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 68ed969..b0c52ad 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -934,6 +934,7 @@ void server_init_process(void) fd_socket = atoi( env_socket ); if (fcntl( fd_socket, F_SETFD, 1 ) == -1) fatal_perror( "Bad server socket %d", fd_socket ); + unsetenv( "WINESERVERSOCKET" ); } else {

1 0

Francois Gouget : msrle32: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 28 Nov '06

28 Nov '06

Module: wine Branch: master Commit: 8852d2ce9e33856143067075a2ff65587d2fa368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8852d2ce9e33856143067075a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 27 19:20:31 2006 +0100 msrle32: Add a Portuguese translation (contributed by Americo Jose Melo). --- dlls/msrle32/msrle_Pt.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/msrle_Pt.rc b/dlls/msrle32/msrle_Pt.rc index e24a1ad..cc74b38 100644 --- a/dlls/msrle32/msrle_Pt.rc +++ b/dlls/msrle32/msrle_Pt.rc @@ -2,6 +2,7 @@ * Portuguese resource file for MS-RLE * * Copyright 2003 Marcelo Duarte + * Copyright 2006 Am�rico Jos� Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,3 +27,12 @@ STRINGTABLE DISCARDABLE IDS_DESCRIPTION "Wine MS-RLE codificador/decodificador de v�deo" IDS_ABOUT "Wine MS-RLE codificador/decodificador de v�deo\nCopyright 2002 por Michael G�nnewig" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE codificador/decodificador de v�deo" + IDS_ABOUT "Wine MS-RLE codificador/decodificador de v�deo\nDireitos de autor 2002 por Michael G�nnewig" +}

1 0

appdb/. browse_newest_apps.php
by WineHQ 28 Nov '06

28 Nov '06

ChangeSet ID: 30094 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/27 19:10:26 Modified files: . : browse_newest_apps.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix the newest apps list so it displays the correct date when the application was submitted, plus some small fixes Patch: http://cvs.winehq.org/patch.py?id=30094 Old revision New revision Changes Path 1.1 1.2 +5 -5 appdb/browse_newest_apps.php Index: appdb/browse_newest_apps.php diff -u -p appdb/browse_newest_apps.php:1.1 appdb/browse_newest_apps.php:1.2 --- appdb/browse_newest_apps.php:1.1 28 Nov 2006 1:10:26 -0000 +++ appdb/browse_newest_apps.php 28 Nov 2006 1:10:26 -0000 @@ -1,6 +1,6 @@ <?php /** - * Browse newest versions + * Browse newest applications * */ @@ -8,13 +8,13 @@ require("path.php"); require(BASE."include/incl.php"); require(BASE."include/filter.php"); -// set default value +/* Set default value */ if(empty($aClean['iNumVersions']) || $aClean['iNumVersions'] > 200 || $aClean['iNumVersions'] < 0) $aClean['iNumVersions'] = 25; apidb_header("Browse Newest Applications"); -/* selector for how many versions to view */ +/* Selector for how many versions to view */ echo "<form method=\"post\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">"; echo "How many versions to display:"; echo "<select name='iNumVersions'>"; @@ -46,7 +46,7 @@ if($hResult) echo "<tr class=\"color4\">\n"; echo "<td>Submission Date</td>\n"; echo "<td>Application</td>\n"; - echo "<td>Description</td></td>\n"; + echo "<td>Description</td></tr>\n"; $c = 1; while($row = mysql_fetch_object($hResult)) @@ -54,7 +54,7 @@ if($hResult) $bgcolor = ($c % 2) ? "color0" : "color1"; $link = "<a href=\"appview.php?iAppId=$row->appId\"> $row->appName </a>"; echo "<tr class=\"$bgcolor\">"; - echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($oApp->sSubmitTime))."</td>\n"; + echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."</td>\n"; echo "<td>$link </td>\n"; echo "<td>$row->description </td></tr>\n"; $c++;

1 0

Pierre d'Herbemont : winsock: Get rid of already disabled WS prefix, thus fix Wine compilation on big-endian.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 4919a76edf0ae9703607b12e71d1dc26d4ba67b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4919a76edf0ae9703607b12e7… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Mon Nov 27 18:19:03 2006 +0100 winsock: Get rid of already disabled WS prefix, thus fix Wine compilation on big-endian. --- include/winsock.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index ae5df6d..9d5165b 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -516,20 +516,20 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set #ifdef WORDS_BIGENDIAN -#define htonl(l) ((WS(u_long))(l)) -#define htons(s) ((WS(u_short))(s)) -#define ntohl(l) ((WS(u_long))(l)) -#define ntohs(s) ((WS(u_short))(s)) +#define htonl(l) ((u_long)(l)) +#define htons(s) ((u_short)(s)) +#define ntohl(l) ((u_long)(l)) +#define ntohs(s) ((u_short)(s)) #else /* WORDS_BIGENDIAN */ -inline static WS(u_short) __wine_ushort_swap(WS(u_short) s) +inline static u_short __wine_ushort_swap(u_short s) { return (s >> 8) | (s << 8); } -inline static WS(u_long) __wine_ulong_swap(WS(u_long) l) +inline static u_long __wine_ulong_swap(u_long l) { - return ((WS(u_long))__wine_ushort_swap((WS(u_short))l) << 16) | __wine_ushort_swap((WS(u_short))(l >> 16)); + return ((u_long)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16)); } #define htonl(l) __wine_ulong_swap(l) #define htons(s) __wine_ushort_swap(s)

1 0

Alexandre Julliard : winsock: Add WS_ prefix on WSAIoctl constants.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 167b32cc4b3b168b95e282dfeaaf3573b46595f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167b32cc4b3b168b95e282dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 18:48:58 2006 +0100 winsock: Add WS_ prefix on WSAIoctl constants. --- dlls/ws2_32/socket.c | 6 +++--- include/mswsock.h | 5 ++++- include/winsock2.h | 46 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e90c4b2..8113ab7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2077,7 +2077,7 @@ INT WINAPI WSAIoctl(SOCKET s, } return WS_ioctlsocket( s, WS_FIONREAD, lpbOutBuffer); - case SIO_GET_INTERFACE_LIST: + case WS_SIO_GET_INTERFACE_LIST: { INTERFACE_INFO* intArray = (INTERFACE_INFO*)lpbOutBuffer; DWORD size, numInt, apiReturn; @@ -2206,13 +2206,13 @@ INT WINAPI WSAIoctl(SOCKET s, break; } - case SIO_ADDRESS_LIST_CHANGE: + case WS_SIO_ADDRESS_LIST_CHANGE: FIXME("-> SIO_ADDRESS_LIST_CHANGE request: stub\n"); /* FIXME: error and return code depend on whether socket was created * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */ break; - case SIO_FLUSH: + case WS_SIO_FLUSH: FIXME("SIO_FLUSH: stub.\n"); break; diff --git a/include/mswsock.h b/include/mswsock.h index 8b8597a..398572b 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -76,8 +76,11 @@ extern "C" { #define WS_TCP_BSDURGENT 0x7000 #endif +#ifndef USE_WS_PREFIX #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) - +#else +#define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) +#endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET diff --git a/include/winsock2.h b/include/winsock2.h index f89390c..8b75342 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -110,12 +110,51 @@ extern "C" { #define SD_BOTH 0x02 /* Constants for WSAIoctl() */ -#undef IOC_VOID /* for Darwin */ +#ifdef USE_WS_PREFIX +#define WS_IOC_UNIX 0x00000000 +#define WS_IOC_WS2 0x08000000 +#define WS_IOC_PROTOCOL 0x10000000 +#define WS_IOC_VENDOR 0x18000000 +#define WS_IOC_VOID 0x20000000 +#define WS_IOC_OUT 0x40000000 +#define WS_IOC_IN 0x80000000 +#define WS_IOC_INOUT (WS_IOC_IN|WS_IOC_OUT) +#define _WSAIO(x,y) (WS_IOC_VOID|(x)|(y)) +#define _WSAIOR(x,y) (WS_IOC_OUT|(x)|(y)) +#define _WSAIOW(x,y) (WS_IOC_IN|(x)|(y)) +#define _WSAIORW(x,y) (WS_IOC_INOUT|(x)|(y)) +#define WS_SIO_ASSOCIATE_HANDLE _WSAIOW(WS_IOC_WS2,1) +#define WS_SIO_ENABLE_CIRCULAR_QUEUEING _WSAIO(WS_IOC_WS2,2) +#define WS_SIO_FIND_ROUTE _WSAIOR(WS_IOC_WS2,3) +#define WS_SIO_FLUSH _WSAIO(WS_IOC_WS2,4) +#define WS_SIO_GET_BROADCAST_ADDRESS _WSAIOR(WS_IOC_WS2,5) +#define WS_SIO_GET_EXTENSION_FUNCTION_POINTER _WSAIORW(WS_IOC_WS2,6) +#define WS_SIO_GET_QOS _WSAIORW(WS_IOC_WS2,7) +#define WS_SIO_GET_GROUP_QOS _WSAIORW(WS_IOC_WS2,8) +#define WS_SIO_MULTIPOINT_LOOPBACK _WSAIOW(WS_IOC_WS2,9) +#define WS_SIO_MULTICAST_SCOPE _WSAIOW(WS_IOC_WS2,10) +#define WS_SIO_SET_QOS _WSAIOW(WS_IOC_WS2,11) +#define WS_SIO_SET_GROUP_QOS _WSAIOW(WS_IOC_WS2,12) +#define WS_SIO_TRANSLATE_HANDLE _WSAIORW(WS_IOC_WS2,13) +#define WS_SIO_ROUTING_INTERFACE_QUERY _WSAIORW(WS_IOC_WS2,20) +#define WS_SIO_ROUTING_INTERFACE_CHANGE _WSAIOW(WS_IOC_WS2,21) +#define WS_SIO_ADDRESS_LIST_QUERY _WSAIOR(WS_IOC_WS2,22) +#define WS_SIO_ADDRESS_LIST_CHANGE _WSAIO(WS_IOC_WS2,23) +#define WS_SIO_QUERY_TARGET_PNP_HANDLE _WSAIOR(WS_IOC_WS2,24) +#define WS_SIO_GET_INTERFACE_LIST WS__IOR('t', 127, WS_u_long) +#else /* USE_WS_PREFIX */ +#undef IOC_VOID +#undef IOC_IN +#undef IOC_OUT +#undef IOC_INOUT #define IOC_UNIX 0x00000000 #define IOC_WS2 0x08000000 #define IOC_PROTOCOL 0x10000000 #define IOC_VENDOR 0x18000000 #define IOC_VOID 0x20000000 +#define IOC_OUT 0x40000000 +#define IOC_IN 0x80000000 +#define IOC_INOUT (IOC_IN|IOC_OUT) #define _WSAIO(x,y) (IOC_VOID|(x)|(y)) #define _WSAIOR(x,y) (IOC_OUT|(x)|(y)) #define _WSAIOW(x,y) (IOC_IN|(x)|(y)) @@ -138,11 +177,8 @@ extern "C" { #define SIO_ADDRESS_LIST_QUERY _WSAIOR(IOC_WS2,22) #define SIO_ADDRESS_LIST_CHANGE _WSAIO(IOC_WS2,23) #define SIO_QUERY_TARGET_PNP_HANDLE _WSAIOR(IOC_WS2,24) -#ifndef USE_WS_PREFIX #define SIO_GET_INTERFACE_LIST _IOR ('t', 127, u_long) -#else -#define SIO_GET_INTERFACE_LIST WS__IOR ('t', 127, WS_u_long) -#endif +#endif /* USE_WS_PREFIX */ /* Constants for WSAIoctl() */ #define WSA_FLAG_OVERLAPPED 0x01

1 0

Eric Pouech : dbghelp: Silence typedefs children in sub program block.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 3669415dd5421a0985d89f1c7636ca3c255394b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3669415dd5421a0985d89f1c7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Nov 25 10:31:30 2006 +0100 dbghelp: Silence typedefs children in sub program block. --- dlls/dbghelp/dwarf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index bcd07c3..cd66c0e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1447,6 +1447,7 @@ static void dwarf2_parse_subprogram_bloc case DW_TAG_structure_type: case DW_TAG_union_type: case DW_TAG_enumeration_type: + case DW_TAG_typedef: /* the type referred to will be loaded when we need it, so skip it */ break; default:

1 0

Eric Pouech : winedbg: Added basic support for printing 64bit wide entities .
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 7ca25148f47a03084bf83df094eac2d230d62577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca25148f47a03084bf83df09… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:51 2006 +0100 winedbg: Added basic support for printing 64bit wide entities. --- programs/winedbg/debugger.h | 1 + programs/winedbg/memory.c | 14 +++++++++----- programs/winedbg/types.c | 33 +++++++++++++++++++++------------ 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index e436956..67b84ba 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -392,6 +392,7 @@ extern void print_value(cons extern int types_print_type(const struct dbg_type*, BOOL details); extern int print_types(void); extern long int types_extract_as_integer(const struct dbg_lvalue*); +extern LONGLONG types_extract_as_longlong(const struct dbg_lvalue*); extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS64*); extern BOOL types_deref(const struct dbg_lvalue* value, struct dbg_lvalue* result); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, long int* tmpbuf); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index cdfc149..d4fb7c3 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -466,7 +466,7 @@ static void print_typed_basic(const stru */ void print_basic(const struct dbg_lvalue* lvalue, int count, char format) { - long int res; + LONGLONG res; if (lvalue->type.id == dbg_itype_none) { @@ -474,17 +474,18 @@ void print_basic(const struct dbg_lvalue return; } - res = types_extract_as_integer(lvalue); + res = types_extract_as_longlong(lvalue); /* FIXME: this implies i386 byte ordering */ switch (format) { case 'x': - dbg_printf("0x%lx", res); + dbg_printf("0x%lx", (DWORD)(ULONG64)res); break; case 'd': - dbg_printf("%ld\n", res); + dbg_print_longlong(res, TRUE); + dbg_printf("\n"); break; case 'c': @@ -507,7 +508,10 @@ void print_basic(const struct dbg_lvalue dbg_printf("Format specifier '%c' is meaningless in 'print' command\n", format); case 0: if (lvalue->type.id == dbg_itype_segptr) - dbg_printf("%ld", res); + { + dbg_print_longlong(res, TRUE); + dbg_printf("\n"); + } else print_typed_basic(lvalue); break; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index da62669..ca7fd06 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -48,15 +48,14 @@ BOOL types_get_real_type(struct dbg_type } /****************************************************************** - * types_extract_as_integer + * types_extract_as_longlong * * Given a lvalue, try to get an integral (or pointer/address) value * out of it */ -long int types_extract_as_integer(const struct dbg_lvalue* lvalue) +LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue) { - long int rtn; - LONGLONG val; + LONGLONG rtn; DWORD tag, bt; DWORD64 size; struct dbg_type type = lvalue->type; @@ -87,30 +86,29 @@ long int types_extract_as_integer(const { case btChar: case btInt: - if (!be_cpu->fetch_integer(lvalue, (unsigned)size, TRUE, &val)) + if (!be_cpu->fetch_integer(lvalue, (unsigned)size, TRUE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); - rtn = (long)val; break; case btUInt: - if (!be_cpu->fetch_integer(lvalue, (unsigned)size, FALSE, &val)) + if (!be_cpu->fetch_integer(lvalue, (unsigned)size, FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); - rtn = (DWORD)(DWORD64)val; break; case btFloat: RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); } break; case SymTagPointerType: - if (!memory_read_value(lvalue, sizeof(void*), &rtn)) + if (!be_cpu->fetch_integer(lvalue, sizeof(void*), FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagArrayType: case SymTagUDT: - if (!memory_read_value(lvalue, sizeof(rtn), &rtn)) + if (!be_cpu->fetch_integer(lvalue, sizeof(unsigned), FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagEnum: - if (!memory_read_value(lvalue, sizeof(rtn), &rtn)) + /* FIXME: we don't handle enum size */ + if (!be_cpu->fetch_integer(lvalue, sizeof(unsigned), FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagFunctionType: @@ -126,6 +124,17 @@ long int types_extract_as_integer(const } /****************************************************************** + * types_extract_as_integer + * + * Given a lvalue, try to get an integral (or pointer/address) value + * out of it + */ +long int types_extract_as_integer(const struct dbg_lvalue* lvalue) +{ + return types_extract_as_longlong(lvalue); +} + +/****************************************************************** * types_extract_as_address * * @@ -139,7 +148,7 @@ void types_extract_as_address(const stru else { addr->Mode = AddrModeFlat; - addr->Offset = types_extract_as_integer( lvalue ); + addr->Offset = types_extract_as_longlong( lvalue ); } }

1 0

Eric Pouech : winedbg: Host references lookup.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 135f2e1b79a3860ec8742306f0180dbe3532e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=135f2e1b79a3860ec8742306f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:47 2006 +0100 winedbg: Host references lookup. Since more and more information in now available through the CPU registers, those require DLV_HOST access to be a bit better handled than it is... --- programs/winedbg/memory.c | 2 -- programs/winedbg/types.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 42866da..cdfc149 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -394,7 +394,6 @@ static void print_typed_basic(const stru break; case SymTagArrayType: case SymTagUDT: - assert(lvalue->cookie == DLV_TARGET); if (!memory_read_value(lvalue, sizeof(val_ptr), &val_ptr)) return; dbg_printf("%p", val_ptr); break; @@ -402,7 +401,6 @@ static void print_typed_basic(const stru { BOOL ok = FALSE; - assert(lvalue->cookie == DLV_TARGET); /* FIXME: it depends on underlying type for enums * (not supported yet in dbghelp) * Assuming 4 as for an int diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 0268978..da62669 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -106,12 +106,10 @@ long int types_extract_as_integer(const break; case SymTagArrayType: case SymTagUDT: - assert(lvalue->cookie == DLV_TARGET); if (!memory_read_value(lvalue, sizeof(rtn), &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case SymTagEnum: - assert(lvalue->cookie == DLV_TARGET); if (!memory_read_value(lvalue, sizeof(rtn), &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break;

1 0