Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 51995: [UMPNPMGR] Implement PNP_GetClassRegProp and fix a little bug in PNP_GetDeviceRegProp.
by ekohl＠svn.reactos.org 29 May '11

29 May '11

Author: ekohl Date: Sun May 29 15:58:49 2011 New Revision: 51995 URL: http://svn.reactos.org/svn/reactos?rev=51995&view=rev Log: [UMPNPMGR] Implement PNP_GetClassRegProp and fix a little bug in PNP_GetDeviceRegProp. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun May 29 15:58:49 2011 @@ -730,14 +730,17 @@ pulRegDataType, Buffer, pulLength); - if (lError == ERROR_MORE_DATA) + if (lError != ERROR_SUCCESS) { - ret = CR_BUFFER_SMALL; - } - else - { - *pulLength = 0; - ret = CR_NO_SUCH_VALUE; + if (lError == ERROR_MORE_DATA) + { + ret = CR_BUFFER_SMALL; + } + else + { + *pulLength = 0; + ret = CR_NO_SUCH_VALUE; + } } } else @@ -827,7 +830,7 @@ } done:; - *pulTransferLen = (ret != CR_SUCCESS) ? 0 : *pulLength; + *pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0; if (hKey != NULL) RegCloseKey(hKey); @@ -1234,8 +1237,113 @@ PNP_RPC_STRING_LEN *pulLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; + LPWSTR lpValueName = NULL; + HKEY hInstKey = NULL; + HKEY hPropKey = NULL; + LONG lError; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_GetClassRegProp() called\n"); + + if (pulTransferLen == NULL || pulLength == NULL) + { + ret = CR_INVALID_POINTER; + goto done; + } + + if (ulFlags != 0) + { + ret = CR_INVALID_FLAG; + goto done; + } + + if (*pulLength < *pulTransferLen) + *pulLength = *pulTransferLen; + + *pulTransferLen = 0; + + switch (ulProperty) + { + case CM_CRP_SECURITY: + lpValueName = L"Security"; + break; + + case CM_CRP_DEVTYPE: + lpValueName = L"DeviceType"; + break; + + case CM_CRP_EXCLUSIVE: + lpValueName = L"Exclusive"; + break; + + case CM_CRP_CHARACTERISTICS: + lpValueName = L"DeviceCharacteristics"; + break; + + default: + ret = CR_INVALID_PROPERTY; + goto done; + } + + DPRINT("Value name: %S\n", lpValueName); + + lError = RegOpenKeyExW(hClassKey, + pszClassGuid, + 0, + KEY_READ, + &hInstKey); + if (lError != ERROR_SUCCESS) + { + *pulLength = 0; + ret = CR_NO_SUCH_REGISTRY_KEY; + goto done; + } + + lError = RegOpenKeyExW(hInstKey, + L"Properties", + 0, + KEY_READ, + &hPropKey); + if (lError != ERROR_SUCCESS) + { + *pulLength = 0; + ret = CR_NO_SUCH_REGISTRY_KEY; + goto done; + } + + lError = RegQueryValueExW(hPropKey, + lpValueName, + NULL, + pulRegDataType, + Buffer, + pulLength); + if (lError != ERROR_SUCCESS) + { + if (lError == ERROR_MORE_DATA) + { + ret = CR_BUFFER_SMALL; + } + else + { + *pulLength = 0; + ret = CR_NO_SUCH_VALUE; + } + } + +done:; + *pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0; + + if (hPropKey != NULL) + RegCloseKey(hPropKey); + + if (hInstKey != NULL) + RegCloseKey(hInstKey); + + DPRINT("PNP_GetClassRegProp() done (returns %lx)\n", ret); + + return ret; } @@ -1264,19 +1372,19 @@ switch (ulProperty) { - case CM_DRP_SECURITY: + case CM_CRP_SECURITY: lpValueName = L"Security"; break; - case CM_DRP_DEVTYPE: + case CM_CRP_DEVTYPE: lpValueName = L"DeviceType"; break; - case CM_DRP_EXCLUSIVE: + case CM_CRP_EXCLUSIVE: lpValueName = L"Exclusive"; break; - case CM_DRP_CHARACTERISTICS: + case CM_CRP_CHARACTERISTICS: lpValueName = L"DeviceCharacteristics"; break;

1 0

[tkreuzer] 51994: [WIN32K] - Finish implementation of EngLoadFontFile and EngLoadFontFileFD except checksum support - Fix a typo noticed by Amine
by tkreuzer＠svn.reactos.org 29 May '11

29 May '11

