Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 56585: [SAMLIB] Remove the unused functions SamGetDomainSid and SamSetDomainSid. They have been replaced by LSA APIs.
by ekohl＠svn.reactos.org 14 May '12

14 May '12

Author: ekohl Date: Mon May 14 00:01:24 2012 New Revision: 56585 URL: http://svn.reactos.org/svn/reactos?rev=56585&view=rev Log: [SAMLIB] Remove the unused functions SamGetDomainSid and SamSetDomainSid. They have been replaced by LSA APIs. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/include/reactos/libs/samlib/samlib.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Mon May 14 00:01:24 2012 @@ -298,52 +298,6 @@ } -BOOL WINAPI -SamGetDomainSid (PSID *Sid) -{ - DPRINT ("SamGetDomainSid() called\n"); - - return FALSE; -} - - -BOOL WINAPI -SamSetDomainSid (PSID Sid) -{ - HKEY hAccountKey; - - DPRINT ("SamSetDomainSid() called\n"); - - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account", - 0, - KEY_ALL_ACCESS, - &hAccountKey)) - { - DPRINT1 ("Failed to open the Account key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - if (RegSetValueExW (hAccountKey, - L"Sid", - 0, - REG_BINARY, - (LPBYTE)Sid, - RtlLengthSid (Sid))) - { - DPRINT1 ("Failed to set Domain-SID value! (Error %lu)\n", GetLastError()); - RegCloseKey (hAccountKey); - return FALSE; - } - - RegCloseKey (hAccountKey); - - DPRINT ("SamSetDomainSid() called\n"); - - return TRUE; -} - - /* * ERROR_USER_EXISTS */ Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Mon May 14 00:01:24 2012 @@ -65,8 +65,6 @@ @ stub SamiSetDSRMPasswordOWF @ stdcall SamInitializeSAM() -@ stdcall SamGetDomainSid(ptr) -@ stdcall SamSetDomainSid(ptr) @ stdcall SamCreateUser(wstr wstr ptr) @ stdcall SamCheckUserPassword(wstr wstr) @ stdcall SamGetUserSid(wstr ptr) Modified: trunk/reactos/include/reactos/libs/samlib/samlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samli… ============================================================================== --- trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] Mon May 14 00:01:24 2012 @@ -30,12 +30,6 @@ SamInitializeSAM (VOID); BOOL WINAPI -SamGetDomainSid (PSID *Sid); - -BOOL WINAPI -SamSetDomainSid (PSID Sid); - -BOOL WINAPI SamCreateUser (PWSTR UserName, PWSTR UserPassword, PSID UserSid);

1 0

[ekohl] 56584: [SYSSETUP] Remove the now outdated call to SamSetDomainSid.
by ekohl＠svn.reactos.org 13 May '12

13 May '12

Author: ekohl Date: Sun May 13 23:33:36 2012 New Revision: 56584 URL: http://svn.reactos.org/svn/reactos?rev=56584&view=rev Log: [SYSSETUP] Remove the now outdated call to SamSetDomainSid. Modified: trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sun May 13 23:33:36 2012 @@ -25,9 +25,6 @@ LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; NTSTATUS Status; - - if (DomainSid != NULL) - SamSetDomainSid (DomainSid); memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES);

1 0

[spetreolle] 56583: [MSI] Create InstallerLocation key, regression from r55046. Fixes msi installer check in bug 6879.
by spetreolle＠svn.reactos.org 13 May '12

13 May '12

Author: spetreolle Date: Sun May 13 22:49:24 2012 New Revision: 56583 URL: http://svn.reactos.org/svn/reactos?rev=56583&view=rev Log: [MSI] Create InstallerLocation key, regression from r55046. Fixes msi installer check in bug 6879. Modified: trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sun May 13 22:49:24 2012 @@ -28,6 +28,7 @@ [RegistrationPhase2] RegisterDlls = OleControlDlls +AddReg=Classes [OleControlDlls] 11,,atl.dll,1 @@ -89,3 +90,16 @@ 11,,wininet.dll,2 11,,wintrust.dll,1 11,,wuapi.dll,1 + +[Strings] +MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" +Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" +Desktop="Control Panel\Desktop" +Metrics="Control Panel\Desktop\WindowMetrics" +CurrentVersion="Software\Microsoft\Windows\CurrentVersion" +CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" +FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" +Control="System\CurrentControlSet\Control" + +[Classes] +HKLM,%CurrentVersion%\Installer,"InstallerLocation",,"%11%"

