December 2005 - Wine-Commits

wine/tools/winapi win32.api
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21632 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:16:01 Modified files: tools/winapi : win32.api Log message: Francois Gouget <fgouget(a)free.fr> Update win32.api to match the current sources. Patch: http://cvs.winehq.org/patch.py?id=21632 Old revision New revision Changes Path 1.61 1.62 +2 -4 wine/tools/winapi/win32.api Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.61 wine/tools/winapi/win32.api:1.62 --- wine/tools/winapi/win32.api:1.61 2 Dec 2005 13:16: 1 -0000 +++ wine/tools/winapi/win32.api 2 Dec 2005 13:16: 1 -0000 @@ -105,9 +105,7 @@ MD5_CTX * PACCESS_MASK PACL PACL * -PACTRL_ACCESSA * PACTRL_ACCESSW * -PACTRL_AUDITA * PACTRL_AUDITW * PBOOL PDWORD @@ -2263,8 +2261,8 @@ REFCLSID %long HDRVR -LRESULT LPARAM +LRESULT UINT %long --pointer @@ -2320,6 +2318,7 @@ unsigned __int64 EXCEPTION_REGISTRATION_RECORD * EXCEPTION_REGISTRATION_RECORD ** +MSVCRT___sighandler_t MSVCRT__beginthread_start_routine_t MSVCRT__beginthreadex_start_routine_t MSVCRT__onexit_t @@ -2372,7 +2371,6 @@ unsigned long * va_list void (*)(void) void * -__sighandler_t %str

1 0

wine/ include/objbase.h tools/widl/header.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21631 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:53 Modified files: include : objbase.h tools/widl : header.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Use the typedef'd declaration of IRpcStubBuffer and IRpcChannelBuffer in RPC _Stubs. Add IRpcStubBuffer and IRpcChannelBuffer declarations to objbase.h. Patch: http://cvs.winehq.org/patch.py?id=21631 Old revision New revision Changes Path 1.63 1.64 +9 -0 wine/include/objbase.h 1.40 1.41 +2 -2 wine/tools/widl/header.c Index: wine/include/objbase.h diff -u -p wine/include/objbase.h:1.63 wine/include/objbase.h:1.64 --- wine/include/objbase.h:1.63 2 Dec 2005 13:15:53 -0000 +++ wine/include/objbase.h 2 Dec 2005 13:15:53 -0000 @@ -272,6 +272,15 @@ #endif /* __cplusplus && !CINTERFACE */ +#ifndef __IRpcStubBuffer_FWD_DEFINED__ +#define __IRpcStubBuffer_FWD_DEFINED__ +typedef interface IRpcStubBuffer IRpcStubBuffer; +#endif +#ifndef __IRpcChannelBuffer_FWD_DEFINED__ +#define __IRpcChannelBuffer_FWD_DEFINED__ +typedef interface IRpcChannelBuffer IRpcChannelBuffer; +#endif + #include <objidl.h> #ifndef RC_INVOKED Index: wine/tools/widl/header.c diff -u -p wine/tools/widl/header.c:1.40 wine/tools/widl/header.c:1.41 --- wine/tools/widl/header.c:1.40 2 Dec 2005 13:15:53 -0000 +++ wine/tools/widl/header.c 2 Dec 2005 13:15:53 -0000 @@ -690,8 +690,8 @@ static void write_method_proto(type_t *i fprintf(header, "void __RPC_STUB %s_", iface->name); write_name(header,def); fprintf(header, "_Stub(\n"); - fprintf(header, " interface IRpcStubBuffer* This,\n"); - fprintf(header, " interface IRpcChannelBuffer* pRpcChannelBuffer,\n"); + fprintf(header, " IRpcStubBuffer* This,\n"); + fprintf(header, " IRpcChannelBuffer* pRpcChannelBuffer,\n"); fprintf(header, " PRPC_MESSAGE pRpcMessage,\n"); fprintf(header, " DWORD* pdwStubPhase);\n");

1 0

