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

wine/dlls/shdocvw dochost.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21622 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:14:47 Modified files: dlls/shdocvw : dochost.c Log message: Jacek Caban <jacek(a)codeweavers.com> Use sink in navigate_complete instead of ClientSite's IDispatch. Patch: http://cvs.winehq.org/patch.py?id=21622 Old revision New revision Changes Path 1.5 1.6 +8 -15 wine/dlls/shdocvw/dochost.c Index: wine/dlls/shdocvw/dochost.c diff -u -p wine/dlls/shdocvw/dochost.c:1.5 wine/dlls/shdocvw/dochost.c:1.6 --- wine/dlls/shdocvw/dochost.c:1.5 2 Dec 2005 13:14:47 -0000 +++ wine/dlls/shdocvw/dochost.c 2 Dec 2005 13:14:47 -0000 @@ -27,17 +27,13 @@ static ATOM doc_view_atom = 0; static void navigate_complete(WebBrowser *This) { - IDispatch *disp, *docdisp = NULL; + IDispatch *disp = NULL; DISPPARAMS dispparams; VARIANTARG params[2]; VARIANT url; HRESULT hres; - hres = IOleClientSite_QueryInterface(This->client, &IID_IDispatch, (void**)&disp); - if(FAILED(hres)) - return; - - hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&docdisp); + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); if(FAILED(hres)) FIXME("Could not get IDispatch interface\n"); @@ -50,19 +46,16 @@ static void navigate_complete(WebBrowser V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = docdisp; + V_DISPATCH(params+1) = disp; V_VT(&url) = VT_BSTR; V_BSTR(&url) = This->url; - IDispatch_Invoke(disp, DISPID_NAVIGATECOMPLETE2, &IID_NULL, LOCALE_SYSTEM_DEFAULT, - DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - IDispatch_Invoke(disp, DISPID_DOCUMENTCOMPLETE, &IID_NULL, LOCALE_SYSTEM_DEFAULT, - DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - - IDispatch_Release(disp); - if(docdisp) - IDispatch_Release(docdisp); + call_sink(This->cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); + call_sink(This->cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + + if(disp) + IDispatch_Release(disp); } static LRESULT navigate2(WebBrowser *This)

1 0

wine/dlls/crypt32 Makefile.in cert.c crypt32.s ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21621 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:31:52 Modified files: dlls/crypt32 : Makefile.in cert.c crypt32.spec crypt32_private.h encode.c main.c dlls/crypt32/tests: .cvsignore Makefile.in encode.c Added files: dlls/crypt32 : oid.c dlls/crypt32/tests: oid.c Log message: Juan Lang <juan_lang(a)yahoo.com> Implement more OID support functions. Use the exported OID support functions internally. Move OID support functions and stubs to a separate file. Patch: http://cvs.winehq.org/patch.py?id=21621 Old revision New revision Changes Path 1.14 1.15 +1 -0 wine/dlls/crypt32/Makefile.in 1.24 1.25 +0 -13 wine/dlls/crypt32/cert.c 1.34 1.35 +2 -2 wine/dlls/crypt32/crypt32.spec 1.1 1.2 +3 -0 wine/dlls/crypt32/crypt32_private.h 1.34 1.35 +53 -282 wine/dlls/crypt32/encode.c 1.27 1.28 +4 -40 wine/dlls/crypt32/main.c Added 1.1 +0 -0 wine/dlls/crypt32/oid.c 1.4 1.5 +1 -0 wine/dlls/crypt32/tests/.cvsignore 1.6 1.7 +1 -0 wine/dlls/crypt32/tests/Makefile.in 1.27 1.28 +0 -55 wine/dlls/crypt32/tests/encode.c Added 1.1 +0 -0 wine/dlls/crypt32/tests/oid.c

1 0

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

Dec. 2, 2005

ChangeSet ID: 21620 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:31:11 Modified files: tools/winapi : c_parser.pm winapi_parser.pm Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Make winapi_check understand the interface keyword. Patch: http://cvs.winehq.org/patch.py?id=21620 Old revision New revision Changes Path 1.19 1.20 +12 -12 wine/tools/winapi/c_parser.pm 1.8 1.9 +8 -8 wine/tools/winapi/winapi_parser.pm Index: wine/tools/winapi/c_parser.pm diff -u -p wine/tools/winapi/c_parser.pm:1.19 wine/tools/winapi/c_parser.pm:1.20 --- wine/tools/winapi/c_parser.pm:1.19 2 Dec 2005 10:31:11 -0000 +++ wine/tools/winapi/c_parser.pm 2 Dec 2005 10:31:11 -0000 @@ -1110,7 +1110,7 @@ sub parse_c_file($$$$) { $declaration .= $&; if($declaration =~ /^typedef/s || - $declaration =~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)*(?:struct|union)(?:\s+\w+)?\s*\{/s) + $declaration =~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)*(?:interface|struct|union)(?:\s+\w+)?\s*\{/s) { # Nothing } elsif($plevel == 1 && $blevel == 1) { @@ -1128,7 +1128,7 @@ sub parse_c_file($$$$) { $declaration .= $&; if(0 && $blevel == 1 && $declaration !~ /^typedef/ && - $declaration !~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)?(?:struct|union)(?:\s+\w+)?\s*\{/s && + $declaration !~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)?(?:interface|struct|union)(?:\s+\w+)?\s*\{/s && $declaration =~ /^(?:\w+(?:\s*\*)*\s+)*(\w+)\s*$\s*(?:(?:\w+\s*,\s*)*(\w+))?\s*$\s*(.*?);$/s && $1 ne "ICOM_VTABLE" && defined($2) && $2 ne "void" && $3) # K&R { @@ -1617,7 +1617,7 @@ sub parse_c_struct_union($$$$$$$$$) { $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); - if (!s/^(struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + if (!s/^(interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { return 0; } $kind = $1; @@ -1787,7 +1787,7 @@ sub parse_c_type($$$$$) { # Nothing } elsif($self->_parse_c('ICOM_VTABLE$.*?$', \$_, \$line, \$column, \$type)) { # Nothing - } elsif($self->_parse_c('(?:enum\s+|struct\s+|union\s+)?(?:(?:MSVCRT|WS)$\s*\w+\s*$|\w+)\s*(\*\s*)*', + } elsif($self->_parse_c('(?:enum\s+|interface\s+|struct\s+|union\s+)?(?:(?:MSVCRT|WS)$\s*\w+\s*$|\w+)\s*(\*\s*)*', \$_, \$line, \$column, \$type)) { # Nothing @@ -1986,7 +1986,7 @@ sub parse_c_variable($$$$$$$) { # Nothing } elsif(/^$/) { return 0; - } elsif (s/^(enum\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + } elsif (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { my $kind = $1; my $_name = $2; $self->_update_c_position($&, \$line, \$column); @@ -1998,7 +1998,7 @@ sub parse_c_variable($$$$$$$) { } $finished = 1; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { $type = "$sign$1"; $name = $2; @@ -2017,13 +2017,13 @@ sub parse_c_variable($$$$$$$) { $type = $self->_format_c_type($type); $finished = 1; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { $type = "$sign$1:$2"; $name = ""; $type = $self->_format_c_type($type); $finished = 1; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { $type = $self->_format_c_type("$sign$1$3"); $name = $2; @@ -2049,7 +2049,7 @@ sub parse_c_variable($$$$$$$) { } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { $type = $match; $finished = 1; - } elsif(s/^(enum|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { + } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { my $kind = $1; my $_name = $2; $self->_update_c_position($&, \$line, \$column); @@ -2059,7 +2059,7 @@ sub parse_c_variable($$$$$$$) { } else { $type = "struct { }"; } - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { $type = $&; $type =~ s/\s//g; } else { @@ -2109,7 +2109,7 @@ sub parse_c_variable($$$$$$$) { } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$.*?$', \$_, \$line, \$column, \$match)) { $type = "<type>"; $name = "<name>"; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+)\s* + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s* (?:\*\s*)*(\w+|\s*\*?\s*\w+\s*\))\s*(?:\[[^\]]*\]|$[^$]*\))? (?:,\s*(?:\*\s*)*(\w+)\s*(?:\[[^\]]*\])?)* \s*(?:=|$)//sx) @@ -2121,7 +2121,7 @@ sub parse_c_variable($$$$$$$) { $type =~ s/\s//g; $type =~ s/^struct/struct /; - } elsif(/^(enum|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*((?:\*\s*)*)(\w+)\s*(?:=|$)/s) { + } elsif(/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*((?:\*\s*)*)(\w+)\s*(?:=|$)/s) { $self->_update_c_position($&, \$line, \$column); my $kind = $1; Index: wine/tools/winapi/winapi_parser.pm diff -u -p wine/tools/winapi/winapi_parser.pm:1.8 wine/tools/winapi/winapi_parser.pm:1.9 --- wine/tools/winapi/winapi_parser.pm:1.8 2 Dec 2005 10:31:11 -0000 +++ wine/tools/winapi/winapi_parser.pm 2 Dec 2005 10:31:11 -0000 @@ -140,7 +140,7 @@ sub parse_c_file($$) { my $names = shift; foreach my $name (@$names) { - if($type =~ /^(?:struct|enum)/) { + if($type =~ /^(?:enum|interface|struct|union)/) { # $output->write("typedef $type {\n"); # $output->write("} $name;\n"); } else { @@ -372,7 +372,7 @@ sub parse_c_file($$) { } } next; - } elsif(/(extern\s+|static\s+)?((struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) + } elsif(/(extern\s+|static\s+)?((interface\s+|struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) ((__cdecl|__stdcall|__RPC_STUB|__RPC_USER|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)? (\w+($\w+$)?)\s*$(.*?)$\s*(\{|\;)/sx) { @@ -432,7 +432,7 @@ sub parse_c_file($$) { $argument_type = "..."; $argument_name = "..."; } elsif($argument =~ /^ - ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?:short\s+(?=int)|long\s+(?=int))?)?(?:\w+|ElfW$\w+$|WS$\w+$))\s* ((?:__RPC_FAR|const|CONST|volatile)?\s*(?:\*\s*(?:__RPC_FAR|const|CONST|volatile)?\s*?)*)\s* (\w*)\s*(\[\])?(?:\s+OPTIONAL)?$/x) @@ -446,7 +446,7 @@ sub parse_c_file($$) { } $argument_name = $3; } elsif ($argument =~ /^ - ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?: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+)? @@ -465,7 +465,7 @@ sub parse_c_file($$) { $argument_type = "$return_type (*)($arguments)"; } elsif ($argument =~ /^ - ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* (\w+)\s*\[\s*(.*?)\s*\](?:\[\s*(.*?)\s*\])?$/x) @@ -548,7 +548,7 @@ sub parse_c_file($$) { } elsif(/(DEFAULT|DECLARE)_DEBUG_CHANNEL\s*$(\S+)$/s) { $_ = $'; $again = 1; push @$debug_channels, $1; - } elsif(/typedef\s+(enum|struct|union)(?:\s+(\w+))?\s*\{/s) { + } elsif(/typedef\s+(enum|interface|struct|union)(?:\s+(\w+))?\s*\{/s) { $_ = $'; $again = 1; $level++; my $type = $1; @@ -557,7 +557,7 @@ sub parse_c_file($$) { } &$type_begin($type); } elsif(/typedef\s+ - ((?:const\s+|CONST\s+|enum\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) + ((?:const\s+|CONST\s+|enum\s+|interface\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) (\w+) (?:\s+const|\s+volatile)? ((?:\s*(?:(?:FAR|__RPC_FAR|TW_HUGE)?\s*)?\*+\s*|\s+)(?:volatile\s+|DECLSPEC_ALIGN$\d+$\s+)?\w+\s*(?:\[[^\]]*\])* @@ -585,7 +585,7 @@ sub parse_c_file($$) { &$type_begin($type); &$type_end([@names]); } elsif(/typedef\s+ - (?:(?:const\s+|enum\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) + (?:(?:const\s+|enum\s+|interface\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) (\w+(?:\s*\*+\s*)?)\s* (?:(\w+)\s*)? $(?:(\w+)\s*)?\s*(?:\*\s*(\w+)|_ATL_CATMAPFUNC)\s*$\s*

1 0

