January 2007 - Wine-commits

Francois Gouget : sfc_os: Add a prototype for SfcIsKeyProtected().
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 3845c06853b1634af4d858ea27409d0207c94691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3845c06853b1634af4d858ea2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:42:10 2007 +0100 sfc_os: Add a prototype for SfcIsKeyProtected(). --- dlls/sfc_os/sfc_os.c | 1 + include/sfc.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index db03a10..070eea7 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" #include "sfc.h" #include "wine/debug.h" diff --git a/include/sfc.h b/include/sfc.h index 7a76928..949e6b3 100644 --- a/include/sfc.h +++ b/include/sfc.h @@ -36,6 +36,7 @@ typedef struct _PROTECTED_FILE_DATA { BOOL WINAPI SfcGetNextProtectedFile(HANDLE, PPROTECTED_FILE_DATA); BOOL WINAPI SfcIsFileProtected(HANDLE, LPCWSTR); +BOOL WINAPI SfcIsKeyProtected(HKEY, LPCWSTR, REGSAM); BOOL WINAPI SfpVerifyFile(LPCSTR, LPSTR, DWORD); #ifdef __cplusplus

1 0

Francois Gouget : dbghelp: Fix the spec file to better match the SymGetSymFromAddr64() prototype.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: e10222ced76a3157e1edcba6722984962a2eb552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10222ced76a3157e1edcba67… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:40:30 2007 +0100 dbghelp: Fix the spec file to better match the SymGetSymFromAddr64() prototype. This fixes a winapi_check warning. --- dlls/dbghelp/dbghelp.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 7ceefb7..21ce93d 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -99,7 +99,7 @@ @ stub SymGetSourceVarFromToken @ stub SymGetSourceVarFromTokenW @ stdcall SymGetSymFromAddr(long long ptr ptr) -@ stdcall SymGetSymFromAddr64(long long long ptr ptr) +@ stdcall SymGetSymFromAddr64(long double ptr ptr) @ stdcall SymGetSymFromName(long str ptr) @ stub SymGetSymFromName64 @ stdcall SymGetSymNext(long ptr)

1 0

Francois Gouget : shell32: SHLoadNonloadedIconOverlayIdentifiers() is a WINAPI function.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: ab8d1e788a668222fdf85187c1d6779b62b44c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8d1e788a668222fdf85187c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:41:12 2007 +0100 shell32: SHLoadNonloadedIconOverlayIdentifiers() is a WINAPI function. This fixes a winapi_check warning. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index feeeac4..565018f 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1114,7 +1114,7 @@ void WINAPI FreeIconList( DWORD dw ) /************************************************************************* * SHLoadNonloadedIconOverlayIdentifiers (SHELL32.@) */ -HRESULT SHLoadNonloadedIconOverlayIdentifiers( VOID ) +HRESULT WINAPI SHLoadNonloadedIconOverlayIdentifiers( VOID ) { FIXME("stub\n"); return S_OK;

1 0

Francois Gouget : mscoree: _CorValidateImage() is a WINAPI function.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 21540b7591aba493b25f5b8bce037256948e8dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21540b7591aba493b25f5b8bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:40:58 2007 +0100 mscoree: _CorValidateImage() is a WINAPI function. This fixes a winapi_check warning. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 90057bc..d44e621 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -186,7 +186,7 @@ void WINAPI _CorImageUnloading(LPCVOID* TRACE("(%p): stub\n", imageBase); } -DWORD _CorValidateImage(LPCVOID* imageBase, LPCWSTR imageName) +DWORD WINAPI _CorValidateImage(LPCVOID* imageBase, LPCWSTR imageName) { TRACE("(%p, %s): stub\n", imageBase, debugstr_w(imageName)); return E_FAIL;

1 0

Alexandre Julliard : widl: Add support for some simple pointer types.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 8d50f9d054f94497e9b5e08bdd435d69267df335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d50f9d054f94497e9b5e08bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 20:10:57 2007 +0100 widl: Add support for some simple pointer types. --- tools/widl/typegen.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f350aaa..4b4f4cf 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1545,6 +1545,11 @@ static unsigned int get_required_buffer_ return size; } + case RPC_FC_RP: + if (is_base_type( type->ref->type ) || type->ref->type == RPC_FC_STRUCT) + return get_required_buffer_size_type( type->ref, 0, NULL, name, alignment ); + return 0; + default: error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); return 0; @@ -1918,30 +1923,43 @@ void write_remoting_arguments(FILE *file } else if (var->ptr_level == 0) { - const char *ndrtype; - switch (rtype) { case RPC_FC_STRUCT: - ndrtype = "SimpleStruct"; + print_phase_function(file, indent, "SimpleStruct", phase, var->name, *type_offset); break; case RPC_FC_CSTRUCT: case RPC_FC_CPSTRUCT: - ndrtype = "ConformantStruct"; + print_phase_function(file, indent, "ConformantStruct", phase, var->name, *type_offset); break; case RPC_FC_CVSTRUCT: - ndrtype = "ConformantVaryingStruct"; + print_phase_function(file, indent, "ConformantVaryingStruct", phase, var->name, *type_offset); break; case RPC_FC_BOGUS_STRUCT: - ndrtype = "ComplexStruct"; + print_phase_function(file, indent, "ComplexStruct", phase, var->name, *type_offset); + break; + case RPC_FC_RP: + if (is_base_type( var->type->ref->type )) + { + print_phase_basetype(file, indent, phase, pass, var, var->name); + } + else if (var->type->ref->type == RPC_FC_STRUCT) + { + if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) + print_phase_function(file, indent, "SimpleStruct", phase, var->name, *type_offset + 4); + } + else + { + const var_t *iid; + if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) + print_file( file, indent, "_StubMsg.MaxCount = (unsigned long)%s;\n", iid->name ); + print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); + } break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, rtype, var->ptr_level); - ndrtype = NULL; } - - print_phase_function(file, indent, ndrtype, phase, var->name, *type_offset); } else {

1 0

Francois Gouget : snmpapi: SnmpUtilDbgPrint() is a vararg and not an stdcall function.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 618be0874a2fbdda10db8753c8a8371194abaf3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=618be0874a2fbdda10db8753c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:39:26 2007 +0100 snmpapi: SnmpUtilDbgPrint() is a vararg and not an stdcall function. --- dlls/snmpapi/main.c | 9 ++++++++- dlls/snmpapi/snmpapi.spec | 2 +- include/snmp.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 539c8e1..04ec05d 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -136,8 +136,15 @@ BOOL WINAPI DllMain( /*********************************************************************** * SnmpUtilDbgPrint (SNMPAPI.@) + * + * NOTES + * The Microsoft headers claim this function uses the stdcall calling + * convention. But stdcall functions cannot take a variable number of + * arguments so this does not make sense. The stdcall specification is + * probably ignored by Microsoft's compiler in this case. So declare it + * correctly in Wine so it works with all compilers. */ -void WINAPI SnmpUtilDbgPrint(INT loglevel, LPSTR format, ...) +void WINAPIV SnmpUtilDbgPrint(INT loglevel, LPSTR format, ...) { FIXME("(%d, %s)\n", loglevel, debugstr_a(format)); } diff --git a/dlls/snmpapi/snmpapi.spec b/dlls/snmpapi/snmpapi.spec index 2ada750..385ca8a 100644 --- a/dlls/snmpapi/snmpapi.spec +++ b/dlls/snmpapi/snmpapi.spec @@ -20,7 +20,7 @@ @ stub SnmpUtilAnsiToUnicode @ stdcall SnmpUtilAsnAnyCpy(ptr ptr) @ stdcall SnmpUtilAsnAnyFree(ptr) -@ stdcall SnmpUtilDbgPrint(long str) +@ varargs SnmpUtilDbgPrint(long str) @ stdcall SnmpUtilIdsToA(ptr long) @ stdcall SnmpUtilMemAlloc(long) @ stdcall SnmpUtilMemFree(ptr) diff --git a/include/snmp.h b/include/snmp.h index aaece6c..2399d00 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -289,7 +289,7 @@ DWORD WINAPI SnmpSvcGetUptime(void); void WINAPI SnmpSvcSetLogLevel(int nLogLevel); void WINAPI SnmpSvcSetLogType(int nLogType); -void WINAPI SnmpUtilDbgPrint(int nLogLevel, LPSTR szFormat, ...); +void WINAPIV SnmpUtilDbgPrint(int nLogLevel, LPSTR szFormat, ...); #ifdef __cplusplus }

1 0

Francois Gouget : snmpapi: Add a missing '\n' trace.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 9f02f9e1fdbb219a186d1d41f8b89b85fb818aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f02f9e1fdbb219a186d1d41f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 24 15:39:01 2007 +0100 snmpapi: Add a missing '\n' trace. --- dlls/snmpapi/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 04ec05d..29c381c 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -541,6 +541,7 @@ void WINAPI SnmpUtilPrintOid(AsnObjectId TRACE("%u", oid->ids[i]); if (i < oid->idLength - 1) TRACE("."); } + TRACE("\n"); } /***********************************************************************

1 0

Alexandre Julliard : widl: Fix alignment check for struct members format string.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 4f106ca398352d6e453c75dd4fd73cbbbe978a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f106ca398352d6e453c75dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 20:08:50 2007 +0100 widl: Fix alignment check for struct members format string. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 585ecc1..9944b07 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1051,7 +1051,7 @@ static size_t write_struct_members(FILE error("Unsupported member type 0x%x\n", rtype); } - if (typestring_size % 1) + if (!(typestring_size % 2)) { print_file(file, 2, "0x%x,\t\t/* FC_PAD */\n", RPC_FC_PAD); typestring_size++;

1 0

Alexandre Julliard : widl: Store the interface id in _StubMsg. MaxCount for iid_is pointers.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: d885244148f7cce6f67832f9c724032be6e8dcc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d885244148f7cce6f67832f9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 20:10:07 2007 +0100 widl: Store the interface id in _StubMsg.MaxCount for iid_is pointers. --- tools/widl/typegen.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9944b07..f350aaa 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1956,6 +1956,9 @@ void write_remoting_arguments(FILE *file } else { + const var_t *iid; + if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) + print_file( file, indent, "_StubMsg.MaxCount = (unsigned long)%s;\n", iid->name ); print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); } }

1 0

Alexandre Julliard : widl: Skip local functions when building format strings.
by Alexandre Julliard 25 Jan '07

25 Jan '07

Module: wine Branch: master Commit: 8e3c5c9ab927536fd1f479825ddde29cb66eaa73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3c5c9ab927536fd1f479825… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 20:06:51 2007 +0100 widl: Skip local functions when building format strings. --- tools/widl/typegen.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ac3ab94..936812d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -283,6 +283,7 @@ void write_procformatstring(FILE *file, const func_t *func; LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) { + if (is_local(func->def->attrs)) continue; /* emit argument data */ if (func->args) { @@ -1473,6 +1474,7 @@ void write_typeformatstring(FILE *file, const func_t *func; LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) { + if (is_local(func->def->attrs)) continue; current_func = func; if (func->args) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) @@ -2032,6 +2034,7 @@ size_t get_size_typeformatstring(const i { LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) { + if (is_local(func->def->attrs)) continue; /* argument list size */ if (func->args) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry )

1 0