June 2006 - Wine-commits - list.winehq.org

Saulius Krasuckas : mscms: Eliminate complex test macro to make source navigation easier.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 3692219db4feae3a1459470ad276168cf7642ba7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3692219db4feae3a1459470… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Mon Jun 12 20:49:31 2006 +0300 mscms: Eliminate complex test macro to make source navigation easier. --- dlls/mscms/tests/profile.c | 143 +++++++++++++++++++++++++++++--------------- 1 files changed, 93 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3692219db4feae3a145…

1 0

Robert Shearman : mlang: Add us-ascii encoding to the list of supported encodings.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 0d1456ca30da84d13cce3715270e0cb019319048 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d1456ca30da84d13cce371… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:45:31 2006 +0100 mlang: Add us-ascii encoding to the list of supported encodings. --- dlls/mlang/mlang.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9ec9780..1dfb9fc 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -375,6 +375,11 @@ static const MIME_CP_INFO western_cp[] = 10079, MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, "x-mac-icelandic", "x-mac-icelandic", "x-mac-icelandic" }, + { "US-ASCII", + 20127, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_EXPORT | + MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | + MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, + "us-ascii", "us-ascii", "us-ascii" }, { "Western European (ISO)", 28591, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER |

1 0

Robert Shearman : mlang: Return S_OK from fnIMultiLanguage2_SetMimeDBSource .
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: abc0f385a3652d74477cd72653cda5f3b0b01f8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abc0f385a3652d74477cd72… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:45:40 2006 +0100 mlang: Return S_OK from fnIMultiLanguage2_SetMimeDBSource. The source is largely irrelevant since we are not likely to be wanting to ship updates to the MIME database as registry updates, instead of just changing the code. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1dfb9fc..835a7b3 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2228,8 +2228,8 @@ static HRESULT WINAPI fnIMultiLanguage2_ IMultiLanguage2* iface, MIMECONTF dwSource) { - FIXME("\n"); - return E_NOTIMPL; + FIXME("0x%08x\n", dwSource); + return S_OK; } static HRESULT WINAPI fnIMultiLanguage2_GetNumberOfScripts(

1 0

Robert Shearman : advapi32: Fix the parsing of string SIDs with multiple sub-authorities.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 4b7a5aaca63da6fedea79acd8e8b8447f0f3246d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b7a5aaca63da6fedea79ac… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:45:24 2006 +0100 advapi32: Fix the parsing of string SIDs with multiple sub-authorities. --- dlls/advapi32/security.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3ee550a..0644f15 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3404,6 +3404,8 @@ static BOOL ParseStringSidToSid(LPCWSTR { while (*StringSid && *StringSid != '-') StringSid++; + if (*StringSid == '-') + StringSid++; pisid->SubAuthority[i++] = atoiW(StringSid); }

1 0

Robert Shearman : advapi32: Replace some mixed tabs with spaces.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 8a4088d8a303b579fb9150132aa417fe3cf55714 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a4088d8a303b579fb91501… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:37:49 2006 +0100 advapi32: Replace some mixed tabs with spaces. --- dlls/advapi32/security.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8f70186..3ee550a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3346,7 +3346,7 @@ static BOOL ParseStringSidToSid(LPCWSTR { SetLastError(ERROR_INVALID_PARAMETER); TRACE("StringSid is NULL, returning FALSE\n"); - return FALSE; + return FALSE; } *cBytes = ComputeStringSidSize(StringSid); @@ -3359,7 +3359,7 @@ static BOOL ParseStringSidToSid(LPCWSTR if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ { DWORD i = 0, identAuth; - DWORD csubauth = ((*cBytes - sizeof(SID)) / sizeof(DWORD)) + 1; + DWORD csubauth = ((*cBytes - sizeof(SID)) / sizeof(DWORD)) + 1; StringSid += 2; /* Advance to Revision */ pisid->Revision = atoiW(StringSid); @@ -3375,10 +3375,10 @@ static BOOL ParseStringSidToSid(LPCWSTR goto lend; /* ERROR_INVALID_SID */ } - pisid->SubAuthorityCount = csubauth; + pisid->SubAuthorityCount = csubauth; /* Advance to identifier authority */ - while (*StringSid && *StringSid != '-') + while (*StringSid && *StringSid != '-') StringSid++; if (*StringSid == '-') StringSid++; @@ -3401,14 +3401,14 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid++; while (*StringSid) - { - while (*StringSid && *StringSid != '-') + { + while (*StringSid && *StringSid != '-') StringSid++; pisid->SubAuthority[i++] = atoiW(StringSid); } - if (i != pisid->SubAuthorityCount) + if (i != pisid->SubAuthorityCount) goto lend; /* ERROR_INVALID_SID */ bret = TRUE;

1 0

Robert Shearman : advapi32: Support well-knowns SIDs in string SIDs.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 84019596beea8620aba27432b499ace865af4ba9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84019596beea8620aba2743… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:37:07 2006 +0100 advapi32: Support well-knowns SIDs in string SIDs. --- dlls/advapi32/security.c | 92 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 64 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 96a93b8..8f70186 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -59,6 +59,14 @@ typedef struct _ACEFLAG DWORD value; } ACEFLAG, *LPACEFLAG; +typedef struct WELLKNOWNSID +{ + WCHAR wstr[2]; + SID_IDENTIFIER_AUTHORITY auth; + BYTE nSubAuthorityCount; + DWORD SubAuthority[8]; +} WELLKNOWNSID; + static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; /* @@ -3217,27 +3225,6 @@ BOOL WINAPI CreateProcessAsUserW( return TRUE; } -/****************************************************************************** - * ComputeStringSidSize - */ -static DWORD ComputeStringSidSize(LPCWSTR StringSid) -{ - int ctok = 0; - DWORD size = sizeof(SID); - - while (*StringSid) - { - if (*StringSid == '-') - ctok++; - StringSid++; - } - - if (ctok > 3) - size += (ctok - 3) * sizeof(DWORD); - - return size; -} - BOOL WINAPI DuplicateTokenEx( HANDLE ExistingTokenHandle, DWORD dwDesiredAccess, LPSECURITY_ATTRIBUTES lpTokenAttributes, @@ -3303,6 +3290,49 @@ BOOL WINAPI EnumDependentServicesW( return FALSE; } +static const WELLKNOWNSID WellKnownSids[] = +{ + { {'W','D'}, { SECURITY_WORLD_SID_AUTHORITY }, 1, { SECURITY_WORLD_RID } }, + { {'B','A'}, { SECURITY_NT_AUTHORITY }, 2, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_GROUP_RID_ADMINS } }, + { {'B','G'}, { SECURITY_NT_AUTHORITY }, 2, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_GROUP_RID_GUESTS } }, + { {'B','U'}, { SECURITY_NT_AUTHORITY }, 2, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_GROUP_RID_USERS } }, + { {'I','U'}, { SECURITY_NT_AUTHORITY }, 1, { SECURITY_INTERACTIVE_RID } }, + { {'L','S'}, { SECURITY_NT_AUTHORITY }, 1, { SECURITY_SERVICE_RID } }, + { {'S','Y'}, { SECURITY_NT_AUTHORITY }, 1, { SECURITY_LOCAL_SYSTEM_RID } }, +}; + +/****************************************************************************** + * ComputeStringSidSize + */ +static DWORD ComputeStringSidSize(LPCWSTR StringSid) +{ + DWORD size = sizeof(SID); + + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ + { + int ctok = 0; + while (*StringSid) + { + if (*StringSid == '-') + ctok++; + StringSid++; + } + + if (ctok > 3) + size += (ctok - 3) * sizeof(DWORD); + } + else /* String constant format - Only available in winxp and above */ + { + int i; + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) + size += (WellKnownSids[i].nSubAuthorityCount - 1) * sizeof(DWORD); + } + + return size; +} + /****************************************************************************** * ParseStringSidToSid */ @@ -3385,16 +3415,22 @@ static BOOL ParseStringSidToSid(LPCWSTR } else /* String constant format - Only available in winxp and above */ { + int i; pisid->Revision = SDDL_REVISION; - pisid->SubAuthorityCount = 1; - - FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); - /* TODO: Lookup string of well-known SIDs in table */ - pisid->IdentifierAuthority.Value[5] = 0; - pisid->SubAuthority[0] = 0; + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) + { + DWORD j; + pisid->SubAuthorityCount = WellKnownSids[i].nSubAuthorityCount; + pisid->IdentifierAuthority = WellKnownSids[i].auth; + for (j = 0; j < WellKnownSids[i].nSubAuthorityCount; j++) + pisid->SubAuthority[j] = WellKnownSids[i].SubAuthority[j]; + bret = TRUE; + } - bret = TRUE; + if (!bret) + FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); } lend:

1 0

Robert Shearman : advapi32: Nul-terminate the domain string in LookupAccountNameW.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: ddd84f4f281df2805d62cd0e3ba8ee506c12c77c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ddd84f4f281df2805d62cd0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:36:54 2006 +0100 advapi32: Nul-terminate the domain string in LookupAccountNameW. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2630606..96a93b8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1857,7 +1857,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; BOOL ret; PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N'}; + static const WCHAR dm[] = {'D','O','M','A','I','N',0}; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse);

1 0

Robert Shearman : ole32: Print an error if a DLL' s DllGetClassObject fails as this is
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: b5f7e818a172f2d520331c74003cef669dd0c2c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b5f7e818a172f2d520331c7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jun 12 16:36:45 2006 +0100 ole32: Print an error if a DLL's DllGetClassObject fails as this is usually a good indicator of a bug elsewhere in Wine. --- dlls/ole32/compobj.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 796c4ab..1a8ab45 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1567,6 +1567,7 @@ static HRESULT get_inproc_class_object(H typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); DllGetClassObjectFunc DllGetClassObject; WCHAR dllpath[MAX_PATH+1]; + HRESULT hr; if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { @@ -1592,7 +1593,12 @@ static HRESULT get_inproc_class_object(H /* OK: get the ClassObject */ COMPOBJ_DLLList_Add( hLibrary ); - return DllGetClassObject(rclsid, riid, ppv); + hr = DllGetClassObject(rclsid, riid, ppv); + + if (hr != S_OK) + ERR("DllGetClassObject returned error 0x%08lx\n", hr); + + return hr; } /***********************************************************************