wine/tools/widl header.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21630 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:45 Modified files: tools/widl : header.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Reorder the virtual table definition so it's defined before it is used in widl header output. Patch: http://cvs.winehq.org/patch.py?id=21630 Old revision New revision Changes Path 1.39 1.40 +8 -10 wine/tools/widl/header.c Index: wine/tools/widl/header.c diff -u -p wine/tools/widl/header.c:1.39 wine/tools/widl/header.c:1.40 --- wine/tools/widl/header.c:1.39 2 Dec 2005 13:15:45 -0000 +++ wine/tools/widl/header.c 2 Dec 2005 13:15:45 -0000 @@ -827,17 +827,16 @@ static void write_com_interface(type_t * } fprintf(header, "#else\n"); /* C interface */ - fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name); - fprintf(header, "interface %s {\n", iface->name); - fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); - fprintf(header, "};\n"); - fprintf(header, "struct %sVtbl {\n", iface->name); + fprintf(header, "typedef struct %sVtbl {\n", iface->name); indentation++; fprintf(header, " BEGIN_INTERFACE\n"); fprintf(header, "\n"); write_c_method_def(iface); indentation--; fprintf(header, " END_INTERFACE\n"); + fprintf(header, "} %sVtbl;\n", iface->name); + fprintf(header, "interface %s {\n", iface->name); + fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); fprintf(header, "};\n"); fprintf(header, "\n"); fprintf(header, "#ifdef COBJMACROS\n"); @@ -894,17 +893,16 @@ void write_dispinterface(type_t *iface) fprintf(header, "};\n"); fprintf(header, "#else\n"); /* C interface */ - fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name); - fprintf(header, "interface %s {\n", iface->name); - fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); - fprintf(header, "};\n"); - fprintf(header, "struct %sVtbl {\n", iface->name); + fprintf(header, "typedef struct %sVtbl {\n", iface->name); indentation++; fprintf(header, " BEGIN_INTERFACE\n"); fprintf(header, "\n"); write_c_disp_method_def(iface); indentation--; fprintf(header, " END_INTERFACE\n"); + fprintf(header, "} %sVtbl;\n", iface->name); + fprintf(header, "interface %s {\n", iface->name); + fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); fprintf(header, "};\n"); fprintf(header, "\n"); fprintf(header, "#ifdef COBJMACROS\n");

1 0

wine/tools/widl header.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21629 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:39 Modified files: tools/widl : header.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Use interface instead of struct where appropriate in widl. Patch: http://cvs.winehq.org/patch.py?id=21629 Old revision New revision Changes Path 1.38 1.39 +10 -10 wine/tools/widl/header.c Index: wine/tools/widl/header.c diff -u -p wine/tools/widl/header.c:1.38 wine/tools/widl/header.c:1.39 --- wine/tools/widl/header.c:1.38 2 Dec 2005 13:15:39 -0000 +++ wine/tools/widl/header.c 2 Dec 2005 13:15:39 -0000 @@ -690,8 +690,8 @@ static void write_method_proto(type_t *i fprintf(header, "void __RPC_STUB %s_", iface->name); write_name(header,def); fprintf(header, "_Stub(\n"); - fprintf(header, " struct IRpcStubBuffer* This,\n"); - fprintf(header, " struct IRpcChannelBuffer* pRpcChannelBuffer,\n"); + fprintf(header, " interface IRpcStubBuffer* This,\n"); + fprintf(header, " interface IRpcChannelBuffer* pRpcChannelBuffer,\n"); fprintf(header, " PRPC_MESSAGE pRpcMessage,\n"); fprintf(header, " DWORD* pdwStubPhase);\n"); @@ -762,9 +762,9 @@ void write_forward(type_t *iface) * interface, since non-object interfaces shouldn't need forwards */ if ((!iface->defined || is_object(iface->attrs) || is_attr(iface->attrs, ATTR_DISPINTERFACE)) && !iface->written) { - fprintf(header,"#ifndef __%s_FWD_DEFINED__\n", iface->name); - fprintf(header,"#define __%s_FWD_DEFINED__\n", iface->name); - fprintf(header, "typedef struct %s %s;\n", iface->name, iface->name); + fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", iface->name); + fprintf(header, "#define __%s_FWD_DEFINED__\n", iface->name); + fprintf(header, "typedef interface %s %s;\n", iface->name, iface->name); fprintf(header, "#endif\n\n" ); iface->written = TRUE; } @@ -806,7 +806,7 @@ static void write_com_interface(type_t * fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); if (iface->ref) { - fprintf(header, "struct %s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "%s : public %s\n", iface->name, iface->ref->name); fprintf(header, "{\n"); indentation++; write_cpp_method_def(iface); @@ -815,7 +815,7 @@ static void write_com_interface(type_t * } else { - fprintf(header, "struct %s\n", iface->name); + fprintf(header, "%s\n", iface->name); fprintf(header, "{\n"); fprintf(header, " BEGIN_INTERFACE\n"); fprintf(header, "\n"); @@ -828,7 +828,7 @@ static void write_com_interface(type_t * fprintf(header, "#else\n"); /* C interface */ fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name); - fprintf(header, "struct %s {\n", iface->name); + fprintf(header, "interface %s {\n", iface->name); fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); fprintf(header, "};\n"); fprintf(header, "struct %sVtbl {\n", iface->name); @@ -889,13 +889,13 @@ void write_dispinterface(type_t *iface) write_forward(iface); /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); - fprintf(header, "struct %s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "%s : public %s\n", iface->name, iface->ref->name); fprintf(header, "{\n"); fprintf(header, "};\n"); fprintf(header, "#else\n"); /* C interface */ fprintf(header, "typedef struct %sVtbl %sVtbl;\n", iface->name, iface->name); - fprintf(header, "struct %s {\n", iface->name); + fprintf(header, "interface %s {\n", iface->name); fprintf(header, " const %sVtbl* lpVtbl;\n", iface->name); fprintf(header, "};\n"); fprintf(header, "struct %sVtbl {\n", iface->name);