1 0

[tkreuzer] 56582: [WIN32K] - Handle unknown color types in TranslateCOLORREF - properly translate the color back to RGB in NtGdiSetPixel Fixes a few hundred thousand gdi32 winetests (dib) :)
by tkreuzer＠svn.reactos.org 13 May '12

13 May '12

Author: tkreuzer Date: Sun May 13 22:31:28 2012 New Revision: 56582 URL: http://svn.reactos.org/svn/reactos?rev=56582&view=rev Log: [WIN32K] - Handle unknown color types in TranslateCOLORREF - properly translate the color back to RGB in NtGdiSetPixel Fixes a few hundred thousand gdi32 winetests (dib) :) Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun May 13 22:31:28 2012 @@ -18,11 +18,10 @@ #define ROP_TO_ROP4(Rop) ((Rop) >> 16) ULONG -TranslateCOLORREF(PDC pdc, COLORREF *pcrColor) +TranslateCOLORREF(PDC pdc, COLORREF crColor) { PPALETTE ppalDC, ppalSurface; ULONG index, ulColor, iBitmapFormat; - COLORREF crColor = *pcrColor; EXLATEOBJ exlo; switch (crColor >> 24) @@ -65,15 +64,11 @@ else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; else index = crColor & 0xFFFFFF; - - /* Translate the color to RGB for the caller */ - ppalSurface = pdc->dclevel.pSurface->ppal; - *pcrColor = PALETTE_ulGetRGBColorFromIndex(ppalSurface, index); return index; default: DPRINT("Unsupported color type %d passed\n", crColor >> 24); - return 0; + crColor &= 0xFFFFFF; } /* Initialize an XLATEOBJ from RGB to the target surface */ @@ -86,19 +81,6 @@ /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); - /* Initialize an XLATEOBJ from the target surface to RGB */ - EXLATEOBJ_vInitialize(&exlo, - ppalSurface, - &gpalRGB, - 0, - pdc->pdcattr->crBackgroundClr, - pdc->pdcattr->crForegroundClr); - - /* Translate the color back to RGB */ - *pcrColor = XLATEOBJ_iXlate(&exlo.xlo, ulColor); - - /* Cleanup and return the target format color */ - EXLATEOBJ_vCleanup(&exlo); return ulColor; } @@ -1070,6 +1052,7 @@ BOOL bResult; PEBRUSHOBJ pebo; ULONG ulDirty; + EXLATEOBJ exlo; /* Lock the DC */ pdc = DC_LockDc(hdc); @@ -1088,7 +1071,7 @@ } /* Translate the color to the target format and get the RGB value */ - iSolidColor = TranslateCOLORREF(pdc, &crColor); + iSolidColor = TranslateCOLORREF(pdc, crColor); /* Use the DC's text brush, which is always a solid brush */ pebo = &pdc->eboText; @@ -1106,6 +1089,20 @@ /* Restore old text brush color and dirty flags */ EBRUSHOBJ_iSetSolidColor(pebo, iOldColor); pdc->pdcattr->ulDirty_ = ulDirty; + + /* Initialize an XLATEOBJ from the target surface to RGB */ + EXLATEOBJ_vInitialize(&exlo, + pdc->dclevel.pSurface->ppal, + &gpalRGB, + 0, + pdc->pdcattr->crBackgroundClr, + pdc->pdcattr->crForegroundClr); + + /* Translate the color back to RGB */ + crColor = XLATEOBJ_iXlate(&exlo.xlo, iSolidColor); + + /* Cleanup and return the target format color */ + EXLATEOBJ_vCleanup(&exlo); /* Unlock the DC */ DC_UnlockDc(pdc);