Author: tkreuzer Date: Sun May 29 14:23:37 2011 New Revision: 51994 URL: http://svn.reactos.org/svn/reactos?rev=51994&view=rev Log: [WIN32K] - Finish implementation of EngLoadFontFile and EngLoadFontFileFD except checksum support - Fix a typo noticed by Amine Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Sun May 29 14:23:37 2011 @@ -58,9 +58,9 @@ gbAttachedCSRSS = FALSE; } - -ULONG_PTR -FONTDEV_LoadFontFile( +static +HFF +FONTDEV_hffLoadFontFile( PFONTDEV pfntdev, ULONG cFiles, ULONG_PTR *piFile, @@ -88,56 +88,70 @@ } -#if 0 +HFF +NTAPI EngLoadFontFileFD( - PPFF ppff, + ULONG cFiles, + PULONG_PTR piFiles, + DESIGNVECTOR *pdv, + ULONG ulCheckSum, + HDEV *phdev) { KAPC_STATE ApcState; - ULONG_PTR aiFile[FD_MAX_FILES]; PVOID apvView[FD_MAX_FILES]; ULONG acjView[FD_MAX_FILES]; - ULONG ulLangID = 0; + ULONG i, ulLangID = 0; + PFONTDEV pfntdev; + PLIST_ENTRY ple; HFF hff = 0; /* Loop all files */ - for (i = 0; i < ppff->cFiles; i++) - { - /* Setup the file array */ - aiFile[i] = (ULONG_PTR)ppff->ppfv[i]; - + for (i = 0; i < cFiles; i++) + { /* Map the font file */ - bResult = EngMapFontFileFD(aiFile[i], &apvView[i], &acjView[i]); + if (!EngMapFontFileFD(piFiles[i], (PULONG*)&apvView[i], &acjView[i])) + { + ASSERT(FALSE); + } } /* Attach to CSRSS */ AttachCSRSS(&ApcState); + /* Acquire font friver list lock */ + EngAcquireSemaphore(ghsemFontDriver); + /* Loop all installed font drivers */ - for (pfntdev = gleFontDriverList.Flink; - pfntdev != &gleFontDriverList; - pfntdev = pfntdev->leLink.Flink) - { + for (ple = gleFontDriverList.Flink; + ple != &gleFontDriverList; + ple = ple->Flink) + { + pfntdev = CONTAINING_RECORD(ple, FONTDEV, leLink); + /* Try to load the font file */ - hff = FONTDEV_LoadFontFile(pfntdev, - cFiles, - aiFile, - apvView, - acjView, - pdv, - ulLangID, - ppff->ulCheckSum); + hff = FONTDEV_hffLoadFontFile(pfntdev, + cFiles, + piFiles, + apvView, + acjView, + pdv, + ulLangID, + ulCheckSum); if (hff) { - ppff->hff = hff; + *phdev = (HDEV)pfntdev; break; } } + /* Release font friver list lock */ + EngReleaseSemaphore(ghsemFontDriver); + /* Detach from CSRSS */ - DetachCSRSS(&ApcState) - -} -#endif + DetachCSRSS(&ApcState); + + return hff; +} BOOL EngLoadFontDriver( Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Sun May 29 14:23:37 2011 @@ -32,7 +32,7 @@ for (i = 0; i < cFiles; i++) { /* Check if the files match */ - if (pffv[i] != ppff->ppfv[i]) return FALSE; + if (pffv[i] != ppff->apffv[i]) return FALSE; } return TRUE; @@ -41,13 +41,16 @@ PPFF NTAPI EngLoadFontFile( + IN ULONG cFiles, IN PWCHAR apwszFiles[], - IN ULONG cFiles) + IN DESIGNVECTOR *pdv) { PFONTFILEVIEW apffv[FD_MAX_FILES]; PLIST_ENTRY ple; - PPFF ppff; - ULONG i, cjSize; + PPFF ppff = NULL; + ULONG i, cjSize, ulChecksum = 0; + HDEV hdev; + HFF hff; /* Loop the files */ for (i = 0; i < cFiles; i++) @@ -79,8 +82,17 @@ } } + /* Load the font with any of the font drivers */ + hff = EngLoadFontFileFD(cFiles, (PULONG_PTR)apffv, pdv, ulChecksum, &hdev); + if (!hff) + { + DPRINT1("File format is not supported by any font driver\n"); + while (i--) EngFreeModule(apffv[i]); + goto leave; + } + /* Allocate a new PFF */ - cjSize = sizeof(PFF) + cFiles * sizeof(PVOID); + cjSize = sizeof(PFF); ppff = EngAllocMem(0, cjSize, 'ffpG'); if (!ppff) { @@ -89,10 +101,11 @@ ppff->sizeofThis = cjSize; ppff->cFiles = cFiles; - ppff->ppfv = (PVOID)(ppff + 1); + ppff->hdev = hdev; + ppff->hff = hff; /* Copy the FONTFILEVIEWs */ - for (i = 0; i < cFiles; i++) ppff->ppfv[i] = apffv[i]; + for (i = 0; i < cFiles; i++) ppff->apffv[i] = apffv[i]; /* Insert the PFF into the list */ InsertTailList(&glePFFList, &ppff->leLink); @@ -186,8 +199,10 @@ INT iRes = 0; /* Check parameters */ - if (cFiles > FD_MAX_FILES || cwc < 3 || cwc > FD_MAX_FILES * MAX_PATH) - { + if (cFiles == 0 || cFiles > FD_MAX_FILES || + cwc < 6 || cwc > FD_MAX_FILES * MAX_PATH) + { + EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -195,6 +210,7 @@ pvBuffer = EngAllocMem(0, (cwc + 1) * sizeof(WCHAR), 'pmTG'); if (!pvBuffer) { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] Sun May 29 14:23:37 2011 @@ -59,7 +59,7 @@ /* Unlock the DC and return */ DC_UnlockDc(pdc); - return bResult;; + return bResult; } W32KAPI Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Sun May 29 14:23:37 2011 @@ -36,8 +36,8 @@ struct _PFT *pPFT; ULONG ulCheckSum; ULONG cFonts; - PFONTFILEVIEW *ppfv; void *pPvtDataHead; + PFONTFILEVIEW apffv[FD_MAX_FILES]; } PFF, *PPFF; typedef struct _PFE @@ -206,7 +206,6 @@ } - HFONT NTAPI GreHfontCreate( @@ -216,3 +215,15 @@ IN FLONG fl, IN PVOID pvCliData); +PRFONT +NTAPI +DC_prfnt(PDC pdc); + +HFF +NTAPI +EngLoadFontFileFD( + ULONG cFiles, + PULONG_PTR piFiles, + DESIGNVECTOR *pdv, + ULONG ulCheckSum, + HDEV *phdev);