1 0

wine/dlls/atl atl_main.c atliface.idl
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21628 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:33 Modified files: dlls/atl : atl_main.c atliface.idl Log message: Francois Gouget <fgouget(a)free.fr> Fix the AtlAxWinInit() prototype. Also make it return FALSE to indicate failure instead of E_FAIL. Define AtlAxWinInit() and AtlAxCreateControl() in atliface.idl. Patch: http://cvs.winehq.org/patch.py?id=21628 Old revision New revision Changes Path 1.17 1.18 +2 -2 wine/dlls/atl/atl_main.c 1.1 1.2 +3 -0 wine/dlls/atl/atliface.idl Index: wine/dlls/atl/atl_main.c diff -u -p wine/dlls/atl/atl_main.c:1.17 wine/dlls/atl/atl_main.c:1.18 --- wine/dlls/atl/atl_main.c:1.17 2 Dec 2005 13:15:33 -0000 +++ wine/dlls/atl/atl_main.c 2 Dec 2005 13:15:33 -0000 @@ -174,10 +174,10 @@ HRESULT WINAPI AtlModuleUnregisterServer * TRUE or FALSE */ -HRESULT WINAPI AtlAxWinInit(void) +BOOL WINAPI AtlAxWinInit(void) { FIXME("Try use native atl.dll if possible\n"); - return E_FAIL; + return FALSE; } Index: wine/dlls/atl/atliface.idl diff -u -p wine/dlls/atl/atliface.idl:1.1 wine/dlls/atl/atliface.idl:1.2 --- wine/dlls/atl/atliface.idl:1.1 2 Dec 2005 13:15:33 -0000 +++ wine/dlls/atl/atliface.idl 2 Dec 2005 13:15:33 -0000 @@ -69,3 +69,6 @@ interface IRegistrar : IUnknown } cpp_quote("DEFINE_GUID(CLSID_ATLRegistrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);") + +cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);") +cpp_quote("BOOL WINAPI AtlAxWinInit(void);")

1 0

