October 2007 - Wine-commits

Lionel Debroux : gdi32/tests: Fix memory leak (found by Smatch).
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: b78ed57a39c8d6c1c3080fc66f78a4f204cc2d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78ed57a39c8d6c1c3080fc66… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Oct 20 21:05:15 2007 +0200 gdi32/tests: Fix memory leak (found by Smatch). --- dlls/gdi32/tests/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 1ededdc..e1e4437 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1828,6 +1828,7 @@ static void test_get16dibits(void) overwritten_bytes++; ok(overwritten_bytes == 0, "GetDIBits wrote past the buffer given\n"); + HeapFree(GetProcessHeap(), 0, info); DeleteObject(hbmp); ReleaseDC(NULL, screen_dc); }

1 0

Mikołaj Zalewski : advapi32/tests: Define OBJECT_BASIC_INFORMATION in source file as it is not defined in Windows SDK winternl .h.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 8bc12f3f41004a71542155eea5947a296b6b695b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc12f3f41004a71542155eea… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 20 23:58:21 2007 -0700 advapi32/tests: Define OBJECT_BASIC_INFORMATION in source file as it is not defined in Windows SDK winternl.h. --- dlls/advapi32/tests/security.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9962f0e..1040868 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -31,10 +31,32 @@ #include "sddl.h" #include "ntsecapi.h" #include "lmcons.h" -#include "winternl.h" #include "wine/test.h" +/* copied from Wine winternl.h - not included in the Windows SDK */ +typedef enum _OBJECT_INFORMATION_CLASS { + ObjectBasicInformation, + ObjectNameInformation, + ObjectTypeInformation, + ObjectAllInformation, + ObjectDataInformation +} OBJECT_INFORMATION_CLASS, *POBJECT_INFORMATION_CLASS; + +typedef struct _OBJECT_BASIC_INFORMATION { + ULONG Attributes; + ACCESS_MASK GrantedAccess; + ULONG HandleCount; + ULONG PointerCount; + ULONG PagedPoolUsage; + ULONG NonPagedPoolUsage; + ULONG Reserved[3]; + ULONG NameInformationLength; + ULONG TypeInformationLength; + ULONG SecurityDescriptorLength; + LARGE_INTEGER CreateTime; +} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; + #define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } typedef VOID (WINAPI *fnBuildTrusteeWithSidA)( PTRUSTEEA pTrustee, PSID pSid );

1 0

