Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[dgorbachev] 27107: Fix issue #2151.
by dgorbachev＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dgorbachev Date: Sun Jun 10 15:11:05 2007 New Revision: 27107 URL: http://svn.reactos.org/svn/reactos?rev=27107&view=rev Log: Fix issue #2151. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Sun Jun 10 15:11:05 2007 @@ -1767,7 +1767,7 @@ NtHeader->OptionalHeader.AddressOfEntryPoint); LdrEntry->SizeOfImage = DriverSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; - LdrEntry->SectionPointer = LdrEntry; + LdrEntry->SectionPointer = NULL; // ? /* Now write the DLL name */ LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1);

1 0

[weiden] 27106: Display the owner of the security descriptor
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 14:45:38 2007 New Revision: 27106 URL: http://svn.reactos.org/svn/reactos?rev=27106&view=rev Log: Display the owner of the security descriptor Modified: trunk/reactos/dll/win32/aclui/aclui.c trunk/reactos/dll/win32/aclui/aclui_En.rc trunk/reactos/dll/win32/aclui/precomp.h trunk/reactos/dll/win32/aclui/resource.h trunk/reactos/dll/win32/aclui/sidcache.c Modified: trunk/reactos/dll/win32/aclui/aclui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.c?re… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.c (original) +++ trunk/reactos/dll/win32/aclui/aclui.c Sun Jun 10 14:45:38 2007 @@ -90,6 +90,9 @@ DestroySidCacheMgr(sp->SidCacheMgr); + if (sp->OwnerSid != NULL) + LocalFree((HLOCAL)sp->OwnerSid); + HeapFree(GetProcessHeap(), 0, sp); @@ -309,34 +312,44 @@ } static LPWSTR +GetDisplayStringFromSidRequestResult(IN PSIDREQRESULT SidReqResult) +{ + LPWSTR lpDisplayString = NULL; + + if (SidReqResult->SidNameUse == SidTypeUser || + SidReqResult->SidNameUse == SidTypeGroup) + { + LoadAndFormatString(hDllInstance, + IDS_USERDOMAINFORMAT, + &lpDisplayString, + SidReqResult->AccountName, + SidReqResult->DomainName, + SidReqResult->AccountName); + } + else + { + LoadAndFormatString(hDllInstance, + IDS_USERFORMAT, + &lpDisplayString, + SidReqResult->AccountName); + } + + return lpDisplayString; +} + +static LPWSTR GetPrincipalDisplayString(IN PPRINCIPAL_LISTITEM PrincipalListItem) { LPWSTR lpDisplayString = NULL; if (PrincipalListItem->SidReqResult != NULL) { - if (PrincipalListItem->SidReqResult->SidNameUse == SidTypeUser || - PrincipalListItem->SidReqResult->SidNameUse == SidTypeGroup) - { - LoadAndFormatString(hDllInstance, - IDS_USERDOMAINFORMAT, - &lpDisplayString, - PrincipalListItem->SidReqResult->AccountName, - PrincipalListItem->SidReqResult->DomainName, - PrincipalListItem->SidReqResult->AccountName); - } - else - { - LoadAndFormatString(hDllInstance, - IDS_USERFORMAT, - &lpDisplayString, - PrincipalListItem->SidReqResult->AccountName); - } + lpDisplayString = GetDisplayStringFromSidRequestResult(PrincipalListItem->SidReqResult); } else { - ConvertSidToStringSid((PSID)(PrincipalListItem + 1), - &lpDisplayString); + ConvertSidToStringSidW((PSID)(PrincipalListItem + 1), + &lpDisplayString); } return lpDisplayString; @@ -491,8 +504,11 @@ ReloadPrincipalsList(IN PSECURITY_PAGE sp) { PSECURITY_DESCRIPTOR SecurityDescriptor; - BOOL DaclPresent, DaclDefaulted; + BOOL DaclPresent, DaclDefaulted, OwnerDefaulted; PACL Dacl = NULL; + PSID OwnerSid = NULL; + LPTSTR OwnerSidString; + DWORD SidLen; HRESULT hRet; /* delete the cached ACL */ @@ -501,11 +517,67 @@ /* query the ACL */ hRet = sp->psi->lpVtbl->GetSecurity(sp->psi, - DACL_SECURITY_INFORMATION, + DACL_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, &SecurityDescriptor, FALSE); if (SUCCEEDED(hRet) && SecurityDescriptor != NULL) { + if (GetSecurityDescriptorOwner(SecurityDescriptor, + &OwnerSid, + &OwnerDefaulted)) + { + sp->OwnerDefaulted = OwnerDefaulted; + if (sp->OwnerSid != NULL) + { + LocalFree((HLOCAL)sp->OwnerSid); + sp->OwnerSid = NULL; + } + + SidLen = GetLengthSid(OwnerSid); + if (SidLen == 0) + goto ClearOwner; + + sp->OwnerSid = (PSID)LocalAlloc(LMEM_FIXED, + SidLen); + if (sp->OwnerSid != NULL) + { + if (CopySid(SidLen, + sp->OwnerSid, + OwnerSid)) + { + /* Lookup the SID now */ + if (!LookupSidCache(sp->SidCacheMgr, + sp->OwnerSid, + SidLookupCompletion, + sp)) + { + /* Lookup was deferred */ + if (ConvertSidToStringSid(sp->OwnerSid, + &OwnerSidString)) + { + SetDlgItemText(sp->hWnd, + IDC_OWNER, + OwnerSidString); + LocalFree((HLOCAL)OwnerSidString); + } + else + goto ClearOwner; + } + } + else + goto ClearOwner; + } + else + goto ClearOwner; + } + else + { +ClearOwner: + SetDlgItemText(sp->hWnd, + IDC_OWNER, + NULL); + } + if (GetSecurityDescriptorDacl(SecurityDescriptor, &DaclPresent, &Dacl, @@ -605,6 +677,29 @@ IN PSIDLOOKUPNOTIFYINFO LookupInfo) { PPRINCIPAL_LISTITEM CurItem; + LPWSTR DisplayName; + + if (sp->OwnerSid != NULL && + EqualSid(sp->OwnerSid, + LookupInfo->Sid)) + { + if (LookupInfo->SidRequestResult != NULL) + DisplayName = GetDisplayStringFromSidRequestResult(LookupInfo->SidRequestResult); + else if (!ConvertSidToStringSidW(LookupInfo->Sid, + &DisplayName)) + { + DisplayName = NULL; + } + + if (DisplayName != NULL) + { + SetDlgItemTextW(sp->hWnd, + IDC_OWNER, + DisplayName); + + LocalFree((HLOCAL)DisplayName); + } + } for (CurItem = sp->PrincipalsListHead; CurItem != NULL; @@ -1422,6 +1517,9 @@ return NULL; } + ZeroMemory(sPage, + sizeof(*sPage)); + sPage->psi = psi; sPage->ObjectInfo = ObjectInfo; sPage->ServerName = SystemName; Modified: trunk/reactos/dll/win32/aclui/aclui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_En.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_En.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui_En.rc Sun Jun 10 14:45:38 2007 @@ -5,8 +5,10 @@ CAPTION "Security" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Group or user names:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Group or user names:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Owner:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "A&dd...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "&Remove", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX Modified: trunk/reactos/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/aclui/precomp.h (original) +++ trunk/reactos/dll/win32/aclui/precomp.h Sun Jun 10 14:45:38 2007 @@ -50,6 +50,9 @@ HWND hWndPrincipalsList; PPRINCIPAL_LISTITEM PrincipalsListHead; + PSID OwnerSid; + BOOL OwnerDefaulted; + INT ControlsMargin; INT SpecialPermCheckIndex; Modified: trunk/reactos/dll/win32/aclui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/resource.h… ============================================================================== --- trunk/reactos/dll/win32/aclui/resource.h (original) +++ trunk/reactos/dll/win32/aclui/resource.h Sun Jun 10 14:45:38 2007 @@ -12,6 +12,7 @@ #define IDC_ADVANCED 1007 #define IDC_LABEL_ADVANCED 1008 #define IDC_LABEL_PERMISSIONS_FOR 1009 +#define IDC_OWNER 1010 #define IDS_PSP_TITLE 1001 #define IDS_UNKNOWN 1002 Modified: trunk/reactos/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/sidcache.c… ============================================================================== --- trunk/reactos/dll/win32/aclui/sidcache.c (original) +++ trunk/reactos/dll/win32/aclui/sidcache.c Sun Jun 10 14:45:38 2007 @@ -36,7 +36,7 @@ typedef struct _SIDCACHEMGR { - LONG RefCount; + volatile LONG RefCount; LSA_HANDLE LsaHandle; CRITICAL_SECTION Lock; LIST_ENTRY QueueListHead; @@ -109,12 +109,6 @@ static VOID CleanupSidCacheMgr(IN PSIDCACHEMGR scm) { - /* make sure the lookup thread runs down */ - SetEvent(scm->LookupEvent); - WaitForSingleObject(scm->LookupThread, - INFINITE); - - LsaClose(scm->LsaHandle); CloseHandle(scm->LookupEvent); CloseHandle(scm->LookupThread); @@ -164,14 +158,7 @@ static VOID DereferenceSidCacheMgr(IN PSIDCACHEMGR scm) { - if (InterlockedDecrement(&scm->RefCount) == 0) - { - CleanupSidCacheMgr(scm); - - HeapFree(scm->Heap, - 0, - scm); - } + InterlockedDecrement(&scm->RefCount); } @@ -456,7 +443,17 @@ static DWORD WINAPI LookupThreadProc(IN LPVOID lpParameter) { + HMODULE hModule; PSIDCACHEMGR scm = (PSIDCACHEMGR)lpParameter; + + /* Reference the dll to avoid problems in case of accidental + FreeLibrary calls... */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)hDllInstance, + &hModule)) + { + hModule = NULL; + } while (scm->RefCount != 0) { @@ -564,6 +561,19 @@ FreeQueueEntry(scm, QueueEntry); } + } + + CleanupSidCacheMgr(scm); + + HeapFree(scm->Heap, + 0, + scm); + + if (hModule != NULL) + { + /* dereference the library and exit */ + FreeLibraryAndExitThread(hModule, + 0); } return 0;

1 0

[weiden] 27105: Add GUIDs for IID_IBandSite, CLSID_RebarBandSite and IID_IDeskBand
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 13:32:11 2007 New Revision: 27105 URL: http://svn.reactos.org/svn/reactos?rev=27105&view=rev Log: Add GUIDs for IID_IBandSite, CLSID_RebarBandSite and IID_IDeskBand Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=27… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c Sun Jun 10 13:32:11 2007 @@ -89,3 +89,7 @@ DEFINE_GUID(CLSID_Picture_Metafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_Picture_Dib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); + +DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); +DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC);

1 0

[weiden] 27104: Add a very experimental explorer that heavily relies on the shell. It's still very buggy, not very functional and will not work on ReactOS due to the lack of support in shell32.dll and friends. It will not be built by default. - todo.h is a header that contains definitions and GUIDs that we miss in the public sdk headers. - undoc.h contains functions that are not publicly documented. It also contains internal (not yet complete) COM interfaces used with the start menu and SHCreate
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 12:09:42 2007 New Revision: 27104 URL: http://svn.reactos.org/svn/reactos?rev=27104&view=rev Log: Add a very experimental explorer that heavily relies on the shell. It's still very buggy, not very functional and will not work on ReactOS due to the lack of support in shell32.dll and friends. It will not be built by default. - todo.h is a header that contains definitions and GUIDs that we miss in the public sdk headers. - undoc.h contains functions that are not publicly documented. It also contains internal (not yet complete) COM interfaces used with the start menu and SHCreateDesktop. Added: trunk/reactos/base/shell/explorer-new/ trunk/reactos/base/shell/explorer-new/comcsup.h (with props) trunk/reactos/base/shell/explorer-new/desktop.c (with props) trunk/reactos/base/shell/explorer-new/dragdrop.c (with props) trunk/reactos/base/shell/explorer-new/explorer.c (with props) trunk/reactos/base/shell/explorer-new/explorer.rbuild (with props) trunk/reactos/base/shell/explorer-new/explorer.rc (with props) trunk/reactos/base/shell/explorer-new/lang/ trunk/reactos/base/shell/explorer-new/lang/en-US.rc (with props) trunk/reactos/base/shell/explorer-new/manifest.xml (with props) trunk/reactos/base/shell/explorer-new/precomp.h (with props) trunk/reactos/base/shell/explorer-new/res/ trunk/reactos/base/shell/explorer-new/res/logov.bmp (with props) trunk/reactos/base/shell/explorer-new/res/start.ico (with props) trunk/reactos/base/shell/explorer-new/resource.h (with props) trunk/reactos/base/shell/explorer-new/startmnu.c (with props) trunk/reactos/base/shell/explorer-new/taskband.c (with props) trunk/reactos/base/shell/explorer-new/taskswnd.c (with props) trunk/reactos/base/shell/explorer-new/tbsite.c (with props) trunk/reactos/base/shell/explorer-new/todo.h (with props) trunk/reactos/base/shell/explorer-new/trayntfy.c (with props) trunk/reactos/base/shell/explorer-new/trayprop.c (with props) trunk/reactos/base/shell/explorer-new/traywnd.c (with props) trunk/reactos/base/shell/explorer-new/undoc.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/shell/explorer-new/comcsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/co… Added: trunk/reactos/base/shell/explorer-new/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/de… Added: trunk/reactos/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr… Added: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/shell/explorer-new/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ma… Added: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… Added: trunk/reactos/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… Added: trunk/reactos/base/shell/explorer-new/res/start.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… Added: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… Added: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… Added: trunk/reactos/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… Added: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… Added: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… Added: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… Added: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… Added: trunk/reactos/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… Added: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… Added: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un…

1 0

[weiden] 27103: Add a base address for usrmgr.dll
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 11:39:21 2007 New Revision: 27103 URL: http://svn.reactos.org/svn/reactos?rev=27103&view=rev Log: Add a base address for usrmgr.dll Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=271… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sun Jun 10 11:39:21 2007 @@ -10,6 +10,7 @@ <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> + <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> <property name="BASEADDRESS_DPLAYX" value="0x5e080000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" />

1 0

[greatlrd] 27102: simplefly the math for calc out the guiddeviceidentify
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 08:36:19 2007 New Revision: 27102 URL: http://svn.reactos.org/svn/reactos?rev=27102&view=rev Log: simplefly the math for calc out the guiddeviceidentify Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 10 08:36:19 2007 @@ -545,18 +545,16 @@ /* Count out the guidDeviceIdentifier */ memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); - pDDDI->guidDeviceIdentifier.Data1 = pDDDI->guidDeviceIdentifier.Data1 ^ pDDDI->dwVendorId; + pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId; lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; - *lpdata = *lpdata ^ pDDDI->dwDeviceId; + *lpdata ^= pDDDI->dwDeviceId; lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; - *lpdata = *lpdata ^ pDDDI->dwSubSysId; - *lpdata = *lpdata ^ pDDDI->liDriverVersion.LowPart; + *lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart; lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; - *lpdata = *lpdata ^ pDDDI->dwRevision; - *lpdata = *lpdata ^ pDDDI->liDriverVersion.HighPart; + *lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart; /* FIXME pDDDI->dwWHQLLevel * we leave this with no informations, I do not known

1 0

[greatlrd] 27101: update some comment DD COM object now we got 7 of 30 done and 7 of 30 are under developing / testing total we got 14 of 30 that is working
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:54:37 2007 New Revision: 27101 URL: http://svn.reactos.org/svn/reactos?rev=27101&view=rev Log: update some comment DD COM object now we got 7 of 30 done and 7 of 30 are under developing / testing total we got 14 of 30 that is working Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 10 07:54:37 2007 @@ -494,7 +494,7 @@ if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) { - // if we got another device like hardware mpeg decoder or video card or another drv + /* if we got another device like hardware mpeg decoder or video card or another drv */ found = TRUE; } else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) @@ -558,7 +558,11 @@ *lpdata = *lpdata ^ pDDDI->dwRevision; *lpdata = *lpdata ^ pDDDI->liDriverVersion.HighPart; - /* FIXME pDDDI->dwWHQLLevel */ + /* FIXME pDDDI->dwWHQLLevel + * we leave this with no informations, I do not known + * if program care for it, I mark this api done, and + * tested, no bugs was found in it + */ pDDDI->dwWHQLLevel = 0; retVal = DD_OK; } @@ -602,7 +606,7 @@ Main_DirectDraw_GetMonitorFrequency, /* (GetMonitorFrequency done) */ Main_DirectDraw_GetScanLine, Main_DirectDraw_GetVerticalBlankStatus, - Main_DirectDraw_Initialize, + Main_DirectDraw_Initialize, /* (Initialize done) */ Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel testing / devloping) */ Main_DirectDraw_SetDisplayMode, /* (SetDisplayMode testing / devloping) */ @@ -611,7 +615,7 @@ Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_RestoreAllSurfaces, Main_DirectDraw_TestCooperativeLevel, - Main_DirectDraw_GetDeviceIdentifier7, + Main_DirectDraw_GetDeviceIdentifier7, /* (GetDeviceIdentifier done) */ Main_DirectDraw_StartModeTest, Main_DirectDraw_EvaluateMode };

1 0

[greatlrd] 27100: adding real testcase to GetDeviceIdentifier, we can not test everything, I leave small code comment out for easy debuging
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:41:49 2007 New Revision: 27100 URL: http://svn.reactos.org/svn/reactos?rev=27100&view=rev Log: adding real testcase to GetDeviceIdentifier, we can not test everything, I leave small code comment out for easy debuging Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild (original) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Sun Jun 10 07:41:49 2007 @@ -5,6 +5,7 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <library>ole32</library> <library>ddraw</library> <library>dxguid</library> <file>ddraw_test.cpp</file> Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun Jun 10 07:41:49 2007 @@ -378,6 +378,10 @@ BOOL Test_GetDeviceIdentifier (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; + DDDEVICEIDENTIFIER2 pDDDI; + //OLECHAR GuidStr[100]; + + /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) @@ -385,6 +389,33 @@ printf("ERROR: Failed to set up ddraw\n"); return FALSE; } + + TEST ( DirectDraw->GetDeviceIdentifier(NULL, 0) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->GetDeviceIdentifier(NULL, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->GetDeviceIdentifier(NULL, DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); + + + memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); + TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, 0) == DD_OK ); + +/* + StringFromGUID2(pDDDI.guidDeviceIdentifier, GuidStr, 100); + printf("1. \n"); + printf("szDriver : %s\n",pDDDI.szDriver); + printf("szDescription : %s\n",pDDDI.szDescription); + printf("liDriverVersion : 0x%08x . 0x%08x\n", pDDDI.liDriverVersion.HighPart, pDDDI.liDriverVersion.LowPart); + printf("dwVendorId : 0x%08x\n",pDDDI.dwVendorId); + printf("dwDeviceId : 0x%08x\n",pDDDI.dwDeviceId); + printf("dwSubSysId : 0x%08x\n",pDDDI.dwSubSysId); + printf("dwRevision : 0x%08x\n",pDDDI.dwRevision); + printf("guidDeviceIdentifier : %ls\n",GuidStr); + printf("dwWHQLLevel : 0x%08x\n",pDDDI.dwWHQLLevel); +*/ + + memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); + TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, DDGDI_GETHOSTIDENTIFIER) == DD_OK ); + memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); + TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); DirectDraw->Release();

1 0

[greatlrd] 27099: Only dwWHQLLevel are left todo in GetDeviceIdentifier
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:33:17 2007 New Revision: 27099 URL: http://svn.reactos.org/svn/reactos?rev=27099&view=rev Log: Only dwWHQLLevel are left todo in GetDeviceIdentifier Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 10 07:33:17 2007 @@ -463,7 +463,7 @@ DWORD strSize = MAX_DDDEVICEID_STRING; char *pdest; char* pcCnvEnd; - long data; + long *lpdata; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -542,18 +542,23 @@ pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); - /* FIXME pDDDI->guidDeviceIdentifier, pDDDI->dwWHQLLevel */ - + /* Count out the guidDeviceIdentifier */ memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); pDDDI->guidDeviceIdentifier.Data1 = pDDDI->guidDeviceIdentifier.Data1 ^ pDDDI->dwVendorId; - data = (pDDDI->guidDeviceIdentifier.Data3 <<16) | pDDDI->guidDeviceIdentifier.Data2; - data = data ^ pDDDI->dwDeviceId; - pDDDI->guidDeviceIdentifier.Data2 = data & 0xFFFF; - pDDDI->guidDeviceIdentifier.Data3 = (data>>16) & 0xFFFF; - - + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; + *lpdata = *lpdata ^ pDDDI->dwDeviceId; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; + *lpdata = *lpdata ^ pDDDI->dwSubSysId; + *lpdata = *lpdata ^ pDDDI->liDriverVersion.LowPart; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; + *lpdata = *lpdata ^ pDDDI->dwRevision; + *lpdata = *lpdata ^ pDDDI->liDriverVersion.HighPart; + + /* FIXME pDDDI->dwWHQLLevel */ pDDDI->dwWHQLLevel = 0; retVal = DD_OK; }

1 0

[greatlrd] 27098: Building part of guidDeviceIdentifier in GetDeviceIdentifier left to coding in is REV_ SUBSYS_ liDriverVersion
by greatlrd＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: greatlrd Date: Sun Jun 10 07:10:20 2007 New Revision: 27098 URL: http://svn.reactos.org/svn/reactos?rev=27098&view=rev Log: Building part of guidDeviceIdentifier in GetDeviceIdentifier left to coding in is REV_ SUBSYS_ liDriverVersion Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 10 07:10:20 2007 @@ -463,6 +463,7 @@ DWORD strSize = MAX_DDDEVICEID_STRING; char *pdest; char* pcCnvEnd; + long data; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; @@ -518,6 +519,10 @@ { ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); } + else + { + strcat(pDDDI->szDriver,".dll"); + } RegCloseKey(hKey); } @@ -538,6 +543,16 @@ pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); /* FIXME pDDDI->guidDeviceIdentifier, pDDDI->dwWHQLLevel */ + + memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); + + pDDDI->guidDeviceIdentifier.Data1 = pDDDI->guidDeviceIdentifier.Data1 ^ pDDDI->dwVendorId; + + data = (pDDDI->guidDeviceIdentifier.Data3 <<16) | pDDDI->guidDeviceIdentifier.Data2; + data = data ^ pDDDI->dwDeviceId; + pDDDI->guidDeviceIdentifier.Data2 = data & 0xFFFF; + pDDDI->guidDeviceIdentifier.Data3 = (data>>16) & 0xFFFF; + pDDDI->dwWHQLLevel = 0; retVal = DD_OK;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007