wine/dlls/commdlg cdlg_Bg.rc cdlg_Ca.rc cdlg_C ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21619 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:31:02 Modified files: dlls/commdlg : cdlg_Bg.rc cdlg_Ca.rc cdlg_Cn.rc cdlg_Cs.rc cdlg_Da.rc cdlg_De.rc cdlg_En.rc cdlg_Es.rc cdlg_Fi.rc cdlg_Fr.rc cdlg_Hu.rc cdlg_It.rc cdlg_Ja.rc cdlg_Nl.rc cdlg_No.rc cdlg_Pl.rc cdlg_Pt.rc cdlg_Ru.rc cdlg_Si.rc cdlg_Sk.rc cdlg_Sv.rc cdlg_Uk.rc cdlg_Wa.rc cdlg_Zh.rc Log message: Pavel Roskin <proski(a)gnu.org> Improve script selection combobox in the font selection dialog - set height to 90 (the old value of 10 could only fit a single line) and remove CBS_OWNERDRAWFIXED flag to trim excessive height from the list items. Patch: http://cvs.winehq.org/patch.py?id=21619 Old revision New revision Changes Path 1.2 1.3 +1 -1 wine/dlls/commdlg/cdlg_Bg.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Ca.rc 1.10 1.11 +1 -1 wine/dlls/commdlg/cdlg_Cn.rc 1.10 1.11 +1 -1 wine/dlls/commdlg/cdlg_Cs.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Da.rc 1.26 1.27 +1 -1 wine/dlls/commdlg/cdlg_De.rc 1.42 1.43 +2 -2 wine/dlls/commdlg/cdlg_En.rc 1.19 1.20 +1 -1 wine/dlls/commdlg/cdlg_Es.rc 1.14 1.15 +1 -1 wine/dlls/commdlg/cdlg_Fi.rc 1.22 1.23 +1 -1 wine/dlls/commdlg/cdlg_Fr.rc 1.11 1.12 +1 -1 wine/dlls/commdlg/cdlg_Hu.rc 1.20 1.21 +1 -1 wine/dlls/commdlg/cdlg_It.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Ja.rc 1.15 1.16 +1 -1 wine/dlls/commdlg/cdlg_Nl.rc 1.11 1.12 +1 -1 wine/dlls/commdlg/cdlg_No.rc 1.21 1.22 +1 -1 wine/dlls/commdlg/cdlg_Pl.rc 1.22 1.23 +1 -1 wine/dlls/commdlg/cdlg_Pt.rc 1.23 1.24 +1 -1 wine/dlls/commdlg/cdlg_Ru.rc 1.15 1.16 +1 -1 wine/dlls/commdlg/cdlg_Si.rc 1.16 1.17 +1 -1 wine/dlls/commdlg/cdlg_Sk.rc 1.18 1.19 +1 -1 wine/dlls/commdlg/cdlg_Sv.rc 1.8 1.9 +1 -1 wine/dlls/commdlg/cdlg_Uk.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Wa.rc 1.12 1.13 +1 -1 wine/dlls/commdlg/cdlg_Zh.rc

1 0

wine/dlls/shdocvw events.c shdocvw.h
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21618 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:30:19 Modified files: dlls/shdocvw : events.c shdocvw.h Log message: Jacek Caban <jacek(a)codeweavers.com> Added implementation of IConnectionPoint::Advise and Unadvise. Patch: http://cvs.winehq.org/patch.py?id=21618 Old revision New revision Changes Path 1.18 1.19 +83 -14 wine/dlls/shdocvw/events.c 1.37 1.38 +7 -3 wine/dlls/shdocvw/shdocvw.h Index: wine/dlls/shdocvw/events.c diff -u -p wine/dlls/shdocvw/events.c:1.18 wine/dlls/shdocvw/events.c:1.19 --- wine/dlls/shdocvw/events.c:1.18 2 Dec 2005 10:30:19 -0000 +++ wine/dlls/shdocvw/events.c 2 Dec 2005 10:30:19 -0000 @@ -27,13 +27,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -typedef struct { +struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; WebBrowser *webbrowser; + IDispatch **sinks; + DWORD sinks_size; + IID iid; -} ConnectionPoint; +}; #define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl) @@ -84,13 +87,13 @@ static HRESULT WINAPI ConnectionPointCon if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents2 %p)\n", This, ppCP); - *ppCP = This->cp_wbe2; + *ppCP = CONPOINT(This->cp_wbe2); }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); - *ppCP = This->cp_wbe; + *ppCP = CONPOINT(This->cp_wbe); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = This->cp_pns; + *ppCP = CONPOINT(This->cp_pns); } if(*ppCP) { @@ -181,15 +184,53 @@ static HRESULT WINAPI ConnectionPoint_Ad DWORD *pdwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); - return E_NOTIMPL; + IDispatch *disp; + DWORD i; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); + + hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&disp); + if(FAILED(hres)) { + hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return CONNECT_E_CANNOTCONNECT; + } + + if(This->sinks) { + for(i=0; i<This->sinks_size; i++) { + if(!This->sinks[i]) + break; + } + + if(i == This->sinks_size) + This->sinks = HeapReAlloc(GetProcessHeap(), 0, This->sinks, + (++This->sinks_size)*sizeof(*This->sinks)); + }else { + This->sinks = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sinks)); + This->sinks_size = 1; + i = 0; + } + + This->sinks[i] = disp; + *pdwCookie = i+1; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, dwCookie); - return E_NOTIMPL; + + TRACE("(%p)->(%ld)\n", This, dwCookie); + + if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1]) + return CONNECT_E_NOCONNECTION; + + IDispatch_Release(This->sinks[dwCookie-1]); + This->sinks[dwCookie-1] = NULL; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, @@ -214,15 +255,43 @@ static const IConnectionPointVtbl Connec ConnectionPoint_EnumConnections }; -static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, IConnectionPoint **cp) +void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) +{ + DWORD i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i]) + IDispatch_Invoke(This->sinks[i], dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_METHOD, dispparams, NULL, NULL, NULL); + } +} + +static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, ConnectionPoint **cp) { ConnectionPoint *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; ret->webbrowser = wb; + + ret->sinks = NULL; + ret->sinks_size = 0; + memcpy(&ret->iid, riid, sizeof(IID)); - *cp = CONPOINT(ret); + *cp = ret; +} + +static void ConnectionPoint_Destroy(ConnectionPoint *This) +{ + int i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i]) + IDispatch_Release(This->sinks[i]); + } + + HeapFree(GetProcessHeap(), 0, This->sinks); + HeapFree(GetProcessHeap(), 0, This); } void WebBrowser_Events_Init(WebBrowser *This) @@ -236,7 +305,7 @@ void WebBrowser_Events_Init(WebBrowser * void WebBrowser_Events_Destroy(WebBrowser *This) { - HeapFree(GetProcessHeap(), 0, This->cp_wbe2); - HeapFree(GetProcessHeap(), 0, This->cp_wbe); - HeapFree(GetProcessHeap(), 0, This->cp_pns); + ConnectionPoint_Destroy(This->cp_wbe2); + ConnectionPoint_Destroy(This->cp_wbe); + ConnectionPoint_Destroy(This->cp_pns); } Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.37 wine/dlls/shdocvw/shdocvw.h:1.38 --- wine/dlls/shdocvw/shdocvw.h:1.37 2 Dec 2005 10:30:19 -0000 +++ wine/dlls/shdocvw/shdocvw.h 2 Dec 2005 10:30:19 -0000 @@ -58,6 +58,9 @@ extern HRESULT SHDOCVW_GetShellInstanceO /********************************************************************** * WebBrowser declaration for SHDOCVW.DLL */ + +typedef struct ConnectionPoint ConnectionPoint; + typedef struct { /* Interfaces available via WebBrowser object */ @@ -109,9 +112,9 @@ typedef struct { /* Connection points */ - IConnectionPoint *cp_wbe2; - IConnectionPoint *cp_wbe; - IConnectionPoint *cp_pns; + ConnectionPoint *cp_wbe2; + ConnectionPoint *cp_wbe; + ConnectionPoint *cp_pns; } WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) @@ -155,6 +158,7 @@ void WebBrowser_ClientSite_Destroy(WebBr HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(WebBrowser *This); +void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); #define WB_WM_NAVIGATE2 (WM_USER+100)

1 0

wine/dlls/wldap32 add.c bind.c compare.c contr ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21617 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:30:14 Modified files: dlls/wldap32 : add.c bind.c compare.c control.c delete.c dn.c error.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document DN and error handling functions. Try to stick to Wine's documentation format. Patch: http://cvs.winehq.org/patch.py?id=21617 Old revision New revision Changes Path 1.6 1.7 +4 -4 wine/dlls/wldap32/add.c 1.8 1.9 +9 -9 wine/dlls/wldap32/bind.c 1.5 1.6 +4 -4 wine/dlls/wldap32/compare.c 1.5 1.6 +7 -7 wine/dlls/wldap32/control.c 1.3 1.4 +4 -4 wine/dlls/wldap32/delete.c 1.2 1.3 +84 -0 wine/dlls/wldap32/dn.c 1.4 1.5 +74 -2 wine/dlls/wldap32/error.c

1 0

wine/programs/wcmd batch.c builtins.c wcmdmain.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21616 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:30:04 Modified files: programs/wcmd : batch.c builtins.c wcmdmain.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Avoid formatted output in a few more places where formatting is not really needed and output could be large enough to be truncated. Patch: http://cvs.winehq.org/patch.py?id=21616 Old revision New revision Changes Path 1.14 1.15 +5 -2 wine/programs/wcmd/batch.c 1.31 1.32 +7 -2 wine/programs/wcmd/builtins.c 1.49 1.50 +3 -3 wine/programs/wcmd/wcmdmain.c Index: wine/programs/wcmd/batch.c diff -u -p wine/programs/wcmd/batch.c:1.14 wine/programs/wcmd/batch.c:1.15 --- wine/programs/wcmd/batch.c:1.14 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/batch.c 2 Dec 2005 10:30: 4 -0000 @@ -94,7 +94,9 @@ BATCH_CONTEXT *prev_context; while (WCMD_fgets (string, sizeof(string), h)) { if (strlen(string) == MAXSTRING -1) - WCMD_output("Line in Batch processing possible truncated. Using:\n%s\n",string); + WCMD_output_asis( "Line in Batch processing possible truncated. Using:\n"); + WCMD_output_asis( string); + WCMD_output_asis( "\n"); if (string[0] != ':') { /* Skip over labels */ WCMD_batch_command (string); } @@ -179,7 +181,8 @@ int i; /* Show prompt before batch line IF echo is on */ if (echo_mode && (line[0] != '@')) { WCMD_show_prompt(); - WCMD_output ("%s\n", cmd2); + WCMD_output_asis ( cmd2); + WCMD_output_asis ( "\n"); } WCMD_process_command (cmd2); Index: wine/programs/wcmd/builtins.c diff -u -p wine/programs/wcmd/builtins.c:1.31 wine/programs/wcmd/builtins.c:1.32 --- wine/programs/wcmd/builtins.c:1.31 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/builtins.c 2 Dec 2005 10:30: 4 -0000 @@ -827,7 +827,10 @@ char buffer[1048]; */ status = GetEnvironmentVariable(s, buffer, sizeof(buffer)); if (status) { - WCMD_output("%s=%s\n", s, buffer); + WCMD_output_asis( s); + WCMD_output_asis( "="); + WCMD_output_asis( buffer); + WCMD_output_asis( "\n"); } else { WCMD_output ("Environment variable %s not defined\n", s); } @@ -856,7 +859,9 @@ DWORD status; if (strlen(param1) == 0) { status = GetEnvironmentVariable ("PATH", string, sizeof(string)); if (status != 0) { - WCMD_output ("PATH=%s\n", string); + WCMD_output_asis ( "PATH="); + WCMD_output_asis ( string); + WCMD_output_asis ( "\n"); } else { WCMD_output ("PATH not found\n"); Index: wine/programs/wcmd/wcmdmain.c diff -u -p wine/programs/wcmd/wcmdmain.c:1.49 wine/programs/wcmd/wcmdmain.c:1.50 --- wine/programs/wcmd/wcmdmain.c:1.49 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/wcmdmain.c 2 Dec 2005 10:30: 4 -0000 @@ -698,7 +698,7 @@ char *p, *q; *q = '\0'; } } - WCMD_output (out_string); + WCMD_output_asis (out_string); } /**************************************************************************** @@ -720,9 +720,9 @@ int status; error_code, GetLastError()); return; } - WCMD_output (lpMsgBuf); + WCMD_output_asis (lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); - WCMD_output (newline); + WCMD_output_asis (newline); return; }

1 0

wine/dlls/shdocvw oleobject.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21615 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:57 Modified files: dlls/shdocvw : oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Sync window sizes. Patch: http://cvs.winehq.org/patch.py?id=21615 Old revision New revision Changes Path 1.23 1.24 +26 -1 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.23 wine/dlls/shdocvw/oleobject.c:1.24 --- wine/dlls/shdocvw/oleobject.c:1.23 2 Dec 2005 10:29:57 -0000 +++ wine/dlls/shdocvw/oleobject.c 2 Dec 2005 10:29:57 -0000 @@ -31,8 +31,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static ATOM shell_embedding_atom = 0; +static LRESULT resize_window(WebBrowser *This, LONG width, LONG height) +{ + if(This->doc_view_hwnd) + SetWindowPos(This->doc_view_hwnd, NULL, 0, 0, width, height, + SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; +} + static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + WebBrowser *This; + + static const WCHAR wszTHIS[] = {'T','H','I','S',0}; + + if(msg == WM_CREATE) { + This = *(WebBrowser**)lParam; + SetPropW(hwnd, wszTHIS, This); + }else { + This = GetPropW(hwnd, wszTHIS); + } + + switch(msg) { + case WM_SIZE: + return resize_window(This, LOWORD(lParam), HIWORD(lParam)); + } + return DefWindowProcA(hwnd, msg, wParam, lParam); } @@ -477,8 +502,8 @@ static HRESULT WINAPI OleInPlaceObject_S if(This->shell_embedding_hwnd) { SetWindowPos(This->shell_embedding_hwnd, NULL, lprcPosRect->left, lprcPosRect->top, - lprcPosRect->bottom-lprcPosRect->top, lprcPosRect->right-lprcPosRect->left, + lprcPosRect->bottom-lprcPosRect->top, SWP_NOZORDER | SWP_NOACTIVATE); }

1 0

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

Dec. 2, 2005

