June 2006 - Wine-Commits - list.winehq.org

Juan Lang : winedbg: Remove useless NOCMD state.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 92deacbe425bfd986a2cc3bf1e776aca02cf08c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92deacbe425bfd986a2cc3b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Sun Jun 4 13:32:25 2006 -0700 winedbg: Remove useless NOCMD state. --- programs/winedbg/debug.l | 51 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a3df742..6bdabe0 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -89,7 +89,6 @@ STRING \"[^\n"]+\" %s SHOW_CMD %s MODE_CMD %s MAINT_CMD -%s NOCMD %x ASTRING_EXPECTED %x NOPROCESS @@ -135,36 +134,36 @@ STRING \"[^\n"]+\" yylval.string = lexeme_alloc(p); return tSTRING; } <INITIAL,NOPROCESS>info|inf|in { BEGIN(INFO_CMD); return tINFO; } -<INITIAL>up { BEGIN(NOCMD); return tUP; } -<INITIAL>down|dow|do { BEGIN(NOCMD); return tDOWN; } -<INITIAL>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; } +<INITIAL>up { return tUP; } +<INITIAL>down|dow|do { return tDOWN; } +<INITIAL>frame|fram|fra|fr { return tFRAME; } <INITIAL>list|lis|li|l { BEGIN(PATH_EXPECTED); return tLIST; } <INITIAL>enable|enabl|enab|ena { BEGIN(BD_CMD); return tENABLE;} <INITIAL>disable|disabl|disab|disa|dis { BEGIN(BD_CMD); return tDISABLE; } -<INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { BEGIN(NOCMD); return tDISASSEMBLE; } +<INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { return tDISASSEMBLE; } <INITIAL>locally|local { BEGIN(LOCAL_CMD); return tLOCAL; } <INITIAL,LOCAL_CMD>display|displa|displ|disp { BEGIN(FORMAT_EXPECTED); return tDISPLAY; } -<INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d { BEGIN(NOCMD); return tDISPLAY; } -<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { BEGIN(NOCMD); return tUNDISPLAY; } +<INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d { return tDISPLAY; } +<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { return tUNDISPLAY; } <INITIAL>delete|delet|dele|del { BEGIN(BD_CMD); return tDELETE; } -<INITIAL,NOPROCESS>quit|qui|qu|q { BEGIN(NOCMD); return tQUIT; } -<INITIAL>set|se { BEGIN(NOCMD); return tSET; } +<INITIAL,NOPROCESS>quit|qui|qu|q { return tQUIT; } +<INITIAL>set|se { return tSET; } <INITIAL>x { BEGIN(FORMAT_EXPECTED); return tEXAM; } <INITIAL,NOPROCESS>help|hel|he|"?" { BEGIN(HELP_CMD); return tHELP; } -<INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; } -<INITIAL,NOPROCESS>where|wher|whe { BEGIN(NOCMD); return tBACKTRACE; } +<INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { return tBACKTRACE; } +<INITIAL,NOPROCESS>where|wher|whe { return tBACKTRACE; } -<INITIAL>cont|con|co|c { BEGIN(NOCMD); return tCONT; } -<INITIAL>pass|pas|pa { BEGIN(NOCMD); return tPASS; } -<INITIAL>condition|conditio|conditi|condit|condi|cond { BEGIN(NOCMD); return tCOND; } -<INITIAL>step|ste|st|s { BEGIN(NOCMD); return tSTEP; } -<INITIAL>next|nex|ne|n { BEGIN(NOCMD); return tNEXT; } -<INITIAL>stepi|si { BEGIN(NOCMD); return tSTEPI; } -<INITIAL>nexti|ni { BEGIN(NOCMD); return tNEXTI; } -<INITIAL>finish|finis|fini|fin|fi { BEGIN(NOCMD); return tFINISH; } +<INITIAL>cont|con|co|c { return tCONT; } +<INITIAL>pass|pas|pa { return tPASS; } +<INITIAL>condition|conditio|conditi|condit|condi|cond { return tCOND; } +<INITIAL>step|ste|st|s { return tSTEP; } +<INITIAL>next|nex|ne|n { return tNEXT; } +<INITIAL>stepi|si { return tSTEPI; } +<INITIAL>nexti|ni { return tNEXTI; } +<INITIAL>finish|finis|fini|fin|fi { return tFINISH; } -<INITIAL>abort|abor|abo { BEGIN(NOCMD); return tABORT; } +<INITIAL>abort|abor|abo { return tABORT; } <INITIAL>print|prin|pri|pr|p { BEGIN(FORMAT_EXPECTED); return tPRINT; } <INITIAL>mode { BEGIN(MODE_CMD); return tMODE; } @@ -172,16 +171,16 @@ STRING \"[^\n"]+\" <INITIAL,NOPROCESS>source|sourc|sour|src { BEGIN(PATH_EXPECTED); return tSOURCE; } <INITIAL>symbolfile|symbols|symbol|sf { BEGIN(PATH_EXPECTED); return tSYMBOLFILE; } -<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { BEGIN(NOCMD); return tBREAK; } -<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(NOCMD); return tHBREAK; } -<INITIAL>watch|watc|wat { BEGIN(NOCMD); return tWATCH; } -<INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } +<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { return tBREAK; } +<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { return tHBREAK; } +<INITIAL>watch|watc|wat { return tWATCH; } +<INITIAL>whatis|whati|what { return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} -<INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } +<INITIAL>detach|detac|deta|det { return tDETACH; } <INITIAL>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } <INITIAL>minidump|mdmp { BEGIN(PATH_EXPECTED); return tMINIDUMP; } <INITIAL>echo { BEGIN(ASTRING_EXPECTED); return tECHO; } -<NOPROCESS>attach|attac|atta|att { BEGIN(NOCMD); return tATTACH; } +<NOPROCESS>attach|attac|atta|att { return tATTACH; } <INFO_CMD>share|shar|sha { return tSHARE; } <INFO_CMD>locals|local|loca|loc { return tLOCAL; } <INFO_CMD>class|clas|cla { return tCLASS; }