1 0

[ekohl] 56581: [ADVAPI32] Use LSA functions to query the account domain SID.
by ekohl＠svn.reactos.org 13 May '12

13 May '12

Author: ekohl Date: Sun May 13 21:45:59 2012 New Revision: 56581 URL: http://svn.reactos.org/svn/reactos?rev=56581&view=rev Log: [ADVAPI32] Use LSA functions to query the account domain SID. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun May 13 21:45:59 2012 @@ -307,75 +307,59 @@ static BOOL WINAPI -SamGetDomainSid(PSID *Sid) -{ +GetDomainSid(PSID *Sid) +{ + PPOLICY_ACCOUNT_DOMAIN_INFO Info = NULL; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle; PSID lpSid; - DWORD dwLength; - HKEY hDomainKey; - - TRACE("SamGetDomainSid() called\n"); - - if (Sid != NULL) - *Sid = NULL; - - /* Open the account domain key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account", - 0, - KEY_READ, - &hDomainKey)) - { - ERR("Failed to open the account domain key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - /* Get SID size */ - dwLength = 0; - if (RegQueryValueExW(hDomainKey, - L"Sid", - NULL, - NULL, - NULL, - &dwLength)) - { - ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); - RegCloseKey(hDomainKey); - return FALSE; - } - - /* Allocate sid buffer */ - TRACE("Required SID buffer size: %lu\n", dwLength); - lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - dwLength); + ULONG Length; + NTSTATUS Status; + + *Sid = NULL; + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_TRUST_ADMIN, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaOpenPolicy failed (Status: 0x%08lx)\n", Status); + return FALSE; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&Info); + if (!NT_SUCCESS(Status)) + { + ERR("LsaQueryInformationPolicy failed (Status: 0x%08lx)\n", Status); + LsaClose(PolicyHandle); + return FALSE; + } + + Length = RtlLengthSid(Info->DomainSid); + + lpSid = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length); if (lpSid == NULL) { ERR("Failed to allocate SID buffer!\n"); - RegCloseKey(hDomainKey); - return FALSE; - } - - /* Read sid */ - if (RegQueryValueExW(hDomainKey, - L"Sid", - NULL, - NULL, - (LPBYTE)lpSid, - &dwLength)) - { - ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); - RtlFreeHeap(RtlGetProcessHeap(), - 0, - lpSid); - RegCloseKey(hDomainKey); - return FALSE; - } - - RegCloseKey(hDomainKey); + LsaFreeMemory(Info); + LsaClose(PolicyHandle); + return FALSE; + } + + memcpy(lpSid, Info->DomainSid, Length); *Sid = lpSid; - TRACE("SamGetDomainSid() done\n"); + LsaFreeMemory(Info); + LsaClose(PolicyHandle); return TRUE; } @@ -435,7 +419,7 @@ if (!NT_SUCCESS(Status)) return NULL; - if (!SamGetDomainSid(&DomainSid)) + if (!GetDomainSid(&DomainSid)) return NULL; TokenGroups = RtlAllocateHeap(

1 0

[tkreuzer] 56580: [WIN32K] Check for psoMask == NULL in BltMask. Fixes part 2 of bug #7070
by tkreuzer＠svn.reactos.org 13 May '12

13 May '12

Author: tkreuzer Date: Sun May 13 19:39:20 2012 New Revision: 56580 URL: http://svn.reactos.org/svn/reactos?rev=56580&view=rev Log: [WIN32K] Check for psoMask == NULL in BltMask. Fixes part 2 of bug #7070 Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Sun May 13 19:39:20 2012 @@ -49,6 +49,8 @@ DWORD fgndRop, bkgndRop; ASSERT(IS_VALID_ROP4(Rop4)); + + if (!psoMask) return FALSE; fgndRop = ROP4_FGND(Rop4); bkgndRop = ROP4_BKGND(Rop4);

1 0