ChangeSet ID: 21614 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:49 Modified files: dlls/shell32/tests: shlfolder.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Added a test for native PIDL format. Patch: http://cvs.winehq.org/patch.py?id=21614 Old revision New revision Changes Path 1.44 1.45 +11 -0 wine/dlls/shell32/tests/shlfolder.c Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.44 wine/dlls/shell32/tests/shlfolder.c:1.45 --- wine/dlls/shell32/tests/shlfolder.c:1.44 2 Dec 2005 10:29:49 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 2 Dec 2005 10:29:49 -0000 @@ -368,6 +368,17 @@ static void test_GetDisplayName(void) return; } + /* WinXP stores the filenames as both ANSI and UNICODE in the pidls */ + pidlLast = ILFindLastID(pidlTestFile); + todo_wine { + ok( pidlLast->mkid.cb >= 76, "Expected pidl length of at least 76, got %d.\n", + pidlLast->mkid.cb); + } + if (pidlLast->mkid.cb >= 76) { + ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName), + "WinXP stores the filename as a wchar-string at this position!\n"); + } + /* It seems as if we cannot bind to regular files on windows, but only directories. */ hr = IShellFolder_BindToObject(psfDesktop, pidlTestFile, NULL, &IID_IUnknown, (VOID**)&psfFile);

1 0

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

Dec. 2, 2005

ChangeSet ID: 21613 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:40 Modified files: dlls/advpack : advpack.c Log message: James Hawkins <truiken(a)gmail.com> Document many of the advpack functions. Patch: http://cvs.winehq.org/patch.py?id=21613 Old revision New revision Changes Path 1.17 1.18 +74 -0 wine/dlls/advpack/advpack.c Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.17 wine/dlls/advpack/advpack.c:1.18 --- wine/dlls/advpack/advpack.c:1.17 2 Dec 2005 10:29:40 -0000 +++ wine/dlls/advpack/advpack.c 2 Dec 2005 10:29:40 -0000 @@ -126,6 +126,8 @@ HRESULT WINAPI RunSetupCommand( HWND hWn /*********************************************************************** * LaunchINFSection (ADVPACK.@) + * + * See LaunchINFSectionEx. */ INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { @@ -135,6 +137,21 @@ INT WINAPI LaunchINFSection( HWND hWnd, /*********************************************************************** * LaunchINFSectionEx (ADVPACK.@) + * + * Installs an INF section. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * hInst [I] Instance of the process. + * cmdline [I] Contains parameters in the order INF,section,CAB,flags. + * show [I] How the window should be shown. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * BUGS + * Unimplemented. */ HRESULT WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { @@ -181,6 +198,18 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM /*********************************************************************** * IsNTAdmin (ADVPACK.@) + * + * Checks if the user has admin privileges. + * + * PARAMS + * reserved [I] Reserved. Must be 0. + * pReserved [I] Reserved. Must be NULL. + * + * RETURNS + * TRUE if user has admin rights, FALSE otherwise. + * + * BUGS + * Unimplemented. */ BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved ) { @@ -190,6 +219,11 @@ BOOL WINAPI IsNTAdmin( DWORD reserved, L /*********************************************************************** * NeedRebootInit (ADVPACK.@) + * + * Sets up conditions for reboot checking. + * + * RETURNS + * Value required by NeedReboot. */ DWORD WINAPI NeedRebootInit(VOID) { @@ -199,6 +233,17 @@ DWORD WINAPI NeedRebootInit(VOID) /*********************************************************************** * NeedReboot (ADVPACK.@) + * + * Determines whether a reboot is required. + * + * PARAMS + * dwRebootCheck [I] Value from NeedRebootInit. + * + * RETURNS + * TRUE if a reboot is needed, FALSE otherwise. + * + * BUGS + * Unimplemented. */ BOOL WINAPI NeedReboot(DWORD dwRebootCheck) { @@ -208,6 +253,8 @@ BOOL WINAPI NeedReboot(DWORD dwRebootChe /*********************************************************************** * GetVersionFromFile (ADVPACK.@) + * + * See GetVersionFromFileEx. */ HRESULT WINAPI GetVersionFromFile( LPSTR Filename, LPDWORD MajorVer, LPDWORD MinorVer, BOOL Version ) @@ -225,6 +272,21 @@ typedef struct tagLANGANDCODEPAGE /*********************************************************************** * GetVersionFromFileEx (ADVPACK.@) + * + * Gets the files version or language information. + * + * PARAMS + * lpszFilename [I] The file to get the info from. + * pdwMSVer [O] Major version. + * pdwLSVer [O] Minor version. + * bVersion [I] Whether to retrieve version or language info. + * + * RETURNS + * Always returns S_OK. + * + * NOTES + * If bVersion is TRUE, version information is retrieved, else + * pdwMSVer gets the language ID and pdwLSVer gets the codepage ID. */ HRESULT WINAPI GetVersionFromFileEx( LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion ) @@ -452,6 +514,18 @@ HRESULT WINAPI DelNode( LPCSTR pszFileOr /*********************************************************************** * DelNodeRunDLL32 (ADVPACK.@) * + * Deletes a file or directory, WinMain style. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * hInst [I] Instance of the process. + * cmdline [I] Contains parameters in the order FileOrDirName,Flags. + * show [I] How the window should be shown. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * * BUGS * Unimplemented */

1 0

wine/dlls/x11drv opengl.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21612 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:36 Modified files: dlls/x11drv : opengl.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Handle DONTCARE flags on ChoosePixelFormat. DOUBLEBUFFER and STEREO are non-mandatory options (ie if not available find a compatible pixel format without). So try without if we cannot find a valid fbconfig with these options. Patch: http://cvs.winehq.org/patch.py?id=21612 Old revision New revision Changes Path 1.18 1.19 +38 -9 wine/dlls/x11drv/opengl.c Index: wine/dlls/x11drv/opengl.c diff -u -p wine/dlls/x11drv/opengl.c:1.18 wine/dlls/x11drv/opengl.c:1.19 --- wine/dlls/x11drv/opengl.c:1.18 2 Dec 2005 10:29:36 -0000 +++ wine/dlls/x11drv/opengl.c 2 Dec 2005 10:29:36 -0000 @@ -183,6 +183,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV const PIXELFORMATDESCRIPTOR *ppfd) { int att_list[64]; int att_pos = 0; + int att_pos_fac = 0; GLXFBConfig* cfgs = NULL; int ret = 0; @@ -204,22 +205,24 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Now, build the request to GLX */ - TEST_AND_ADD2(ppfd->dwFlags & PFD_DOUBLEBUFFER, GLX_DOUBLEBUFFER, TRUE); - TEST_AND_ADD1(ppfd->dwFlags & PFD_STEREO, GLX_STEREO); if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) { ADD2(GLX_BUFFER_SIZE, ppfd->cColorBits); } if (ppfd->iPixelType == PFD_TYPE_RGBA) { ADD2(GLX_RENDER_TYPE, GLX_RGBA_BIT); - if (32 == ppfd->cDepthBits) { - /** - * for 32 bpp depth buffers force to use 24. - * needed as some drivers don't support 32bpp - */ - TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, 24); + if (ppfd->dwFlags & PFD_DEPTH_DONTCARE) { + ADD2(GLX_DEPTH_SIZE, GLX_DONT_CARE); } else { - TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, ppfd->cDepthBits); + if (32 == ppfd->cDepthBits) { + /** + * for 32 bpp depth buffers force to use 24. + * needed as some drivers don't support 32bpp + */ + TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, 24); + } else { + TEST_AND_ADD2(ppfd->cDepthBits, GLX_DEPTH_SIZE, ppfd->cDepthBits); + } } if (32 == ppfd->cColorBits) { ADD2(GLX_RED_SIZE, 8); @@ -237,6 +240,21 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV /* These flags are not supported yet... ADD2(GLX_ACCUM_SIZE, ppfd->cAccumBits); */ + + /** facultative flags now */ + att_pos_fac = att_pos; + if (ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) { + ADD2(GLX_DOUBLEBUFFER, GLX_DONT_CARE); + } else { + ADD2(GLX_DOUBLEBUFFER, (ppfd->dwFlags & PFD_DOUBLEBUFFER) ? TRUE : FALSE); + } + if (ppfd->dwFlags & PFD_STEREO_DONTCARE) { + ADD2(GLX_STEREO, GLX_DONT_CARE); + } else { + ADD2(GLX_STEREO, (ppfd->dwFlags & PFD_STEREO) ? TRUE : FALSE); + } + + /** Attributes List End */ att_list[att_pos] = None; wine_tsx11_lock(); @@ -251,6 +269,17 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV UINT it_fmt; cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), att_list, &nCfgs); + /** + * if we have facultative flags and we failed, try without + * as MSDN said + * + * see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/opengl/nto… + */ + if ((NULL == cfgs || 0 == nCfgs) && att_pos > att_pos_fac) { + att_list[att_pos_fac] = None; + cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), att_list, &nCfgs); + } + if (NULL == cfgs || 0 == nCfgs) { ERR("glXChooseFBConfig returns NULL (glError: %d)\n", pglGetError()); ret = 0;

1 0

lostwages/ news/2005102503.xml wwn/wn20011007_ ...
by Jeremy Newman Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21611 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/01 17:17:32 Modified files: news : 2005102503.xml wwn : wn20011007_105.xml wn20011125_109.xml wn20021101_142.xml wn20050218_262.xml wn20051025_296.xml wn20051028_297.xml wn20051104_298.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes Patch: http://cvs.winehq.org/patch.py?id=21611 Old revision New revision Changes Path 1.1 1.2 +1 -1 lostwages/news/2005102503.xml 1.6 1.7 +3 -3 lostwages/wwn/wn20011007_105.xml 1.8 1.9 +1 -1 lostwages/wwn/wn20011125_109.xml 1.9 1.10 +1 -1 lostwages/wwn/wn20021101_142.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20050218_262.xml 1.6 1.7 +1 -1 lostwages/wwn/wn20051025_296.xml 1.2 1.3 +20 -20 lostwages/wwn/wn20051028_297.xml 1.1 1.2 +24 -24 lostwages/wwn/wn20051104_298.xml

1 0

lostwages/templates/en download.template
by Jeremy Newman Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21610 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/01 17:16:56 Modified files: templates/en : download.template Log message: Scott Ritchie <scott(a)open-vote.org> update Ubuntu version Patch: http://cvs.winehq.org/patch.py?id=21610 Old revision New revision Changes Path 1.69 1.70 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.69 lostwages/templates/en/download.template:1.70 --- lostwages/templates/en/download.template:1.69 1 Dec 2005 23:16:56 -0000 +++ lostwages/templates/en/download.template 1 Dec 2005 23:16:56 -0000 @@ -61,7 +61,7 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/site/download-deb">Ubuntu</a></b> - binary and source .debs for Ubuntu Warty Warthog and Hoary Hedgehog</td> + binary and source .debs for Ubuntu Breezy Badger</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr>

1 0

wine/dlls/wldap32 Makefile.in wldap32.spec parse.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21609 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:54 Modified files: dlls/wldap32 : Makefile.in wldap32.spec Added files: dlls/wldap32 : parse.c Log message: Hans Leidekker <hans(a)it.vu.nl> Implement ldap_parse_extended_result{A,W}, ldap_parse_reference{A,W}, ldap_parse_result{A,W}, ldap_parse_sort_control{A,W} and ldap_parse_vlv_control{A,W}. Stub implementations for ldap_parse_page_control{A,W}. Patch: http://cvs.winehq.org/patch.py?id=21609 Old revision New revision Changes Path 1.19 1.20 +1 -0 wine/dlls/wldap32/Makefile.in 1.32 1.33 +16 -16 wine/dlls/wldap32/wldap32.spec Added 1.1 +0 -0 wine/dlls/wldap32/parse.c

1 0

wine/dlls/wldap32 misc.c search.c winldap_priv ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21608 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:42 Modified files: dlls/wldap32 : misc.c search.c winldap_private.h wldap32.spec Log message: Hans Leidekker <hans(a)it.vu.nl> Stub implementations for functions handling paged search results. Add some missing declarations. Patch: http://cvs.winehq.org/patch.py?id=21608 Old revision New revision Changes Path 1.9 1.10 +29 -0 wine/dlls/wldap32/misc.c 1.7 1.8 +26 -24 wine/dlls/wldap32/search.c 1.32 1.33 +22 -0 wine/dlls/wldap32/winldap_private.h 1.31 1.32 +7 -7 wine/dlls/wldap32/wldap32.spec

1 0

wine/dlls/msxml3 domdoc.c element.c msxml_priv ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21607 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:33 Modified files: dlls/msxml3 : domdoc.c element.c msxml_private.h node.c dlls/msxml3/tests: domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Make the node object aggregatable so that the element object (and in future all of the other node types) can use it. Patch: http://cvs.winehq.org/patch.py?id=21607 Old revision New revision Changes Path 1.19 1.20 +53 -31 wine/dlls/msxml3/domdoc.c 1.11 1.12 +25 -9 wine/dlls/msxml3/element.c 1.13 1.14 +4 -1 wine/dlls/msxml3/msxml_private.h 1.16 1.17 +121 -38 wine/dlls/msxml3/node.c 1.13 1.14 +15 -6 wine/dlls/msxml3/tests/domdoc.c

1 0

wine/dlls/ntdll virtual.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21606 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:21 Modified files: dlls/ntdll : virtual.c Log message: Check for need to add area to the reserved list also on unmap. Patch: http://cvs.winehq.org/patch.py?id=21606 Old revision New revision Changes Path 1.74 1.75 +2 -0 wine/dlls/ntdll/virtual.c Index: wine/dlls/ntdll/virtual.c diff -u -p wine/dlls/ntdll/virtual.c:1.74 wine/dlls/ntdll/virtual.c:1.75 --- wine/dlls/ntdll/virtual.c:1.74 1 Dec 2005 17:52:21 -0000 +++ wine/dlls/ntdll/virtual.c 1 Dec 2005 17:52:21 -0000 @@ -336,6 +336,8 @@ static inline void unmap_area( void *add { if (wine_mmap_is_in_reserved_area( addr, size )) wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + else if (is_beyond_limit( addr, size, user_space_limit )) + add_reserved_area( addr, size ); else munmap( addr, size ); }

1 0

wine/dlls/ntdll virtual.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21605 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:52:12 Modified files: dlls/ntdll : virtual.c Log message: Ignore the large address space flag when version is win9x. Patch: http://cvs.winehq.org/patch.py?id=21605 Old revision New revision Changes Path 1.73 1.74 +3 -0 wine/dlls/ntdll/virtual.c Index: wine/dlls/ntdll/virtual.c diff -u -p wine/dlls/ntdll/virtual.c:1.73 wine/dlls/ntdll/virtual.c:1.74 --- wine/dlls/ntdll/virtual.c:1.73 1 Dec 2005 17:52:12 -0000 +++ wine/dlls/ntdll/virtual.c 1 Dec 2005 17:52:12 -0000 @@ -1226,6 +1226,9 @@ BOOL VIRTUAL_HasMapping( LPCVOID addr ) void VIRTUAL_UseLargeAddressSpace(void) { if (user_space_limit >= ADDRESS_SPACE_LIMIT) return; + /* no large address space on win9x */ + if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; + RtlEnterCriticalSection( &csVirtual ); remove_reserved_area( user_space_limit, (char *)ADDRESS_SPACE_LIMIT - (char *)user_space_limit ); user_space_limit = ADDRESS_SPACE_LIMIT;

1 0

wine/dlls/wldap32 add.c delete.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21604 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:15:36 Modified files: dlls/wldap32 : add.c delete.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document the ldap_delete* functions. Patch: http://cvs.winehq.org/patch.py?id=21604 Old revision New revision Changes Path 1.5 1.6 +4 -4 wine/dlls/wldap32/add.c 1.2 1.3 +91 -0 wine/dlls/wldap32/delete.c Index: wine/dlls/wldap32/add.c diff -u -p wine/dlls/wldap32/add.c:1.5 wine/dlls/wldap32/add.c:1.6 --- wine/dlls/wldap32/add.c:1.5 1 Dec 2005 17:15:36 -0000 +++ wine/dlls/wldap32/add.c 1 Dec 2005 17:15:36 -0000 @@ -81,7 +81,7 @@ exit: /*********************************************************************** * ldap_addW (WLDAP32.@) * - * Add entries to a directory tree (asynchronous operation). + * Add an entry to a directory tree (asynchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. @@ -189,7 +189,7 @@ exit: /*********************************************************************** * ldap_add_extW (WLDAP32.@) * - * Add entries to a directory tree (asynchronous operation). + * Add an entry to a directory tree (asynchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. @@ -309,7 +309,7 @@ exit: /*********************************************************************** * ldap_add_ext_sW (WLDAP32.@) * - * Add entries to a directory tree (synchronous operation). + * Add an entry to a directory tree (synchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. @@ -414,7 +414,7 @@ exit: /*********************************************************************** * ldap_add_sW (WLDAP32.@) * - * Add entries to a directory tree (synchronous operation). + * Add an entry to a directory tree (synchronous operation). * * Parameters * ld [I] Pointer to an LDAP context. Index: wine/dlls/wldap32/delete.c diff -u -p wine/dlls/wldap32/delete.c:1.2 wine/dlls/wldap32/delete.c:1.3 --- wine/dlls/wldap32/delete.c:1.2 1 Dec 2005 17:15:36 -0000 +++ wine/dlls/wldap32/delete.c 1 Dec 2005 17:15:36 -0000 @@ -40,6 +40,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_deleteA (WLDAP32.@) + * + * See ldap_deleteW. + */ ULONG ldap_deleteA( WLDAP32_LDAP *ld, PCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -62,6 +67,24 @@ ULONG ldap_deleteA( WLDAP32_LDAP *ld, PC return ret; } +/*********************************************************************** + * ldap_deleteW (WLDAP32.@) + * + * Delete an entry from a directory tree (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * + * RETURNS + * Success: Message ID of the add operation. + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. Cancel the operation by calling ldap_abandon + * with the message ID. + */ ULONG ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -91,6 +114,11 @@ ULONG ldap_deleteW( WLDAP32_LDAP *ld, PW return ret; } +/*********************************************************************** + * ldap_delete_extA (WLDAP32.@) + * + * See ldap_delete_extW. + */ ULONG ldap_delete_extA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { @@ -130,6 +158,27 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_extW (WLDAP32.@) + * + * Delete an entry from a directory tree (asynchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the delete operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Call ldap_result with the message ID to get the result of + * the operation. The serverctrls and clientctrls parameters are + * optional and should be set to NULL if not used. + */ ULONG ldap_delete_extW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { @@ -171,6 +220,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_ext_sA (WLDAP32.@) + * + * See ldap_delete_ext_sW. + */ ULONG ldap_delete_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { @@ -208,6 +262,25 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_ext_sW (WLDAP32.@) + * + * Delete an entry from a directory tree (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The serverctrls and clientctrls parameters are optional and + * should be set to NULL if not used. + */ ULONG ldap_delete_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { @@ -245,6 +318,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_delete_sA (WLDAP32.@) + * + * See ldap_delete_sW. + */ ULONG ldap_delete_sA( WLDAP32_LDAP *ld, PCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -267,6 +345,19 @@ ULONG ldap_delete_sA( WLDAP32_LDAP *ld, return ret; } +/*********************************************************************** + * ldap_delete_sW (WLDAP32.@) + * + * Delete an entry from a directory tree (synchronous operation). + * + * Parameters + * ld [I] Pointer to an LDAP context. + * dn [I] DN of the entry to delete. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_delete_sW( WLDAP32_LDAP *ld, PWCHAR dn ) { ULONG ret = LDAP_NOT_SUPPORTED;

1 0

wine/programs/wcmd builtins.c wcmdmain.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21603 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:15:29 Modified files: programs/wcmd : builtins.c wcmdmain.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Don't use formatted output in WCMD_setshow_sortenv. Don't use unsafe vsprintf in WCMD_output. Patch: http://cvs.winehq.org/patch.py?id=21603 Old revision New revision Changes Path 1.30 1.31 +4 -2 wine/programs/wcmd/builtins.c 1.48 1.49 +6 -1 wine/programs/wcmd/wcmdmain.c Index: wine/programs/wcmd/builtins.c diff -u -p wine/programs/wcmd/builtins.c:1.30 wine/programs/wcmd/builtins.c:1.31 --- wine/programs/wcmd/builtins.c:1.30 1 Dec 2005 17:15:29 -0000 +++ wine/programs/wcmd/builtins.c 1 Dec 2005 17:15:29 -0000 @@ -792,8 +792,10 @@ static void WCMD_setshow_sortenv(const c qsort( str, count, sizeof (char*), WCMD_compare ); /* print it */ - for( i=0; i<count; i++ ) - WCMD_output("%s\n", str[i] ); + for( i=0; i<count; i++ ) { + WCMD_output_asis(str[i]); + WCMD_output_asis("\n"); + } LocalFree( str ); } Index: wine/programs/wcmd/wcmdmain.c diff -u -p wine/programs/wcmd/wcmdmain.c:1.48 wine/programs/wcmd/wcmdmain.c:1.49 --- wine/programs/wcmd/wcmdmain.c:1.48 1 Dec 2005 17:15:29 -0000 +++ wine/programs/wcmd/wcmdmain.c 1 Dec 2005 17:15:29 -0000 @@ -789,10 +789,15 @@ void WCMD_output (const char *format, .. va_list ap; char string[1024]; +int ret; va_start(ap,format); - vsprintf (string, format, ap); + ret = vsnprintf (string, sizeof( string), format, ap); va_end(ap); + if( ret >= sizeof( string)) { + WCMD_output_asis("ERR: output truncated in WCMD_output\n" ); + string[sizeof( string) -1] = '\0'; + } WCMD_output_asis(string); }

1 0

wine/dlls/x11drv dib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21602 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 11:15:21 Modified files: dlls/x11drv : dib.c Log message: Oldrich Jedlicka <oldium.pro(a)seznam.cz> Fix for the monochrome DIB with inverted colors. Patch: http://cvs.winehq.org/patch.py?id=21602 Old revision New revision Changes Path 1.46 1.47 +10 -3 wine/dlls/x11drv/dib.c Index: wine/dlls/x11drv/dib.c diff -u -p wine/dlls/x11drv/dib.c:1.46 wine/dlls/x11drv/dib.c:1.47 --- wine/dlls/x11drv/dib.c:1.46 1 Dec 2005 17:15:21 -0000 +++ wine/dlls/x11drv/dib.c 1 Dec 2005 17:15:21 -0000 @@ -896,19 +896,26 @@ static void X11DRV_DIB_GetImageBits_1( i notsupported: { BYTE* dstbyte; + BYTE neg = 0; unsigned long white = (1 << bmpImage->bits_per_pixel) - 1; /* ==== any bmp format -> pal 1 dib ==== */ - WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 1 bit DIB\n", + if ((unsigned)colors[0].rgbRed+colors[0].rgbGreen+colors[0].rgbBlue >= + (unsigned)colors[1].rgbRed+colors[1].rgbGreen+colors[1].rgbBlue ) + neg = 1; + + WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 1 bit DIB, " + "%s color mapping\n", bmpImage->bits_per_pixel, bmpImage->red_mask, - bmpImage->green_mask, bmpImage->blue_mask ); + bmpImage->green_mask, bmpImage->blue_mask, + neg?"negative":"direct" ); for (h=lines-1; h>=0; h--) { BYTE dstval; dstbyte=dstbits; dstval=0; for (x=0; x<width; x++) { - dstval|=(XGetPixel( bmpImage, x, h) >= white) << (7 - (x&7)); + dstval|=((XGetPixel( bmpImage, x, h) >= white) ^ neg) << (7 - (x&7)); if ((x&7)==7) { *dstbyte++=dstval; dstval=0;

1 0

CVSROOT/. loginfo
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21601 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/01 11:13:15 Modified files: . : loginfo Log message: Disable CIA notifications for wine, they will be sent from the git repository instead. Patch: http://cvs.winehq.org/patch.py?id=21601 Old revision New revision Changes Path 1.49 1.50 +1 -0 CVSROOT/loginfo Index: CVSROOT/loginfo diff -u -p CVSROOT/loginfo:1.49 CVSROOT/loginfo:1.50 --- CVSROOT/loginfo:1.49 1 Dec 2005 17:13:15 -0000 +++ CVSROOT/loginfo 1 Dec 2005 17:13:15 -0000 @@ -29,5 +29,6 @@ ^test /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m testing(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -S -s %p %s # All others go to wine-cvs +^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -L 200 -p -S -s %p %s DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -P winehq -L 200 -p -c -S -s %p %s

1 0

wine/dlls/msvcrt/tests headers.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21600 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:40 Modified files: dlls/msvcrt/tests: headers.c Log message: Improved the CHECK_DEF macro to avoid code duplication. Patch: http://cvs.winehq.org/patch.py?id=21600 Old revision New revision Changes Path 1.10 1.11 +163 -163 wine/dlls/msvcrt/tests/headers.c

1 0

wine/dlls/oleaut32 typelib.c typelib.h
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21599 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:36 Modified files: dlls/oleaut32 : typelib.c typelib.h Log message: Robert Shearman <rob(a)codeweavers.com> Make dump functions const. Patch: http://cvs.winehq.org/patch.py?id=21599 Old revision New revision Changes Path 1.183 1.184 +13 -13 wine/dlls/oleaut32/typelib.c 1.23 1.24 +1 -1 wine/dlls/oleaut32/typelib.h Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.183 wine/dlls/oleaut32/typelib.c:1.184 --- wine/dlls/oleaut32/typelib.c:1.183 1 Dec 2005 12: 2:36 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 2:36 -0000 @@ -1026,7 +1026,7 @@ static void MSFT_DoRefType(TLBContext *p /* debug */ -static void dump_TypeDesc(TYPEDESC *pTD,char *szVarType) { +static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) { if (pTD->vt & VT_RESERVED) szVarType += strlen(strcpy(szVarType, "reserved | ")); if (pTD->vt & VT_BYREF) @@ -1073,7 +1073,7 @@ static void dump_TypeDesc(TYPEDESC *pTD, } } -static void dump_ELEMDESC(ELEMDESC *edesc) { +static void dump_ELEMDESC(const ELEMDESC *edesc) { char buf[200]; USHORT flags = edesc->u.paramdesc.wParamFlags; dump_TypeDesc(&edesc->tdesc,buf); @@ -1089,7 +1089,7 @@ static void dump_ELEMDESC(ELEMDESC *edes if (flags & PARAMFLAG_FHASCUSTDATA) MESSAGE(" PARAMFLAG_FHASCUSTDATA"); MESSAGE("\n\t\tu.paramdesc.lpex %p\n",edesc->u.paramdesc.pparamdescex); } -static void dump_FUNCDESC(FUNCDESC *funcdesc) { +static void dump_FUNCDESC(const FUNCDESC *funcdesc) { int i; MESSAGE("memid is %08lx\n",funcdesc->memid); for (i=0;i<funcdesc->cParams;i++) { @@ -1141,7 +1141,7 @@ static const char * typekind_desc[] = "TKIND_MAX" }; -static void dump_TLBFuncDescOne(TLBFuncDesc * pfd) +static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd) { int i; if (!TRACE_ON(typelib)) @@ -1156,7 +1156,7 @@ static void dump_TLBFuncDescOne(TLBFuncD MESSAGE("\thelpstring: %s\n", debugstr_w(pfd->HelpString)); MESSAGE("\tentry: %s\n", debugstr_w(pfd->Entry)); } -static void dump_TLBFuncDesc(TLBFuncDesc * pfd) +static void dump_TLBFuncDesc(const TLBFuncDesc * pfd) { while (pfd) { @@ -1164,7 +1164,7 @@ static void dump_TLBFuncDesc(TLBFuncDesc pfd = pfd->next; }; } -static void dump_TLBVarDesc(TLBVarDesc * pvd) +static void dump_TLBVarDesc(const TLBVarDesc * pvd) { while (pvd) { @@ -1173,7 +1173,7 @@ static void dump_TLBVarDesc(TLBVarDesc * }; } -static void dump_TLBImpLib(TLBImpLib *import) +static void dump_TLBImpLib(const TLBImpLib *import) { TRACE_(typelib)("%s %s\n", debugstr_guid(&(import->guid)), debugstr_w(import->name)); @@ -1181,7 +1181,7 @@ static void dump_TLBImpLib(TLBImpLib *im import->wVersionMinor, import->lcid, import->offset); } -static void dump_TLBRefType(TLBRefType * prt) +static void dump_TLBRefType(const TLBRefType * prt) { while (prt) { @@ -1200,7 +1200,7 @@ static void dump_TLBRefType(TLBRefType * }; } -static void dump_TLBImplType(TLBImplType * impl) +static void dump_TLBImplType(const TLBImplType * impl) { while (impl) { TRACE_(typelib)( @@ -1210,7 +1210,7 @@ static void dump_TLBImplType(TLBImplType } } -void dump_Variant(VARIANT * pvar) +void dump_Variant(const VARIANT * pvar) { SYSTEMTIME st; @@ -1265,7 +1265,7 @@ void dump_Variant(VARIANT * pvar) TRACE("}\n"); } -static void dump_DispParms(DISPPARAMS * pdp) +static void dump_DispParms(const DISPPARAMS * pdp) { int index = 0; @@ -1278,7 +1278,7 @@ static void dump_DispParms(DISPPARAMS * } } -static void dump_TypeInfo(ITypeInfoImpl * pty) +static void dump_TypeInfo(const ITypeInfoImpl * pty) { TRACE("%p ref=%lu\n", pty, pty->ref); TRACE("attr:%s\n", debugstr_guid(&(pty->TypeAttr.guid))); @@ -1293,7 +1293,7 @@ static void dump_TypeInfo(ITypeInfoImpl dump_TLBImplType(pty->impltypelist); } -static void dump_VARDESC(VARDESC *v) +static void dump_VARDESC(const VARDESC *v) { MESSAGE("memid %ld\n",v->memid); MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema)); Index: wine/dlls/oleaut32/typelib.h diff -u -p wine/dlls/oleaut32/typelib.h:1.23 wine/dlls/oleaut32/typelib.h:1.24 --- wine/dlls/oleaut32/typelib.h:1.23 1 Dec 2005 12: 2:36 -0000 +++ wine/dlls/oleaut32/typelib.h 1 Dec 2005 12: 2:36 -0000 @@ -601,7 +601,7 @@ WORD typeofarray #include "poppack.h" extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); -extern void dump_Variant(VARIANT * pvar); +extern void dump_Variant(const VARIANT * pvar); HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);

1 0

wine/dlls/shdocvw oleobject.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21598 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:16 Modified files: dlls/shdocvw : oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added implementation of OLEIVERB_SHOW in DoVerb. Patch: http://cvs.winehq.org/patch.py?id=21598 Old revision New revision Changes Path 1.22 1.23 +19 -1 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.22 wine/dlls/shdocvw/oleobject.c:1.23 --- wine/dlls/shdocvw/oleobject.c:1.22 1 Dec 2005 12: 2:16 -0000 +++ wine/dlls/shdocvw/oleobject.c 1 Dec 2005 12: 2:16 -0000 @@ -192,11 +192,14 @@ static HRESULT WINAPI OleObject_DoVerb(I WebBrowser *This = OLEOBJ_THIS(iface); HRESULT hres; + static const WCHAR wszitem[] = {'i','t','e','m',0}; + TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); switch (iVerb) { + case OLEIVERB_SHOW: case OLEIVERB_INPLACEACTIVATE: { IOleInPlaceSite *inplace; @@ -229,7 +232,8 @@ static HRESULT WINAPI OleObject_DoVerb(I &This->frameinfo); - IOleInPlaceSite_Release(inplace); + if(iVerb == OLEIVERB_INPLACEACTIVATE) + IOleInPlaceSite_Release(inplace); SetWindowPos(This->shell_embedding_hwnd, NULL, This->pos_rect.left, This->pos_rect.top, @@ -245,6 +249,20 @@ static HRESULT WINAPI OleObject_DoVerb(I if(This->frame) IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + if(iVerb == OLEIVERB_INPLACEACTIVATE) + return S_OK; + + TRACE("OLEIVERB_SHOW\n"); + + IOleInPlaceSite_OnUIActivate(inplace); + IOleInPlaceSite_Release(inplace); + + IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + + /* TODO: + * IOleInPlaceFrmae_SetMenu + */ + return S_OK; } default:

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21597 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:02:09 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Remove broken return value handling code and that would reference memory beyond the end of the arguments array. Replace it with code that properly handles referencing the return type and setting the return type to VT_VOID when a dispinterface function doesn't have any return value. Patch: http://cvs.winehq.org/patch.py?id=21597 Old revision New revision Changes Path 1.182 1.183 +27 -32 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.182 wine/dlls/oleaut32/typelib.c:1.183 --- wine/dlls/oleaut32/typelib.c:1.182 1 Dec 2005 12: 2: 9 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 2: 9 -0000 @@ -1861,43 +1861,38 @@ MSFT_DoFuncs(TLBContext* pcx, recoffset + reclength - ((pFuncRec->nrargs - j - 1) * sizeof(MSFT_ParameterInfo))); } + } - /* parameter is the return value! */ - if ( paraminfo.Flags & PARAMFLAG_FRETVAL ) + /* special treatment for dispinterfaces: this makes functions appear + * to return their [retval] value when it is really returning an + * HRESULT */ + if ((pTI->TypeAttr.typekind == TKIND_DISPATCH) && + (*pptfd)->funcdesc.elemdescFunc.tdesc.vt == VT_HRESULT) + { + if (pFuncRec->nrargs && + ((*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) { - TYPEDESC* lpArgTypeDesc; - - (*pptfd)->funcdesc.elemdescFunc = - (*pptfd)->funcdesc.lprgelemdescParam[j]; - - lpArgTypeDesc = & ((*pptfd)->funcdesc.elemdescFunc.tdesc) ; - - while ( lpArgTypeDesc != NULL ) + ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1]; + if (elemdesc->tdesc.vt != VT_PTR) { - switch ( lpArgTypeDesc->vt ) - { - case VT_PTR: - lpArgTypeDesc = lpArgTypeDesc->u.lptdesc; - break; - case VT_CARRAY: - lpArgTypeDesc = - & (lpArgTypeDesc->u.lpadesc->tdescElem); - - break; - - case VT_USERDEFINED: - MSFT_DoRefType(pcx, - pTI, - lpArgTypeDesc->u.hreftype); - - lpArgTypeDesc = NULL; - break; - - default: - lpArgTypeDesc = NULL; - } + ERR_(typelib)("elemdesc should have started with VT_PTR instead of:\n"); + if (ERR_ON(typelib)) + dump_ELEMDESC(elemdesc); + /* FIXME: return error */ + break; } + + (*pptfd)->funcdesc.elemdescFunc = *elemdesc; + + /* dereference parameter */ + (*pptfd)->funcdesc.elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; + + pFuncRec->nrargs--; + (*pptfd)->funcdesc.cParams = pFuncRec->nrargs; } + else + (*pptfd)->funcdesc.elemdescFunc.tdesc.vt = VT_VOID; + } /* scode is not used: archaic win16 stuff FIXME: right? */

1 0

wine/dlls/msvcrt except.c msvcrt.h tests/headers.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21596 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:51 Modified files: dlls/msvcrt : except.c msvcrt.h dlls/msvcrt/tests: headers.c Log message: Prefix signal definitions with MSVCRT_ to avoid conflicts with system headers. Patch: http://cvs.winehq.org/patch.py?id=21596 Old revision New revision Changes Path 1.37 1.38 +24 -25 wine/dlls/msvcrt/except.c 1.39 1.40 +16 -0 wine/dlls/msvcrt/msvcrt.h 1.9 1.10 +10 -0 wine/dlls/msvcrt/tests/headers.c Index: wine/dlls/msvcrt/except.c diff -u -p wine/dlls/msvcrt/except.c:1.37 wine/dlls/msvcrt/except.c:1.38 --- wine/dlls/msvcrt/except.c:1.37 1 Dec 2005 12: 1:51 -0000 +++ wine/dlls/msvcrt/except.c 1 Dec 2005 12: 1:51 -0000 @@ -40,7 +40,6 @@ #include "excpt.h" #include "wincon.h" #include "msvcrt/float.h" -#include "msvcrt/signal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -380,7 +379,7 @@ void __stdcall _seh_longjmp_unwind(struc } #endif /* i386 */ -static __sighandler_t sighandlers[NSIG] = { SIG_DFL }; +static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL }; static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) { @@ -389,10 +388,10 @@ static BOOL WINAPI msvcrt_console_handle switch (ctrlType) { case CTRL_C_EVENT: - if (sighandlers[SIGINT]) + if (sighandlers[MSVCRT_SIGINT]) { - if (sighandlers[SIGINT] != SIG_IGN) - sighandlers[SIGINT](SIGINT); + if (sighandlers[MSVCRT_SIGINT] != MSVCRT_SIG_IGN) + sighandlers[MSVCRT_SIGINT](MSVCRT_SIGINT); ret = TRUE; } break; @@ -427,10 +426,10 @@ static LONG WINAPI msvcrt_exception_filt switch (except->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: - if (sighandlers[SIGSEGV]) + if (sighandlers[MSVCRT_SIGSEGV]) { - if (sighandlers[SIGSEGV] != SIG_IGN) - sighandlers[SIGSEGV](SIGSEGV); + if (sighandlers[MSVCRT_SIGSEGV] != MSVCRT_SIG_IGN) + sighandlers[MSVCRT_SIGSEGV](MSVCRT_SIGSEGV); ret = EXCEPTION_CONTINUE_EXECUTION; } break; @@ -446,13 +445,13 @@ static LONG WINAPI msvcrt_exception_filt case EXCEPTION_FLT_OVERFLOW: case EXCEPTION_FLT_STACK_CHECK: case EXCEPTION_FLT_UNDERFLOW: - if (sighandlers[SIGFPE]) + if (sighandlers[MSVCRT_SIGFPE]) { - if (sighandlers[SIGFPE] != SIG_IGN) + if (sighandlers[MSVCRT_SIGFPE] != MSVCRT_SIG_IGN) { int i, float_signal = _FPE_INVALID; - float_handler handler = (float_handler)sighandlers[SIGFPE]; + float_handler handler = (float_handler)sighandlers[MSVCRT_SIGFPE]; for (i = 0; i < sizeof(float_exception_map) / sizeof(float_exception_map[0]); i++) if (float_exception_map[i].status == @@ -461,16 +460,16 @@ static LONG WINAPI msvcrt_exception_filt float_signal = float_exception_map[i].signal; break; } - handler(SIGFPE, float_signal); + handler(MSVCRT_SIGFPE, float_signal); } ret = EXCEPTION_CONTINUE_EXECUTION; } break; case EXCEPTION_ILLEGAL_INSTRUCTION: - if (sighandlers[SIGILL]) + if (sighandlers[MSVCRT_SIGILL]) { - if (sighandlers[SIGILL] != SIG_IGN) - sighandlers[SIGILL](SIGILL); + if (sighandlers[MSVCRT_SIGILL] != MSVCRT_SIG_IGN) + sighandlers[MSVCRT_SIGILL](MSVCRT_SIGILL); ret = EXCEPTION_CONTINUE_EXECUTION; } break; @@ -497,30 +496,30 @@ void msvcrt_free_signals(void) * Some signals may never be generated except through an explicit call to * raise. */ -__sighandler_t MSVCRT_signal(int sig, __sighandler_t func) +MSVCRT___sighandler_t MSVCRT_signal(int sig, MSVCRT___sighandler_t func) { - __sighandler_t ret = SIG_ERR; + MSVCRT___sighandler_t ret = MSVCRT_SIG_ERR; TRACE("(%d, %p)\n", sig, func); - if (func == SIG_ERR) return SIG_ERR; + if (func == MSVCRT_SIG_ERR) return MSVCRT_SIG_ERR; switch (sig) { /* Cases handled internally. Note SIGTERM is never generated by Windows, * so we effectively mask it. */ - case SIGABRT: - case SIGFPE: - case SIGILL: - case SIGSEGV: - case SIGINT: - case SIGTERM: + case MSVCRT_SIGABRT: + case MSVCRT_SIGFPE: + case MSVCRT_SIGILL: + case MSVCRT_SIGSEGV: + case MSVCRT_SIGINT: + case MSVCRT_SIGTERM: ret = sighandlers[sig]; sighandlers[sig] = func; break; default: - ret = SIG_ERR; + ret = MSVCRT_SIG_ERR; } return ret; } Index: wine/dlls/msvcrt/msvcrt.h diff -u -p wine/dlls/msvcrt/msvcrt.h:1.39 wine/dlls/msvcrt/msvcrt.h:1.40 --- wine/dlls/msvcrt/msvcrt.h:1.39 1 Dec 2005 12: 1:51 -0000 +++ wine/dlls/msvcrt/msvcrt.h 1 Dec 2005 12: 1:51 -0000 @@ -555,6 +555,22 @@ struct MSVCRT__stati64 { #define MSVCRT_CLOCKS_PER_SEC 1000 +/* signals */ +#define MSVCRT_SIGINT 2 +#define MSVCRT_SIGILL 4 +#define MSVCRT_SIGFPE 8 +#define MSVCRT_SIGSEGV 11 +#define MSVCRT_SIGTERM 15 +#define MSVCRT_SIGBREAK 21 +#define MSVCRT_SIGABRT 22 +#define MSVCRT_NSIG (MSVCRT_SIGABRT + 1) + +typedef void (*MSVCRT___sighandler_t)(int); + +#define MSVCRT_SIG_DFL ((MSVCRT___sighandler_t)0) +#define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) +#define MSVCRT_SIG_ERR ((MSVCRT___sighandler_t)-1) + void MSVCRT_free(void*); void* MSVCRT_malloc(MSVCRT_size_t); void* MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); Index: wine/dlls/msvcrt/tests/headers.c diff -u -p wine/dlls/msvcrt/tests/headers.c:1.9 wine/dlls/msvcrt/tests/headers.c:1.10 --- wine/dlls/msvcrt/tests/headers.c:1.9 1 Dec 2005 12: 1:51 -0000 +++ wine/dlls/msvcrt/tests/headers.c 1 Dec 2005 12: 1:51 -0000 @@ -48,6 +48,7 @@ #include "conio.h" #include "process.h" #include "string.h" +#include "signal.h" #include "time.h" #include "locale.h" #include "setjmp.h" @@ -96,6 +97,7 @@ static void test_types(void) CHECK_TYPE(_se_translator_function); CHECK_TYPE(_beginthread_start_routine_t); CHECK_TYPE(_onexit_t); + CHECK_TYPE(__sighandler_t); } /************* Checking structs ***************/ @@ -437,6 +439,14 @@ static void test_defines(void) CHECK_DEF("_FPCLASS_PD", _FPCLASS_PD, MSVCRT__FPCLASS_PD); CHECK_DEF("_FPCLASS_PN", _FPCLASS_PN, MSVCRT__FPCLASS_PN); CHECK_DEF("_FPCLASS_PINF", _FPCLASS_PINF, MSVCRT__FPCLASS_PINF); + CHECK_DEF("SIGINT", SIGINT, MSVCRT_SIGINT); + CHECK_DEF("SIGILL", SIGILL, MSVCRT_SIGILL); + CHECK_DEF("SIGFPE", SIGFPE, MSVCRT_SIGFPE); + CHECK_DEF("SIGSEGV", SIGSEGV, MSVCRT_SIGSEGV); + CHECK_DEF("SIGTERM", SIGTERM, MSVCRT_SIGTERM); + CHECK_DEF("SIGBREAK", SIGBREAK, MSVCRT_SIGBREAK); + CHECK_DEF("SIGABRT", SIGABRT, MSVCRT_SIGABRT); + CHECK_DEF("NSIG", NSIG, MSVCRT_NSIG); #ifdef __i386__ CHECK_DEF("_EM_INVALID", _EM_INVALID, MSVCRT__EM_INVALID); CHECK_DEF("_EM_DENORMAL", _EM_DENORMAL, MSVCRT__EM_DENORMAL);

1 0

wine/ dlls/ntdll/cdrom.c dlls/ntdll/file.c inc ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21595 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:43 Modified files: dlls/ntdll : cdrom.c file.c include : winsock2.h programs/regedit: treeview.c server : registry.c Log message: Fixed some compiler warnings on Darwin. Patch: http://cvs.winehq.org/patch.py?id=21595 Old revision New revision Changes Path 1.74 1.75 +26 -28 wine/dlls/ntdll/cdrom.c 1.106 1.107 +6 -6 wine/dlls/ntdll/file.c 1.28 1.29 +1 -0 wine/include/winsock2.h 1.17 1.18 +14 -18 wine/programs/regedit/treeview.c 1.84 1.85 +1 -1 wine/server/registry.c

1 0

wine/programs/notepad dialog.c main.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21594 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:18 Modified files: programs/notepad: dialog.c main.c Log message: Pavel Roskin <proski(a)gnu.org> Improve font support in Notepad. Patch: http://cvs.winehq.org/patch.py?id=21594 Old revision New revision Changes Path 1.31 1.32 +1 -1 wine/programs/notepad/dialog.c 1.36 1.37 +31 -0 wine/programs/notepad/main.c Index: wine/programs/notepad/dialog.c diff -u -p wine/programs/notepad/dialog.c:1.31 wine/programs/notepad/dialog.c:1.32 --- wine/programs/notepad/dialog.c:1.31 1 Dec 2005 12: 1:18 -0000 +++ wine/programs/notepad/dialog.c 1 Dec 2005 12: 1:18 -0000 @@ -620,7 +620,7 @@ VOID DIALOG_SelectFont(VOID) cf.lStructSize=sizeof(cf); cf.hwndOwner=Globals.hMainWnd; cf.lpLogFont=&lf; - cf.Flags=CF_SCREENFONTS; + cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; if( ChooseFont(&cf) ) { Index: wine/programs/notepad/main.c diff -u -p wine/programs/notepad/main.c:1.36 wine/programs/notepad/main.c:1.37 --- wine/programs/notepad/main.c:1.36 1 Dec 2005 12: 1:18 -0000 +++ wine/programs/notepad/main.c 1 Dec 2005 12: 1:18 -0000 @@ -49,6 +49,36 @@ VOID SetFileName(LPCWSTR szFileName) /*********************************************************************** * + * NOTEPAD_InitFont + * + * Initialize font for the edit window + */ +static VOID NOTEPAD_InitFont() +{ + LOGFONT *lf = &Globals.lfFont; + static const WCHAR systemW[] = { 'S','y','s','t','e','m',0 }; + + lf->lfHeight = -10; + lf->lfWidth = 0; + lf->lfEscapement = 0; + lf->lfOrientation = 0; + lf->lfWeight = FW_BOLD; + lf->lfItalic = FALSE; + lf->lfUnderline = FALSE; + lf->lfStrikeOut = FALSE; + lf->lfCharSet = DEFAULT_CHARSET; + lf->lfOutPrecision = OUT_DEFAULT_PRECIS; + lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf->lfQuality = DEFAULT_QUALITY; + lf->lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; + lstrcpy(lf->lfFaceName, systemW); + + Globals.hFont = CreateFontIndirect(lf); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); +} + +/*********************************************************************** + * * NOTEPAD_MenuCommand * * All handling of main menu events @@ -153,6 +183,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HW ES_AUTOVSCROLL | ES_MULTILINE, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); + NOTEPAD_InitFont(); break; }

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21593 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:01:12 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Introduce a variable "elemdesc" to eliminate some long common expressions. Move the contents of the second arguments loop inside the first. Move the MSFT_ReadLEDWords so that it is the last statement in the loop since it is one of the iterators. Patch: http://cvs.winehq.org/patch.py?id=21593 Old revision New revision Changes Path 1.181 1.182 +39 -43 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.181 wine/dlls/oleaut32/typelib.c:1.182 --- wine/dlls/oleaut32/typelib.c:1.181 1 Dec 2005 12: 1:12 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 1:12 -0000 @@ -1780,14 +1780,15 @@ MSFT_DoFuncs(TLBContext* pcx, for ( j = 0 ; j < pFuncRec->nrargs ; j++ ) { - TYPEDESC* lpArgTypeDesc = 0; + TYPEDESC *lpArgTypeDesc; + ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[j]; MSFT_GetTdesc(pcx, paraminfo.DataType, - &(*pptfd)->funcdesc.lprgelemdescParam[j].tdesc, + &elemdesc->tdesc, pTI); - (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags = paraminfo.Flags; + elemdesc->u.paramdesc.wParamFlags = paraminfo.Flags; /* name */ if (paraminfo.oName == -1) @@ -1800,17 +1801,9 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w((*pptfd)->pParamDesc[j].Name)); - /* SEEK value = jump to offset, - * from there jump to the end of record, - * go back by (j-1) arguments - */ - MSFT_ReadLEDWords( &paraminfo , - sizeof(MSFT_ParameterInfo), pcx, - recoffset + reclength - ((pFuncRec->nrargs - j - 1) - * sizeof(MSFT_ParameterInfo))); - lpArgTypeDesc = - & ((*pptfd)->funcdesc.lprgelemdescParam[j].tdesc); + lpArgTypeDesc = &elemdesc->tdesc; + /* resolve referenced type if any */ while ( lpArgTypeDesc != NULL ) { switch ( lpArgTypeDesc->vt ) @@ -1834,8 +1827,40 @@ MSFT_DoFuncs(TLBContext* pcx, lpArgTypeDesc = NULL; } } - } + /* default value */ + if ( (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) && + (pFuncRec->FKCCIC & 0x1000) ) + { + INT* pInt = (INT *)((char *)pFuncRec + + reclength - + (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); + + PARAMDESC* pParamDesc = &elemdesc->u.paramdesc; + + pParamDesc->pparamdescex = TLB_Alloc(sizeof(PARAMDESCEX)); + pParamDesc->pparamdescex->cBytes = sizeof(PARAMDESCEX); + + MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), + pInt[j], pcx); + } + /* custom info */ + if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) + { + MSFT_CustData(pcx, + pFuncRec->OptAttr[7+j], + &(*pptfd)->pParamDesc[j].pCustData); + } + + /* SEEK value = jump to offset, + * from there jump to the end of record, + * go back by (j-1) arguments + */ + MSFT_ReadLEDWords( &paraminfo , + sizeof(MSFT_ParameterInfo), pcx, + recoffset + reclength - ((pFuncRec->nrargs - j - 1) + * sizeof(MSFT_ParameterInfo))); + } /* parameter is the return value! */ if ( paraminfo.Flags & PARAMFLAG_FRETVAL ) @@ -1873,35 +1898,6 @@ MSFT_DoFuncs(TLBContext* pcx, } } } - - /* second time around */ - for(j=0;j<pFuncRec->nrargs;j++) - { - /* default value */ - if ( (PARAMFLAG_FHASDEFAULT & - (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc.wParamFlags) && - ((pFuncRec->FKCCIC) & 0x1000) ) - { - INT* pInt = (INT *)((char *)pFuncRec + - reclength - - (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); - - PARAMDESC* pParamDesc = & (*pptfd)->funcdesc.lprgelemdescParam[j].u.paramdesc; - - pParamDesc->pparamdescex = TLB_Alloc(sizeof(PARAMDESCEX)); - pParamDesc->pparamdescex->cBytes = sizeof(PARAMDESCEX); - - MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), - pInt[j], pcx); - } - /* custom info */ - if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) - { - MSFT_CustData(pcx, - pFuncRec->OptAttr[7+j], - &(*pptfd)->pParamDesc[j].pCustData); - } - } } /* scode is not used: archaic win16 stuff FIXME: right? */

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21592 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:52 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Don't truncate large integer constants. Patch: http://cvs.winehq.org/patch.py?id=21592 Old revision New revision Changes Path 1.180 1.181 +1 -1 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.180 wine/dlls/oleaut32/typelib.c:1.181 --- wine/dlls/oleaut32/typelib.c:1.180 1 Dec 2005 12: 0:52 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 0:52 -0000 @@ -1532,7 +1532,7 @@ static void MSFT_ReadValue( VARIANT * pV if(offset <0) { /* data are packed in here */ V_VT(pVar) = (offset & 0x7c000000 )>> 26; - V_I2(pVar) = offset & 0x3ffffff; + V_I4(pVar) = offset & 0x3ffffff; return; } MSFT_ReadLEWords(&(V_VT(pVar)), sizeof(VARTYPE), pcx,

1 0

wine/dlls/shdocvw oleobject.c shdocvw.h webbro ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21591 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:33 Modified files: dlls/shdocvw : oleobject.c shdocvw.h webbrowser.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added IOleInPlaceActiveObject stub implementation. Patch: http://cvs.winehq.org/patch.py?id=21591 Old revision New revision Changes Path 1.21 1.22 +95 -5 wine/dlls/shdocvw/oleobject.c 1.36 1.37 +2 -0 wine/dlls/shdocvw/shdocvw.h 1.30 1.31 +3 -0 wine/dlls/shdocvw/webbrowser.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.21 wine/dlls/shdocvw/oleobject.c:1.22 --- wine/dlls/shdocvw/oleobject.c:1.21 1 Dec 2005 12: 0:33 -0000 +++ wine/dlls/shdocvw/oleobject.c 1 Dec 2005 12: 0:33 -0000 @@ -116,7 +116,7 @@ static HRESULT WINAPI OleObject_SetClien This->client = pClientSite; if(!pClientSite) return S_OK; - + IOleClientSite_AddRef(pClientSite); create_shell_embedding_hwnd(This); @@ -237,7 +237,6 @@ static HRESULT WINAPI OleObject_DoVerb(I This->pos_rect.bottom-This->pos_rect.top, SWP_NOZORDER | SWP_SHOWWINDOW); - if(This->client) { IOleClientSite_ShowObject(This->client); IOleClientSite_GetContainer(This->client, &This->container); @@ -556,11 +555,102 @@ static const IOleControlVtbl OleControlV OleControl_FreezeEvents }; +#define ACTIVEOBJ_THIS(iface) DEFINE_THIS(WebBrowser, OleInPlaceActiveObject, iface) + +static HRESULT WINAPI InPlaceActiveObject_QueryInterface(IOleInPlaceActiveObject *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER2(This), riid, ppv); +} + +static ULONG WINAPI InPlaceActiveObject_AddRef(IOleInPlaceActiveObject *iface) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER2(This)); +} + +static ULONG WINAPI InPlaceActiveObject_Release(IOleInPlaceActiveObject *iface) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER2(This)); +} + +static HRESULT WINAPI InPlaceActiveObject_GetWindow(IOleInPlaceActiveObject *iface, + HWND *phwnd) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IOleInPlaceObject_GetWindow(INPLACEOBJ(This), phwnd); +} + +static HRESULT WINAPI InPlaceActiveObject_ContextSensitiveHelp(IOleInPlaceActiveObject *iface, + BOOL fEnterMode) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IOleInPlaceObject_ContextSensitiveHelp(INPLACEOBJ(This), fEnterMode); +} + +static HRESULT WINAPI InPlaceActiveObject_TranslateAccelerator(IOleInPlaceActiveObject *iface, + LPMSG lpmsg) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, lpmsg); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_ResizeBorder(IOleInPlaceActiveObject *iface, + LPCRECT lprcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fFrameWindow) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%p %p %x)\n", This, lprcBorder, pUIWindow, fFrameWindow); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_EnableModeless(IOleInPlaceActiveObject *iface, + BOOL fEnable) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnable); + return E_NOTIMPL; +} + +#undef ACTIVEOBJ_THIS + +static const IOleInPlaceActiveObjectVtbl OleInPlaceActiveObjectVtbl = { + InPlaceActiveObject_QueryInterface, + InPlaceActiveObject_AddRef, + InPlaceActiveObject_Release, + InPlaceActiveObject_GetWindow, + InPlaceActiveObject_ContextSensitiveHelp, + InPlaceActiveObject_TranslateAccelerator, + InPlaceActiveObject_OnFrameWindowActivate, + InPlaceActiveObject_OnDocWindowActivate, + InPlaceActiveObject_ResizeBorder, + InPlaceActiveObject_EnableModeless +}; + void WebBrowser_OleObject_Init(WebBrowser *This) { - This->lpOleObjectVtbl = &OleObjectVtbl; - This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; - This->lpOleControlVtbl = &OleControlVtbl; + This->lpOleObjectVtbl = &OleObjectVtbl; + This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; + This->lpOleControlVtbl = &OleControlVtbl; + This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl; This->client = NULL; This->container = NULL; Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.36 wine/dlls/shdocvw/shdocvw.h:1.37 --- wine/dlls/shdocvw/shdocvw.h:1.36 1 Dec 2005 12: 0:33 -0000 +++ wine/dlls/shdocvw/shdocvw.h 1 Dec 2005 12: 0:33 -0000 @@ -71,6 +71,7 @@ typedef struct { const IQuickActivateVtbl *lpQuickActivateVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; + const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; /* Interfaces available for embeded document */ @@ -125,6 +126,7 @@ typedef struct { #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); +#define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.30 wine/dlls/shdocvw/webbrowser.c:1.31 --- wine/dlls/shdocvw/webbrowser.c:1.30 1 Dec 2005 12: 0:34 -0000 +++ wine/dlls/shdocvw/webbrowser.c 1 Dec 2005 12: 0:34 -0000 @@ -94,6 +94,9 @@ static HRESULT WINAPI WebBrowser_QueryIn }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2 %p)\n", This, ppv); *ppv = VIEWOBJ2(This); + }else if(IsEqualGUID(&IID_IOleInPlaceActiveObject, riid)) { + TRACE("(%p)->(IID_IOleInPlaceActiveObject %p)\n", This, ppv); + *ppv = ACTIVEOBJ(This); } if(*ppv) {

1 0

wine/ dlls/advpack/advpack.c dlls/advpack/advp ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21590 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:26 Modified files: dlls/advpack : advpack.c advpack.spec include : advpub.h Log message: James Hawkins <truiken(a)gmail.com> Add a stub for AdvInstallFile. Patch: http://cvs.winehq.org/patch.py?id=21590 Old revision New revision Changes Path 1.16 1.17 +34 -0 wine/dlls/advpack/advpack.c 1.11 1.12 +1 -1 wine/dlls/advpack/advpack.spec 1.7 1.8 +14 -0 wine/include/advpub.h Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.16 wine/dlls/advpack/advpack.c:1.17 --- wine/dlls/advpack/advpack.c:1.16 1 Dec 2005 12: 0:26 -0000 +++ wine/dlls/advpack/advpack.c 1 Dec 2005 12: 0:26 -0000 @@ -36,6 +36,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); typedef HRESULT (WINAPI *DLLREGISTER) (void); +/*********************************************************************** + * AdvInstallFile (ADVPACK.@) + * + * Copies a file from the source to a destination. + * + * PARAMS + * hwnd [I] Handle to the window used for messages. + * lpszSourceDir [I] Source directory. + * lpszSourceFile [I] Source filename. + * lpszDestDir [I] Destination directory. + * lpszDestFile [I] Optional destination filename. + * dwFlags [I] See advpub.h. + * dwReserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * If lpszDestFile is NULL, the destination filename is the same as + * lpszSourceFIle. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, + LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) +{ + FIXME("(%p,%p,%p,%p,%p,%ld,%ld) stub\n", hwnd, debugstr_a(lpszSourceDir), + debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), + debugstr_a(lpszDestFile), dwFlags, dwReserved); + return E_FAIL; +} /*********************************************************************** * DllMain (ADVPACK.@) Index: wine/dlls/advpack/advpack.spec diff -u -p wine/dlls/advpack/advpack.spec:1.11 wine/dlls/advpack/advpack.spec:1.12 --- wine/dlls/advpack/advpack.spec:1.11 1 Dec 2005 12: 0:26 -0000 +++ wine/dlls/advpack/advpack.spec 1 Dec 2005 12: 0:26 -0000 @@ -1,5 +1,5 @@ @ stub AddDelBackupEntry -@ stub AdvInstallFile +@ stdcall AdvInstallFile(long str str str str long long) @ stub CloseINFEngine @ stdcall DelNode(str long) @ stdcall DelNodeRunDLL32(ptr ptr str long) Index: wine/include/advpub.h diff -u -p wine/include/advpub.h:1.7 wine/include/advpub.h:1.8 --- wine/include/advpub.h:1.7 1 Dec 2005 12: 0:26 -0000 +++ wine/include/advpub.h 1 Dec 2005 12: 0:26 -0000 @@ -46,6 +46,17 @@ typedef struct _StrTable { typedef const STRTABLE CSTRTABLE; typedef CSTRTABLE *LPCSTRTABLE; +/* Flags for AdvInstallFile */ +#define AIF_WARNIFSKIP 0x00000001 +#define AIF_NOSKIP 0x00000002 +#define AIF_NOVERSIONCHECK 0x00000004 +#define AIF_FORCE_FILE_IN_USE 0x00000008 +#define AIF_NOOVERWRITE 0x00000010 +#define AIF_NO_VERSION_DIALOG 0x00000020 +#define AIF_REPLACEONLY 0x00000400 +#define AIF_NOLANGUAGECHECK 0x10000000 +#define AIF_QUIET 0x20000000 + /* Flags for RunSetupCommand */ #define RSC_FLAG_INF 0x00000001 #define RSC_FLAG_SKIPDISKSPACECHECK 0x00000002 @@ -61,6 +72,9 @@ typedef CSTRTABLE *LPCSTRTABLE; #define ADN_DONT_DEL_DIR 0x00000004 #define ADN_DEL_UNC_PATHS 0x00000008 +HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, + LPCSTR lpszSourceFile, LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved); HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags); HRESULT WINAPI DelNodeRunDLL32(HWND,HINSTANCE,LPSTR,INT); HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved );

1 0

wine/ ./configure ./configure.ac dlls/wininet/ ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21589 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:19 Modified files: . : configure configure.ac dlls/wininet : netconnection.c include : config.h.in Log message: Robert Shearman <rob(a)codeweavers.com> Cleanup SSL connections properly, do a few security checks in NETCON_secure_connect and display errors from SSL on failure. Don't use SSL_set_bio as SSL_set_fd is cleaner for us. Patch: http://cvs.winehq.org/patch.py?id=21589 Old revision New revision Changes Path 1.720 1.721 +2 -0 wine/configure 1.416 1.417 +1 -0 wine/configure.ac 1.16 1.17 +114 -28 wine/dlls/wininet/netconnection.c 1.235 1.236 +3 -0 wine/include/config.h.in

1 0

wine/dlls/user listbox.c tests/listbox.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21588 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:59:24 Modified files: dlls/user : listbox.c dlls/user/tests: listbox.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a test for LB_SELITEMRANGE, make it pass under Wine. Patch: http://cvs.winehq.org/patch.py?id=21588 Old revision New revision Changes Path 1.25 1.26 +7 -5 wine/dlls/user/listbox.c 1.11 1.12 +87 -0 wine/dlls/user/tests/listbox.c Index: wine/dlls/user/listbox.c diff -u -p wine/dlls/user/listbox.c:1.25 wine/dlls/user/listbox.c:1.26 --- wine/dlls/user/listbox.c:1.25 1 Dec 2005 11:59:24 -0000 +++ wine/dlls/user/listbox.c 1 Dec 2005 11:59:24 -0000 @@ -1380,11 +1380,13 @@ static LRESULT LISTBOX_SelectItemRange( /* A few sanity checks */ if (descr->style & LBS_NOSEL) return LB_ERR; - if ((last == -1) && (descr->nb_items == 0)) return LB_OKAY; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - if (last == -1) last = descr->nb_items - 1; - if ((first < 0) || (first >= descr->nb_items)) return LB_ERR; - if ((last < 0) || (last >= descr->nb_items)) return LB_ERR; + + if (!descr->nb_items) return LB_OKAY; + + if (last >= descr->nb_items) last = descr->nb_items - 1; + if (first < 0) first = 0; + if (last < first) return LB_OKAY; if (on) /* Turn selection on */ { @@ -1424,7 +1426,7 @@ static LRESULT LISTBOX_SetSelection( LB_ if (descr->style & LBS_MULTIPLESEL) { if (index == -1) /* Select all items */ - return LISTBOX_SelectItemRange( descr, 0, -1, on ); + return LISTBOX_SelectItemRange( descr, 0, descr->nb_items, on ); else /* Only one item */ return LISTBOX_SelectItemRange( descr, index, index, on ); } Index: wine/dlls/user/tests/listbox.c diff -u -p wine/dlls/user/tests/listbox.c:1.11 wine/dlls/user/tests/listbox.c:1.12 --- wine/dlls/user/tests/listbox.c:1.11 1 Dec 2005 11:59:24 -0000 +++ wine/dlls/user/tests/listbox.c 1 Dec 2005 11:59:24 -0000 @@ -304,6 +304,92 @@ static void test_ownerdraw(void) DestroyWindow(parent); } +#define listbox_test_query(exp, got) \ + ok(exp.selected == got.selected, "expected selected %d, got %d\n", exp.selected, got.selected); \ + ok(exp.anchor == got.anchor, "expected anchor %d, got %d\n", exp.anchor, got.anchor); \ + ok(exp.caret == got.caret, "expected caret %d, got %d\n", exp.caret, got.caret); \ + ok(exp.selcount == got.selcount, "expected selcount %d, got %d\n", exp.selcount, got.selcount); + +static void test_selection(void) +{ + static const struct listbox_stat test_nosel = { 0, LB_ERR, 0, 0 }; + static const struct listbox_stat test_1 = { 0, LB_ERR, 0, 2 }; + static const struct listbox_stat test_2 = { 0, LB_ERR, 0, 3 }; + static const struct listbox_stat test_3 = { 0, LB_ERR, 0, 4 }; + HWND hLB; + struct listbox_stat answer; + INT ret; + + trace("testing LB_SELITEMRANGE\n"); + + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + assert(hLB); + + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 4)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_3, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(-5, 5)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(4, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(10, 1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, -1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + DestroyWindow(hLB); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -376,4 +462,5 @@ START_TEST(listbox) check_item_height(); test_ownerdraw(); + test_selection(); }

1 0

wine/dlls/stdole2.tlb std_ole_v2.idl
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21587 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:59:11 Modified files: dlls/stdole2.tlb: std_ole_v2.idl Log message: Robert Shearman <rob(a)codeweavers.com> Fix the entry attributes of the two module functions and uncomment LoadPicture, but comment out the defaultvalue attribute that causes widl to issue a warning. Patch: http://cvs.winehq.org/patch.py?id=21587 Old revision New revision Changes Path 1.1 1.2 +4 -6 wine/dlls/stdole2.tlb/std_ole_v2.idl Index: wine/dlls/stdole2.tlb/std_ole_v2.idl diff -u -p wine/dlls/stdole2.tlb/std_ole_v2.idl:1.1 wine/dlls/stdole2.tlb/std_ole_v2.idl:1.2 --- wine/dlls/stdole2.tlb/std_ole_v2.idl:1.1 1 Dec 2005 11:59:11 -0000 +++ wine/dlls/stdole2.tlb/std_ole_v2.idl 1 Dec 2005 11:59:11 -0000 @@ -397,21 +397,19 @@ library stdole helpcontext(0x2775) ] module StdFunctions{ - /* FIXME: widl can't cope with a defaultvalue of an enum parameter yet. */ - /* [ - entry(0x60000000), + entry("OleLoadPictureFileEx"), helpstring("Loads a picture from a file"), helpcontext(0x2775) ] HRESULT LoadPicture([in, optional] VARIANT filename, [in, optional, defaultvalue(0)] int widthDesired, [in, optional, defaultvalue(0)] int heightDesired, - [in, optional, defaultvalue(0)] enum LoadPictureConstants flags, + /* FIXME: widl can't cope with a defaultvalue of an enum parameter yet. */ + [in, optional/*, defaultvalue(0)*/] enum LoadPictureConstants flags, [out, retval] IPictureDisp **retval); - */ [ - entry(0x60000001), + entry("OleSavePictureFile"), helpstring("Saves a picture to a file"), helpcontext(0x2775) ]

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21586 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:59:07 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> The pparamdescex of an ELEMDESC should only be copied if wParamFlags & PARAMFLAG_DHASDEFAULT. Make ITypeInfo_ReleaseVarDesc use TLB_FreeElemDesc. Patch: http://cvs.winehq.org/patch.py?id=21586 Old revision New revision Changes Path 1.179 1.180 +9 -9 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.179 wine/dlls/oleaut32/typelib.c:1.180 --- wine/dlls/oleaut32/typelib.c:1.179 1 Dec 2005 11:59: 7 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 11:59: 7 -0000 @@ -4333,7 +4333,7 @@ static ULONG WINAPI ITypeInfo_fnRelease( static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, LPTYPEATTR *ppTypeAttr) { - ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const ITypeInfoImpl *This = (ITypeInfoImpl *)iface; SIZE_T size; TRACE("(%p)\n",This); @@ -4382,7 +4382,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTyp static SIZE_T TLB_SizeElemDesc( const ELEMDESC *elemdesc ) { SIZE_T size = TLB_SizeTypeDesc(&elemdesc->tdesc, FALSE); - if (elemdesc->u.paramdesc.pparamdescex) + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) size += sizeof(*elemdesc->u.paramdesc.pparamdescex); return size; } @@ -4391,23 +4391,24 @@ static HRESULT TLB_CopyElemDesc( const E { memcpy(dest, src, sizeof(ELEMDESC)); *buffer = TLB_CopyTypeDesc(&dest->tdesc, &src->tdesc, *buffer); - if (src->u.paramdesc.pparamdescex) + if (src->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { const PARAMDESCEX *pparamdescex_src = src->u.paramdesc.pparamdescex; PARAMDESCEX *pparamdescex_dest = dest->u.paramdesc.pparamdescex = (PARAMDESCEX *)*buffer; *buffer += sizeof(PARAMDESCEX); memcpy(pparamdescex_dest, pparamdescex_src, sizeof(PARAMDESCEX)); VariantInit(&pparamdescex_dest->varDefaultValue); - if (src->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - return VariantCopy(&pparamdescex_dest->varDefaultValue, - (VARIANTARG *)&pparamdescex_src->varDefaultValue); + return VariantCopy(&pparamdescex_dest->varDefaultValue, + (VARIANTARG *)&pparamdescex_src->varDefaultValue); } + else + dest->u.paramdesc.pparamdescex = NULL; return S_OK; } static void TLB_FreeElemDesc( ELEMDESC *elemdesc ) { - if (elemdesc->u.paramdesc.pparamdescex) + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); } @@ -5717,8 +5718,7 @@ static void WINAPI ITypeInfo_fnReleaseVa ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)->(%p)\n", This, pVarDesc); - if (pVarDesc->elemdescVar.u.paramdesc.pparamdescex) - VariantClear(&pVarDesc->elemdescVar.u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeElemDesc(&pVarDesc->elemdescVar); if (pVarDesc->varkind == VAR_CONST) VariantClear(pVarDesc->u.lpvarValue); SysFreeString((BSTR)pVarDesc);

1 0

wine/dlls/wldap32 search.c wldap32.spec
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21585 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:49 Modified files: dlls/wldap32 : search.c wldap32.spec Log message: Steven Edwards <steven(a)codeweavers.com> Add stubs for ldap_search_init_page[A/W]. Patch: http://cvs.winehq.org/patch.py?id=21585 Old revision New revision Changes Path 1.6 1.7 +24 -0 wine/dlls/wldap32/search.c 1.30 1.31 +3 -3 wine/dlls/wldap32/wldap32.spec Index: wine/dlls/wldap32/search.c diff -u -p wine/dlls/wldap32/search.c:1.6 wine/dlls/wldap32/search.c:1.7 --- wine/dlls/wldap32/search.c:1.6 1 Dec 2005 11:58:49 -0000 +++ wine/dlls/wldap32/search.c 1 Dec 2005 11:58:49 -0000 @@ -495,3 +495,27 @@ exit: #endif return ret; } + +PLDAPSearch ldap_search_init_pageA( WLDAP32_LDAP *ld, const PCHAR name, + ULONG scope, const PCHAR filter, PCHAR attrs[], + ULONG attrsonly, PLDAPControlA* srvcontrols, + PLDAPControlA* clntcontrols, ULONG timelimit, + ULONG sizelimit, PLDAPSortKeyA* keys) +{ + FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)\n", + ld, debugstr_a(name), scope, debugstr_a(filter), attrs, + attrsonly, srvcontrols, clntcontrols, timelimit, sizelimit, keys); + return NULL; +} + +PLDAPSearch ldap_search_init_pageW( WLDAP32_LDAP *ld, const PWCHAR name, + ULONG scope, const PWCHAR filter, PWCHAR attrs[], + ULONG attrsonly, PLDAPControlW* srvcontrols, + PLDAPControlW* clntcontrols, ULONG timelimit, + ULONG sizelimit, PLDAPSortKeyW* keys) +{ + FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)\n", + ld, debugstr_w(name), scope, debugstr_w(filter), attrs, + attrsonly, srvcontrols, clntcontrols, timelimit, sizelimit, keys); + return NULL; +} Index: wine/dlls/wldap32/wldap32.spec diff -u -p wine/dlls/wldap32/wldap32.spec:1.30 wine/dlls/wldap32/wldap32.spec:1.31 --- wine/dlls/wldap32/wldap32.spec:1.30 1 Dec 2005 11:58:49 -0000 +++ wine/dlls/wldap32/wldap32.spec 1 Dec 2005 11:58:49 -0000 @@ -191,9 +191,9 @@ 201 cdecl ldap_startup(ptr ptr) 202 cdecl ldap_cleanup(long) 203 cdecl ldap_search_ext_sW(ptr wstr long wstr ptr long ptr ptr ptr long ptr) -204 stub ldap_search_init_page -205 stub ldap_search_init_pageA -206 stub ldap_search_init_pageW +204 cdecl ldap_search_init_page(ptr str long str ptr long ptr ptr ptr long ptr) ldap_search_init_pageA +205 cdecl ldap_search_init_pageA(ptr str long str ptr long ptr ptr ptr long ptr) +206 cdecl ldap_search_init_pageW(ptr wstr long wstr ptr long ptr ptr ptr long ptr) 207 cdecl ldap_search_sA(ptr str long str ptr long ptr) 208 cdecl ldap_search_sW(ptr wstr long wstr ptr long ptr) 209 cdecl ldap_search_stA(ptr str long str ptr long ptr ptr)

1 0

wine/dlls/x11drv winpos.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21584 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:41 Modified files: dlls/x11drv : winpos.c Log message: Detlef Riekenberg <wine.dev(a)web.de> Remove unused include X11/IntrinsicP.h. Patch: http://cvs.winehq.org/patch.py?id=21584 Old revision New revision Changes Path 1.143 1.144 +0 -1 wine/dlls/x11drv/winpos.c Index: wine/dlls/x11drv/winpos.c diff -u -p wine/dlls/x11drv/winpos.c:1.143 wine/dlls/x11drv/winpos.c:1.144 --- wine/dlls/x11drv/winpos.c:1.143 1 Dec 2005 11:58:41 -0000 +++ wine/dlls/x11drv/winpos.c 1 Dec 2005 11:58:41 -0000 @@ -23,7 +23,6 @@ #include <X11/Xlib.h> #ifdef HAVE_LIBXSHAPE -#include <X11/IntrinsicP.h> #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */ #include <stdarg.h>

1 0

wine/dlls/shdocvw oleobject.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21583 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:33 Modified files: dlls/shdocvw : oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added SetObjectRects implementation. Patch: http://cvs.winehq.org/patch.py?id=21583 Old revision New revision Changes Path 1.20 1.21 +12 -2 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.20 wine/dlls/shdocvw/oleobject.c:1.21 --- wine/dlls/shdocvw/oleobject.c:1.20 1 Dec 2005 11:58:33 -0000 +++ wine/dlls/shdocvw/oleobject.c 1 Dec 2005 11:58:33 -0000 @@ -454,8 +454,18 @@ static HRESULT WINAPI OleInPlaceObject_S LPCRECT lprcPosRect, LPCRECT lprcClipRect) { WebBrowser *This = INPLACEOBJ_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + + if(This->shell_embedding_hwnd) { + SetWindowPos(This->shell_embedding_hwnd, NULL, + lprcPosRect->left, lprcPosRect->top, + lprcPosRect->bottom-lprcPosRect->top, + lprcPosRect->right-lprcPosRect->left, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObject_ReactivateAndUndo(IOleInPlaceObject *iface)

1 0

wine/dlls/shdocvw client.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21582 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:27 Modified files: dlls/shdocvw : client.c Log message: Jacek Caban <jacek(a)codeweavers.com> Return S_OK in [On|Can]InPlaceActivate. Handle IOleDocumentSite in QueryInterface. Patch: http://cvs.winehq.org/patch.py?id=21582 Old revision New revision Changes Path 1.6 1.7 +14 -4 wine/dlls/shdocvw/client.c Index: wine/dlls/shdocvw/client.c diff -u -p wine/dlls/shdocvw/client.c:1.6 wine/dlls/shdocvw/client.c:1.7 --- wine/dlls/shdocvw/client.c:1.6 1 Dec 2005 11:58:27 -0000 +++ wine/dlls/shdocvw/client.c 1 Dec 2005 11:58:27 -0000 @@ -47,6 +47,9 @@ static HRESULT WINAPI ClientSite_QueryIn }else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) { TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv); *ppv = DOCHOSTUI2(This); + }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) { + TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv); + *ppv = DOCSITE(This); } if(*ppv) { @@ -168,15 +171,21 @@ static HRESULT WINAPI InPlaceSite_Contex static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSite *iface) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSite *iface) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_OnUIActivate(IOleInPlaceSite *iface) @@ -197,6 +206,7 @@ static HRESULT WINAPI InPlaceSite_GetWin *ppFrame = INPLACEFRAME(This); *ppDoc = NULL; + GetClientRect(This->doc_view_hwnd, lprcPosRect); memcpy(lprcClipRect, lprcPosRect, sizeof(RECT));

1 0

wine/dlls/gdi freetype.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21581 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:23 Modified files: dlls/gdi : freetype.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Make WineEngGetFontData always return the used byte count. Patch: http://cvs.winehq.org/patch.py?id=21581 Old revision New revision Changes Path 1.106 1.107 +14 -2 wine/dlls/gdi/freetype.c Index: wine/dlls/gdi/freetype.c diff -u -p wine/dlls/gdi/freetype.c:1.106 wine/dlls/gdi/freetype.c:1.107 --- wine/dlls/gdi/freetype.c:1.106 1 Dec 2005 11:58:23 -0000 +++ wine/dlls/gdi/freetype.c 1 Dec 2005 11:58:23 -0000 @@ -3692,9 +3692,15 @@ DWORD WineEngGetFontData(GdiFont font, D } /* If the FT_Load_Sfnt_Table function is there we'll use it */ - if(pFT_Load_Sfnt_Table) + if(pFT_Load_Sfnt_Table) { + /* make sure value of len is the value freetype says it needs */ + if( buf && len) { + DWORD needed = 0; + err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; + } err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - else { /* Do it the hard way */ + } else { /* Do it the hard way */ TT_Face tt_face = (TT_Face) ft_face; SFNT_Interface *sfnt; if (FT_Version.major==2 && FT_Version.minor==0) @@ -3707,6 +3713,12 @@ DWORD WineEngGetFontData(GdiFont font, D /* A field was added in the middle of the structure in 2.1.x */ sfnt = *(SFNT_Interface**)((char*)tt_face + 532); } + /* make sure value of len is the value freetype says it needs */ + if( buf && len) { + DWORD needed = 0; + err = sfnt->load_any(tt_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; + } err = sfnt->load_any(tt_face, table, offset, buf, &len); } if(err) {

1 0