1 0

Juan Lang : user: Use SetPropW rather than SetPropA for internal property.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 9a974b899bfe216466b961cf52e6653508ea8740 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a974b899bfe216466b961c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Sun Jun 4 20:49:16 2006 -0700 user: Use SetPropW rather than SetPropA for internal property. --- dlls/user/winpos.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 70aea4f..0c23507 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -78,14 +78,16 @@ typedef struct /* ----- internal functions ----- */ +static const WCHAR SysIP_W[] = { 'S','y','s','I','P',0 }; + static inline INTERNALPOS *get_internal_pos( HWND hwnd ) { - return GetPropA( hwnd, "SysIP" ); + return GetPropW( hwnd, SysIP_W ); } static inline void set_internal_pos( HWND hwnd, INTERNALPOS *pos ) { - SetPropA( hwnd, "SysIP", pos ); + SetPropW( hwnd, SysIP_W, pos ); } /***********************************************************************

1 0

Robert Shearman : msi: An empty string is equivalent to nil, so handle this in the optimised WHERE_execute path.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: d70db020a6d961b8266fbd780e42409064e4e6e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d70db020a6d961b8266fbd7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 5 01:41:04 2006 +0100 msi: An empty string is equivalent to nil, so handle this in the optimised WHERE_execute path. --- dlls/msi/where.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 6fa70a3..a02b19b 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -265,11 +265,17 @@ static UINT WHERE_execute( struct tagMSI if ((col_cond->type == EXPR_COL_NUMBER_STRING) && (val_cond->type == EXPR_SVAL)) { col = col_cond->u.col_number; - r = msi_string2idW(wv->db->strings, val_cond->u.sval, &value); - if (r != ERROR_SUCCESS) + /* special case for "" - translate it into nil */ + if (!val_cond->u.sval[0]) + value = 0; + else { - TRACE("no id for %s, assuming it doesn't exist in the table\n", debugstr_w(wv->cond->u.expr.right->u.sval)); - return ERROR_SUCCESS; + r = msi_string2idW(wv->db->strings, val_cond->u.sval, &value); + if (r != ERROR_SUCCESS) + { + TRACE("no id for %s, assuming it doesn't exist in the table\n", debugstr_w(wv->cond->u.expr.right->u.sval)); + return ERROR_SUCCESS; + } } do