1 0

Jan Zerebecki : wined3d: Move a checkGLcall to it's gl call inside an "if".
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: c6449b5a910d72caca80c4bf8916f910bf89861c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6449b5a910d72caca80c4b… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Jun 9 17:32:46 2006 +0200 wined3d: Move a checkGLcall to it's gl call inside an "if". --- dlls/wined3d/device.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3f5ddda..e0322eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4135,9 +4135,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); } else { - if(!This->stateBlock->renderState[WINED3DRS_ALPHABLENDENABLE]) + if(!This->stateBlock->renderState[WINED3DRS_ALPHABLENDENABLE]) { glDisable(GL_BLEND); - checkGLcall("glDisable(GL_BLEND)"); + checkGLcall("glDisable(GL_BLEND)"); + } glDisable(GL_LINE_SMOOTH); checkGLcall("glDisable(GL_LINE_SMOOTH)"); }

1 0

Jan Zerebecki : wined3d: Fix stencil related render states.
by Alexandre Julliard 13 Jun '06

13 Jun '06

Module: wine Branch: refs/heads/master Commit: 7528fc0de11d6db023c50a60fe5ee2a833dffea5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7528fc0de11d6db023c50a6… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Jun 9 17:32:18 2006 +0200 wined3d: Fix stencil related render states. --- dlls/wined3d/device.c | 404 +++++++++++++++------------------------- dlls/wined3d/utils.c | 18 ++ dlls/wined3d/wined3d_private.h | 2 3 files changed, 172 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7528fc0de11d6db023c…

1 0