1 0

[mkupfer] 51993: Edijs Kolesnikovics < terminedijs AT yahoo DOT com> - Show GPL licence from beginning - See issue #6278 for details.
by mkupfer＠svn.reactos.org 29 May '11

29 May '11

Author: mkupfer Date: Sun May 29 12:55:07 2011 New Revision: 51993 URL: http://svn.reactos.org/svn/reactos?rev=51993&view=rev Log: Edijs Kolesnikovics < terminedijs AT yahoo DOT com> - Show GPL licence from beginning - See issue #6278 for details. Modified: trunk/reactos/dll/cpl/sysdm/licence.c Modified: trunk/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/licence.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/licence.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/licence.c [iso-8859-1] Sun May 29 12:55:07 2011 @@ -54,7 +54,7 @@ EM_SETSEL, -1, 0); - + PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), WM_VSCROLL, SB_TOP, 0); return TRUE; }

1 0

[tkreuzer] 51992: [WIN32K] - Implement NtGdiGetTextMetricsW. (It's sooo much cleaner now :D)
by tkreuzer＠svn.reactos.org 29 May '11

29 May '11

Author: tkreuzer Date: Sun May 29 12:51:55 2011 New Revision: 51992 URL: http://svn.reactos.org/svn/reactos?rev=51992&view=rev Log: [WIN32K] - Implement NtGdiGetTextMetricsW. (It's sooo much cleaner now :D) Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] Sun May 29 12:51:55 2011 @@ -16,11 +16,50 @@ APIENTRY NtGdiGetTextMetricsW( IN HDC hdc, - OUT TMW_INTERNAL * ptm, + OUT TMW_INTERNAL *ptmwi, IN ULONG cj) { - ASSERT(FALSE); - return FALSE; + PDC pdc; + PRFONT prfnt; + PIFIMETRICS pifi; + BOOL bResult = TRUE; + + /* verify that the buffer is large enough */ + if (cj < sizeof(TMW_INTERNAL)) return FALSE; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return FALSE; + } + + /* Get pointer to RFONT and IFI */ + prfnt = DC_prfnt(pdc); + pifi = prfnt->ppfe->pifi; + + /* Enter SEH for buffer copy */ + _SEH2_TRY + { + /* Probe and fill TMW_INTERNAL */ + ProbeForWrite(ptmwi, cj, 1); + RtlCopyMemory(&ptmwi->TextMetric, prfnt->ptmw, sizeof(TEXTMETRICW)); + ptmwi->Diff.cjotma = 0; // FIXME: what is this? + ptmwi->Diff.chFirst = pifi->chFirstChar; + ptmwi->Diff.chLast = pifi->chLastChar; + ptmwi->Diff.ChDefault = pifi->chDefaultChar; + ptmwi->Diff.ChBreak = pifi->chBreakChar; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + bResult = FALSE; + } + _SEH2_END + + /* Unlock the DC and return */ + DC_UnlockDc(pdc); + return bResult;; } W32KAPI

1 0

[sserapion] 51991: [NTLMSSP] - Implement QueryContextAttributes(SECPKG_ATTR_SIZES and SECPKG_ATTR_FLAGS). - Fix confusion with UNICODE_STRING.Length, it should contain the size in bytes of the stri...
by sserapion＠svn.reactos.org 29 May '11

29 May '11

Author: sserapion Date: Sun May 29 10:23:00 2011 New Revision: 51991 URL: http://svn.reactos.org/svn/reactos?rev=51991&view=rev Log: [NTLMSSP] - Implement QueryContextAttributes(SECPKG_ATTR_SIZES and SECPKG_ATTR_FLAGS). - Fix confusion with UNICODE_STRING.Length, it should contain the size in bytes of the string. - WIP Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c [iso-8859-1] Sun May 29 10:23:00 2011 @@ -112,7 +112,7 @@ const PUCHAR session_base_key, const PUCHAR lm_challenge_resonse, const PUCHAR server_challenge, - PUCHAR key_exchange_key) + PUCHAR key_exchange_key) { /* fix me */ memcpy(key_exchange_key, session_base_key, 16); Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] Sun May 29 10:23:00 2011 @@ -399,21 +399,9 @@ goto fail; } - /* set results */ + /* set result */ phNewContext->dwUpper = NegotiateFlags; phNewContext->dwLower = newContext; - - /* build blob with the nego message */ - SecBufferDesc BufferDesc; - BufferDesc.ulVersion = SECBUFFER_VERSION; - BufferDesc.cBuffers = 1; - BufferDesc.pBuffers = OutputToken1; - - if(fContextReq & ISC_REQ_ALLOCATE_MEMORY) - *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; - - *pOutput = BufferDesc; - } else /* challenge! */ { @@ -433,28 +421,34 @@ } } - /* get second output token */ - ret = NtlmGetSecBuffer(pOutput, - 1, - &OutputToken2, - TRUE); - if(!ret) - { - /* not fatal, aparently */ - ERR("Failed to get output token!\n"); - } - - TRACE("phContext->dwLower %lx\n", phContext->dwLower); - NtlmHandleChallengeMessage(phContext->dwLower, - fContextReq, - InputToken1, - InputToken2, - &OutputToken1, - &OutputToken2, - pfContextAttr, - ptsExpiry, - &NegotiateFlags); - } + ret = NtlmHandleChallengeMessage(phNewContext->dwLower, + fContextReq, + InputToken1, + InputToken2, + OutputToken1, + OutputToken2, + pfContextAttr, + ptsExpiry, + &NegotiateFlags); + + if(!NT_SUCCESS(ret)) + { + ERR("NtlmHandleChallengeMessage failed with %lx\n", ret); + goto fail; + } + + } + + /* build blob with the output message */ + SecBufferDesc BufferDesc; + BufferDesc.ulVersion = SECBUFFER_VERSION; + BufferDesc.cBuffers = 1; + BufferDesc.pBuffers = OutputToken1; + + if(fContextReq & ISC_REQ_ALLOCATE_MEMORY) + *pfContextAttr |= ISC_RET_ALLOCATED_MEMORY; + + *pOutput = BufferDesc; return ret; @@ -520,13 +514,42 @@ ULONG ulAttribute, void *pBuffer) { + SECURITY_STATUS ret = SEC_E_OK; + PNTLMSSP_CONTEXT context = NtlmReferenceContext(phContext->dwLower); + TRACE("%p %lx %p\n", phContext, ulAttribute, pBuffer); - if (!phContext) + + if (!context) return SEC_E_INVALID_HANDLE; - UNIMPLEMENTED; - - return SEC_E_UNSUPPORTED_FUNCTION; + switch(ulAttribute) + { + case SECPKG_ATTR_SIZES: + { + PSecPkgContext_Sizes spcs = (PSecPkgContext_Sizes) pBuffer; + spcs->cbMaxToken = NTLM_MAX_BUF; + spcs->cbMaxSignature = sizeof(MESSAGE_SIGNATURE); + spcs->cbBlockSize = 0; + spcs->cbSecurityTrailer = sizeof(MESSAGE_SIGNATURE); + break; + } + case SECPKG_ATTR_FLAGS: + { + PSecPkgContext_Flags spcf = (PSecPkgContext_Flags)pBuffer; + spcf->Flags = 0; + if(context->NegotiateFlags & NTLMSSP_NEGOTIATE_SIGN) + spcf->Flags |= ISC_RET_INTEGRITY; + if(context->NegotiateFlags & NTLMSSP_NEGOTIATE_SEAL) + spcf->Flags |= ISC_RET_CONFIDENTIALITY; + break; + } + default: + FIXME("ulAttribute %lx unsupported\n", ulAttribute); + ret = SEC_E_UNSUPPORTED_FUNCTION; + } + + NtlmDereferenceContext((ULONG_PTR)context); + return ret; } SECURITY_STATUS @@ -553,9 +576,8 @@ SECURITY_STATUS ret = SEC_E_OK; PSecBuffer InputToken1, InputToken2; PSecBuffer OutputToken1; - ULONG_PTR newContext; - - TRACE("%p %p %p %lx %lx %p %p %p %p\n", phCredential, phContext, pInput, + + TRACE("AcceptSecurityContext %p %p %p %lx %lx %p %p %p %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); /* get first input token */ @@ -577,7 +599,7 @@ if(!ret) { ERR("Failed to get input token!\n"); - return SEC_E_INVALID_TOKEN; + //return SEC_E_INVALID_TOKEN; } /* get first output token */ @@ -592,7 +614,7 @@ } /* first call */ - if(!phContext && !InputToken2->cbBuffer) + if(!phContext && !InputToken2) { if(!phCredential) { @@ -601,17 +623,17 @@ } ret = NtlmHandleNegotiateMessage(phCredential->dwLower, - &newContext, + &phNewContext->dwLower, fContextReq, InputToken1, &OutputToken1, pfContextAttr, ptsExpiry); - phNewContext = (PCtxtHandle)newContext; } else + { WARN("Handle Authenticate UNIMPLEMENTED!\n"); - + } //if(!NT_SUCCESS(ret)) UNIMPLEMENTED; @@ -650,9 +672,6 @@ return ret; } -/*********************************************************************** - * RevertSecurityContext - */ SECURITY_STATUS SEC_ENTRY RevertSecurityContext(PCtxtHandle phContext) @@ -681,8 +700,8 @@ SECURITY_STATUS SEC_ENTRY -ApplyControlToken(IN PCtxtHandle phContext, - IN PSecBufferDesc pInput) +ApplyControlToken(IN PCtxtHandle phContext, + IN PSecBufferDesc pInput) { UNIMPLEMENTED; Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] Sun May 29 10:23:00 2011 @@ -196,10 +196,7 @@ pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); if (pGetKeyFn || pGetKeyArgument) - { WARN("msdn says these should always be null!\n"); - return ret; - } //initialize to null RtlInitUnicodeString(&username, NULL); @@ -224,13 +221,13 @@ if(auth_data->User) { - int len = auth_data->UserLength; - username.Buffer = NtlmAllocate((len+1) * sizeof(WCHAR)); + int len = auth_data->UserLength * sizeof(WCHAR); + username.Buffer = NtlmAllocate(len+sizeof(WCHAR)); if(username.Buffer) { - username.MaximumLength = username.Length = len+1; - memcpy(username.Buffer, auth_data->User, len* sizeof(WCHAR)); - username.Buffer[len+1] = L'\0'; + username.MaximumLength = username.Length = len; + memcpy(username.Buffer, auth_data->User, len); + username.Buffer[(len/sizeof(WCHAR))+1] = L'\0'; } else return SEC_E_INSUFFICIENT_MEMORY; @@ -238,13 +235,13 @@ if(auth_data->Password) { - int len = auth_data->PasswordLength; - password.Buffer = NtlmAllocate((len+1) * sizeof(WCHAR)); + int len = auth_data->PasswordLength * sizeof(WCHAR); + password.Buffer = NtlmAllocate(len+sizeof(WCHAR)); if(password.Buffer) { - password.MaximumLength = password.Length = len+1; - memcpy(password.Buffer, auth_data->Password, len* sizeof(WCHAR)); - password.Buffer[len+1] = L'\0'; + password.MaximumLength = password.Length = len; + memcpy(password.Buffer, auth_data->Password, len); + password.Buffer[(len/sizeof(WCHAR))+1] = L'\0'; } else return SEC_E_INSUFFICIENT_MEMORY; @@ -252,13 +249,13 @@ if(auth_data->Domain) { - int len = auth_data->DomainLength; - domain.Buffer = NtlmAllocate((len+1) * sizeof(WCHAR)); + int len = auth_data->DomainLength * sizeof(WCHAR); + domain.Buffer = NtlmAllocate(len+sizeof(WCHAR)); if(domain.Buffer) { - domain.MaximumLength = domain.Length = len+1; - memcpy(domain.Buffer, auth_data->Domain, len* sizeof(WCHAR)); - domain.Buffer[len+1] = L'\0'; + domain.MaximumLength = domain.Length = len; + memcpy(domain.Buffer, auth_data->Domain, len); + domain.Buffer[(len/sizeof(WCHAR))+1] = L'\0'; } else return SEC_E_INSUFFICIENT_MEMORY; @@ -292,7 +289,7 @@ if(password.Buffer != NULL) { - NtlmProtectMemory(password.Buffer, password.Length * sizeof(WCHAR)); + NtlmProtectMemory(password.Buffer, password.Length); cred->Password = password; }

1 0

[akhaldi] 51990: [CMAKE] * Add missing dependency.
by akhaldi＠svn.reactos.org 29 May '11

29 May '11

Author: akhaldi Date: Sun May 29 09:55:23 2011 New Revision: 51990 URL: http://svn.reactos.org/svn/reactos?rev=51990&view=rev Log: [CMAKE] * Add missing dependency. Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun May 29 09:55:23 2011 @@ -58,3 +58,4 @@ target_link_libraries(msvcrtex oldnames) endif() +add_dependencies(msvcrtex psdk)

1 0

[tkreuzer] 51989: [WIN32K] - Implement NtGdiSelectFont
by tkreuzer＠svn.reactos.org 29 May '11

29 May '11

Author: tkreuzer Date: Sun May 29 09:29:31 2011 New Revision: 51989 URL: http://svn.reactos.org/svn/reactos?rev=51989&view=rev Log: [WIN32K] - Implement NtGdiSelectFont Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/dc.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c [iso-8859-1] Sun May 29 09:29:31 2011 @@ -11,6 +11,41 @@ #define NDEBUG #include <debug.h> +static +HFONT +DC_hSelectFont(PDC pdc, HFONT hlfntNew) +{ + PLFONT plfntNew; + HFONT hlfntOld; + + /* Get the current selected font */ + hlfntOld = pdc->dclevel.plfnt->baseobj.hHmgr; + + /* Check if a new font should be selected */ + if (hlfntNew != hlfntOld) + { + /* Lock the new font */ + plfntNew = LFONT_ShareLockFont(hlfntNew); + if (plfntNew) + { + /* Success, dereference the old font */ + LFONT_ShareUnlockFont(pdc->dclevel.plfnt); + + /* Select the new font */ + pdc->dclevel.plfnt = plfntNew; + pdc->pdcattr->hlfntNew = hlfntNew; + } + else + { + /* Failed, restore old, return NULL */ + pdc->pdcattr->hlfntNew = hlfntOld; + hlfntOld = NULL; + } + } + + return hlfntOld; +} + #if 0 PRFONT NTAPI @@ -19,28 +54,13 @@ PLFONT plfnt; PRFONT prfnt; - /* Check if new font was selected */ - if (pdc->pdcattr->ulDirty_ & DIRTY_TEXT) - { - /* Lock the new font */ - plfnt = LFONT_ShareLockFont(pdc->pdcattr->hlfntNew); - if (plfnt) - { - LFONT_ShareUnlockFont(pdc->dclevel.pFont); - pdc->dclevel.pFont = plfnt; - } - else - { - // FIXME: test how selecting an invalid font is handled - pdc->pdcattr->hlfntNew = pdc->dclevel.pFont; - } - } + /* Select "current" font */ + DC_hSelectFont(pdc->pdcattr->hlfntNew); /* Check if font is already realized */ if (pdc->hlfntCur != pdc->pdcattr->hlfntNew) { - - prfnt = LFONT_prfntRealizeFont(pdc->dclevel.pFont); + prfnt = LFONT_prfntRealizeFont(pdc->dclevel.plfnt); /* Dereference the old RFONT */ RFONT_ShareUnlockFont(pdc->prfnt); @@ -147,8 +167,22 @@ APIENTRY NtGdiSelectFont( IN HDC hdc, - IN HFONT hf) + IN HFONT hlfnt) { - ASSERT(FALSE); - return 0; + PDC pdc; + HFONT hlfntOld; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return NULL; + } + + /* Call the internal function */ + hlfntOld = DC_hSelectFont(pdc, hlfnt); + + /* Unlock DC and return result */ + DC_UnlockDc(pdc); + return hlfntOld; } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Sun May 29 09:29:31 2011 @@ -12,7 +12,6 @@ #include <debug.h> HSEMAPHORE ghsemPFFList; -PPFF gppffList; LIST_ENTRY glePFFList = {&glePFFList, &glePFFList}; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sun May 29 09:29:31 2011 @@ -69,7 +69,7 @@ POINTL ptlBrushOrigin; PBRUSH pbrFill; PBRUSH pbrLine; - PVOID plfnt; /* LFONTOBJ* (TEXTOBJ*) */ + struct _LFONT *plfnt; HGDIOBJ hPath; /* HPATH */ FLONG flPath; LINEATTRS laPath; /* 0x20 bytes */ Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sun May 29 09:29:31 2011 @@ -310,7 +310,9 @@ // pdc->dclevel.ca = /* Setup font data */ - pdc->hlfntCur = NULL; // FIXME: 2f0a0cf8 + pdc->dcattr.hlfntNew = StockObjects[SYSTEM_FONT]; + pdc->hlfntCur = NULL; + pdc->dclevel.plfnt = (PVOID)GDIOBJ_ReferenceObjectByHandle(pdc->dcattr.hlfntNew, GDIObjType_LFONT_TYPE); // LFONT_ShareLockFont(pdc->dcattr.hlfntNew); pdc->pPFFList = NULL; pdc->flSimulationFlags = 0; pdc->lEscapement = 0; @@ -322,8 +324,6 @@ pdc->dcattr.lRelAbs = 1; pdc->dcattr.lBreakExtra = 0; pdc->dcattr.cBreak = 0; - pdc->dcattr.hlfntNew = StockObjects[SYSTEM_FONT]; -// pdc->dclevel.pFont = LFONT_ShareLockFont(pdc->dcattr.hlfntNew); /* Other stuff */ pdc->hdcNext = NULL;

1 0

[ekohl] 51988: [UMPNPMGR] - Implement PNP_SetClassRegProp. - Fix a typo in the PNP_SetClassRegProp declaration in pnp.idl.
by ekohl＠svn.reactos.org 28 May '11

28 May '11

Author: ekohl Date: Sat May 28 22:15:38 2011 New Revision: 51988 URL: http://svn.reactos.org/svn/reactos?rev=51988&view=rev Log: [UMPNPMGR] - Implement PNP_SetClassRegProp. - Fix a typo in the PNP_SetClassRegProp declaration in pnp.idl. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat May 28 22:15:38 2011 @@ -1242,15 +1242,100 @@ /* Function 27 */ DWORD PNP_SetClassRegProp( handle_t hBinding, - LPWSTR *pszClassGuid, + LPWSTR pszClassGuid, DWORD ulProperty, DWORD ulDataType, BYTE *Buffer, PNP_PROP_SIZE ulLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; + LPWSTR lpValueName = NULL; + HKEY hInstKey = 0; + HKEY hPropKey = 0; + LONG lError; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_SetClassRegProp() called\n"); + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + switch (ulProperty) + { + case CM_DRP_SECURITY: + lpValueName = L"Security"; + break; + + case CM_DRP_DEVTYPE: + lpValueName = L"DeviceType"; + break; + + case CM_DRP_EXCLUSIVE: + lpValueName = L"Exclusive"; + break; + + case CM_DRP_CHARACTERISTICS: + lpValueName = L"DeviceCharacteristics"; + break; + + default: + return CR_INVALID_PROPERTY; + } + + lError = RegOpenKeyExW(hClassKey, + pszClassGuid, + 0, + KEY_WRITE, + &hInstKey); + if (lError != ERROR_SUCCESS) + { + ret = CR_NO_SUCH_REGISTRY_KEY; + goto done; + } + + /* FIXME: Set security descriptor */ + lError = RegCreateKeyExW(hInstKey, + L"Properties", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hPropKey, + NULL); + if (lError != ERROR_SUCCESS) + { + ret = CR_REGISTRY_ERROR; + goto done; + } + + if (ulLength == 0) + { + if (RegDeleteValueW(hPropKey, + lpValueName)) + ret = CR_REGISTRY_ERROR; + } + else + { + if (RegSetValueExW(hPropKey, + lpValueName, + 0, + ulDataType, + Buffer, + ulLength)) + ret = CR_REGISTRY_ERROR; + } + +done:; + if (hPropKey != NULL) + RegCloseKey(hPropKey); + + if (hInstKey != NULL) + RegCloseKey(hInstKey); + + return ret; } Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sat May 28 22:15:38 2011 @@ -467,7 +467,7 @@ /* Function 27 */ DWORD PNP_SetClassRegProp( [in] handle_t hBinding, - [in, string, ref] LPWSTR *pszClassGuid, + [in, string, ref] LPWSTR pszClassGuid, [in] DWORD ulProperty, [in] DWORD ulDataType, [in, size_is(ulLength)] BYTE *Buffer,

1 0

[akhaldi] 51987: [CMAKE] * Improve reactos.cab creation a bit: create it using a custom command instead of a custom target.. marking it as output this way ensures a proper cleanup with make clean a...
by akhaldi＠svn.reactos.org 28 May '11

28 May '11

Author: akhaldi Date: Sat May 28 22:03:07 2011 New Revision: 51987 URL: http://svn.reactos.org/svn/reactos?rev=51987&view=rev Log: [CMAKE] * Improve reactos.cab creation a bit: create it using a custom command instead of a custom target.. marking it as output this way ensures a proper cleanup with make clean and co. Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sat May 28 22:03:07 2011 @@ -26,20 +26,22 @@ ) # And now we build reactos.cab + +# First we create reactos.inf add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff ) -# add_custom_command( - # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - # COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} - # DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -# ) -add_custom_target(reactos_cab - native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} +# Then we create the actual cab file +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf - VERBATIM) +) + +# Finally, we create the reactos_cab target +add_custom_target(reactos_cab ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

[tkreuzer] 51986: [WIN32K] Get rid of ftGdiGetGlyphOutline, NtGdiGetFontFamilyInfo, IntGetCharDimensions, ftGdiGetTextCharsetInfo, IntGetFontLanguageInfo, RealizeFontInit
by tkreuzer＠svn.reactos.org 28 May '11

28 May '11

Author: tkreuzer Date: Sat May 28 21:57:24 2011 New Revision: 51986 URL: http://svn.reactos.org/svn/reactos?rev=51986&view=rev Log: [WIN32K] Get rid of ftGdiGetGlyphOutline, NtGdiGetFontFamilyInfo, IntGetCharDimensions, ftGdiGetTextCharsetInfo, IntGetFontLanguageInfo, RealizeFontInit Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/misc.c [iso-8859-1] Sat May 28 21:57:24 2011 @@ -146,32 +146,7 @@ } -// *********** hacks - -ULONG -FASTCALL -ftGdiGetGlyphOutline( - PDC dc, - WCHAR wch, - UINT iFormat, - LPGLYPHMETRICS pgm, - ULONG cjBuf, - PVOID pvBuf, - LPMAT2 pmat2, - BOOL bIgnoreRotation) -{ - ASSERT(FALSE); - return 0; -} - -int APIENTRY -NtGdiGetFontFamilyInfo(HDC Dc, - LPLOGFONTW UnsafeLogFont, - PFONTFAMILYINFO UnsafeInfo, - DWORD Size) -{ - return 0; -} +// *********** hack NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) @@ -181,39 +156,5 @@ return STATUS_UNSUCCESSFUL; } -DWORD -FASTCALL -IntGetCharDimensions(HDC hdc, PTEXTMETRICW ptm, PDWORD height) -{ - ASSERT(FALSE); - return -1; -} - -INT -FASTCALL -ftGdiGetTextCharsetInfo( - PDC Dc, - LPFONTSIGNATURE lpSig, - DWORD dwFlags) -{ - ASSERT(FALSE); - return 0; -} - -DWORD -FASTCALL -IntGetFontLanguageInfo(PDC Dc) -{ - ASSERT(FALSE); - return 0; -} - -PTEXTOBJ -FASTCALL -RealizeFontInit(HFONT hFont) -{ - ASSERT(FALSE); - return 0; -} Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sat May 28 21:57:24 2011 @@ -314,7 +314,7 @@ BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) { - TEXTMETRICW tmw; + //TEXTMETRICW tmw; UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); if (! IntCreatePrimarySurface()) { @@ -342,8 +342,11 @@ gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); // Font is realized and this dc was previously set to internal DC_ATTR. + DPRINT1("HACK HACK HACK HACK HACK HACK HACK HACK HACK \n"); +#if 0 gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); gpsi->tmSysFont = tmw; +#endif return TRUE; } @@ -974,7 +977,7 @@ /* * FIXME - don't allow changing the window station if there are threads that are attached to desktops and own gui objects */ - + PsSetProcessWindowStation(ppi->peProcess, hWindowStation); ppi->prpwinsta = NewWinSta; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat May 28 21:57:24 2011 @@ -106,8 +106,6 @@ void DC_InitHack(PDC pdc) { - pdc->pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); - /* This should never fail */ ASSERT(pdc->dclevel.ppal); Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Sat May 28 21:57:24 2011 @@ -290,7 +290,8 @@ break; case GdiGetFontLanguageInfo: - SafeResult = IntGetFontLanguageInfo(pdc); + ASSERT(FALSE); // FIXME + SafeResult = 0; break; case GdiGetIsMemDc: Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/objects/path.c [iso-8859-1] Sat May 28 21:57:24 2011 @@ -2037,7 +2037,8 @@ pdcattr = dc->pdcattr; - TextObj = RealizeFontInit( pdcattr->hlfntNew); +ASSERT(FALSE); + TextObj = NULL; if ( !TextObj ) return FALSE; FontGetObject( TextObj, sizeof(lf), &lf); Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Sat May 28 21:57:24 2011 @@ -678,7 +678,6 @@ SVC_(GdiSetDIBits, 7) SVC_(GdiSetViewportOrgEx, 4) SVC_(GdiSetWindowOrgEx, 4) -SVC_(GdiGetFontFamilyInfo, 4) SVC_(GdiOffsetViewportOrgEx, 4) SVC_(GdiOffsetWindowOrgEx, 4)

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