1 0

Robert Shearman : rpcrt4: Implement varying array NDR functions.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: c9779ca16b7f7715ed04450c3339f200c8fccb9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9779ca16b7f7715ed04450… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 5 01:41:30 2006 +0100 rpcrt4: Implement varying array NDR functions. --- dlls/rpcrt4/ndr_marshall.c | 252 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 245 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index af20c0a..30f5ddc 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -21,7 +21,6 @@ * TODO: * - Non-conformant strings * - String structs - * - Varying arrays * - Encapsulated unions * - Byte count pointers * - transmit_as/represent as @@ -3532,7 +3531,59 @@ unsigned char * WINAPI NdrVaryingArrayM unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + unsigned char alignment; + DWORD elements, esize; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pFormat[0] != RPC_FC_SMVARRAY) && + (pFormat[0] != RPC_FC_LGVARRAY)) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + alignment = pFormat[1] + 1; + + if (pFormat[0] == RPC_FC_SMVARRAY) + { + pFormat += 2; + pFormat += sizeof(WORD); + elements = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + } + else + { + pFormat += 2; + pFormat += sizeof(DWORD); + elements = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + } + + esize = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + if ((pStubMsg->ActualCount > elements) || + (pStubMsg->ActualCount + pStubMsg->Offset > elements)) + { + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + + WriteVariance(pStubMsg); + + ALIGN_POINTER(pStubMsg->Buffer, alignment); + + memcpy(pStubMsg->Buffer, pMemory + pStubMsg->Offset, pStubMsg->ActualCount*esize); + pStubMsg->BufferMark = pStubMsg->Buffer; + pStubMsg->Buffer += pStubMsg->ActualCount*esize; + + EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); + + STD_OVERFLOW_CHECK(pStubMsg); + return NULL; } @@ -3544,7 +3595,58 @@ unsigned char * WINAPI NdrVaryingArrayU PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - FIXME("stub\n"); + unsigned char alignment; + DWORD size, elements, esize; + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + + if ((pFormat[0] != RPC_FC_SMVARRAY) && + (pFormat[0] != RPC_FC_LGVARRAY)) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + alignment = pFormat[1] + 1; + + if (pFormat[0] == RPC_FC_SMVARRAY) + { + pFormat += 2; + size = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + elements = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + } + else + { + pFormat += 2; + size = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + elements = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + } + + esize = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + + pFormat = ReadVariance(pStubMsg, pFormat); + if ((pStubMsg->ActualCount > elements) || + (pStubMsg->ActualCount + pStubMsg->Offset > elements)) + { + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + + ALIGN_POINTER(pStubMsg->Buffer, alignment); + + if (!*ppMemory || fMustAlloc) + *ppMemory = NdrAllocate(pStubMsg, size); + memcpy(*ppMemory + pStubMsg->Offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); + pStubMsg->Buffer += pStubMsg->ActualCount * esize; + + EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + return NULL; } @@ -3555,7 +3657,54 @@ void WINAPI NdrVaryingArrayBufferSize(PM unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + unsigned char alignment; + DWORD elements, esize; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pFormat[0] != RPC_FC_SMVARRAY) && + (pFormat[0] != RPC_FC_LGVARRAY)) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + alignment = pFormat[1] + 1; + + if (pFormat[0] == RPC_FC_SMVARRAY) + { + pFormat += 2; + pFormat += sizeof(WORD); + elements = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + } + else + { + pFormat += 2; + pFormat += sizeof(DWORD); + elements = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + } + + esize = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + if ((pStubMsg->ActualCount > elements) || + (pStubMsg->ActualCount + pStubMsg->Offset > elements)) + { + RpcRaiseException(RPC_S_INVALID_BOUND); + return; + } + + SizeVariance(pStubMsg); + + ALIGN_LENGTH(pStubMsg->BufferLength, alignment); + + pStubMsg->BufferLength += pStubMsg->ActualCount * esize; + + EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } /*********************************************************************** @@ -3564,8 +3713,57 @@ void WINAPI NdrVaryingArrayBufferSize(PM unsigned long WINAPI NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - FIXME("stub\n"); - return 0; + unsigned char alignment; + DWORD size, elements, esize; + + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + if ((pFormat[0] != RPC_FC_SMVARRAY) && + (pFormat[0] != RPC_FC_LGVARRAY)) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return 0; + } + + alignment = pFormat[1] + 1; + + if (pFormat[0] == RPC_FC_SMVARRAY) + { + pFormat += 2; + size = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + elements = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + } + else + { + pFormat += 2; + size = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + elements = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + } + + esize = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + + pFormat = ReadVariance(pStubMsg, pFormat); + if ((pStubMsg->ActualCount > elements) || + (pStubMsg->ActualCount + pStubMsg->Offset > elements)) + { + RpcRaiseException(RPC_S_INVALID_BOUND); + return 0; + } + + ALIGN_POINTER(pStubMsg->Buffer, alignment); + + pStubMsg->Buffer += pStubMsg->ActualCount * esize; + pStubMsg->MemorySize += size; + + EmbeddedPointerMemorySize(pStubMsg, pFormat); + + return pStubMsg->MemorySize; } /*********************************************************************** @@ -3575,7 +3773,47 @@ void WINAPI NdrVaryingArrayFree(PMIDL_ST unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + unsigned char alignment; + DWORD elements; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pFormat[0] != RPC_FC_SMVARRAY) && + (pFormat[0] != RPC_FC_LGVARRAY)) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + alignment = pFormat[1] + 1; + + if (pFormat[0] == RPC_FC_SMVARRAY) + { + pFormat += 2; + pFormat += sizeof(WORD); + elements = *(const WORD*)pFormat; + pFormat += sizeof(WORD); + } + else + { + pFormat += 2; + pFormat += sizeof(DWORD); + elements = *(const DWORD*)pFormat; + pFormat += sizeof(DWORD); + } + + pFormat += sizeof(WORD); + + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + if ((pStubMsg->ActualCount > elements) || + (pStubMsg->ActualCount + pStubMsg->Offset > elements)) + { + RpcRaiseException(RPC_S_INVALID_BOUND); + return; + } + + EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Don' t call NdrBaseTypeMemorySize from within NdrBaseTypeUnmarshall.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: cd19c992847d8669006f94285c72c7fced87fd49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd19c992847d8669006f942… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 5 01:41:18 2006 +0100 rpcrt4: Don't call NdrBaseTypeMemorySize from within NdrBaseTypeUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 02c3583..af20c0a 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4153,19 +4153,11 @@ static unsigned char *WINAPI NdrBaseType { TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false"); - if (fMustAlloc || !*ppMemory) - { - unsigned char *Buffer = pStubMsg->Buffer; - unsigned long MemorySize = pStubMsg->MemorySize; - *ppMemory = NdrAllocate(pStubMsg, NdrBaseTypeMemorySize(pStubMsg, pFormat)); - pStubMsg->MemorySize = MemorySize; - pStubMsg->Buffer = Buffer; - } - - TRACE("*ppMemory: %p\n", *ppMemory); - #define BASE_TYPE_UNMARSHALL(type) \ ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + if (fMustAlloc || !*ppMemory) \ + *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ + TRACE("*ppMemory: %p\n", *ppMemory); \ **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ pStubMsg->Buffer += sizeof(type); @@ -4205,6 +4197,9 @@ #define BASE_TYPE_UNMARSHALL(type) \ break; case RPC_FC_ENUM16: ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); + if (fMustAlloc || !*ppMemory) + *ppMemory = NdrAllocate(pStubMsg, sizeof(UINT)); + TRACE("*ppMemory: %p\n", *ppMemory); /* 16-bits on the wire, but int in memory */ **(UINT **)ppMemory = *(USHORT *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(USHORT);

1 0

Eric Pouech : winedbg: Correct typedefs in type manipulations.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 65da8987d549d1136fade7d12ab68f5ef5a4d4e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65da8987d549d1136fade7d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 4 09:47:48 2006 +0200 winedbg: Correct typedefs in type manipulations. --- programs/winedbg/types.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index f4df0d8..05e1e89 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -510,6 +510,11 @@ void print_value(const struct dbg_lvalue dbg_printf(": "); types_print_type(&lvalue->type, FALSE); break; + case SymTagTypedef: + lvalue_field = *lvalue; + types_get_info(&lvalue->type, TI_GET_TYPE, &lvalue_field.type.id); + print_value(&lvalue_field, format, level); + break; default: WINE_FIXME("Unknown tag (%lu)\n", tag); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); @@ -666,6 +671,9 @@ int types_print_type(const struct dbg_ty } dbg_printf(")"); break; + case SymTagTypedef: + dbg_printf(name); + break; default: WINE_ERR("Unknown type %lu for %s\n", tag, name); break;

1 0

Mike McCormack : progman: Win64 fixes.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: bda34ac973a94681828b4c02c5af4148f67890de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bda34ac973a94681828b4c0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 00:28:48 2006 +0900 progman: Win64 fixes. --- programs/progman/dialog.c | 36 ++++++++++++++++++------------------ programs/progman/group.c | 6 +++--- programs/progman/program.c | 10 +++++----- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index 469fd40..f3c2974 100644 --- a/programs/progman/dialog.c +++ b/programs/progman/dialog.c @@ -27,12 +27,12 @@ #include "commdlg.h" #include "progman.h" static BOOL DIALOG_BrowsePrograms(HWND, LPSTR, INT); static BOOL DIALOG_BrowseSymbols(HWND, LPSTR, INT); -static BOOL CALLBACK DIALOG_NEW_DlgProc(HWND, UINT, WPARAM, LPARAM); -static BOOL CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND, UINT, WPARAM, LPARAM); -static BOOL CALLBACK DIALOG_GROUP_DlgProc(HWND, UINT, WPARAM, LPARAM); -static BOOL CALLBACK DIALOG_PROGRAM_DlgProc(HWND, UINT, WPARAM, LPARAM); -static BOOL CALLBACK DIALOG_SYMBOL_DlgProc(HWND, UINT, WPARAM, LPARAM); -static BOOL CALLBACK DIALOG_EXECUTE_DlgProc(HWND, UINT, WPARAM, LPARAM); +static INT_PTR CALLBACK DIALOG_NEW_DlgProc(HWND, UINT, WPARAM, LPARAM); +static INT_PTR CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND, UINT, WPARAM, LPARAM); +static INT_PTR CALLBACK DIALOG_GROUP_DlgProc(HWND, UINT, WPARAM, LPARAM); +static INT_PTR CALLBACK DIALOG_PROGRAM_DlgProc(HWND, UINT, WPARAM, LPARAM); +static INT_PTR CALLBACK DIALOG_SYMBOL_DlgProc(HWND, UINT, WPARAM, LPARAM); +static INT_PTR CALLBACK DIALOG_EXECUTE_DlgProc(HWND, UINT, WPARAM, LPARAM); /*********************************************************************** * @@ -62,7 +62,7 @@ INT DIALOG_New(INT nDefault) * DIALOG_NEW_DlgProc */ -static BOOL CALLBACK DIALOG_NEW_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DIALOG_NEW_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -125,7 +125,7 @@ HLOCAL DIALOG_CopyMove(LPCSTR lpszProgra * DIALOG_COPY_MOVE_DlgProc */ -static BOOL CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { HLOCAL hGroup; @@ -213,7 +213,7 @@ BOOL DIALOG_GroupAttributes(LPSTR lpszTi * DIALOG_GROUP_DlgProc */ -static BOOL CALLBACK DIALOG_GROUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DIALOG_GROUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -297,7 +297,7 @@ #endif * DIALOG_PROGRAM_DlgProc */ -static BOOL CALLBACK DIALOG_PROGRAM_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DIALOG_PROGRAM_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { CHAR buffer[MAX_STRING_LEN]; switch (msg) @@ -418,7 +418,7 @@ VOID DIALOG_Symbol(HICON *lphIcon, LPSTR * DIALOG_SYMBOL_DlgProc */ -static BOOL CALLBACK DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -491,13 +491,13 @@ #endif * DIALOG_Execute */ -VOID DIALOG_Execute() +VOID DIALOG_Execute(void) { -INT_PTR z; - DLGPROC lpfnDlg = MakeProcInstance(DIALOG_EXECUTE_DlgProc, Globals.hInstance); - z=DialogBox(Globals.hInstance, STRING_EXECUTE, - Globals.hMainWnd, lpfnDlg); - FreeProcInstance(lpfnDlg); + INT_PTR z; + DLGPROC lpfnDlg = MakeProcInstance(DIALOG_EXECUTE_DlgProc, Globals.hInstance); + z=DialogBox(Globals.hInstance, STRING_EXECUTE, + Globals.hMainWnd, lpfnDlg); + FreeProcInstance(lpfnDlg); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -505,7 +505,7 @@ INT_PTR z; * DIALOG_EXECUTE_DlgProc */ -static BOOL CALLBACK DIALOG_EXECUTE_DlgProc(HWND hDlg, UINT msg, +static INT_PTR CALLBACK DIALOG_EXECUTE_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) diff --git a/programs/progman/group.c b/programs/progman/group.c index 5b9ce49..ea2dd7b 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -44,7 +44,7 @@ #endif case WM_CHILDACTIVATE: case WM_NCLBUTTONDOWN: - Globals.hActiveGroup = (HLOCAL) GetWindowLong(hWnd, 0); + Globals.hActiveGroup = (HLOCAL) GetWindowLongPtr(hWnd, 0); EnableMenuItem(Globals.hFileMenu, PM_MOVE , MF_GRAYED); EnableMenuItem(Globals.hFileMenu, PM_COPY , MF_GRAYED); break; @@ -64,7 +64,7 @@ ATOM GROUP_RegisterGroupWinClass() class.style = CS_HREDRAW | CS_VREDRAW; class.lpfnWndProc = GROUP_GroupWndProc; class.cbClsExtra = 0; - class.cbWndExtra = sizeof(LONG); + class.cbWndExtra = sizeof(LONG_PTR); class.hInstance = Globals.hInstance; class.hIcon = LoadIcon (0, IDI_WINLOGO); class.hCursor = LoadCursor (0, IDC_ARROW); @@ -180,7 +180,7 @@ HLOCAL GROUP_AddGroup(LPCSTR lpszName, L group->hWnd = (HWND)SendMessage(Globals.hMDIWnd, WM_MDICREATE, 0, (LPARAM)&cs); - SetWindowLong(group->hWnd, 0, (LONG) hGroup); + SetWindowLongPtr(group->hWnd, 0, (LONG_PTR) hGroup); #if 1 if (!bSuppressShowWindow) /* FIXME shouldn't be necessary */ diff --git a/programs/progman/program.c b/programs/progman/program.c index 8751c3c..347378c 100644 --- a/programs/progman/program.c +++ b/programs/progman/program.c @@ -35,7 +35,7 @@ static LRESULT CALLBACK PROGRAM_ProgramW { case WM_NCLBUTTONDOWN: { - HLOCAL hProgram = (HLOCAL) GetWindowLong(hWnd, 0); + HLOCAL hProgram = (HLOCAL) GetWindowLongPtr(hWnd, 0); PROGRAM *program = LocalLock(hProgram); PROGGROUP *group = LocalLock(program->hGroup); group->hActiveProgram = hProgram; @@ -45,7 +45,7 @@ static LRESULT CALLBACK PROGRAM_ProgramW } case WM_NCLBUTTONDBLCLK: { - PROGRAM_ExecuteProgram((HLOCAL) GetWindowLong(hWnd, 0)); + PROGRAM_ExecuteProgram((HLOCAL) GetWindowLongPtr(hWnd, 0)); return(0); } @@ -56,7 +56,7 @@ static LRESULT CALLBACK PROGRAM_ProgramW PAINTSTRUCT ps; HDC hdc; hdc = BeginPaint(hWnd,&ps); - program = LocalLock((HLOCAL) GetWindowLong(hWnd, 0)); + program = LocalLock((HLOCAL) GetWindowLongPtr(hWnd, 0)); if (program->hIcon) DrawIcon(hdc, 0, 0, program->hIcon); EndPaint(hWnd,&ps); @@ -78,7 +78,7 @@ ATOM PROGRAM_RegisterProgramWinClass() class.style = CS_HREDRAW | CS_VREDRAW; class.lpfnWndProc = PROGRAM_ProgramWndProc; class.cbClsExtra = 0; - class.cbWndExtra = sizeof(LONG); + class.cbWndExtra = sizeof(LONG_PTR); class.hInstance = Globals.hInstance; class.hIcon = 0; class.hCursor = LoadCursor (0, IDC_ARROW); @@ -220,7 +220,7 @@ HLOCAL PROGRAM_AddProgram(HLOCAL hGroup, x, y, CW_USEDEFAULT, CW_USEDEFAULT, group->hWnd, 0, Globals.hInstance, 0); - SetWindowLong(program->hWnd, 0, (LONG) hProgram); + SetWindowLongPtr(program->hWnd, 0, (LONG_PTR) hProgram); ShowWindow (program->hWnd, SW_SHOWMINIMIZED); SetWindowPos (program->hWnd, 0, x, y, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);

1 0

Mike McCormack : cmdlgtst: Use correct types for Win64.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 7300f56300e1c8a30d9e3e6c7fba035fadb95694 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7300f56300e1c8a30d9e3e6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 00:28:21 2006 +0900 cmdlgtst: Use correct types for Win64. --- programs/cmdlgtst/cmdlgtst.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index 410b3a5..f82388b 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -559,7 +559,7 @@ static void mw_PageSetup(HWND hWnd) * In particular, we have to set things properly, and get the flags back. */ -static void mwcd_SetFlags(HWND hWnd, struct FlagTableEntry *table, unsigned long flags) +static void mwcd_SetFlags(HWND hWnd, struct FlagTableEntry *table, DWORD flags) { int i; @@ -569,7 +569,7 @@ static void mwcd_SetFlags(HWND hWnd, str } } -static unsigned long mwcd_GetFlags(HWND hWnd, struct FlagTableEntry * table) +static DWORD mwcd_GetFlags(HWND hWnd, struct FlagTableEntry * table) { int i; unsigned long l = 0; @@ -590,8 +590,8 @@ static unsigned long mwcd_GetFlags(HWND * not the handlers. I'll fix that later; this works as of right now. */ -static BOOL mwcd_Setup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, - struct FlagTableEntry * table, unsigned long * flags) +static INT_PTR mwcd_Setup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, + struct FlagTableEntry * table, DWORD* flags) { (void) lParam; @@ -629,7 +629,7 @@ static BOOL mwcd_Setup(HWND hWnd, UINT u } } -static BOOL CALLBACK mwcd_ColorSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_ColorSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static struct FlagTableEntry flagTable[] = { {I_CC_RGBINIT, CC_RGBINIT}, @@ -645,7 +645,7 @@ static BOOL CALLBACK mwcd_ColorSetup(HWN return mwcd_Setup(hWnd, uMsg, wParam, lParam, flagTable, &cc.Flags); } -static BOOL CALLBACK mwcd_FontSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_FontSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static struct FlagTableEntry flagTable[] = { {I_CF_APPLY, CF_APPLY}, @@ -676,7 +676,7 @@ static BOOL CALLBACK mwcd_FontSetup(HWND return mwcd_Setup(hWnd, uMsg, wParam, lParam, flagTable, &cf.Flags); } -static BOOL CALLBACK mwcd_FindSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_FindSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static struct FlagTableEntry flagTable[] = { @@ -703,7 +703,7 @@ static BOOL CALLBACK mwcd_FindSetup(HWND return mwcd_Setup(hWnd, uMsg, wParam, lParam, flagTable, &frS.Flags); } -static BOOL CALLBACK mwcd_PrintSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_PrintSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static struct FlagTableEntry flagTable[] = { {I_PD_ALLPAGES, PD_ALLPAGES}, @@ -734,7 +734,7 @@ static BOOL CALLBACK mwcd_PrintSetup(HWN return mwcd_Setup(hWnd, uMsg, wParam, lParam, flagTable, &pd.Flags); } -static BOOL CALLBACK mwcd_PageSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_PageSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static struct FlagTableEntry flagTable[] = { {I_PSD_DEFAULTMINMARGINS, PSD_DEFAULTMINMARGINS}, @@ -762,7 +762,7 @@ static BOOL CALLBACK mwcd_PageSetup(HWND return mwcd_Setup(hWnd, uMsg, wParam, lParam, flagTable, &psd.Flags); } -static BOOL CALLBACK mwcd_FileSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_FileSetup(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static struct FlagTableEntry flagTable[] = { {I_OFN_ALLOWMULTISELECT, OFN_ALLOWMULTISELECT}, @@ -788,7 +788,7 @@ static BOOL CALLBACK mwcd_FileSetup(HWND return mwcd_Setup(hWnd, uMsg, wParam, lParam, flagTable, &ofn.Flags); } -static BOOL CALLBACK mwcd_About(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK mwcd_About(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { (void) wParam; (void) lParam;

1 0

Mike McCormack : winemine: Remove dialog.h as it's redundant.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: b7049d52e5f643bed53833a5f79526d0fb6615b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7049d52e5f643bed53833a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 00:27:50 2006 +0900 winemine: Remove dialog.h as it's redundant. --- programs/winemine/dialog.c | 1 - programs/winemine/dialog.h | 29 ----------------------------- programs/winemine/main.c | 1 - 3 files changed, 0 insertions(+), 31 deletions(-) delete mode 100644 programs/winemine/dialog.h diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index ef0ccee..c9139b2 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -22,7 +22,6 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "main.h" -#include "dialog.h" #include "resource.h" BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) diff --git a/programs/winemine/dialog.h b/programs/winemine/dialog.h deleted file mode 100644 index 235af8e..0000000 --- a/programs/winemine/dialog.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * WineMine (dialog.h) - * - * Copyright 2000 Joshua Thielen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - -BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); - -BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); - -BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); - -BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); - diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 6b5549a..7551db0 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -25,7 +25,6 @@ #include <time.h> #include <windows.h> #include <stdlib.h> #include "main.h" -#include "dialog.h" #include "resource.h" #include <wine/debug.h>

1 0

Mike McCormack : winemine: Fix dialog proc prototypes for Win64.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: a4eb809fb2a8751f6f494ddb772694e4dbf9fefb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4eb809fb2a8751f6f494dd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 4 00:28:04 2006 +0900 winemine: Fix dialog proc prototypes for Win64. --- programs/winemine/dialog.c | 8 ++++---- programs/winemine/main.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index c9139b2..fb7efb2 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -24,7 +24,7 @@ #include <windows.h> #include "main.h" #include "resource.h" -BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) +INT_PTR CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { BOOL IsRet; static BOARD *p_board; @@ -56,7 +56,7 @@ BOOL CALLBACK CustomDlgProc( HWND hDlg, return FALSE; } -BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) +INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { static BOARD *p_board; @@ -85,7 +85,7 @@ BOOL CALLBACK CongratsDlgProc( HWND hDlg return FALSE; } -BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) +INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { static BOARD *p_board; unsigned i; @@ -115,7 +115,7 @@ BOOL CALLBACK TimesDlgProc( HWND hDlg, U return FALSE; } -BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) +INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { switch( uMsg ) { case WM_INITDIALOG: diff --git a/programs/winemine/main.h b/programs/winemine/main.h index dba54ec..bc257b8 100644 --- a/programs/winemine/main.h +++ b/programs/winemine/main.h @@ -170,12 +170,12 @@ void DrawFace( HDC hdc, HDC hMemDC, BOAR LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK CustomDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); -BOOL CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); +INT_PTR CALLBACK AboutDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); /* end of header */

1 0