Mikołaj Zalewski : advapi32: Add a test for CreateWellKnownSid and implement two more SIDs.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: b06379b2b3afb3382d3ff50c8a71f566aef91f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06379b2b3afb3382d3ff50c8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 21 00:41:54 2007 -0700 advapi32: Add a test for CreateWellKnownSid and implement two more SIDs. --- dlls/advapi32/security.c | 2 + dlls/advapi32/tests/security.c | 87 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 559291c..5d33fd2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -124,6 +124,8 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinOtherOrganizationSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_OTHER_ORGANIZATION_RID } } }, { {0,0}, WinBuiltinPerfMonitoringUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_MONITORING_USERS } } }, { {0,0}, WinBuiltinPerfLoggingUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_LOGGING_USERS } } }, + { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, + { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, }; static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1040868..40b3f12 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -139,6 +139,7 @@ static void init(void) pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW"); + pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); myARGC = winetest_get_mainargs( &myARGV ); } @@ -1069,6 +1070,89 @@ static void test_sid_str(PSID * sid) } } +struct well_known_sid_value +{ + BOOL without_domain; + const char *sid_string; +} well_known_sid_values[] = { +/* 0 */ {TRUE, "S-1-0-0"}, {TRUE, "S-1-1-0"}, {TRUE, "S-1-2-0"}, {TRUE, "S-1-3-0"}, +/* 4 */ {TRUE, "S-1-3-1"}, {TRUE, "S-1-3-2"}, {TRUE, "S-1-3-3"}, {TRUE, "S-1-5"}, +/* 8 */ {FALSE, "S-1-5-1"}, {TRUE, "S-1-5-2"}, {TRUE, "S-1-5-3"}, {TRUE, "S-1-5-4"}, +/* 12 */ {TRUE, "S-1-5-6"}, {TRUE, "S-1-5-7"}, {TRUE, "S-1-5-8"}, {TRUE, "S-1-5-9"}, +/* 16 */ {TRUE, "S-1-5-10"}, {TRUE, "S-1-5-11"}, {TRUE, "S-1-5-12"}, {TRUE, "S-1-5-13"}, +/* 20 */ {TRUE, "S-1-5-14"}, {FALSE, NULL}, {TRUE, "S-1-5-18"}, {TRUE, "S-1-5-19"}, +/* 24 */ {TRUE, "S-1-5-20"}, {TRUE, "S-1-5-32"}, +/* 26 */ {FALSE, "S-1-5-32-544"}, {TRUE, "S-1-5-32-545"}, {TRUE, "S-1-5-32-546"}, +/* 29 */ {TRUE, "S-1-5-32-547"}, {TRUE, "S-1-5-32-548"}, {TRUE, "S-1-5-32-549"}, +/* 32 */ {TRUE, "S-1-5-32-550"}, {TRUE, "S-1-5-32-551"}, {TRUE, "S-1-5-32-552"}, +/* 35 */ {TRUE, "S-1-5-32-554"}, {TRUE, "S-1-5-32-555"}, {TRUE, "S-1-5-32-556"}, +/* 38 */ {FALSE, "S-1-5-21-12-23-34-45-56-500"}, {FALSE, "S-1-5-21-12-23-34-45-56-501"}, +/* 40 */ {FALSE, "S-1-5-21-12-23-34-45-56-502"}, {FALSE, "S-1-5-21-12-23-34-45-56-512"}, +/* 42 */ {FALSE, "S-1-5-21-12-23-34-45-56-513"}, {FALSE, "S-1-5-21-12-23-34-45-56-514"}, +/* 44 */ {FALSE, "S-1-5-21-12-23-34-45-56-515"}, {FALSE, "S-1-5-21-12-23-34-45-56-516"}, +/* 46 */ {FALSE, "S-1-5-21-12-23-34-45-56-517"}, {FALSE, "S-1-5-21-12-23-34-45-56-518"}, +/* 48 */ {FALSE, "S-1-5-21-12-23-34-45-56-519"}, {FALSE, "S-1-5-21-12-23-34-45-56-520"}, +/* 50 */ {FALSE, "S-1-5-21-12-23-34-45-56-553"}, +/* 51 */ {TRUE, "S-1-5-64-10"}, {TRUE, "S-1-5-64-21"}, {TRUE, "S-1-5-64-14"}, +/* 54 */ {TRUE, "S-1-5-15"}, {TRUE, "S-1-5-1000"}, {FALSE, "S-1-5-32-557"}, +/* 57 */ {TRUE, "S-1-5-32-558"}, {TRUE, "S-1-5-32-559"}, {TRUE, "S-1-5-32-560"}, +/* 60 */ {TRUE, "S-1-5-32-561"}, +/* Added in Windows Vista: */ +/* 61 */ {TRUE, "S-1-5-32-562"}, {TRUE, "S-1-5-32-568"}, +/* 63 */ {TRUE, "S-1-5-17"}, {FALSE, "S-1-5-32-569"}, {TRUE, "S-1-16-0"}, +/* 66 */ {TRUE, "S-1-16-4096"}, {TRUE, "S-1-16-8192"}, {TRUE, "S-1-16-12288"}, +/* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, +/* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, +/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"} +}; + +static void test_CreateWellKnownSid() +{ + SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; + PSID domainsid; + int i; + + if (!pCreateWellKnownSid) + { + skip("CreateWellKnownSid not available\n"); + return; + } + + /* a domain sid usually have three subauthorities but we test that CreateWellKnownSid doesn't check it */ + AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid); + + for (i = 0; i < sizeof(well_known_sid_values)/sizeof(well_known_sid_values[0]); i++) + { + struct well_known_sid_value *value = &well_known_sid_values[i]; + char sid_buffer[SECURITY_MAX_SID_SIZE]; + LPSTR str; + DWORD cb; + + if (value->sid_string == NULL || !value->without_domain) + continue; + + if (i >= WinBuiltinTerminalServerLicenseServersSid + 1) + { + /* These SIDs aren't implemented by all Windows versions - detect it and break the loop */ + cb = sizeof(sid_buffer); + if (!pCreateWellKnownSid(i, domainsid, sid_buffer, &cb)) + { + skip("Well know SIDs starting from %d are not implemented\n", i); + break; + } + } + + cb = sizeof(sid_buffer); + ok(CreateWellKnownSid(i, value->without_domain ? NULL : domainsid, sid_buffer, &cb), "Couldn't create well known sid %d\n", i); + expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); + ok(IsValidSid(sid_buffer), "The sid is not valid\n"); + ok(ConvertSidToStringSid(sid_buffer, &str), "Couldn't convert SID to string\n"); + ok(strcmp(str, value->sid_string) == 0, "SID mismatch - expected %s, got %s\n", + value->sid_string, str); + LocalFree(str); + } +} + static void test_LookupAccountSid(void) { SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; @@ -1235,8 +1319,6 @@ static void test_LookupAccountSid(void) FreeSid(pUsersSid); - pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); - if (pCreateWellKnownSid && pConvertSidToStringSidA) { trace("Well Known SIDs:\n"); @@ -2194,6 +2276,7 @@ START_TEST(security) test_sid(); test_trustee(); test_luid(); + test_CreateWellKnownSid(); test_FileSecurity(); test_AccessCheck(); test_token_attr();

1 0

Louis Lenders : tapi32: Add stub for lineInitializeExA.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: c29517896f7fcfb3970072543f5a558787371ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29517896f7fcfb3970072543… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 21 21:12:13 2007 +0100 tapi32: Add stub for lineInitializeExA. --- dlls/tapi32/line.c | 10 ++++++++++ dlls/tapi32/tapi32.spec | 1 + include/tapi.h | 12 ++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 6824d26..214e504 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -964,6 +964,16 @@ DWORD WINAPI lineInitialize( } /*********************************************************************** + * lineInitializeExA (TAPI32.@) + */ +LONG WINAPI lineInitializeExA(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECALLBACK lpfnCallback, LPCSTR lpszFriendlyAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPLINEINITIALIZEEXPARAMS lpLineInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphLineApp, hInstance, + lpfnCallback, debugstr_a(lpszFriendlyAppName), lpdwNumDevs, lpdwAPIVersion, lpLineInitializeExParams); + return 0; +} + +/*********************************************************************** * lineMakeCall (TAPI32.@) */ DWORD WINAPI lineMakeCallA(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index db7f302..87266ce 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -63,6 +63,7 @@ @ stdcall lineHandoffA(long str long) @ stdcall lineHold(long) @ stdcall lineInitialize(ptr long ptr str ptr) +@ stdcall lineInitializeExA(ptr long ptr str ptr ptr ptr) @ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA @ stdcall lineMakeCallA(long ptr str long ptr) @ stdcall lineMonitorDigits(long long) diff --git a/include/tapi.h b/include/tapi.h index 8673665..4d7dca0 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -632,6 +632,18 @@ typedef struct linegeneratetone_tag { DWORD dwVolume; } LINEGENERATETONE, *LPLINEGENERATETONE; +typedef struct lineinitializeexparams_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwOptions; + union { + HANDLE hEvent; + HANDLE hCompletionPort; + } Handles; + DWORD dwCompletionKey; +} LINEINITIALIZEEXPARAMS, *LPLINEINITIALIZEEXPARAMS; + typedef struct linemediacontrolcallstate_tag { DWORD dwCallStates; DWORD dwMediaControl;

1 0

Louis Lenders : hhctrl.ocx: Update version info.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 7a06e0d36c9ac63d16264930f601bd74148c3c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a06e0d36c9ac63d16264930f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 21 21:17:47 2007 +0100 hhctrl.ocx: Update version info. --- dlls/hhctrl.ocx/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/version.rc b/dlls/hhctrl.ocx/version.rc index 3a89350..bbdfd89 100644 --- a/dlls/hhctrl.ocx/version.rc +++ b/dlls/hhctrl.ocx/version.rc @@ -21,9 +21,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX" #define WINE_FILENAME_STR "hhctrl.ocx" -#define WINE_FILEVERSION 4,72,7325,0 -#define WINE_FILEVERSION_STR "4.72.7325.0" -#define WINE_PRODUCTVERSION 4,72,7325,0 -#define WINE_PRODUCTVERSION_STR "4.72.7325.0" +#define WINE_FILEVERSION 5,2,3790,2744 +#define WINE_FILEVERSION_STR "5.2.3790.2744" +#define WINE_PRODUCTVERSION 5,2,3790,2744 +#define WINE_PRODUCTVERSION_STR "5.2.3790.2744" #include <wine/wine_common_ver.rc>

1 0

Mikołaj Zalewski : advapi32/tests: Make the SDDL test pass under Vista.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 05cb54fcc86c98b0f79f58788d0c0562b8c18d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cb54fcc86c98b0f79f58788… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Oct 20 23:46:40 2007 -0700 advapi32/tests: Make the SDDL test pass under Vista. --- dlls/advapi32/tests/security.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1a0e191..9962f0e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2025,6 +2025,11 @@ static void test_ConvertSecurityDescriptorToString() ok(len >= (strlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", strlen(exp_str) + 1, len); \ LocalFree(string); +#define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \ + ok(strcmp(string, (exp_str1)) == 0 || strcmp(string, (exp_str2)) == 0, "String mismatch (expected\n\"%s\" or\n\"%s\", got\n\"%s\")\n", (exp_str1), (exp_str2), string); \ + ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", strlen(string) + 1, len); \ + LocalFree(string); + InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE(""); @@ -2086,11 +2091,13 @@ static void test_ConvertSecurityDescriptorToString() SetSecurityDescriptorDacl(&desc, TRUE, NULL, FALSE); AddAuditAccessAceEx(pacl, ACL_REVISION, VALID_INHERIT_FLAGS, KEY_READ|KEY_WRITE, psid2, TRUE, TRUE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); - CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)"); + CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)", /* XP */ + "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" /* Vista */); AddAuditAccessAceEx(pacl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, FILE_GENERIC_READ|FILE_GENERIC_WRITE, psid2, TRUE, FALSE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); - CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)"); + CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", /* XP */ + "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)" /* Vista */); } static void test_PrivateObjectSecurity(void) @@ -2150,6 +2157,7 @@ static void test_PrivateObjectSecurity(void) HeapFree(GetProcessHeap(), 0, buf); } #undef CHECK_RESULT_AND_FREE +#undef CHECK_ONE_OF_AND_FREE START_TEST(security) {

