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

Andrew Talbot : advapi32/tests: Write-strings warnings fix.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: b843ce55c720e141ba139b10d3b6dcaac9c5eaca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b843ce55c720e141ba139b1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Aug 13 09:53:29 2006 +0100 advapi32/tests: Write-strings warnings fix. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3663738..07f4855 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -88,7 +88,7 @@ static void init(void) hmod = GetModuleHandle("advapi32.dll"); } -static void test_str_sid(char *str_sid) +static void test_str_sid(const char *str_sid) { PSID psid; char *temp;

1 0

Andrew Talbot : winetest: Write-strings warnings fix.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: de92ffa3b7a4a58e94703d69f0e7ce3fc8dca71c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de92ffa3b7a4a58e94703d6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 12 22:26:52 2006 +0100 winetest: Write-strings warnings fix. --- programs/winetest/main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e42ba66..20c25f4 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -623,15 +623,20 @@ int WINAPI WinMain (HINSTANCE hInst, HIN cmdLine = strtok (NULL, whitespace); } if (!submit) { + static CHAR platform_windows[] = "WINETEST_PLATFORM=windows", + debug_yes[] = "WINETEST_DEBUG=1", + interactive_no[] = "WINETEST_INTERACTIVE=0", + report_success_no[] = "WINETEST_REPORT_SUCCESS=0"; + report (R_STATUS, "Starting up"); if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); - if (reset_env && (putenv ("WINETEST_PLATFORM=windows") || - putenv ("WINETEST_DEBUG=1") || - putenv ("WINETEST_INTERACTIVE=0") || - putenv ("WINETEST_REPORT_SUCCESS=0"))) + if (reset_env && (putenv (platform_windows) || + putenv (debug_yes) || + putenv (interactive_no) || + putenv (report_success_no))) report (R_FATAL, "Could not reset environment: %d", errno); if (!tag) {

1 0

Stefan Leichter : winedbg: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 7ee81d7b036d2ac11abf3067e37ae144d894eb08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ee81d7b036d2ac11abf306… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Aug 13 09:29:18 2006 +0200 winedbg: Print 64bit integers with wine_dbgstr_longlong. --- programs/winedbg/memory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index fef8209..dc87175 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -325,11 +325,11 @@ static void print_typed_basic(const stru { case btInt: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; - dbg_printf("%lld", val_int); + dbg_printf("%s", wine_dbgstr_longlong(val_int)); break; case btUInt: if (!be_cpu->fetch_integer(lvalue, size, FALSE, &val_int)) return; - dbg_printf("%llu", val_int); + dbg_printf("%s", wine_dbgstr_longlong(val_int)); break; case btFloat: if (!be_cpu->fetch_float(lvalue, size, &val_real)) return; @@ -436,7 +436,7 @@ static void print_typed_basic(const stru count -= min(count, 256); fcp->Start += 256; } - if (!ok) dbg_printf("%lld", val_int); + if (!ok) dbg_printf("%s", wine_dbgstr_longlong(val_int)); } break; default:

1 0

Andrew Talbot : taskmgr: Write-strings warnings fix.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 6c3667ad10c69103b584490d70f5e2035cf53bec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c3667ad10c69103b584490… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 12 21:25:47 2006 +0100 taskmgr: Write-strings warnings fix. --- programs/taskmgr/dbgchnl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 46741eb..f1ebdfa 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -53,9 +53,9 @@ #include "wine/debug.h" static DWORD (WINAPI *pSymSetOptions)(DWORD); static BOOL (WINAPI *pSymInitialize)(HANDLE, PSTR, BOOL); -static DWORD (WINAPI *pSymLoadModule)(HANDLE, HANDLE, PSTR, PSTR, DWORD, DWORD); +static DWORD (WINAPI *pSymLoadModule)(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); static BOOL (WINAPI *pSymCleanup)(HANDLE); -static BOOL (WINAPI *pSymFromName)(HANDLE, LPSTR, PSYMBOL_INFO); +static BOOL (WINAPI *pSymFromName)(HANDLE, PCSTR, PSYMBOL_INFO); BOOL AreDebugChannelsSupported(void) { @@ -158,7 +158,7 @@ static int change_channel_CB(HANDLE hPro return 1; } -static void* get_symbol(HANDLE hProcess, char* name, char* lib) +static void* get_symbol(HANDLE hProcess, const char* name, const char* lib) { char buffer[sizeof(IMAGEHLP_SYMBOL) + 256]; SYMBOL_INFO* si = (SYMBOL_INFO*)buffer;

1 0

Piotr Caban : oleview: Improved interface handling in idl viewer.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 3d4233249340935bd6d28213d4835546d0f1d28f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d4233249340935bd6d2821… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Aug 12 19:44:02 2006 +0200 oleview: Improved interface handling in idl viewer. --- programs/oleview/typelib.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index db28545..f9b8d28 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -302,16 +302,20 @@ int EnumImplTypes(ITypeInfo *pTypeInfo, } void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wszName, - WCHAR *wszHelpString, TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) + WCHAR *wszHelpString, unsigned long ulHelpContext, TYPEATTR *pTypeAttr, + TYPELIB_DATA *pTLData) { ITypeInfo *pRefTypeInfo; HREFTYPE hRefType; BSTR bstrName; WCHAR wszGuid[MAX_LOAD_STRING]; + WCHAR wszHelpContext[MAX_LOAD_STRING]; BOOL bFirst; + const WCHAR wszFormat[] = { '0','x','%','.','8','l','x','\0' }; const WCHAR wszInterface[] = { 'I','n','t','e','r','f','a','c','e',' ','\0' }; const WCHAR wszHelpstring[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; + const WCHAR wszHelpcontext[] = { 'h','e','l','p','c','o','n','t','e','x','t','\0' }; const WCHAR wszTYPEFLAG_FAPPOBJECT[] = { 'a','p','p','o','b','j','e','c','t','\0' }; const WCHAR wszTYPEFLAG_FCANCREATE[] = { 'c','a','n','c','r','e','a','t','e','\0' }; const WCHAR wszTYPEFLAG_FLICENSED[] = { 'l','i','c','e','n','s','e','d','\0' }; @@ -357,6 +361,16 @@ void CreateInterfaceInfo(ITypeInfo *pTyp AddToTLDataStrW(pTLData, wszInvertedComa); AddToTLDataStrW(pTLData, wszCloseBrackets2); } + if(ulHelpContext) + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrW(pTLData, wszHelpcontext); + AddToTLDataStrW(pTLData, wszOpenBrackets2); + wsprintfW(wszHelpContext, wszFormat, ulHelpContext); + AddToTLDataStrW(pTLData, wszHelpContext); + AddToTLDataStrW(pTLData, wszCloseBrackets2); + } if(pTypeAttr->wTypeFlags) { bFirst = TRUE; @@ -367,7 +381,7 @@ #define ENUM_FLAGS(x) if(pTypeAttr->wTyp if(!bFirst)\ {\ AddToTLDataStrW(pTLData, wszComa);\ - AddToTLDataStrW(pTLData, wszSpace);\ + AddToTLDataStrW(pTLData, wszNewLine);\ }\ bFirst = FALSE;\ AddToTLDataStrW(pTLData, wsz##x);\ @@ -426,6 +440,7 @@ int PopulateTree(void) HREFTYPE hRefType; TYPEATTR *pTypeAttr; INT count, i; + unsigned long ulHelpContext; BSTR bstrName; BSTR bstrData; WCHAR wszText[MAX_LOAD_STRING]; @@ -527,7 +542,7 @@ int PopulateTree(void) ITypeLib_GetTypeInfo(pTypeLib, i, &pTypeInfo); ITypeInfo_GetDocumentation(pTypeInfo, MEMBERID_NIL, &bstrName, &bstrData, - NULL, NULL); + &ulHelpContext, NULL); ITypeInfo_GetTypeAttr(pTypeInfo, &pTypeAttr); memset(wszText, 0, sizeof(wszText)); @@ -567,7 +582,8 @@ int PopulateTree(void) break; case TKIND_INTERFACE: CreateInterfaceInfo(pTypeInfo, pTypeAttr->cImplTypes, bstrName, - bstrData, pTypeAttr, (TYPELIB_DATA*)(U(tvis).item.lParam)); + bstrData, ulHelpContext, pTypeAttr, + (TYPELIB_DATA*)(U(tvis).item.lParam)); AddToStrW(wszText, wszTKIND_INTERFACE); AddToStrW(wszText, bstrName); @@ -590,12 +606,16 @@ int PopulateTree(void) memset(wszText, 0, sizeof(wszText)); U(tvis).item.lParam = InitializeTLData(); + SysFreeString(bstrName); + SysFreeString(bstrData); + ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo); ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, - &bstrData, NULL, NULL); + &bstrData, &ulHelpContext, NULL); CreateInterfaceInfo(pTypeInfo, pTypeAttr->cImplTypes, bstrName, - bstrData, pTypeAttr, (TYPELIB_DATA*)(U(tvis).item.lParam)); + bstrData, ulHelpContext, pTypeAttr, + (TYPELIB_DATA*)(U(tvis).item.lParam)); AddToStrW(wszText, wszTKIND_INTERFACE); AddToStrW(wszText, bstrName);

1 0

Andrew Talbot : crypt32/tests: Write-strings warnings fix.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 198bdd422f114b1a7e332cf6dd2aac39b2e6f98f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=198bdd422f114b1a7e332cf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Aug 12 17:30:02 2006 +0100 crypt32/tests: Write-strings warnings fix. --- dlls/crypt32/tests/encode.c | 86 ++++++++++++++++++++++++++----------------- 1 files changed, 51 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1372934..6576f6c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -626,26 +626,33 @@ static const BYTE localhostAttr[] = { 0x static const BYTE aric[] = { 0x61, 0x72, 0x69, 0x63, 0x40, 0x63, 0x6f, 0x64, 0x65, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73, 0x2e, 0x63, 0x6f, 0x6d }; -#define _blob_of(arr) { sizeof(arr), (LPBYTE)arr } -const CERT_RDN_ATTR rdnAttrs[] = { - { "2.5.4.6", CERT_RDN_PRINTABLE_STRING, _blob_of(us) }, - { "2.5.4.8", CERT_RDN_PRINTABLE_STRING, _blob_of(minnesota) }, - { "2.5.4.7", CERT_RDN_PRINTABLE_STRING, _blob_of(minneapolis) }, - { "2.5.4.10", CERT_RDN_PRINTABLE_STRING, _blob_of(codeweavers) }, - { "2.5.4.11", CERT_RDN_PRINTABLE_STRING, _blob_of(wine) }, - { "2.5.4.3", CERT_RDN_PRINTABLE_STRING, _blob_of(localhostAttr) }, - { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, _blob_of(aric) }, -}; -const CERT_RDN_ATTR decodedRdnAttrs[] = { - { "2.5.4.6", CERT_RDN_PRINTABLE_STRING, _blob_of(us) }, - { "2.5.4.3", CERT_RDN_PRINTABLE_STRING, _blob_of(localhostAttr) }, - { "2.5.4.8", CERT_RDN_PRINTABLE_STRING, _blob_of(minnesota) }, - { "2.5.4.7", CERT_RDN_PRINTABLE_STRING, _blob_of(minneapolis) }, - { "2.5.4.10", CERT_RDN_PRINTABLE_STRING, _blob_of(codeweavers) }, - { "2.5.4.11", CERT_RDN_PRINTABLE_STRING, _blob_of(wine) }, - { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, _blob_of(aric) }, -}; -#undef _blob_of +#define RDNA(arr) oid_ ## arr, CERT_RDN_PRINTABLE_STRING, { sizeof(arr), (LPBYTE)arr } +#define RDNIA5(arr) oid_ ## arr, CERT_RDN_IA5_STRING, { sizeof(arr), (LPBYTE)arr } + +static CHAR oid_us[] = "2.5.4.6", + oid_minnesota[] = "2.5.4.8", + oid_minneapolis[] = "2.5.4.7", + oid_codeweavers[] = "2.5.4.10", + oid_wine[] = "2.5.4.11", + oid_localhostAttr[] = "2.5.4.3", + oid_aric[] = "1.2.840.113549.1.9.1"; +static CERT_RDN_ATTR rdnAttrs[] = { { RDNA(us) }, + { RDNA(minnesota) }, + { RDNA(minneapolis) }, + { RDNA(codeweavers) }, + { RDNA(wine) }, + { RDNA(localhostAttr) }, + { RDNIA5(aric) } }; +static CERT_RDN_ATTR decodedRdnAttrs[] = { { RDNA(us) }, + { RDNA(localhostAttr) }, + { RDNA(minnesota) }, + { RDNA(minneapolis) }, + { RDNA(codeweavers) }, + { RDNA(wine) }, + { RDNIA5(aric) } }; + +#undef RDNIA5 +#undef RDNA static const BYTE encodedRDNAttrs[] = { 0x30,0x81,0x96,0x31,0x81,0x93,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55, @@ -1009,10 +1016,13 @@ static void test_decodeName(DWORD dwEnco ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (buf) { + static CHAR oid_sur_name[] = szOID_SUR_NAME, + oid_common_name[] = szOID_COMMON_NAME; + CERT_RDN_ATTR attrs[] = { - { szOID_SUR_NAME, CERT_RDN_PRINTABLE_STRING, { sizeof(surName), + { oid_sur_name, CERT_RDN_PRINTABLE_STRING, { sizeof(surName), (BYTE *)surName } }, - { szOID_COMMON_NAME, CERT_RDN_PRINTABLE_STRING, { sizeof(commonName), + { oid_common_name, CERT_RDN_PRINTABLE_STRING, { sizeof(commonName), (BYTE *)commonName } }, }; @@ -1085,10 +1095,13 @@ static void test_decodeUnicodeName(DWORD ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (buf) { + static CHAR oid_sur_name[] = szOID_SUR_NAME, + oid_common_name[] = szOID_COMMON_NAME; + CERT_RDN_ATTR attrs[] = { - { szOID_SUR_NAME, CERT_RDN_PRINTABLE_STRING, + { oid_sur_name, CERT_RDN_PRINTABLE_STRING, { lstrlenW(surNameW) * sizeof(WCHAR), (BYTE *)surNameW } }, - { szOID_COMMON_NAME, CERT_RDN_PRINTABLE_STRING, + { oid_common_name, CERT_RDN_PRINTABLE_STRING, { lstrlenW(commonNameW) * sizeof(WCHAR), (BYTE *)commonNameW } }, }; @@ -2327,11 +2340,11 @@ struct encodedExtensions static BYTE crit_ext_data[] = { 0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; static BYTE noncrit_ext_data[] = { 0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; - +static CHAR oid_basic_constraints2[] = szOID_BASIC_CONSTRAINTS2; static CERT_EXTENSION criticalExt = - { szOID_BASIC_CONSTRAINTS2, TRUE, { 8, crit_ext_data } }; + { oid_basic_constraints2, TRUE, { 8, crit_ext_data } }; static CERT_EXTENSION nonCriticalExt = - { szOID_BASIC_CONSTRAINTS2, FALSE, { 8, noncrit_ext_data } }; + { oid_basic_constraints2, FALSE, { 8, noncrit_ext_data } }; static const BYTE ext0[] = { 0x30,0x00 }; static const BYTE ext1[] = { 0x30,0x14,0x30,0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01, @@ -2449,23 +2462,26 @@ static const unsigned char bin71[] = { 0x0f}; static unsigned char bin72[] = { 0x05,0x00}; +static CHAR oid_bogus[] = "1.2.3", + oid_rsa[] = szOID_RSA; + static const struct encodedPublicKey pubKeys[] = { /* with a bogus OID */ - { { { "1.2.3", { 0, NULL } }, { 0, NULL, 0 } }, + { { { oid_bogus, { 0, NULL } }, { 0, NULL, 0 } }, bin64, bin65, - { { "1.2.3", { 2, bin72 } }, { 0, NULL, 0 } } }, + { { oid_bogus, { 2, bin72 } }, { 0, NULL, 0 } } }, /* some normal keys */ - { { { szOID_RSA, { 0, NULL } }, { 0, NULL, 0} }, + { { { oid_rsa, { 0, NULL } }, { 0, NULL, 0} }, bin66, bin67, - { { szOID_RSA, { 2, bin72 } }, { 0, NULL, 0 } } }, - { { { szOID_RSA, { 0, NULL } }, { sizeof(aKey), (BYTE *)aKey, 0} }, + { { oid_rsa, { 2, bin72 } }, { 0, NULL, 0 } } }, + { { { oid_rsa, { 0, NULL } }, { sizeof(aKey), (BYTE *)aKey, 0} }, bin68, bin69, - { { szOID_RSA, { 2, bin72 } }, { sizeof(aKey), (BYTE *)aKey, 0} } }, + { { oid_rsa, { 2, bin72 } }, { sizeof(aKey), (BYTE *)aKey, 0} } }, /* with add'l parameters--note they must be DER-encoded */ - { { { szOID_RSA, { sizeof(params), (BYTE *)params } }, { sizeof(aKey), + { { { oid_rsa, { sizeof(params), (BYTE *)params } }, { sizeof(aKey), (BYTE *)aKey, 0 } }, bin70, bin71, - { { szOID_RSA, { sizeof(params), (BYTE *)params } }, { sizeof(aKey), + { { oid_rsa, { sizeof(params), (BYTE *)params } }, { sizeof(aKey), (BYTE *)aKey, 0 } } }, };

1 0

Jacek Caban : mshtml: Remove no longer used get_nsIURI.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 1088164af3ab7bde4d52b7e6e141d9d9caaeb000 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1088164af3ab7bde4d52b7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 12 18:44:13 2006 +0200 mshtml: Remove no longer used get_nsIURI. --- dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/nsio.c | 24 ------------------------ 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8f293f8..df1407b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -295,8 +295,6 @@ void init_nsio(nsIComponentManager*,nsIC void hlink_frame_navigate(HTMLDocument*,IHlinkFrame*,LPCWSTR,nsIInputStream*,DWORD); -nsIURI *get_nsIURI(LPCWSTR); - void *nsalloc(size_t); void nsfree(void*); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 37b3ba0..0c26fd4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1917,27 +1917,3 @@ void init_nsio(nsIComponentManager *comp if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08lx\n", nsres); } - -nsIURI *get_nsIURI(LPCWSTR url) -{ - nsIURI *ret; - nsACString acstr; - nsresult nsres; - char *urla; - int len; - - len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, -1, NULL, NULL); - urla = mshtml_alloc(len); - WideCharToMultiByte(CP_ACP, 0, url, -1, urla, -1, NULL, NULL); - - nsACString_Init(&acstr, urla); - - nsres = nsIIOService_NewURI(nsio, &acstr, NULL, NULL, &ret); - if(NS_FAILED(nsres)) - FIXME("NewURI failed: %08lx\n", nsres); - - nsACString_Finish(&acstr); - mshtml_free(urla); - - return ret; -}

1 0

Jacek Caban : mshtml: Return INET_E_USE_DEFAULT_PROTOCOLHANDLER in about protocol handler' s CombineUrl.
by Alexandre Julliard Aug. 14, 2006

Aug. 14, 2006

Module: wine Branch: master Commit: 57ba0459c9566f3f24eff2fa5081fe05759be394 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57ba0459c9566f3f24eff2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 12 18:43:16 2006 +0200 mshtml: Return INET_E_USE_DEFAULT_PROTOCOLHANDLER in about protocol handler's CombineUrl. --- dlls/mshtml/protocol.c | 34 +++++++++++++--------------------- dlls/mshtml/tests/protocol.c | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index cf60004..04ecda0 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -91,6 +91,17 @@ static ULONG WINAPI InternetProtocolInfo return 1; } +static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, + DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) +{ + TRACE("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), + debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, + pcchResult, dwReserved); + + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; +} + #undef PROTOCOLINFO_THIS #define CLASSFACTORY_THIS(iface) DEFINE_THIS(ProtocolFactory, ClassFactory, iface) @@ -427,15 +438,6 @@ static HRESULT WINAPI AboutProtocolInfo_ return INET_E_DEFAULT_ACTION; } -static HRESULT WINAPI AboutProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR pwzBaseUrl, - LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, DWORD cchResult, - DWORD* pcchResult, DWORD dwReserved) -{ - FIXME("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), - dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - return E_NOTIMPL; -} - static HRESULT WINAPI AboutProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) { @@ -457,7 +459,7 @@ static const IInternetProtocolInfoVtbl A InternetProtocolInfo_AddRef, InternetProtocolInfo_Release, AboutProtocolInfo_ParseUrl, - AboutProtocolInfo_CombineUrl, + InternetProtocolInfo_CombineUrl, AboutProtocolInfo_CompareUrl, AboutProtocolInfo_QueryInfo }; @@ -837,16 +839,6 @@ static HRESULT WINAPI ResProtocolInfo_Pa return INET_E_DEFAULT_ACTION; } -static HRESULT WINAPI ResProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR pwzBaseUrl, - LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, DWORD cchResult, - DWORD* pcchResult, DWORD dwReserved) -{ - TRACE("%p)->(%s %s %08lx %p %ld %p %ld)\n", iface, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), - dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - - return INET_E_USE_DEFAULT_PROTOCOLHANDLER; -} - static HRESULT WINAPI ResProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) { @@ -868,7 +860,7 @@ static const IInternetProtocolInfoVtbl R InternetProtocolInfo_AddRef, InternetProtocolInfo_Release, ResProtocolInfo_ParseUrl, - ResProtocolInfo_CombineUrl, + InternetProtocolInfo_CombineUrl, ResProtocolInfo_CompareUrl, ResProtocolInfo_QueryInfo }; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 8451019..6507819 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -340,16 +340,19 @@ #endif hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL, URL_FILE_USE_PATHURL, NULL, 0xdeadbeef, NULL, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); IInternetProtocolInfo_Release(protocol_info); } @@ -517,6 +520,24 @@ #endif ok(hres == INET_E_DEFAULT_ACTION, "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres); + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_url, + 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); + + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_url, + URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); + + size = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL, + URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); + IInternetProtocolInfo_Release(protocol_info); }

1 0

Dan Hipschman : widl: Improve pointer null checking logic.
by Alexandre Julliard Aug. 12, 2006

Aug. 12, 2006

Module: wine Branch: master Commit: 9e49a8d2f2465030b1502031a8201354fa04f11d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e49a8d2f2465030b150203… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 11 17:33:40 2006 -0700 widl: Improve pointer null checking logic. --- tools/widl/client.c | 22 +++++++-------------- tools/widl/proxy.c | 50 +++++++++++++++++++++++++++++++++++++++++++++--- tools/widl/widltypes.h | 2 ++ 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 79a4283..267bbfe 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -83,7 +83,6 @@ static void print_message_buffer_size(co static void check_pointers(const func_t *func) { var_t *var; - int pointer_type; if (!func->args) return; @@ -92,21 +91,14 @@ static void check_pointers(const func_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); - if (!pointer_type) - pointer_type = RPC_FC_RP; - - if (pointer_type == RPC_FC_RP) + if (is_pointer(var) && cant_be_null(var)) { - if (var->ptr_level >= 1) - { - print_client("if (!%s)\n", var->name); - print_client("{\n"); - indent++; - print_client("RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); - indent--; - print_client("}\n\n"); - } + print_client("if (!%s)\n", var->name); + print_client("{\n"); + indent++; + print_client("RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); + indent--; + print_client("}\n\n"); } var = PREV_LINK(var); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5750159..9bba5c5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -181,20 +181,64 @@ static void clear_output_vars( var_t *ar } } -static int is_pointer(var_t *arg) +int is_pointer(var_t *arg) { if (arg->ptr_level) return 1; - if (arg->type->type == RPC_FC_FP ) + + switch (ref_type(arg->type)) + { + case RPC_FC_RP: + case RPC_FC_C_CSTRING: + case RPC_FC_C_WSTRING: + case RPC_FC_FP: + case RPC_FC_OP: + case RPC_FC_UP: return 1; + } + return 0; } +int cant_be_null(var_t *v) +{ + /* Search backwards for the most recent pointer attribute. */ + const attr_t *attrs = v->attrs; + const type_t *type = v->type; + + if (! attrs && type) + { + attrs = type->attrs; + type = type->ref; + } + + while (attrs) + { + int t = get_attrv(attrs, ATTR_POINTERTYPE); + + if (t == RPC_FC_FP || t == RPC_FC_OP || t == RPC_FC_UP) + return 0; + + if (t == RPC_FC_RP) + return 1; + + if (type) + { + attrs = type->attrs; + type = type->ref; + } + else + attrs = NULL; + } + + return 1; /* Default is RPC_FC_RP. */ +} + static void proxy_check_pointers( var_t *arg ) { END_OF_LIST(arg); while (arg) { - if (is_pointer(arg)) { + if (is_pointer(arg) && cant_be_null(arg)) { print_proxy( "if(!%s)\n", arg->name ); indent++; print_proxy( "RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 926a3e2..d39def3 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -299,5 +299,7 @@ struct _typelib_t { /* Get the actual type field for a type (chase down typedef references). */ unsigned char ref_type(const type_t *type); +int is_pointer(var_t *v); +int cant_be_null(var_t *v); #endif

1 0

Dan Hipschman : widl: Use ref_type to simplify some code.
by Alexandre Julliard Aug. 12, 2006

Aug. 12, 2006

Module: wine Branch: master Commit: 06497dd44c2d9cacbfabe3384d2e7433675dc0e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06497dd44c2d9cacbfabe33… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Aug 11 17:32:47 2006 -0700 widl: Use ref_type to simplify some code. --- tools/widl/parser.y | 5 +---- tools/widl/typegen.c | 2 +- tools/widl/widltypes.h | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ca5db5c..73ccf25 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1235,10 +1235,7 @@ static unsigned char get_pointer_type( t int t; if (is_attr( type->attrs, ATTR_STRING )) { - type_t *t = type; - while( t->type == 0 && t->ref ) - t = t->ref; - switch( t->type ) + switch( ref_type( type ) ) { case RPC_FC_CHAR: return RPC_FC_C_CSTRING; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index badf124..83af2eb 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -165,7 +165,7 @@ static inline int is_base_type(unsigned } } -static unsigned char ref_type(const type_t *type) +unsigned char ref_type(const type_t *type) { while (type_has_ref(type)) type = type->ref; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7bf2229..926a3e2 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -297,4 +297,7 @@ struct _typelib_t { importlib_t *importlibs; }; +/* Get the actual type field for a type (chase down typedef references). */ +unsigned char ref_type(const type_t *type); + #endif

1 0