wine/ dlls/netapi32/ds.c tools/winapi/win32.api
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21627 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:28 Modified files: dlls/netapi32 : ds.c tools/winapi : win32.api Log message: Francois Gouget <fgouget(a)free.fr> Better stick to the PSDK types and to the dsrole.h prototype. Update win32.api. Patch: http://cvs.winehq.org/patch.py?id=21627 Old revision New revision Changes Path 1.1 1.2 +2 -1 wine/dlls/netapi32/ds.c 1.60 1.61 +4 -4 wine/tools/winapi/win32.api Index: wine/dlls/netapi32/ds.c diff -u -p wine/dlls/netapi32/ds.c:1.1 wine/dlls/netapi32/ds.c:1.2 --- wine/dlls/netapi32/ds.c:1.1 2 Dec 2005 13:15:28 -0000 +++ wine/dlls/netapi32/ds.c 2 Dec 2005 13:15:28 -0000 @@ -37,10 +37,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ds); * RETURNS * Nothing */ -void WINAPI DsRoleFreeMemory(PVOID Buffer) +VOID WINAPI DsRoleFreeMemory(PVOID Buffer) { FIXME("(%p) stub\n", Buffer); } + /************************************************************ * DsRoleGetPrimaryDomainInformation (NETAPI32.@) * Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.60 wine/tools/winapi/win32.api:1.61 --- wine/tools/winapi/win32.api:1.60 2 Dec 2005 13:15:28 -0000 +++ wine/tools/winapi/win32.api 2 Dec 2005 13:15:28 -0000 @@ -2553,16 +2553,16 @@ PNETSETUP_JOIN_STATUS PVOID PVOID * -%void - -void - %wstr LMSTR LPCWSTR LPWSTR +%void + +VOID + %%newdev.dll %long

1 0

wine/tools/winapi winapi_parser.pm
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21626 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:21 Modified files: tools/winapi : winapi_parser.pm Log message: Francois Gouget <fgouget(a)free.fr> Fix __RPC_USER handling. Patch: http://cvs.winehq.org/patch.py?id=21626 Old revision New revision Changes Path 1.9 1.10 +1 -1 wine/tools/winapi/winapi_parser.pm Index: wine/tools/winapi/winapi_parser.pm diff -u -p wine/tools/winapi/winapi_parser.pm:1.9 wine/tools/winapi/winapi_parser.pm:1.10 --- wine/tools/winapi/winapi_parser.pm:1.9 2 Dec 2005 13:15:21 -0000 +++ wine/tools/winapi/winapi_parser.pm 2 Dec 2005 13:15:21 -0000 @@ -450,7 +450,7 @@ sub parse_c_file($$) { (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* (?:__cdecl\s+|__stdcall\s+|__RPC_STUB\s+|__RPC_USER\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|STDMETHODCALLTYPE\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)? - $\s*(?:__cdecl|__stdcall|__RPC_STUB|__RPC_USER\s+|CALLBACK|CDECL|NET_API_FUNCTION|RPC_ENTRY|STDMETHODCALLTYPE|VFWAPIV|VFWAPI|WINAPIV|WINAPI)?\s*\*\s*((?:\w+)?)\s*$\s* + $\s*(?:__cdecl|__stdcall|__RPC_STUB|__RPC_USER|CALLBACK|CDECL|NET_API_FUNCTION|RPC_ENTRY|STDMETHODCALLTYPE|VFWAPIV|VFWAPI|WINAPIV|WINAPI)?\s*\*\s*((?:\w+)?)\s*$\s* $\s*(.*?)\s*$$/x) { my $return_type = $1;

1 0