1 0

Rob Shearman : urlmon: Add a stub for GetClassFileOrMime.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: a3ad394f9cc8ca26a1ed8f9072fca36512998e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ad394f9cc8ca26a1ed8f907… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Oct 21 15:24:47 2007 +0100 urlmon: Add a stub for GetClassFileOrMime. --- dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 26 +++++++++++++++++++++----- include/urlmon.idl | 1 + 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 1da697d..fdb94eb 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -38,7 +38,7 @@ @ stub FindMediaType @ stub FindMediaTypeClass @ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) -@ stub GetClassFileOrMime +@ stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) @ stub GetClassURL @ stub GetComponentIDFromCLSSPEC @ stub GetMarkOfTheWeb diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index bbd7cc5..a64d494 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -408,11 +408,7 @@ void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) pbindinfo->cbSize = size; } -/*********************************************************************** - * FindMimeFromData (URLMON.@) - * - * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. - */ + static BOOL text_html_filter(const BYTE *b, DWORD size) { int i; @@ -522,6 +518,11 @@ static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) return TRUE; } +/*********************************************************************** + * FindMimeFromData (URLMON.@) + * + * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. + */ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, LPWSTR* ppwzMimeOut, DWORD dwReserved) @@ -677,6 +678,21 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, } /*********************************************************************** + * GetClassFileOrMime (URLMON.@) + * + * Determines the class ID from the bind context, file name or MIME type. + */ +HRESULT WINAPI GetClassFileOrMime(LPBC pBC, LPCWSTR pszFilename, + LPVOID pBuffer, DWORD cbBuffer, LPCWSTR pszMimeType, DWORD dwReserved, + CLSID *pclsid) +{ + FIXME("(%p, %s, %p, %d, %p, 0x%08x, %p): stub\n", pBC, + debugstr_w(pszFilename), pBuffer, cbBuffer, debugstr_w(pszMimeType), + dwReserved, pclsid); + return E_NOTIMPL; +} + +/*********************************************************************** * Extract (URLMON.@) */ HRESULT WINAPI Extract(void *dest, LPCSTR szCabName) diff --git a/include/urlmon.idl b/include/urlmon.idl index 3f2b49e..d84f1e7 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1264,6 +1264,7 @@ cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC* cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);") cpp_quote("HRESULT WINAPI FindMimeFromData(LPBC,LPCWSTR,LPVOID,DWORD,LPCWSTR,DWORD,LPWSTR*,DWORD);") +cpp_quote("HRESULT WINAPI GetClassFileOrMime(LPBC,LPCWSTR,LPVOID,DWORD,LPCWSTR,DWORD,CLSID*);") cpp_quote("HRESULT WINAPI HlinkGoBack(IUnknown*);") cpp_quote("HRESULT WINAPI HlinkGoForward(IUnknown*);") cpp_quote("HRESULT WINAPI HlinkNavigateMoniker(IUnknown*,IMoniker*);")

