January 2007 - Wine-Commits

Andrew Talbot : cabinet: Improve initialization of some arrays.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 267fcdd009566e4464f8a8cf3b4ecdf180dfeacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=267fcdd009566e4464f8a8cf3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 25 22:14:49 2007 +0000 cabinet: Improve initialization of some arrays. --- dlls/cabinet/fdi.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 8ffc0f4..8e8120d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -865,8 +865,21 @@ static int QTMfdi_init(int window, int l * LZXfdi_init (internal) */ static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) { + static const cab_UBYTE bits[] = + { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, + 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, + 15, 15, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17}; + static const cab_ULONG base[] = + { 0, 1, 2, 3, 4, 6, 8, 12, + 16, 24, 32, 48, 64, 96, 128, 192, + 256, 384, 512, 768, 1024, 1536, 2048, 3072, + 4096, 6144, 8192, 12288, 16384, 24576, 32768, 49152, + 65536, 98304, 131072, 196608, 262144, 393216, 524288, 655360, + 786432, 917504, 1048576, 1179648, 1310720, 1441792, 1572864, 1703936, + 1835008, 1966080, 2097152}; cab_ULONG wndsize = 1 << window; - int i, j, posn_slots; + int posn_slots; /* LZX supports window sizes of 2^15 (32Kb) through 2^21 (2Mb) */ /* if a previously allocated window is big enough, keep it */ @@ -882,14 +895,8 @@ static int LZXfdi_init(int window, fdi_d LZX(window_size) = wndsize; /* initialize static tables */ - for (i=0, j=0; i <= 50; i += 2) { - CAB(extra_bits)[i] = CAB(extra_bits)[i+1] = j; /* 0,0,0,0,1,1,2,2,3,3... */ - if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */ - } - for (i=0, j=0; i <= 50; i++) { - CAB(lzx_position_base)[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */ - j += 1 << CAB(extra_bits)[i]; /* 1,1,1,1,2,2,4,4,8,8,16,16,32,32,... */ - } + memcpy(CAB(extra_bits), bits, sizeof(bits)); + memcpy(CAB(lzx_position_base), base, sizeof(base)); /* calculate required position slots */ if (window == 20) posn_slots = 42; @@ -909,8 +916,8 @@ static int LZXfdi_init(int window, fdi_d LZX(window_posn) = 0; /* initialize tables to 0 (because deltas will be applied to them) */ - for (i = 0; i < LZX_MAINTREE_MAXSYMBOLS; i++) LZX(MAINTREE_len)[i] = 0; - for (i = 0; i < LZX_LENGTH_MAXSYMBOLS; i++) LZX(LENGTH_len)[i] = 0; + memset(LZX(MAINTREE_len), 0, sizeof(LZX(MAINTREE_len))); + memset(LZX(LENGTH_len), 0, sizeof(LZX(LENGTH_len))); return DECR_OK; }

1 0

Joris Huizer : libwine: sign-compare fixes.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: eefea58d7d7ad783e285010516bdc40008f130c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefea58d7d7ad783e28501051… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Thu Jan 25 13:14:01 2007 -0800 libwine: sign-compare fixes. --- libs/wine/loader.c | 15 ++++++++------- libs/wine/mmap.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index abf428d..10be9e7 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -59,10 +59,10 @@ char **__wine_main_environ = NULL; struct dll_path_context { - int index; /* current index in the dll path list */ - char *buffer; /* buffer used for storing path names */ - char *name; /* start of file name part in buffer (including leading slash) */ - int namelen; /* length of file name without .so extension */ + unsigned int index; /* current index in the dll path list */ + char *buffer; /* buffer used for storing path names */ + char *name; /* start of file name part in buffer (including leading slash) */ + int namelen; /* length of file name without .so extension */ }; #define MAX_DLLS 100 @@ -82,7 +82,7 @@ static load_dll_callback_t load_dll_call static const char *build_dir; static const char *default_dlldir; static const char **dll_paths; -static int nb_dll_paths; +static unsigned int nb_dll_paths; static int dll_path_maxlen; extern void mmap_init(void); @@ -162,7 +162,7 @@ inline static char *prepend( char *buffe /* get a filename from the next entry in the dll path */ static char *next_dll_path( struct dll_path_context *context ) { - int index = context->index++; + unsigned int index = context->index++; int namelen = context->namelen; char *path = context->name; @@ -331,7 +331,8 @@ static void *map_dll( const IMAGE_NT_HEA DWORD code_start, data_start, data_end; const size_t page_size = getpagesize(); const size_t page_mask = page_size - 1; - int i, delta, nb_sections = 2; /* code + data */ + int delta, nb_sections = 2; /* code + data */ + unsigned int i; size_t size = (sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index b6f5595..d7fd31b 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -49,7 +49,7 @@ struct reserved_area }; static struct list reserved_areas = LIST_INIT(reserved_areas); -static const int granularity_mask = 0xffff; /* reserved areas have 64k granularity */ +static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k granularity */ #ifdef HAVE_MMAP

1 0

Francois Gouget : snmpapi: Fix the winapi_check warnings.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 6f734ac7b902a9121b84e1f5deb66b41ebc26973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f734ac7b902a9121b84e1f5d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 25 15:10:23 2007 +0100 snmpapi: Fix the winapi_check warnings. --- dlls/snmpapi/main.c | 18 +++++++++--------- include/snmp.h | 48 ++++++++++++++++++++++++------------------------ tools/winapi/win32.api | 25 +++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 33 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 29c381c..b929ca3 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -144,7 +144,7 @@ BOOL WINAPI DllMain( * probably ignored by Microsoft's compiler in this case. So declare it * correctly in Wine so it works with all compilers. */ -void WINAPIV SnmpUtilDbgPrint(INT loglevel, LPSTR format, ...) +VOID WINAPIV SnmpUtilDbgPrint(INT loglevel, LPSTR format, ...) { FIXME("(%d, %s)\n", loglevel, debugstr_a(format)); } @@ -170,7 +170,7 @@ LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID /*********************************************************************** * SnmpUtilMemFree (SNMPAPI.@) */ -void WINAPI SnmpUtilMemFree(LPVOID mem) +VOID WINAPI SnmpUtilMemFree(LPVOID mem) { TRACE("(%p)\n", mem); HeapFree(GetProcessHeap(), 0, mem); @@ -188,7 +188,7 @@ INT WINAPI SnmpUtilAsnAnyCpy(AsnAny *dst /*********************************************************************** * SnmpUtilAsnAnyFree (SNMPAPI.@) */ -void WINAPI SnmpUtilAsnAnyFree(AsnAny *any) +VOID WINAPI SnmpUtilAsnAnyFree(AsnAny *any) { TRACE("(%p)\n", any); asn_any_free(any); @@ -224,7 +224,7 @@ INT WINAPI SnmpUtilOctetsCpy(AsnOctetStr /*********************************************************************** * SnmpUtilOctetsFree (SNMPAPI.@) */ -void WINAPI SnmpUtilOctetsFree(AsnOctetString *octets) +VOID WINAPI SnmpUtilOctetsFree(AsnOctetString *octets) { TRACE("(%p)\n", octets); @@ -326,7 +326,7 @@ INT WINAPI SnmpUtilOidCpy(AsnObjectIdent /*********************************************************************** * SnmpUtilOidFree (SNMPAPI.@) */ -void WINAPI SnmpUtilOidFree(AsnObjectIdentifier *oid) +VOID WINAPI SnmpUtilOidFree(AsnObjectIdentifier *oid) { TRACE("(%p)\n", oid); @@ -402,7 +402,7 @@ INT WINAPI SnmpUtilVarBindCpy(SnmpVarBin /*********************************************************************** * SnmpUtilVarBindFree (SNMPAPI.@) */ -void WINAPI SnmpUtilVarBindFree(SnmpVarBind *vb) +VOID WINAPI SnmpUtilVarBindFree(SnmpVarBind *vb) { TRACE("(%p)\n", vb); @@ -459,7 +459,7 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVa /*********************************************************************** * SnmpUtilVarBindListFree (SNMPAPI.@) */ -void WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *vb) +VOID WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *vb) { unsigned int i; SnmpVarBind *entry; @@ -528,7 +528,7 @@ LPSTR WINAPI SnmpUtilOidToA(AsnObjectIde /*********************************************************************** * SnmpUtilPrintOid (SNMPAPI.@) */ -void WINAPI SnmpUtilPrintOid(AsnObjectIdentifier *oid) +VOID WINAPI SnmpUtilPrintOid(AsnObjectIdentifier *oid) { unsigned int i; @@ -547,7 +547,7 @@ void WINAPI SnmpUtilPrintOid(AsnObjectId /*********************************************************************** * SnmpUtilPrintAsnAny (SNMPAPI.@) */ -void WINAPI SnmpUtilPrintAsnAny(AsnAny *any) +VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) { unsigned int i; diff --git a/include/snmp.h b/include/snmp.h index 2399d00..b41243b 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -224,7 +224,7 @@ BOOL WINAPI SnmpExtensionTrap(AsnObjectI AsnInteger32 *pGenericTrapId, AsnInteger32 *pSpecificTrapId, AsnTimeticks *pTimeStamp, SnmpVarBindList *pVarBindList); -void WINAPI SnmpExtensionClose(void); +VOID WINAPI SnmpExtensionClose(VOID); typedef BOOL (WINAPI *PFNSNMPEXTENSIONINIT)(DWORD dwUptimeReference, HANDLE *phSubagentTrapEvent, AsnObjectIdentifier *pFirstSupportedRegion); @@ -245,51 +245,51 @@ typedef BOOL (WINAPI *PFNSNMPEXTENSIONTR AsnInteger32 *pGenericTrapId, AsnInteger32 *pSpecificTrapId, AsnTimeticks *pTimeStamp, SnmpVarBindList *pVarBindList); -typedef void (WINAPI *PFNSNMPEXTENSIONCLOSE)(void); +typedef VOID (WINAPI *PFNSNMPEXTENSIONCLOSE)(VOID); -int WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *pOidDst, +INT WINAPI SnmpUtilOidCpy(AsnObjectIdentifier *pOidDst, AsnObjectIdentifier *pOidSrc); -int WINAPI SnmpUtilOidAppend(AsnObjectIdentifier *pOidDst, +INT WINAPI SnmpUtilOidAppend(AsnObjectIdentifier *pOidDst, AsnObjectIdentifier *pOidSrc); -int WINAPI SnmpUtilOidCmp(AsnObjectIdentifier *pOid1, +INT WINAPI SnmpUtilOidCmp(AsnObjectIdentifier *pOid1, AsnObjectIdentifier *pOid2); -int WINAPI SnmpUtilOidNCmp(AsnObjectIdentifier *pOid1, +INT WINAPI SnmpUtilOidNCmp(AsnObjectIdentifier *pOid1, AsnObjectIdentifier *pOid2, UINT nSubIds); -void WINAPI SnmpUtilOidFree(AsnObjectIdentifier *pOid); +VOID WINAPI SnmpUtilOidFree(AsnObjectIdentifier *pOid); -int WINAPI SnmpUtilOctetsCmp(AsnOctetString *pOctets1, +INT WINAPI SnmpUtilOctetsCmp(AsnOctetString *pOctets1, AsnOctetString *pOctets2); -int WINAPI SnmpUtilOctetsNCmp(AsnOctetString *pOctets1, +INT WINAPI SnmpUtilOctetsNCmp(AsnOctetString *pOctets1, AsnOctetString *pOctets2, UINT nChars); -int WINAPI SnmpUtilOctetsCpy(AsnOctetString *pOctetsDst, +INT WINAPI SnmpUtilOctetsCpy(AsnOctetString *pOctetsDst, AsnOctetString *pOctetsSrc); -void WINAPI SnmpUtilOctetsFree(AsnOctetString *pOctets); +VOID WINAPI SnmpUtilOctetsFree(AsnOctetString *pOctets); -int WINAPI SnmpUtilAsnAnyCpy(AsnAny *pAnyDst, AsnAny *pAnySrc); -void WINAPI SnmpUtilAsnAnyFree(AsnAny *pAny); +INT WINAPI SnmpUtilAsnAnyCpy(AsnAny *pAnyDst, AsnAny *pAnySrc); +VOID WINAPI SnmpUtilAsnAnyFree(AsnAny *pAny); -int WINAPI SnmpUtilVarBindCpy(SnmpVarBind *pVbDst, SnmpVarBind *pVbSrc); -void WINAPI SnmpUtilVarBindFree(SnmpVarBind *pVb); +INT WINAPI SnmpUtilVarBindCpy(SnmpVarBind *pVbDst, SnmpVarBind *pVbSrc); +VOID WINAPI SnmpUtilVarBindFree(SnmpVarBind *pVb); -int WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *pVblDst, +INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *pVblDst, SnmpVarBindList *pVblSrc); -void WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *pVbl); +VOID WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *pVbl); LPVOID WINAPI SnmpUtilMemAlloc(UINT nBytes); LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID pMem, UINT nBytes); -void WINAPI SnmpUtilMemFree(LPVOID pMem); +VOID WINAPI SnmpUtilMemFree(LPVOID pMem); LPSTR WINAPI SnmpUtilOidToA(AsnObjectIdentifier *Oid); LPSTR WINAPI SnmpUtilIdsToA(UINT *Ids, UINT IdLength); -void WINAPI SnmpUtilPrintOid(AsnObjectIdentifier *Oid); -void WINAPI SnmpUtilPrintAsnAny(AsnAny *pAny); +VOID WINAPI SnmpUtilPrintOid(AsnObjectIdentifier *Oid); +VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *pAny); -DWORD WINAPI SnmpSvcGetUptime(void); -void WINAPI SnmpSvcSetLogLevel(int nLogLevel); -void WINAPI SnmpSvcSetLogType(int nLogType); +DWORD WINAPI SnmpSvcGetUptime(VOID); +VOID WINAPI SnmpSvcSetLogLevel(INT nLogLevel); +VOID WINAPI SnmpSvcSetLogType(INT nLogType); -void WINAPIV SnmpUtilDbgPrint(int nLogLevel, LPSTR szFormat, ...); +VOID WINAPIV SnmpUtilDbgPrint(INT nLogLevel, LPSTR szFormat, ...); #ifdef __cplusplus } diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 65a8aff..a130b0d 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4153,6 +4153,31 @@ void LPCWSTR LPWSTR +%%snmpapi.dll + +%void + +VOID + +%long + +INT +UINT + +%str + +LPSTR + +%ptr + +AsnAny * +AsnObjectIdentifier * +AsnOctetString * +LPVOID +SnmpVarBind * +SnmpVarBindList * +UINT * + %%sti.dll %long

1 0

Mike McCormack : msi: Allocate a buffer in WCHARs not CHARs.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 8a38d3038c20fbd06046759841c3e494199d601d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a38d3038c20fbd0604675984… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 25 23:05:19 2007 +0900 msi: Allocate a buffer in WCHARs not CHARs. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4d76240..b78910d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -140,7 +140,7 @@ static UINT set_user_sid_prop( MSIPACKAG LookupAccountNameW( NULL, user_name, NULL, &size, NULL, &dom_size, &use ); psid = msi_alloc( size ); - dom = msi_alloc( dom_size ); + dom = msi_alloc( dom_size*sizeof (WCHAR) ); if (!psid || !dom) { r = ERROR_OUTOFMEMORY;

1 0

Ulrich Czekalla : wineserver: Validate the children of windows being hidden .
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: cae37b18fd7462bfe965cb7689dcf2629055da6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae37b18fd7462bfe965cb768… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Jan 25 08:57:14 2007 -0500 wineserver: Validate the children of windows being hidden. Prevents paint_count values from being skewed when hiding windows. --- server/window.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index 9fee775..c526185 100644 --- a/server/window.c +++ b/server/window.c @@ -1037,6 +1037,20 @@ static void validate_whole_window( struc } +/* validate a window's children so that we don't get any further paint messages for it */ +static void validate_children( struct window *win ) +{ + struct window *child; + + LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry ) + { + if (!(child->style & WS_VISIBLE)) continue; + validate_children(child); + validate_whole_window(child); + } +} + + /* validate the update region of a window on all parents; helper for redraw_window */ static void validate_parents( struct window *child ) { @@ -1370,6 +1384,7 @@ static void set_window_pos( struct windo { /* clear the update region since the window is no longer visible */ validate_whole_window( win ); + validate_children( win ); goto done; }

1 0

Huw Davies : widl: Don't restrict the number of params of [prop*] functions .
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 305e4949ee7e4897113290e5d6e946e82384e9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305e4949ee7e4897113290e5d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 25 13:40:40 2007 +0000 widl: Don't restrict the number of params of [prop*] functions. --- tools/widl/write_msft.c | 40 +++++++++++----------------------------- 1 files changed, 11 insertions(+), 29 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6ed9c2d..b2dfa15 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1345,25 +1345,6 @@ static HRESULT add_func_desc(msft_typein } } - switch(invokekind) { - case 0x2: /* INVOKE_PROPERTYGET */ - if((num_params != 0 && typeinfo->typekind == TKIND_DISPATCH) - || (num_params != 1 && typeinfo->typekind == TKIND_INTERFACE)) { - error("expecting no args on a propget func\n"); - return S_FALSE; - } - break; - case 0x4: /* INVOKE_PROPERTYPUT */ - case 0x8: /* INVOKE_PROPERTYPUTREF */ - if(num_params != 1) { - error("expecting one arg on a propput func\n"); - return S_FALSE; - } - break; - default: - break; - } - /* allocate type data space for us */ typedata_size = 0x18 + extra_attr * sizeof(int) + (num_params * (num_defaults ? 16 : 12)); @@ -1543,18 +1524,19 @@ static HRESULT add_func_desc(msft_typein if(typeinfo->typekind == TKIND_MODULE) namedata[9] |= 0x20; - if(invokekind != 0x4 /* INVOKE_PROPERTYPUT */ && invokekind != 0x8 /* INVOKE_PROPERTYPUTREF */) { - /* don't give the arg of a [propput*] func a name */ - if (func->args) + if (func->args) + { + i = 0; + LIST_FOR_EACH_ENTRY( arg, func->args, var_t, entry ) { - i = 0; - LIST_FOR_EACH_ENTRY( arg, func->args, var_t, entry ) - { - int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; - offset = ctl2_alloc_name(typeinfo->typelib, arg->name); - paramdata[1] = offset; + /* don't give the last arg of a [propput*] func a name */ + if(i != num_params - 1 || (invokekind != 0x4 /* INVOKE_PROPERTYPUT */ && invokekind != 0x8 /* INVOKE_PROPERTYPUTREF */)) + { + int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; + offset = ctl2_alloc_name(typeinfo->typelib, arg->name); + paramdata[1] = offset; + } i++; - } } } return S_OK;

1 0

Huw Davies : widl: Add VT_DATE support to typelib generation.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: f994c35a3e1a9745369932eeb1e048cae25c89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f994c35a3e1a9745369932eeb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 24 18:30:24 2007 +0000 widl: Add VT_DATE support to typelib generation. --- tools/widl/write_msft.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6248c80..6ed9c2d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -828,6 +828,7 @@ static int encode_type( break; case VT_CY: + case VT_DATE: *encoded_type = default_type; *width = 8; *alignment = 8;

1 0

Alexandre Julliard : widl: Make some generated variables static and/ or const.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 2eee874382465cb37449dd42b82358e099ca0af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eee874382465cb37449dd42b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:09:25 2007 +0100 widl: Make some generated variables static and/or const. --- tools/widl/proxy.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index f3a32fb..a6b7402 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -532,7 +532,7 @@ static void write_proxy(type_t *iface, u } /* proxy vtable */ - print_proxy( "const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", midx, iface->name); + print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", midx, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n", iface->name); @@ -559,7 +559,7 @@ static void write_proxy(type_t *iface, u indent--; fprintf(proxy, "};\n"); print_proxy( "\n"); - print_proxy( "const CInterfaceStubVtbl _%sStubVtbl =\n", iface->name); + print_proxy( "static const CInterfaceStubVtbl _%sStubVtbl =\n", iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n"); @@ -607,30 +607,30 @@ void write_proxies(ifref_list_t *ifaces) write_procformatstring(proxy, ifaces, 1); write_typeformatstring(proxy, ifaces, 1); - fprintf(proxy, "const CInterfaceProxyVtbl* _%s_ProxyVtblList[] =\n", file_id); + fprintf(proxy, "static const CInterfaceProxyVtbl* const _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n"); if (ifaces) LIST_FOR_EACH_ENTRY( cur, ifaces, ifref_t, entry ) if(cur->iface->ref && cur->iface->funcs && is_object(cur->iface->attrs) && !is_local(cur->iface->attrs)) - fprintf(proxy, " (CInterfaceProxyVtbl*)&_%sProxyVtbl,\n", cur->iface->name); + fprintf(proxy, " (const CInterfaceProxyVtbl*)&_%sProxyVtbl,\n", cur->iface->name); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n"); - fprintf(proxy, "const CInterfaceStubVtbl* _%s_StubVtblList[] =\n", file_id); + fprintf(proxy, "static const CInterfaceStubVtbl* const _%s_StubVtblList[] =\n", file_id); fprintf(proxy, "{\n"); if (ifaces) LIST_FOR_EACH_ENTRY( cur, ifaces, ifref_t, entry ) if(cur->iface->ref && cur->iface->funcs && is_object(cur->iface->attrs) && !is_local(cur->iface->attrs)) - fprintf(proxy, " (CInterfaceStubVtbl*)&_%sStubVtbl,\n", cur->iface->name); + fprintf(proxy, " (const CInterfaceStubVtbl*)&_%sStubVtbl,\n", cur->iface->name); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); fprintf(proxy, "\n"); - fprintf(proxy, "PCInterfaceName const _%s_InterfaceNamesList[] =\n", file_id); + fprintf(proxy, "static PCInterfaceName const _%s_InterfaceNamesList[] =\n", file_id); fprintf(proxy, "{\n"); if (ifaces) LIST_FOR_EACH_ENTRY( cur, ifaces, ifref_t, entry ) @@ -663,9 +663,9 @@ void write_proxies(ifref_list_t *ifaces) fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo =\n", file_id); fprintf(proxy, "{\n"); - fprintf(proxy, " (PCInterfaceProxyVtblList*)&_%s_ProxyVtblList,\n", file_id); - fprintf(proxy, " (PCInterfaceStubVtblList*)&_%s_StubVtblList,\n", file_id); - fprintf(proxy, " (const PCInterfaceName*)&_%s_InterfaceNamesList,\n", file_id); + fprintf(proxy, " (const PCInterfaceProxyVtblList*)&_%s_ProxyVtblList,\n", file_id); + fprintf(proxy, " (const PCInterfaceStubVtblList*)&_%s_StubVtblList,\n", file_id); + fprintf(proxy, " _%s_InterfaceNamesList,\n", file_id); fprintf(proxy, " 0,\n"); fprintf(proxy, " &_%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", c);

1 0

Alexandre Julliard : widl: Avoid dependency on COBJMACROS in generated code .
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 2b9c01eed280958166242fd0a18f42514ee79224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9c01eed280958166242fd0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:09:14 2007 +0100 widl: Avoid dependency on COBJMACROS in generated code. --- tools/widl/proxy.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c5a0532..f3a32fb 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -401,9 +401,12 @@ static void gen_stub(type_t *iface, cons fprintf(proxy, "\n"); print_proxy(""); if (has_ret) fprintf(proxy, "_RetVal = "); - fprintf(proxy, "%s_", iface->name); - if (cas) fprintf(proxy, "%s_Stub", cas); - else write_name(proxy, def); + if (cas) fprintf(proxy, "%s_%s_Stub", iface->name, cas); + else + { + fprintf(proxy, "_This->lpVtbl->"); + write_name(proxy, def); + } fprintf(proxy, "(_This"); if (cur->args)

1 0

Alexandre Julliard : widl: Rename a couple of variables to make the code closer to what midl generates .
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 6c559cafabde73cbb038f0556402f0454c5192a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c559cafabde73cbb038f0556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:04:40 2007 +0100 widl: Rename a couple of variables to make the code closer to what midl generates. --- tools/widl/proxy.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index afe998a..3268e5d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -263,7 +263,7 @@ static void gen_proxy(type_t *iface, con write_type(proxy, def->type, def, def->tname); print_proxy( " _RetVal;\n"); } - print_proxy( "RPC_MESSAGE _Msg;\n" ); + print_proxy( "RPC_MESSAGE _RpcMessage;\n" ); print_proxy( "MIDL_STUB_MESSAGE _StubMsg;\n" ); print_proxy( "\n"); @@ -273,7 +273,7 @@ static void gen_proxy(type_t *iface, con print_proxy( "RpcTryExcept\n" ); print_proxy( "{\n" ); indent++; - print_proxy( "NdrProxyInitialize(This, &_Msg, &_StubMsg, &Object_StubDesc, %d);\n", idx); + print_proxy( "NdrProxyInitialize(This, &_RpcMessage, &_StubMsg, &Object_StubDesc, %d);\n", idx); proxy_check_pointers( cur->args ); print_proxy( "RpcTryFinally\n" ); @@ -290,7 +290,10 @@ static void gen_proxy(type_t *iface, con print_proxy( "NdrProxySendReceive(This, &_StubMsg);\n" ); fprintf(proxy, "\n"); - print_proxy("if ((_Msg.DataRepresentation&0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); + print_proxy( "_StubMsg.BufferStart = _RpcMessage.Buffer;\n" ); + print_proxy( "_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n\n" ); + + print_proxy("if ((_RpcMessage.DataRepresentation & 0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; print_proxy("NdrConvert( &_StubMsg, &__MIDL_ProcFormatString.Format[%u]);\n", proc_offset ); indent--; @@ -345,8 +348,8 @@ static void gen_stub(type_t *iface, cons print_proxy( "_Stub(\n"); indent++; print_proxy( "IRpcStubBuffer* This,\n"); - print_proxy( "IRpcChannelBuffer* pRpcChannelBuffer,\n"); - print_proxy( "PRPC_MESSAGE _Msg,\n"); + print_proxy( "IRpcChannelBuffer *_pRpcChannelBuffer,\n"); + print_proxy( "PRPC_MESSAGE _pRpcMessage,\n"); print_proxy( "DWORD* _pdwStubPhase)\n"); indent--; print_proxy( "{\n"); @@ -358,7 +361,7 @@ static void gen_stub(type_t *iface, cons /* FIXME: trace */ - print_proxy("NdrStubInitialize(_Msg, &_StubMsg, &Object_StubDesc, pRpcChannelBuffer);\n"); + print_proxy("NdrStubInitialize(_pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer);\n"); fprintf(proxy, "\n"); if (cur->args) @@ -368,7 +371,7 @@ static void gen_stub(type_t *iface, cons print_proxy("RpcTryFinally\n"); print_proxy("{\n"); indent++; - print_proxy("if ((_Msg->DataRepresentation&0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); + print_proxy("if ((_pRpcMessage->DataRepresentation & 0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; print_proxy("NdrConvert( &_StubMsg, &__MIDL_ProcFormatString.Format[%u]);\n", proc_offset ); indent--; @@ -405,7 +408,7 @@ static void gen_stub(type_t *iface, cons offset = *type_offset; write_remoting_arguments(proxy, indent, cur, &offset, PASS_OUT, PHASE_BUFFERSIZE); - print_proxy("NdrStubGetBuffer(This, pRpcChannelBuffer, &_StubMsg);\n"); + print_proxy("NdrStubGetBuffer(This, _pRpcChannelBuffer, &_StubMsg);\n"); offset = *type_offset; write_remoting_arguments(proxy, indent, cur, &offset, PASS_OUT, PHASE_MARSHAL); @@ -425,7 +428,7 @@ static void gen_stub(type_t *iface, cons print_proxy("}\n"); print_proxy("RpcEndFinally\n"); - print_proxy("_Msg->BufferLength = _StubMsg.Buffer - (unsigned char *)_Msg->Buffer;\n"); + print_proxy("_pRpcMessage->BufferLength = _StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer;\n"); indent--; print_proxy("}\n");

1 0