[tkreuzer] 56579: [WIN32K] - In DC_vSetOwner, do not take ownership of the current dc brush and pen, instead dereference them and select default brush and pen. Fixes bug #7070 - Fix debug logging i...
by tkreuzer＠svn.reactos.org 13 May '12

13 May '12

Author: tkreuzer Date: Sun May 13 18:29:31 2012 New Revision: 56579 URL: http://svn.reactos.org/svn/reactos?rev=56579&view=rev Log: [WIN32K] - In DC_vSetOwner, do not take ownership of the current dc brush and pen, instead dereference them and select default brush and pen. Fixes bug #7070 - Fix debug logging in GDIOBJ_vDereferenceObject - create debug log event in GDIOBJ_vSetObjectOwner Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sun May 13 18:29:31 2012 @@ -414,8 +414,19 @@ GreSetObjectOwner(pdc->dclevel.hPath, ulOwner); } - IntGdiSetBrushOwner(pdc->dclevel.pbrFill, ulOwner); - IntGdiSetBrushOwner(pdc->dclevel.pbrLine, ulOwner); + /* Dereference current brush and pen */ + BRUSH_ShareUnlockBrush(pdc->dclevel.pbrFill); + BRUSH_ShareUnlockBrush(pdc->dclevel.pbrLine); + + /* Select the default fill and line brush */ + pdc->dcattr.hbrush = StockObjects[WHITE_BRUSH]; + pdc->dcattr.hpen = StockObjects[BLACK_PEN]; + pdc->dclevel.pbrFill = BRUSH_ShareLockBrush(pdc->pdcattr->hbrush); + pdc->dclevel.pbrLine = PEN_ShareLockPen(pdc->pdcattr->hpen); + + /* Update the EBRUSHOBJs */ + EBRUSHOBJ_vUpdate(&pdc->eboFill, pdc->dclevel.pbrFill, pdc); + EBRUSHOBJ_vUpdate(&pdc->eboLine, pdc->dclevel.pbrLine, pdc); /* Allocate or free DC attribute */ if (ulOwner == GDI_OBJ_HMGR_PUBLIC || ulOwner == GDI_OBJ_HMGR_NONE) Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sun May 13 18:29:31 2012 @@ -476,18 +476,16 @@ { ULONG cRefs, ulIndex; - /* Log the event */ - DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); + /* Calculate the index */ + ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); /* Check if the object has a handle */ - if (GDI_HANDLE_GET_INDEX(pobj->hHmgr)) - { - /* Calculate the index */ - ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr); - + if (ulIndex) + { /* Decrement reference count */ ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0); cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]); + DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); /* Check if we reached 0 and handle bit is not set */ if ((cRefs & REF_MASK_INUSE) == 0) @@ -517,6 +515,7 @@ /* Decrement the objects reference count */ ASSERT(pobj->ulShareCount > 0); cRefs = InterlockedDecrement((LONG*)&pobj->ulShareCount); + DBG_LOGEVENT(&pobj->slhLog, EVENT_DEREFERENCE, cRefs); /* Check if we reached 0 */ if (cRefs == 0) @@ -777,6 +776,7 @@ /* Set new owner */ pentry->ObjectOwner.ulObj = ulOwner; + DBG_LOGEVENT(&pobj->slhLog, EVENT_SET_OWNER, 0); } /* Locks 2 or 3 objects at a time */

1 0

[ekohl] 56578: [ADVAPI32] Do not add the "SeUnsolicitedInputPrivilege" privilege to the administrators privilege set because it has been superseded by the "SeMachineAccountPrivilege" privilege and ...
by ekohl＠svn.reactos.org 13 May '12

13 May '12