1 0

Juan Lang : crypt32: Don't allocate a 0-length string.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: e0b8e37bf036cbe8b28979b6b504b40a3f97920c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b8e37bf036cbe8b28979b6b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 20 14:25:15 2007 -0700 crypt32: Don't allocate a 0-length string. --- dlls/crypt32/str.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 9677897..a4dc60f 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -640,22 +640,33 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, LPCWSTR *ppszError) { CERT_NAME_VALUE nameValue = { type, { 0, NULL } }; - BOOL ret = FALSE; + BOOL ret = TRUE; - nameValue.Value.pbData = CryptMemAlloc((value->end - value->start) * - sizeof(WCHAR)); - if (nameValue.Value.pbData) + if (value->end > value->start) { - DWORD i; - LPWSTR ptr = (LPWSTR)nameValue.Value.pbData; - - for (i = 0; i < value->end - value->start; i++) + nameValue.Value.pbData = CryptMemAlloc((value->end - value->start) * + sizeof(WCHAR)); + if (!nameValue.Value.pbData) { - *ptr++ = value->start[i]; - if (value->start[i] == '"') - i++; + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + if (ret) + { + if (value->end > value->start) + { + DWORD i; + LPWSTR ptr = (LPWSTR)nameValue.Value.pbData; + + for (i = 0; i < value->end - value->start; i++) + { + *ptr++ = value->start[i]; + if (value->start[i] == '"') + i++; + } + nameValue.Value.cbData = (LPBYTE)ptr - nameValue.Value.pbData; } - nameValue.Value.cbData = (LPBYTE)ptr - nameValue.Value.pbData; ret = CryptEncodeObjectEx(dwCertEncodingType, X509_UNICODE_NAME_VALUE, &nameValue, CRYPT_ENCODE_ALLOC_FLAG, NULL, &output->pbData, &output->cbData);

1 0

Juan Lang : crypt32: Always set *ppszError.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: dda80531799579caa0880e6a793ad25d18418369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda80531799579caa0880e6a7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 20 14:26:00 2007 -0700 crypt32: Always set *ppszError. --- dlls/crypt32/str.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index a4dc60f..9817b9e 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -475,11 +475,16 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, ppszError ? (LPCWSTR *)&errorStr : NULL); if (ppszError) { - DWORD i; + if (!ret) + { + DWORD i; - *ppszError = pszX500; - for (i = 0; i < errorStr - x500; i++) - *ppszError = CharNextA(*ppszError); + *ppszError = pszX500; + for (i = 0; i < errorStr - x500; i++) + *ppszError = CharNextA(*ppszError); + } + else + *ppszError = NULL; } CryptMemFree(x500); } @@ -827,6 +832,8 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, CRYPT_FreeKeynameKeeper(&keeper); if (!error) { + if (ppszError) + *ppszError = NULL; ret = CryptEncodeObjectEx(dwCertEncodingType, X509_NAME, &info, 0, NULL, pbEncoded, pcbEncoded); for (i = 0; i < info.cRDN; i++)

1 0

Rob Shearman : urlmon: Fix the MIME type reported by the HTTP protocol when the Content-Type headers contains charset data too .
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: cfeaa3e682e8c645ee9c6b792533e49613d8bc54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfeaa3e682e8c645ee9c6b792… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Oct 21 15:24:07 2007 +0100 urlmon: Fix the MIME type reported by the HTTP protocol when the Content-Type headers contains charset data too. --- dlls/urlmon/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index e356f34..b86dbef 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -641,6 +641,10 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA } else { + /* remove the charset, if present */ + LPWSTR p = strchrW(content_type, ';'); + if (p) *p = '\0'; + IInternetProtocolSink_ReportProgress(This->protocol_sink, (This->grfBINDF & BINDF_FROMURLMON) ? BINDSTATUS_MIMETYPEAVAILABLE :

1 0