wine/ dlls/wldap32/parse.c include/winldap.h t ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21625 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:16 Modified files: dlls/wldap32 : parse.c include : winldap.h tools/winapi : win32.api Log message: Francois Gouget <fgouget(a)free.fr> Better stick to the PSDK types. Update win32.api. Patch: http://cvs.winehq.org/patch.py?id=21625 Old revision New revision Changes Path 1.1 1.2 +6 -6 wine/dlls/wldap32/parse.c 1.6 1.7 +4 -4 wine/include/winldap.h 1.59 1.60 +6 -0 wine/tools/winapi/win32.api Index: wine/dlls/wldap32/parse.c diff -u -p wine/dlls/wldap32/parse.c:1.1 wine/dlls/wldap32/parse.c:1.2 --- wine/dlls/wldap32/parse.c:1.1 2 Dec 2005 13:15:16 -0000 +++ wine/dlls/wldap32/parse.c 2 Dec 2005 13:15:16 -0000 @@ -262,9 +262,9 @@ ULONG ldap_parse_sort_controlW( WLDAP32_ return ret; } -int ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, LDAPControlA **control, - unsigned long *targetpos, unsigned long *listcount, - struct WLDAP32_berval **context, int *errcode ) +INT ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control, + PULONG targetpos, PULONG listcount, + struct WLDAP32_berval **context, PINT errcode ) { int ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP @@ -289,9 +289,9 @@ int ldap_parse_vlv_controlA( WLDAP32_LDA return ret; } -int ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, LDAPControlW **control, - unsigned long *targetpos, unsigned long *listcount, - struct WLDAP32_berval **context, int *errcode ) +INT ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, + PULONG targetpos, PULONG listcount, + struct WLDAP32_berval **context, PINT errcode ) { int ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP Index: wine/include/winldap.h diff -u -p wine/include/winldap.h:1.6 wine/include/winldap.h:1.7 --- wine/include/winldap.h:1.6 2 Dec 2005 13:15:16 -0000 +++ wine/include/winldap.h 2 Dec 2005 13:15:16 -0000 @@ -480,8 +480,8 @@ ULONG ldap_free_controlsW(LDAPControlW** PCHAR ldap_get_dnA(LDAP*,LDAPMessage*); PWCHAR ldap_get_dnW(LDAP*,LDAPMessage*); #define ldap_get_dn WINELIB_NAME_AW(ldap_get_dn) -ULONG ldap_get_next_page(LDAP*,PLDAPSearch,ULONG,ULONG*); -ULONG ldap_get_next_page_s(LDAP*,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**); +ULONG ldap_get_next_page(PLDAP,PLDAPSearch,ULONG,ULONG*); +ULONG ldap_get_next_page_s(PLDAP,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**); ULONG ldap_get_optionA(LDAP*,int,void*); ULONG ldap_get_optionW(LDAP*,int,void*); #define ldap_get_option WINELIB_NAME_AW(ldap_get_option) @@ -546,8 +546,8 @@ ULONG ldap_parse_resultW(LDAP*,LDAPMessa ULONG ldap_parse_sort_controlA(LDAP*,PLDAPControlA*,ULONG*,PCHAR*); ULONG ldap_parse_sort_controlW(LDAP*,PLDAPControlW*,ULONG*,PWCHAR*); #define ldap_parse_sort_control WINELIB_NAME_AW(ldap_parse_sort_control) -int ldap_parse_vlv_controlA(LDAP*,PLDAPControlA*,unsigned long*,unsigned long*,struct berval**,int*); -int ldap_parse_vlv_controlW(LDAP*,PLDAPControlW*,unsigned long*,unsigned long*,struct berval**,int*); +INT ldap_parse_vlv_controlA(PLDAP,PLDAPControlA*,PULONG,PULONG,PBERVAL*,PINT); +INT ldap_parse_vlv_controlW(PLDAP,PLDAPControlW*,PULONG,PULONG,PBERVAL*,PINT); #define ldap_parse_vlv_control WINELIB_NAME_AW(ldap_parse_vlv_control) void ldap_perror(LDAP*,const PCHAR); ULONG ldap_rename_extA(LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*); Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.59 wine/tools/winapi/win32.api:1.60 --- wine/tools/winapi/win32.api:1.59 2 Dec 2005 13:15:16 -0000 +++ wine/tools/winapi/win32.api 2 Dec 2005 13:15:16 -0000 @@ -5222,16 +5222,22 @@ LDAPModA *[] LDAPModW *[] PBERVAL * PCHAR * +PCHAR ** PCHAR[] +PINT PLDAP_VERSION_INFO PLDAPControlA PLDAPControlA * +PLDAPControlA ** PLDAPControlW PLDAPControlW * +PLDAPControlW ** +PLDAPSearch PLDAPSortKeyA * PLDAPSortKeyW * PULONG PWCHAR * +PWCHAR ** PWCHAR[] ULONG * WLDAP32_BerElement *

1 0