Author: ekohl Date: Sun May 13 18:28:32 2012 New Revision: 56578 URL: http://svn.reactos.org/svn/reactos?rev=56578&view=rev Log: [ADVAPI32] Do not add the "SeUnsolicitedInputPrivilege" privilege to the administrators privilege set because it has been superseded by the "SeMachineAccountPrivilege" privilege and the later has already been added to the privilege set. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun May 13 18:28:32 2012 @@ -623,7 +623,6 @@ } DefaultPrivs[] = { - { L"SeUnsolicitedInputPrivilege", 0 }, { L"SeMachineAccountPrivilege", 0 }, { L"SeSecurityPrivilege", 0 }, { L"SeTakeOwnershipPrivilege", 0 },

1 0

[akhaldi] 56577: [PSDK] * Sync shldisp.idl with Wine.
by akhaldi＠svn.reactos.org 13 May '12

13 May '12

Author: akhaldi Date: Sun May 13 18:15:48 2012 New Revision: 56577 URL: http://svn.reactos.org/svn/reactos?rev=56577&view=rev Log: [PSDK] * Sync shldisp.idl with Wine. Modified: trunk/reactos/include/psdk/shldisp.idl Modified: trunk/reactos/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shldisp.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] Sun May 13 18:15:48 2012 @@ -18,14 +18,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "objidl.idl"; -import "oleidl.idl"; -import "oaidl.idl"; -import "shtypes.idl"; -import "servprov.idl"; -import "comcat.idl"; +import "ocidl.idl"; #include <shdispid.h> + +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef ShellExecute") +cpp_quote("#endif") + +/***************************************************************************** + * IEnumACString interface + */ +[ + local, + object, + uuid(8e74c210-cf9d-4eaf-a403-7356428f0a5a), + pointer_default(unique) +] +interface IEnumACString : IEnumString +{ + typedef IEnumACString *PENUMACSTRING, *LPENUMACSTRING; + + typedef enum _tagACENUMOPTION + { + ACEO_NONE = 0x00000000, + ACEO_MOSTRECENTFIRST = 0x00000001, + ACEO_FIRSTUNUSED = 0x00010000, + } ACENUMOPTION; + + HRESULT NextItem( [out] LPWSTR pszUrl, + [in] ULONG cchMax, + [out] ULONG *pulSortIndex); + + HRESULT SetEnumOptions( [in] DWORD dwOptions ); + + HRESULT GetEnumOptions( [out] DWORD *pdwOptions ); +} /***************************************************************************** * IAutoComplete interface @@ -425,11 +453,32 @@ } [ + object, + uuid(a4c6892c-3ba9-11d2-9dea-00c04fb16162), + oleautomation, + hidden, + dual, +] +interface IShellDispatch2 : IShellDispatch +{ + HRESULT IsRestricted([in] BSTR group, [in] BSTR restriction, [out, retval] long *value); + HRESULT ShellExecute([in] BSTR file, [in, optional] VARIANT args, [in, optional] VARIANT dir, + [in, optional] VARIANT op, [in, optional] VARIANT show); + HRESULT FindPrinter([in, optional] BSTR name, [in, optional] BSTR location, [in, optional] BSTR model); + HRESULT GetSystemInformation([in] BSTR name, [out, retval] VARIANT *ret); + HRESULT ServiceStart([in] BSTR service, [in] VARIANT persistent, [out, retval] VARIANT *ret); + HRESULT ServiceStop([in] BSTR service, [in] VARIANT persistent, [out, retval] VARIANT *ret); + HRESULT IsServiceRunning([in] BSTR service, [out, retval] VARIANT *running); + HRESULT CanStartStopService([in] BSTR service, [out, retval] VARIANT *ret); + HRESULT ShowBrowserBar([in] BSTR clsid, [in] VARIANT show, [out, retval] VARIANT *ret); +} + +[ uuid(13709620-c279-11ce-a49e-444553540000) ] coclass Shell { - [default] interface IShellDispatch; + [default] interface IShellDispatch2; } [

1 0