wine/ dlls/dbghelp/module.c include/dbghelp.h
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21624 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:15:06 Modified files: dlls/dbghelp : module.c include : dbghelp.h Log message: Francois Gouget <fgouget(a)free.fr> Add IMAGEHLP_MODULEW64. Add SymGetModuleInfoW64() and SymLoadModule64(). Patch: http://cvs.winehq.org/patch.py?id=21624 Old revision New revision Changes Path 1.18 1.19 +2 -2 wine/dlls/dbghelp/module.c 1.24 1.25 +29 -0 wine/include/dbghelp.h Index: wine/dlls/dbghelp/module.c diff -u -p wine/dlls/dbghelp/module.c:1.18 wine/dlls/dbghelp/module.c:1.19 --- wine/dlls/dbghelp/module.c:1.18 2 Dec 2005 13:15: 6 -0000 +++ wine/dlls/dbghelp/module.c 2 Dec 2005 13:15: 6 -0000 @@ -420,8 +420,8 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h /*********************************************************************** * SymLoadModule64 (DBGHELP.@) */ -DWORD WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, char* ImageName, - char* ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll) +DWORD64 WINAPI SymLoadModule64(HANDLE hProcess, HANDLE hFile, PSTR ImageName, + PSTR ModuleName, DWORD64 BaseOfDll, DWORD SizeOfDll) { if (!validate_addr64(BaseOfDll)) return FALSE; return SymLoadModule(hProcess, hFile, ImageName, ModuleName, (DWORD)BaseOfDll, SizeOfDll); Index: wine/include/dbghelp.h diff -u -p wine/include/dbghelp.h:1.24 wine/include/dbghelp.h:1.25 --- wine/include/dbghelp.h:1.24 2 Dec 2005 13:15: 6 -0000 +++ wine/include/dbghelp.h 2 Dec 2005 13:15: 6 -0000 @@ -161,6 +161,33 @@ typedef struct _IMAGEHLP_MODULE64 BOOL Publics; } IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; +typedef struct _IMAGEHLP_MODULE64W +{ + DWORD SizeOfStruct; + DWORD64 BaseOfImage; + DWORD ImageSize; + DWORD TimeDateStamp; + DWORD CheckSum; + DWORD NumSyms; + SYM_TYPE SymType; + WCHAR ModuleName[32]; + WCHAR ImageName[256]; + WCHAR LoadedImageName[256]; + WCHAR LoadedPdbName[256]; + DWORD CVSig; + WCHAR CVData[MAX_PATH*3]; + DWORD PdbSig; + GUID PdbSig70; + DWORD PdbAge; + BOOL PdbUnmatched; + BOOL DbgUnmatched; + BOOL LineNumbers; + BOOL GlobalSymbols; + BOOL TypeInfo; + BOOL SourceIndexed; + BOOL Publics; +} IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; + typedef struct _IMAGEHLP_LINE { DWORD SizeOfStruct; @@ -662,8 +689,10 @@ BOOL WINAPI SymEnumerateModules(HANDL BOOL WINAPI SymGetModuleInfo(HANDLE, DWORD, PIMAGEHLP_MODULE); BOOL WINAPI SymGetModuleInfoW(HANDLE, DWORD, PIMAGEHLP_MODULEW); BOOL WINAPI SymGetModuleInfo64(HANDLE, DWORD64, PIMAGEHLP_MODULE64); +BOOL WINAPI SymGetModuleInfoW64(HANDLE, DWORD64, PIMAGEHLP_MODULEW64); DWORD WINAPI SymGetModuleBase(HANDLE, DWORD); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PSTR, PSTR, DWORD, DWORD); +DWORD64 WINAPI SymLoadModule64(HANDLE, HANDLE, PSTR, PSTR, DWORD64, DWORD); DWORD64 WINAPI SymLoadModuleEx(HANDLE, HANDLE, PCSTR, PCSTR, DWORD64, DWORD, PMODLOAD_DATA, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD);

1 0

wine/dlls/shell32 shlview.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21623 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:14:58 Modified files: dlls/shell32 : shlview.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Implemented scrolling during drag&drop for the shellview class. Patch: http://cvs.winehq.org/patch.py?id=21623 Old revision New revision Changes Path 1.122 1.123 +67 -2 wine/dlls/shell32/shlview.c Index: wine/dlls/shell32/shlview.c diff -u -p wine/dlls/shell32/shlview.c:1.122 wine/dlls/shell32/shlview.c:1.123 --- wine/dlls/shell32/shlview.c:1.122 2 Dec 2005 13:14:58 -0000 +++ wine/dlls/shell32/shlview.c 2 Dec 2005 13:14:58 -0000 @@ -103,6 +103,7 @@ typedef struct IDropTarget* pCurDropTarget; /* The sub-item, which is currently dragged over */ IDataObject* pCurDataObject; /* The dragged data-object */ LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ + UINT iActiveTimersMask; /* Bookkeeping of activated timers for drag scrolling */ } IShellViewImpl; static const IShellViewVtbl svvt; @@ -196,6 +197,7 @@ IShellView * IShellView_Constructor( ISh sv->pCurDropTarget = NULL; sv->pCurDataObject = NULL; sv->iDragOverItem = 0; + sv->iActiveTimersMask = 0; TRACE("(%p)->(%p)\n",sv, pFolder); return (IShellView *) sv; @@ -2177,11 +2179,56 @@ static ULONG WINAPI ISVDropTarget_Releas } /****************************************************************************** + * scroll_timer_proc [Internal] + * + * Timer callback function for drag&drop scrolling + */ + +#define IDT_UP 0x1u +#define IDT_DOWN 0x2u +#define IDT_LEFT 0x4u +#define IDT_RIGHT 0x8u + +VOID CALLBACK scroll_timer_proc(HWND hwnd, UINT uMsg, UINT_PTR idTimer, DWORD dwTimer) { + switch (idTimer) { + case IDT_UP: + SendMessageW(hwnd, WM_VSCROLL, SB_LINEUP, 0); + break; + case IDT_DOWN: + SendMessageW(hwnd, WM_VSCROLL, SB_LINEDOWN, 0); + break; + case IDT_LEFT: + SendMessageW(hwnd, WM_HSCROLL, SB_LINEUP, 0); + break; + case IDT_RIGHT: + SendMessageW(hwnd, WM_HSCROLL, SB_LINEDOWN, 0); + break; + } +} + +/****************************************************************************** + * start_stop_timer [Internal] + */ +static inline void start_stop_timer(IShellViewImpl *This, UINT_PTR idTimer, BOOL fStart) { + if (fStart && !(This->iActiveTimersMask & idTimer)) { + SetTimer(This->hWndList, idTimer, 200, scroll_timer_proc); + This->iActiveTimersMask |= idTimer; + } + if (!fStart && This->iActiveTimersMask & idTimer) { + KillTimer(This->hWndList, idTimer); + This->iActiveTimersMask &= ~idTimer; + } +} + +/****************************************************************************** * drag_notify_subitem [Internal] * * Figure out the shellfolder object, which is currently under the mouse cursor * and notify it via the IDropTarget interface. */ + +#define SCROLLAREAWIDTH 20 + static HRESULT drag_notify_subitem(IShellViewImpl *This, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { @@ -2189,15 +2236,23 @@ static HRESULT drag_notify_subitem(IShel LVITEMA lvItem; LONG lResult; HRESULT hr; + RECT clientRect; /* Map from global to client coordinates and query the index of the listview-item, which is * currently under the mouse cursor. */ htinfo.pt.x = pt.x; htinfo.pt.y = pt.y; htinfo.flags = LVHT_ONITEM; - MapWindowPoints(NULL, This->hWndList, &htinfo.pt, 1); + ScreenToClient(This->hWndList, &htinfo.pt); lResult = SendMessageW(This->hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo); + /* Start or stop the drag scrolling timers */ + GetClientRect(This->hWndList, &clientRect); + start_stop_timer(This, IDT_LEFT, htinfo.pt.x < SCROLLAREAWIDTH); + start_stop_timer(This, IDT_RIGHT, htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH); + start_stop_timer(This, IDT_UP, htinfo.pt.y < SCROLLAREAWIDTH); + start_stop_timer(This, IDT_DOWN, htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH); + /* If we are still over the previous sub-item, notify it via DragOver and return. */ if (This->pCurDropTarget && lResult == This->iDragOverItem) return IDropTarget_DragOver(This->pCurDropTarget, grfKeyState, pt, pdwEffect); @@ -2265,7 +2320,12 @@ static HRESULT WINAPI ISVDropTarget_Drag This->pCurDataObject = NULL; This->pCurDropTarget = NULL; This->iDragOverItem = 0; - + + start_stop_timer(This, IDT_LEFT, FALSE); + start_stop_timer(This, IDT_RIGHT, FALSE); + start_stop_timer(This, IDT_UP, FALSE); + start_stop_timer(This, IDT_DOWN, FALSE); + return S_OK; } @@ -2282,6 +2342,11 @@ static HRESULT WINAPI ISVDropTarget_Drop This->pCurDropTarget = NULL; This->iDragOverItem = 0; + start_stop_timer(This, IDT_LEFT, FALSE); + start_stop_timer(This, IDT_RIGHT, FALSE); + start_stop_timer(This, IDT_UP, FALSE); + start_stop_timer(This, IDT_DOWN, FALSE); + return S_OK; }

1 0