[akhaldi] 56576: [SHELL32_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 13 May '12

13 May '12

Author: akhaldi Date: Sun May 13 18:14:09 2012 New Revision: 56576 URL: http://svn.reactos.org/svn/reactos?rev=56576&view=rev Log: [SHELL32_WINETEST] * Sync to Wine 1.5.4. Added: trunk/rostests/winetests/shell32/assoc.c (with props) Modified: trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shell32/appbar.c trunk/rostests/winetests/shell32/brsfolder.c trunk/rostests/winetests/shell32/shelldispatch.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/systray.c trunk/rostests/winetests/shell32/testlist.c Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sun May 13 18:14:09 2012 @@ -7,6 +7,7 @@ list(APPEND SOURCE appbar.c + assoc.c autocomplete.c brsfolder.c ebrowser.c Modified: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… ============================================================================== --- trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/appbar.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include <windows.h> Added: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… ============================================================================== --- trunk/rostests/winetests/shell32/assoc.c (added) +++ trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -1,0 +1,108 @@ +/* Unit test suite for various shell Association objects + * + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "shlwapi.h" +#include "shlguid.h" +#include "shobjidl.h" + +#include "wine/test.h" + + +static void test_IQueryAssociations_QueryInterface(void) +{ + IQueryAssociations *qa; + IQueryAssociations *qa2; + IUnknown *unk; + HRESULT hr; + + /* this works since XP */ + hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&qa); + + if (FAILED(hr)) { + win_skip("CoCreateInstance for IQueryAssociations returned 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); + ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(qa2); + } + + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + IQueryAssociations_Release(qa); +} + + +static void test_IApplicationAssociationRegistration_QueryInterface(void) +{ + IApplicationAssociationRegistration *appreg; + IApplicationAssociationRegistration *appreg2; + IUnknown *unk; + HRESULT hr; + + /* this works since Vista */ + hr = CoCreateInstance(&CLSID_ApplicationAssociationRegistration, NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistration, (LPVOID*)&appreg); + + if (FAILED(hr)) { + skip("IApplicationAssociationRegistration not created: 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(appreg2); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + IApplicationAssociationRegistration_Release(appreg); +} + + +START_TEST(assoc) +{ + CoInitialize(NULL); + + test_IQueryAssociations_QueryInterface(); + test_IApplicationAssociationRegistration_QueryInterface(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/shell32/assoc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/brsfold… ============================================================================== --- trunk/rostests/winetests/shell32/brsfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/brsfolder.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -200,7 +200,7 @@ bi.ulFlags = BIF_NEWDIALOGSTYLE; bi.lpfn = create_new_folder_callback; /* Use test folder as the root folder for dialog box */ - MultiByteToWideChar(CP_UTF8, 0, test_folder_path, MAX_PATH, + MultiByteToWideChar(CP_UTF8, 0, test_folder_path, -1, test_folder_pathW, MAX_PATH); hr = SHGetDesktopFolder(&test_folder_object); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr); Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… ============================================================================== --- trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -27,6 +27,9 @@ #include "shlwapi.h" #include "wine/test.h" +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); @@ -303,6 +306,63 @@ IShellDispatch_Release(sd); } +static void test_service(void) +{ + static const WCHAR spooler[] = {'S','p','o','o','l','e','r',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + SERVICE_STATUS_PROCESS status; + SC_HANDLE scm, service; + IShellDispatch2 *sd; + DWORD dummy; + HRESULT hr; + BSTR name; + VARIANT v; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch2, (void**)&sd); + if (hr != S_OK) + { + win_skip("IShellDispatch2 not supported\n"); + return; + } + + V_VT(&v) = VT_I2; + V_I2(&v) = 10; + hr = IShellDispatch2_IsServiceRunning(sd, NULL, &v); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + EXPECT_HR(hr, S_OK); + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + service = OpenServiceW(scm, spooler, SERVICE_QUERY_STATUS); + QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy); + CloseServiceHandle(service); + CloseServiceHandle(scm); + + /* service should exist */ + name = SysAllocString(spooler); + V_VT(&v) = VT_I2; + hr = IShellDispatch2_IsServiceRunning(sd, name, &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + if (status.dwCurrentState == SERVICE_RUNNING) + ok(V_BOOL(&v) == VARIANT_TRUE, "got %d\n", V_BOOL(&v)); + else + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + SysFreeString(name); + + /* service doesn't exist */ + name = SysAllocString(dummyW); + V_VT(&v) = VT_I2; + hr = IShellDispatch2_IsServiceRunning(sd, name, &v); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_BOOL, "got %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); + SysFreeString(name); + + IShellDispatch_Release(sd); +} + START_TEST(shelldispatch) { HRESULT r; @@ -314,6 +374,7 @@ init_function_pointers(); test_namespace(); + test_service(); CoUninitialize(); } Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… ============================================================================== --- trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -859,6 +859,12 @@ hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } + /* non-existent folder id */ + path = (void *)0xdeadbeef; + hr = pSHGetKnownFolderPath(&IID_IOleObject, 0, NULL, &path); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "got %p\n", path); + path = NULL; hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -92,7 +92,10 @@ static char shell_call[2048]=""; static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) { - INT_PTR rc; + INT_PTR rc, rcEmpty = 0; + + if(!operation) + rcEmpty = shell_execute("", file, parameters, directory); strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, operation); @@ -138,6 +141,10 @@ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (rc > 32) dump_child(); + + if(!operation) + ok(rc == rcEmpty || broken(rc > 32 && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, + "Got different return value with empty string: %lu %lu\n", rc, rcEmpty); return rc; } @@ -2150,6 +2157,7 @@ LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; INT numargs = -1; size_t buflen; + DWORD lerror; wsprintfW(cmdline,fmt1,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); @@ -2163,6 +2171,15 @@ ok(lstrcmpW(args[1],two)==0,"arg1 is not as expected\n"); ok(lstrcmpW(args[2],three)==0,"arg2 is not as expected\n"); ok(lstrcmpW(args[3],four)==0,"arg3 is not as expected\n"); + + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(cmdline,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(NULL,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); wsprintfW(cmdline,fmt2,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -347,6 +347,7 @@ RemoveDirectoryA(".\\testdir\\testdir2"); RemoveDirectoryA(".\\testdir"); } + /* perform test */ static void test_EnumObjects(IShellFolder *iFolder) @@ -1805,6 +1806,7 @@ cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) { struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); + WCHAR *name = pFileStructW->wszName; ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, "FileStructW's offset and length should add up to the PIDL's length!\n"); @@ -1841,9 +1843,9 @@ /* TODO: Perform check for date being within one day.*/ } - ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */ - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 26)), /* Win7 */ + ok (!lstrcmpW(wszFile[i], name) || + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11), /* Win7 */ "The filename should be stored in unicode at this position!\n"); } } @@ -3783,12 +3785,15 @@ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; if (is_wow64 && pGetSystemWow64DirectoryW) { + UINT len; *dirW = 0; - ok(GetSystemDirectoryW(dirW, MAX_PATH) > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); + len = GetSystemDirectoryW(dirW, MAX_PATH); + ok(len > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); *dirW = 0; - ok(pGetSystemWow64DirectoryW(dirW, MAX_PATH) > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); + len = pGetSystemWow64DirectoryW(dirW, MAX_PATH); + ok(len > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); ok(hr == S_OK, "failed %08x\n", hr); ret = pILIsEqual(pidl1, pidl2); Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… ============================================================================== --- trunk/rostests/winetests/shell32/systray.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/systray.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define _WIN32_IE 0x600 -#include <assert.h> #include <stdarg.h> #include <windows.h> Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis… ============================================================================== --- trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] Sun May 13 18:14:09 2012 @@ -7,6 +7,7 @@ #include "wine/test.h" extern void func_appbar(void); +extern void func_assoc(void); extern void func_autocomplete(void); extern void func_brsfolder(void); extern void func_ebrowser(void); @@ -28,6 +29,7 @@ const struct test winetest_testlist[] = { { "appbar", func_appbar }, + { "assoc", func_assoc }, { "autocomplete", func_autocomplete }, { "brsfolder", func_brsfolder }, { "ebrowser", func_ebrowser },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs