Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[janderwald] 47785: [PORTCLS] - Return better return code for unimplemented feature

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jun 16 14:14:33 2010 New Revision: 47785 URL: http://svn.reactos.org/svn/reactos?rev=47785&view=rev Log: [PORTCLS] - Return better return code for unimplemented feature Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [iso-8859-1] Wed Jun 16 14:14:33 2010 @@ -143,10 +143,10 @@ { DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Status = STATUS_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return STATUS_NOT_FOUND; } Status = PcHandlePropertyWithTable(Irp, m_Descriptor->FilterPropertySetCount, m_Descriptor->FilterPropertySet, m_Descriptor);

14 years, 6 months

[ekohl] 47784: [SYSSETUP] Set registry values 'PathName' and 'SystemRoot' in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion. This fixes bug #4414.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 15 19:31:19 2010 New Revision: 47784 URL: http://svn.reactos.org/svn/reactos?rev=47784&view=rev Log: [SYSSETUP] Set registry values 'PathName' and 'SystemRoot' in HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion. This fixes bug #4414. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Jun 15 19:31:19 2010 @@ -855,6 +855,7 @@ DWORD LastError; HANDLE token; TOKEN_PRIVILEGES privs; + HKEY hKey; InitializeSetupActionLog(FALSE); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); @@ -901,6 +902,29 @@ if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) { + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, + KEY_WRITE, + &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, + L"PathName", + 0, + REG_SZ, + (LPBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + + RegSetValueExW(hKey, + L"SystemRoot", + 0, + REG_SZ, + (LPBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + } + PathAddBackslash(szBuffer); _tcscat(szBuffer, _T("system")); CreateDirectory(szBuffer, NULL);

14 years, 6 months

[janderwald] 47783: [PORTCLS] - Add sanity check

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jun 15 17:29:43 2010 New Revision: 47783 URL: http://svn.reactos.org/svn/reactos?rev=47783&view=rev Log: [PORTCLS] - Add sanity check Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Tue Jun 15 17:29:43 2010 @@ -320,11 +320,15 @@ } } + // sanity check + PC_ASSERT(SubDeviceDescriptor->UnknownMiniport); + // allocate a property request PropertyRequest = (PPCPROPERTY_REQUEST)AllocateItem(NonPagedPool, sizeof(PCPROPERTY_REQUEST), TAG_PORTCLASS); if (!PropertyRequest) return STATUS_INSUFFICIENT_RESOURCES; + // initialize property request PropertyRequest->MajorTarget = SubDeviceDescriptor->UnknownMiniport; PropertyRequest->MinorTarget = SubDeviceDescriptor->UnknownStream; PropertyRequest->Irp = Irp; @@ -546,7 +550,7 @@ /// FIXME /// handle driver properties - //DumpFilterDescriptor(FilterDescription); + DumpFilterDescriptor(FilterDescription); Descriptor->FilterPropertySet = (PKSPROPERTY_SET)AllocateItem(NonPagedPool, sizeof(KSPROPERTY_SET) * FilterPropertiesCount, TAG_PORTCLASS); if (! Descriptor->FilterPropertySet) @@ -611,7 +615,7 @@ Descriptor->Factory.PinDescriptorSize = sizeof(KSPIN_DESCRIPTOR); SrcDescriptor = (PPCPIN_DESCRIPTOR)FilterDescription->Pins; - DPRINT("Size %u Expected %u Ex Size %u\n", FilterDescription->PinSize, sizeof(KSPIN_DESCRIPTOR), sizeof(KSPIN_DESCRIPTOR_EX)); + DPRINT("Size %u Expected %u\n", FilterDescription->PinSize, sizeof(PCPIN_DESCRIPTOR)); // copy pin factories for(Index = 0; Index < FilterDescription->PinCount; Index++)

14 years, 6 months

[janderwald] 47782: [MMIXER] - Fix buffer overflow - Dedicated to irc:igorko

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jun 15 14:04:19 2010 New Revision: 47782 URL: http://svn.reactos.org/svn/reactos?rev=47782&view=rev Log: [MMIXER] - Fix buffer overflow - Dedicated to irc:igorko Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Tue Jun 15 14:04:19 2010 @@ -638,9 +638,16 @@ Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); if (Status == MM_STATUS_SUCCESS) { - ASSERT(Length < MAXPNAMELEN); - wcscpy(MixerInfo->MixCaps.szPname, Name); + // copy device name + MixerContext->Copy(MixerInfo->MixCaps.szPname, Name, min(wcslen(Name), MAXPNAMELEN-1) * sizeof(WCHAR)); + + // make sure its null terminated + MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + + // free device name MixerContext->Free(Name); + + // done return Status; } @@ -651,8 +658,13 @@ Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); if (Status == MM_STATUS_SUCCESS) { - ASSERT(Length < MAXPNAMELEN); - wcscpy(MixerInfo->MixCaps.szPname, Name); + // copy device name + MixerContext->Copy(MixerInfo->MixCaps.szPname, Name, min(wcslen(Name), MAXPNAMELEN-1) * sizeof(WCHAR)); + + // make sure its null terminated + MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + + // free device name MixerContext->Free(Name); }

14 years, 6 months

[ilardig] 47781: [REGEDIT] - Implement hex editing. Patch by Katayama Hirofumi. See issue #5447 for more details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Tue Jun 15 10:28:01 2010 New Revision: 47781 URL: http://svn.reactos.org/svn/reactos?rev=47781&view=rev Log: [REGEDIT] - Implement hex editing. Patch by Katayama Hirofumi. See issue #5447 for more details. Modified: trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Tue Jun 15 10:28:01 2010 @@ -416,14 +416,11 @@ if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) { len = (UINT) HexEdit_GetBufferSize(hwndValue); - if (len != valueDataLen && len > 0) - { - binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len); - } - if (len > 0) - { - HexEdit_CopyBuffer(hwndValue, binValueData, len); - } + if (len > 0 && binValueData) + binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len); + else + binValueData = HeapAlloc(GetProcessHeap(), 0, len + 1); + HexEdit_CopyBuffer(hwndValue, binValueData, len); valueDataLen = len; } EndDialog(hwndDlg, IDOK); @@ -622,7 +619,7 @@ } else if (EditBin == TRUE || type == REG_NONE || type == REG_BINARY) { - #ifndef UNICODE +#ifndef UNICODE LPWSTR u_valuename; int len_vname = lstrlen(valueName); @@ -639,10 +636,10 @@ } else u_valuename = L""; - #endif +#endif if(valueDataLen > 0) { - if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen))) + if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen + 1))) { error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); goto done; @@ -650,19 +647,19 @@ /* force to use the unicode version, so editing strings in binary mode is correct */ lRet = RegQueryValueExW(hKey, - #ifndef UNICODE +#ifndef UNICODE u_valuename, - #else +#else valueName, - #endif +#endif 0, 0, (LPBYTE)binValueData, &valueDataLen); if (lRet != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, binValueData); - #ifndef UNICODE +#ifndef UNICODE if(len_vname > 0) HeapFree(GetProcessHeap(), 0, u_valuename); - #endif +#endif error(hwnd, IDS_BAD_VALUE, valueName); goto done; } @@ -676,21 +673,21 @@ { /* force to use the unicode version, so editing strings in binary mode is correct */ lRet = RegSetValueExW(hKey, - #ifndef UNICODE +#ifndef UNICODE u_valuename, - #else +#else valueName, - #endif +#endif 0, type, (LPBYTE)binValueData, valueDataLen); if (lRet == ERROR_SUCCESS) result = TRUE; } if(binValueData != NULL) HeapFree(GetProcessHeap(), 0, binValueData); - #ifndef UNICODE +#ifndef UNICODE if(len_vname > 0) HeapFree(GetProcessHeap(), 0, u_valuename); - #endif +#endif } else { Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Tue Jun 15 10:28:01 2010 @@ -30,7 +30,7 @@ INT nLines; INT nVisibleLinesComplete; INT nVisibleLines; - INT Position; + INT Index; INT LineHeight; INT CharWidth; HFONT hFont; @@ -43,6 +43,7 @@ BOOL EditingField; INT CaretCol; INT CaretLine; + BOOL InMid; } HEXEDIT_DATA, *PHEXEDIT_DATA; /* hit test codes */ @@ -112,7 +113,7 @@ } if(hed->EditingField) - SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + (3 * hed->CaretCol)) * hed->CharWidth) - 1, (hed->CaretLine - si.nPos) * hed->LineHeight); + SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + (3 * hed->CaretCol) + hed->InMid * 2) * hed->CharWidth) - 1, (hed->CaretLine - si.nPos) * hed->LineHeight); else SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + hed->SplitSpacing + (3 * hed->ColumnsPerLine) + hed->CaretCol) * hed->CharWidth) - 2, (hed->CaretLine - si.nPos) * hed->LineHeight); } @@ -314,10 +315,10 @@ } static DWORD -HEXEDIT_PositionFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD Hit, POINT *EditPos, BOOL *EditField) +HEXEDIT_IndexFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD Hit, POINT *EditPos, BOOL *EditField) { SCROLLINFO si; - DWORD Pos, bufsize; + DWORD Index, bufsize; si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_POS; @@ -353,18 +354,18 @@ if(pt.x > 0) { INT BlockWidth = (*EditField ? hed->CharWidth * 3 : hed->CharWidth); - EditPos->x = min(hed->ColumnsPerLine, pt.x / BlockWidth); + EditPos->x = min(hed->ColumnsPerLine, (pt.x + BlockWidth / 2) / BlockWidth); } bufsize = (hed->hBuffer ? (DWORD) LocalSize(hed->hBuffer) : 0); - Pos = (EditPos->y * hed->ColumnsPerLine) + EditPos->x; - if(Pos > bufsize) + Index = (EditPos->y * hed->ColumnsPerLine) + EditPos->x; + if(Index > bufsize) { INT tmp = bufsize % hed->ColumnsPerLine; - Pos = bufsize; + Index = bufsize; EditPos->x = (tmp == 0 ? hed->ColumnsPerLine : tmp); } - return Pos; + return Index; } /*** Control specific messages ************************************************/ @@ -393,7 +394,7 @@ else { hed->hBuffer = LocalFree(hed->hBuffer); - hed->Position = 0; + hed->Index = 0; HEXEDIT_Update(hed); return 0; @@ -416,13 +417,13 @@ LocalUnlock(hed->hBuffer); } - hed->Position = 0; + hed->Index = 0; HEXEDIT_Update(hed); return Size; } else if(hed->hBuffer) { - hed->Position = 0; + hed->Index = 0; hed->hBuffer = LocalFree(hed->hBuffer); HEXEDIT_Update(hed); } @@ -466,12 +467,16 @@ HEXEDIT_HEM_SETMAXBUFFERSIZE(PHEXEDIT_DATA hed, DWORD nMaxSize) { hed->MaxBuffer = nMaxSize; - if(hed->MaxBuffer > 0 && hed->hBuffer && LocalSize(hed->hBuffer) > hed->MaxBuffer) - { - /* truncate the buffer */ + if (hed->MaxBuffer == 0) + { + hed->hBuffer = LocalFree(hed->hBuffer); + return 0; + } + if (hed->hBuffer) hed->hBuffer = LocalReAlloc(hed->hBuffer, hed->MaxBuffer, LMEM_MOVEABLE); - HEXEDIT_Update(hed); - } + else + hed->hBuffer = LocalAlloc(LMEM_MOVEABLE, hed->MaxBuffer); + HEXEDIT_Update(hed); return 0; } @@ -496,6 +501,7 @@ hed->AddressSpacing = 2; hed->SplitSpacing = 2; hed->EditingField = TRUE; /* in hexdump field */ + hed->InMid = FALSE; SetWindowLongPtr(hWnd, 0, (DWORD_PTR)hed); HEXEDIT_Update(hed); @@ -754,10 +760,11 @@ UNREFERENCED_PARAMETER(Buttons); SetFocus(hed->hWndSelf); - hed->Position = HEXEDIT_PositionFromPoint(hed, Pt, Hit, &EditPos, &NewField); + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField); hed->EditingField = NewField; hed->CaretCol = EditPos.x; hed->CaretLine = EditPos.y; + hed->InMid = FALSE; HEXEDIT_MoveCaret(hed, TRUE); @@ -768,6 +775,7 @@ HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode) { size_t bufsize; + PBYTE buf; if(GetKeyState(VK_MENU) & 0x8000) { return FALSE; @@ -777,77 +785,199 @@ switch(VkCode) { + case VK_DELETE: + if (hed->InMid && hed->EditingField) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + hed->InMid = FALSE; + } + else if (hed->Index < bufsize) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + } + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + + case VK_BACK: + if (hed->InMid && hed->EditingField) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + hed->InMid = FALSE; + } + else if (hed->Index > 0) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index - 1, buf + hed->Index, + bufsize - hed->Index); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + hed->Index--; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + } + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + case VK_LEFT: - if(hed->Position > 0) - { - if(--hed->CaretCol < 0) - { - hed->CaretLine--; - hed->CaretCol = hed->ColumnsPerLine; - } - else - hed->Position--; - } + if (hed->Index > 0) + { + hed->Index--; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_RIGHT: + if (hed->Index < (INT)bufsize) + { + hed->Index++; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_UP: + if (hed->Index >= hed->ColumnsPerLine) + { + hed->Index -= hed->ColumnsPerLine; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_DOWN: + if (hed->Index + hed->ColumnsPerLine <= (INT) bufsize) + { + hed->Index += hed->ColumnsPerLine; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + } + else + { + hed->Index = bufsize; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + } + hed->InMid = FALSE; HEXEDIT_MoveCaret(hed, TRUE); break; - - case VK_RIGHT: - if(hed->Position < (INT)bufsize) - { - if(++hed->CaretCol > hed->ColumnsPerLine) - { - hed->CaretCol = 0; - hed->CaretLine++; - } - else - hed->Position++; - } + } + + return FALSE; +} + +static BOOL +HEXEDIT_WM_CHAR(PHEXEDIT_DATA hed, WCHAR ch) +{ + size_t bufsize; + PBYTE buf; + + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + if (!hed->EditingField) + { + if (0x20 <= ch && ch < 0x7F) + { + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + 1); + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index + 1, buf + hed->Index, + bufsize - hed->Index); + buf[hed->Index] = ch; + LocalUnlock(hed->hBuffer); + } + hed->Index++; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + InvalidateRect(hed->hWndSelf, NULL, TRUE); HEXEDIT_MoveCaret(hed, TRUE); - break; - - case VK_UP: - if(hed->Position > 0) - { - if(hed->CaretLine <= 0) - { - hed->CaretCol = 0; - hed->Position = 0; - } - else - { - hed->CaretLine--; - hed->Position -= hed->ColumnsPerLine; - } - } - HEXEDIT_MoveCaret(hed, TRUE); - break; - - case VK_DOWN: - if(hed->Position <= (INT)bufsize) - { - if(hed->CaretLine < hed->nLines - 1) - { - hed->Position += hed->ColumnsPerLine; - hed->CaretLine++; - if(hed->Position > (INT)bufsize) - { - hed->Position = (INT) bufsize; - hed->CaretLine = (hed->nLines > 0 ? hed->nLines - 1 : 0); - hed->CaretCol = (INT) bufsize % hed->ColumnsPerLine; - } - } - else - { - INT tmp = (INT) bufsize % hed->ColumnsPerLine; - hed->Position = (INT) bufsize; - hed->CaretCol = (tmp == 0 ? hed->ColumnsPerLine : tmp); - } - } - HEXEDIT_MoveCaret(hed, TRUE); - break; - } - - return FALSE; + return FALSE; + } + } + else + { + if (('0' <= ch && ch <= '9') || ('A' <= ch && ch <= 'F') || + ('a' <= ch && ch <= 'f')) + { + if (hed->InMid) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + if ('0' <= ch && ch <= '9') + buf[hed->Index] |= ch - '0'; + else if ('A' <= ch && ch <= 'F') + buf[hed->Index] |= ch + 10 - 'A'; + else if ('a' <= ch && ch <= 'f') + buf[hed->Index] |= ch + 10 - 'a'; + LocalUnlock(hed->hBuffer); + } + hed->InMid = FALSE; + hed->Index++; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + else + { + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + 1); + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index + 1, buf + hed->Index, + bufsize - hed->Index); + if ('0' <= ch && ch <= '9') + buf[hed->Index] = (ch - '0') << 4; + else if ('A' <= ch && ch <= 'F') + buf[hed->Index] = (ch + 10 - 'A') << 4; + else if ('a' <= ch && ch <= 'f') + buf[hed->Index] = (ch + 10 - 'a') << 4; + LocalUnlock(hed->hBuffer); + } + hed->InMid = TRUE; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + return FALSE; + } + } + return TRUE; } static LRESULT @@ -878,6 +1008,9 @@ case WM_KEYDOWN: return HEXEDIT_WM_KEYDOWN(hed, (INT)wParam); + case WM_CHAR: + return HEXEDIT_WM_CHAR(hed, (WCHAR)wParam); + case WM_VSCROLL: return HEXEDIT_WM_VSCROLL(hed, HIWORD(wParam), LOWORD(wParam)); Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Tue Jun 15 10:28:01 2010 @@ -543,7 +543,8 @@ errCode = RegQueryInfoKey(hNewKey, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL, &val_count, &max_val_name_len, &max_val_size, NULL, NULL); - if (errCode == ERROR_SUCCESS) { + if (errCode == ERROR_SUCCESS) + { TCHAR* ValName = HeapAlloc(GetProcessHeap(), 0, ++max_val_name_len * sizeof(TCHAR)); DWORD dwValNameLen = max_val_name_len; BYTE* ValBuf = HeapAlloc(GetProcessHeap(), 0, max_val_size + sizeof(TCHAR)); @@ -557,9 +558,15 @@ while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL, &dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) { /* Remove unwanted path from key name */ TCHAR *pLastBl = _tcsrchr(ValName, TEXT('\\')); - if (pLastBl != NULL) ++pLastBl; else pLastBl = ValName; + if (pLastBl != NULL) + ++pLastBl; + else + pLastBl = ValName; /* Add a terminating 0 character. Usually this is only necessary for strings. */ - ((TCHAR*)ValBuf)[dwValSize/sizeof(TCHAR)] = 0; + ValBuf[dwValSize] = 0; +#ifdef UNICODE + ValBuf[dwValSize + 1] = 0; +#endif AddEntryToList(hwndLV, pLastBl, dwValType, ValBuf, dwValSize, -1, TRUE); dwValNameLen = max_val_name_len; dwValSize = max_val_size;

14 years, 6 months

[khornicek] 47780: [OPENGL32] Fixes for ICD reference counting. By Jerome Gardou See issue #5257 for more details.

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Jun 14 13:11:51 2010 New Revision: 47780 URL: http://svn.reactos.org/svn/reactos?rev=47780&view=rev Log: [OPENGL32] Fixes for ICD reference counting. By Jerome Gardou See issue #5257 for more details. Modified: trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Mon Jun 14 13:11:51 2010 @@ -472,8 +472,6 @@ { if (!_wcsicmp( driver, icd->driver_name )) /* found */ { - icd->refcount++; - /* release mutex */ if (!ReleaseMutex( OPENGL32_processdata.driver_mutex )) DBGPRINT( "Error: ReleaseMutex() failed (%d)", GetLastError() ); @@ -484,8 +482,6 @@ /* not found - try to load */ icd = OPENGL32_LoadDriver( driver ); - if (icd != NULL) - icd->refcount = 1; /* release mutex */ if (!ReleaseMutex( OPENGL32_processdata.driver_mutex )) @@ -513,7 +509,7 @@ return FALSE; /* FIXME: do we have to expect such an error and handle it? */ } - if (--icd->refcount == 0) + if (icd->refcount == 0) ret = OPENGL32_UnloadDriver( icd ); /* release mutex */ Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Mon Jun 14 13:11:51 2010 @@ -27,7 +27,6 @@ WCHAR DriverName[256]; /*!< Driver name */ } OPENGL_INFO, *POPENGL_INFO; - /*! \brief Append OpenGL Rendering Context (GLRC) to list * * \param glrc [IN] Pointer to GLRC to append to list @@ -179,8 +178,11 @@ ROSGL_DeleteContext( GLRC *glrc ) { /* unload icd */ - if (glrc->icd != NULL) + if ((glrc->icd != NULL) && (!InterlockedDecrement((LONG*)&glrc->icd->refcount))) + { + /* This is the last context, remove the ICD*/ ROSGL_DeleteDCDataForICD( glrc->icd ); + } /* remove from list */ ROSGL_RemoveContext( glrc ); @@ -413,7 +415,7 @@ NULL) != NULL) { /* Too bad, somebody else was faster... */ - OPENGL32_UnloadICD(drvdata); + DBGTRACE("ICD is already set!\n"); } } } @@ -686,6 +688,9 @@ /* FIXME: fallback? */ return NULL; } + /* Don't forget to refcount it, icd will be released when last context is deleted */ + InterlockedIncrement((LONG*)&icd->refcount); + /* create context */ if (icd->DrvCreateLayerContext != NULL)

14 years, 6 months

[khornicek] 47779: [OPENGL32_WINETEST] Add opengl32 winetest, patch by Jerome Gardou. Not used for now.

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Jun 14 12:41:15 2010 New Revision: 47779 URL: http://svn.reactos.org/svn/reactos?rev=47779&view=rev Log: [OPENGL32_WINETEST] Add opengl32 winetest, patch by Jerome Gardou. Not used for now. Added: trunk/rostests/winetests/opengl32/ trunk/rostests/winetests/opengl32/opengl.c (with props) trunk/rostests/winetests/opengl32/opengl32.rbuild (with props) trunk/rostests/winetests/opengl32/testlist.c (with props) Added: trunk/rostests/winetests/opengl32/opengl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl.c (added) +++ trunk/rostests/winetests/opengl32/opengl.c [iso-8859-1] Mon Jun 14 12:41:15 2010 @@ -1,0 +1,762 @@ +/* + * Some tests for OpenGL functions + * + * Copyright (C) 2007-2008 Roderick Colenbrander + * + * 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 + */ + +#include <windows.h> +#include <wingdi.h> +#include "wine/test.h" + +const unsigned char * WINAPI glGetString(unsigned int); +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 + +#define MAX_FORMATS 256 +typedef void* HPBUFFERARB; + +/* WGL_ARB_create_context */ +HGLRC (WINAPI *pwglCreateContextAttribsARB)(HDC hDC, HGLRC hShareContext, const int *attribList); +/* GetLastError */ +#define ERROR_INVALID_VERSION_ARB 0x2095 +#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 +#define WGL_CONTEXT_FLAGS_ARB 0x2094 +/* Flags for WGL_CONTEXT_FLAGS_ARB */ +#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 +#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 + +/* WGL_ARB_extensions_string */ +static const char* (WINAPI *pwglGetExtensionsStringARB)(HDC); +static int (WINAPI *pwglReleasePbufferDCARB)(HPBUFFERARB, HDC); + +/* WGL_ARB_make_current_read */ +static BOOL (WINAPI *pwglMakeContextCurrentARB)(HDC hdraw, HDC hread, HGLRC hglrc); +static HDC (WINAPI *pwglGetCurrentReadDCARB)(void); + +/* WGL_ARB_pixel_format */ +#define WGL_ACCELERATION_ARB 0x2003 +#define WGL_COLOR_BITS_ARB 0x2014 +#define WGL_RED_BITS_ARB 0x2015 +#define WGL_GREEN_BITS_ARB 0x2017 +#define WGL_BLUE_BITS_ARB 0x2019 +#define WGL_ALPHA_BITS_ARB 0x201B +#define WGL_SUPPORT_GDI_ARB 0x200F +#define WGL_DOUBLE_BUFFER_ARB 0x2011 +#define WGL_NO_ACCELERATION_ARB 0x2025 +#define WGL_GENERIC_ACCELERATION_ARB 0x2026 +#define WGL_FULL_ACCELERATION_ARB 0x2027 + +static BOOL (WINAPI *pwglChoosePixelFormatARB)(HDC, const int *, const FLOAT *, UINT, int *, UINT *); +static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const int *, int *); + +/* WGL_ARB_pbuffer */ +#define WGL_DRAW_TO_PBUFFER_ARB 0x202D +static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); +static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); + +static const char* wgl_extensions = NULL; + +static void init_functions(void) +{ +#define GET_PROC(func) \ + p ## func = (void*)wglGetProcAddress(#func); \ + if(!p ## func) \ + trace("wglGetProcAddress(%s) failed\n", #func); + + /* WGL_ARB_create_context */ + GET_PROC(wglCreateContextAttribsARB); + + /* WGL_ARB_extensions_string */ + GET_PROC(wglGetExtensionsStringARB) + + /* WGL_ARB_make_current_read */ + GET_PROC(wglMakeContextCurrentARB); + GET_PROC(wglGetCurrentReadDCARB); + + /* WGL_ARB_pixel_format */ + GET_PROC(wglChoosePixelFormatARB) + GET_PROC(wglGetPixelFormatAttribivARB) + + /* WGL_ARB_pbuffer */ + GET_PROC(wglCreatePbufferARB) + GET_PROC(wglGetPbufferDCARB) + GET_PROC(wglReleasePbufferDCARB) + +#undef GET_PROC +} + +static void test_pbuffers(HDC hdc) +{ + const int iAttribList[] = { WGL_DRAW_TO_PBUFFER_ARB, 1, /* Request pbuffer support */ + 0 }; + int iFormats[MAX_FORMATS]; + unsigned int nOnscreenFormats; + unsigned int nFormats; + int i, res; + int iPixelFormat = 0; + + nOnscreenFormats = DescribePixelFormat(hdc, 0, 0, NULL); + + /* When you want to render to a pbuffer you need to call wglGetPbufferDCARB which + * returns a 'magic' HDC which you can then pass to wglMakeCurrent to switch rendering + * to the pbuffer. Below some tests are performed on what happens if you use standard WGL calls + * on this 'magic' HDC for both a pixelformat that support onscreen and offscreen rendering + * and a pixelformat that's only available for offscreen rendering (this means that only + * wglChoosePixelFormatARB and friends know about the format. + * + * The first thing we need are pixelformats with pbuffer capabilities. + */ + res = pwglChoosePixelFormatARB(hdc, iAttribList, NULL, MAX_FORMATS, iFormats, &nFormats); + if(res <= 0) + { + skip("No pbuffer compatible formats found while WGL_ARB_pbuffer is supported\n"); + return; + } + trace("nOnscreenFormats: %d\n", nOnscreenFormats); + trace("Total number of pbuffer capable pixelformats: %d\n", nFormats); + + /* Try to select an onscreen pixelformat out of the list */ + for(i=0; i < nFormats; i++) + { + /* Check if the format is onscreen, if it is choose it */ + if(iFormats[i] <= nOnscreenFormats) + { + iPixelFormat = iFormats[i]; + trace("Selected iPixelFormat=%d\n", iPixelFormat); + break; + } + } + + /* A video driver supports a large number of onscreen and offscreen pixelformats. + * The traditional WGL calls only see a subset of the whole pixelformat list. First + * of all they only see the onscreen formats (the offscreen formats are at the end of the + * pixelformat list) and second extended pixelformat capabilities are hidden from the + * standard WGL calls. Only functions that depend on WGL_ARB_pixel_format can see them. + * + * Below we check if the pixelformat is also supported onscreen. + */ + if(iPixelFormat != 0) + { + HDC pbuffer_hdc; + HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); + if(!pbuffer) + skip("Pbuffer creation failed!\n"); + + /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ + pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); + res = GetPixelFormat(pbuffer_hdc); + ok(res == iPixelFormat, "Unexpected iPixelFormat=%d returned by GetPixelFormat for format %d\n", res, iPixelFormat); + trace("iPixelFormat returned by GetPixelFormat: %d\n", res); + trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); + + pwglReleasePbufferDCARB(pbuffer, hdc); + } + else skip("Pbuffer test for onscreen pixelformat skipped as no onscreen format with pbuffer capabilities have been found\n"); + + /* Search for a real offscreen format */ + for(i=0, iPixelFormat=0; i<nFormats; i++) + { + if(iFormats[i] > nOnscreenFormats) + { + iPixelFormat = iFormats[i]; + trace("Selected iPixelFormat: %d\n", iPixelFormat); + break; + } + } + + if(iPixelFormat != 0) + { + HDC pbuffer_hdc; + HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); + if(!pbuffer) + skip("Pbuffer creation failed!\n"); + + /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ + pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); + res = GetPixelFormat(pbuffer_hdc); + + ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); + trace("iPixelFormat returned by GetPixelFormat: %d\n", res); + trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); + pwglReleasePbufferDCARB(pbuffer, hdc); + } + else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); +} + +static void test_setpixelformat(HDC winhdc) +{ + int res = 0; + int nCfgs; + int pf; + int i; + HWND hwnd; + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + HDC hdc = GetDC(0); + ok(hdc != 0, "GetDC(0) failed!\n"); + + /* This should pass even on the main device context */ + pf = ChoosePixelFormat(hdc, &pfd); + ok(pf != 0, "ChoosePixelFormat failed on main device context\n"); + + /* SetPixelFormat on the main device context 'X root window' should fail, + * but some broken drivers allow it + */ + res = SetPixelFormat(hdc, pf, &pfd); + trace("SetPixelFormat on main device context %s\n", res ? "succeeded" : "failed"); + + /* Setting the same format that was set on the HDC is allowed; other + formats fail */ + nCfgs = DescribePixelFormat(winhdc, 0, 0, NULL); + pf = GetPixelFormat(winhdc); + for(i = 1;i <= nCfgs;i++) + { + int res = SetPixelFormat(winhdc, i, NULL); + if(i == pf) ok(res, "Failed to set the same pixel format\n"); + else ok(!res, "Unexpectedly set an alternate pixel format\n"); + } + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + if (hwnd) + { + HDC hdc = GetDC( hwnd ); + pf = ChoosePixelFormat( hdc, &pfd ); + ok( pf != 0, "ChoosePixelFormat failed\n" ); + res = SetPixelFormat( hdc, pf, &pfd ); + ok( res != 0, "SetPixelFormat failed\n" ); + i = GetPixelFormat( hdc ); + ok( i == pf, "GetPixelFormat returned wrong format %d/%d\n", i, pf ); + ReleaseDC( hwnd, hdc ); + hdc = GetWindowDC( hwnd ); + i = GetPixelFormat( hdc ); + ok( i == pf, "GetPixelFormat returned wrong format %d/%d\n", i, pf ); + ReleaseDC( hwnd, hdc ); + DestroyWindow( hwnd ); + } + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + if (hwnd) + { + HDC hdc = GetWindowDC( hwnd ); + pf = ChoosePixelFormat( hdc, &pfd ); + ok( pf != 0, "ChoosePixelFormat failed\n" ); + res = SetPixelFormat( hdc, pf, &pfd ); + ok( res != 0, "SetPixelFormat failed\n" ); + i = GetPixelFormat( hdc ); + ok( i == pf, "GetPixelFormat returned wrong format %d/%d\n", i, pf ); + ReleaseDC( hwnd, hdc ); + DestroyWindow( hwnd ); + } +} + +static void test_sharelists(HDC winhdc) +{ + HGLRC hglrc1, hglrc2, hglrc3; + int res; + + hglrc1 = wglCreateContext(winhdc); + res = wglShareLists(0, 0); + ok(res == FALSE, "Sharing display lists for no contexts passed!\n"); + + /* Test 1: Create a context and just share lists without doing anything special */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglShareLists(hglrc1, hglrc2); + ok(res, "Sharing of display lists failed\n"); + wglDeleteContext(hglrc2); + } + + /* Test 2: Share display lists with a 'destination' context which has been made current */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglMakeCurrent(winhdc, hglrc2); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); + todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } + + /* Test 3: Share display lists with a context which already shares display lists with another context. + * According to MSDN the second parameter cannot share any display lists but some buggy drivers might allow it */ + hglrc3 = wglCreateContext(winhdc); + if(hglrc3) + { + res = wglShareLists(hglrc3, hglrc1); + ok(res == FALSE, "Sharing of display lists passed for a context which already shared lists before\n"); + wglDeleteContext(hglrc3); + } + + /* Test 4: Share display lists with a 'source' context which has been made current */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglMakeCurrent(winhdc, hglrc1); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); + ok(res, "Sharing display lists with a source context which has been made current failed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } +} + +static void test_makecurrent(HDC winhdc) +{ + BOOL ret; + HGLRC hglrc; + DWORD error; + + hglrc = wglCreateContext(winhdc); + ok( hglrc != 0, "wglCreateContext failed\n" ); + + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); + + ok( wglGetCurrentContext() == hglrc, "wrong context\n" ); + + /* set the same context again */ + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); + + /* check wglMakeCurrent(x, y) after another call to wglMakeCurrent(x, y) */ + ret = wglMakeCurrent( winhdc, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + ret = wglMakeCurrent( winhdc, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + SetLastError( 0xdeadbeef ); + ret = wglMakeCurrent( NULL, NULL ); + ok( !ret, "wglMakeCurrent succeeded\n" ); + error = GetLastError(); + ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + + ret = wglMakeCurrent( winhdc, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); + + ret = wglMakeCurrent( NULL, NULL ); + ok( ret, "wglMakeCurrent failed\n" ); + + SetLastError( 0xdeadbeef ); + ret = wglMakeCurrent( NULL, NULL ); + ok( !ret, "wglMakeCurrent succeeded\n" ); + error = GetLastError(); + ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + + ret = wglMakeCurrent( winhdc, hglrc ); + ok( ret, "wglMakeCurrent failed\n" ); +} + +static void test_colorbits(HDC hdc) +{ + const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, + WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; + int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; + unsigned int nFormats; + int res; + int iPixelFormat = 0; + + if (!pwglChoosePixelFormatARB) + { + win_skip("wglChoosePixelFormatARB is not available\n"); + return; + } + + /* We need a pixel format with at least one bit of alpha */ + res = pwglChoosePixelFormatARB(hdc, iAttribs, NULL, 1, &iPixelFormat, &nFormats); + if(res == FALSE || nFormats == 0) + { + skip("No suitable pixel formats found\n"); + return; + } + + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, + sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, iAttribRet); + if(res == FALSE) + { + skip("wglGetPixelFormatAttribivARB failed\n"); + return; + } + iAttribRet[1] += iAttribRet[2]+iAttribRet[3]+iAttribRet[4]; + ok(iAttribRet[0] == iAttribRet[1], "WGL_COLOR_BITS_ARB (%d) does not equal R+G+B+A (%d)!\n", + iAttribRet[0], iAttribRet[1]); +} + +static void test_gdi_dbuf(HDC hdc) +{ + const int iAttribList[] = { WGL_SUPPORT_GDI_ARB, WGL_DOUBLE_BUFFER_ARB }; + int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + unsigned int nFormats; + int iPixelFormat; + int res; + + if (!pwglGetPixelFormatAttribivARB) + { + win_skip("wglGetPixelFormatAttribivARB is not available\n"); + return; + } + + nFormats = DescribePixelFormat(hdc, 0, 0, NULL); + for(iPixelFormat = 1;iPixelFormat <= nFormats;iPixelFormat++) + { + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, + sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, + iAttribRet); + ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); + if(res == FALSE) + continue; + + ok(!(iAttribRet[0] && iAttribRet[1]), "GDI support and double buffering on pixel format %d\n", iPixelFormat); + } +} + +static void test_acceleration(HDC hdc) +{ + const int iAttribList[] = { WGL_ACCELERATION_ARB }; + int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + unsigned int nFormats; + int iPixelFormat; + int res; + PIXELFORMATDESCRIPTOR pfd; + + if (!pwglGetPixelFormatAttribivARB) + { + win_skip("wglGetPixelFormatAttribivARB is not available\n"); + return; + } + + nFormats = DescribePixelFormat(hdc, 0, 0, NULL); + for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) + { + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, + sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, + iAttribRet); + ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); + if(res == FALSE) + continue; + + memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + + switch(iAttribRet[0]) + { + case WGL_NO_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == PFD_GENERIC_FORMAT , "Expected only PFD_GENERIC_FORMAT to be set for WGL_NO_ACCELERATION_ARB!: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + case WGL_GENERIC_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED), "Expected both PFD_GENERIC_FORMAT and PFD_GENERIC_ACCELERATION to be set for WGL_GENERIC_ACCELERATION_ARB: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + case WGL_FULL_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == 0, "Expected no PFD_GENERIC_FORMAT/_ACCELERATION to be set for WGL_FULL_ACCELERATION_ARB: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + } + } +} + +static void test_make_current_read(HDC hdc) +{ + int res; + HDC hread; + HGLRC hglrc = wglCreateContext(hdc); + + if(!hglrc) + { + skip("wglCreateContext failed!\n"); + return; + } + + res = wglMakeCurrent(hdc, hglrc); + if(!res) + { + skip("wglMakeCurrent failed!\n"); + return; + } + + /* Test what wglGetCurrentReadDCARB does for wglMakeCurrent as the spec doesn't mention it */ + hread = pwglGetCurrentReadDCARB(); + trace("hread %p, hdc %p\n", hread, hdc); + ok(hread == hdc, "wglGetCurrentReadDCARB failed for standard wglMakeCurrent\n"); + + pwglMakeContextCurrentARB(hdc, hdc, hglrc); + hread = pwglGetCurrentReadDCARB(); + ok(hread == hdc, "wglGetCurrentReadDCARB failed for wglMakeContextCurrent\n"); +} + +static void test_dc(HWND hwnd, HDC hdc) +{ + int pf1, pf2; + HDC hdc2; + + /* Get another DC and make sure it has the same pixel format */ + hdc2 = GetDC(hwnd); + if(hdc != hdc2) + { + pf1 = GetPixelFormat(hdc); + pf2 = GetPixelFormat(hdc2); + ok(pf1 == pf2, "Second DC does not have the same format (%d != %d)\n", pf1, pf2); + } + else + skip("Could not get a different DC for the window\n"); + + if(hdc2) + { + ReleaseDC(hwnd, hdc2); + hdc2 = NULL; + } +} + +/* Nvidia converts win32 error codes to (0xc007 << 16) | win32_error_code */ +#define NVIDIA_HRESULT_FROM_WIN32(x) (HRESULT_FROM_WIN32(x) | 0x40000000) +static void test_opengl3(HDC hdc) +{ + /* Try to create a context compatible with OpenGL 1.x; 1.0-2.1 is allowed */ + { + HGLRC gl3Ctx; + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 1, 0}; + + gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + ok(gl3Ctx != 0, "pwglCreateContextAttribsARB for a 1.x context failed!\n"); + wglDeleteContext(gl3Ctx); + } + + /* Try to pass an invalid HDC */ + { + HGLRC gl3Ctx; + DWORD error; + gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); + ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); + error = GetLastError(); + todo_wine ok(error == ERROR_DC_NOT_FOUND || + broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ + "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); + wglDeleteContext(gl3Ctx); + } + + /* Try to pass an invalid shareList */ + { + HGLRC gl3Ctx; + DWORD error; + gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); + todo_wine ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); + error = GetLastError(); + /* The Nvidia implementation seems to return hresults instead of win32 error codes */ + todo_wine ok(error == ERROR_INVALID_OPERATION || + error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + wglDeleteContext(gl3Ctx); + } + + /* Try to create an OpenGL 3.0 context */ + { + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + HGLRC gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + + if(gl3Ctx == NULL) + { + skip("Skipping the rest of the WGL_ARB_create_context test due to lack of OpenGL 3.0\n"); + return; + } + + wglDeleteContext(gl3Ctx); + } + + /* Test matching an OpenGL 3.0 context with an older one, OpenGL 3.0 should allow it until the new object model is introduced in a future revision */ + { + HGLRC glCtx = wglCreateContext(hdc); + + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + int attribs_future[] = {WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + + HGLRC gl3Ctx = pwglCreateContextAttribsARB(hdc, glCtx, attribs); + ok(gl3Ctx != NULL, "Sharing of a display list between OpenGL 3.0 and OpenGL 1.x/2.x failed!\n"); + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + + gl3Ctx = pwglCreateContextAttribsARB(hdc, glCtx, attribs_future); + ok(gl3Ctx != NULL, "Sharing of a display list between a forward compatible OpenGL 3.0 context and OpenGL 1.x/2.x failed!\n"); + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + + if(glCtx) + wglDeleteContext(glCtx); + } + + /* Try to create an OpenGL 3.0 context and test windowless rendering */ + { + HGLRC gl3Ctx; + int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 0, 0}; + BOOL res; + + gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); + ok(gl3Ctx != 0, "pwglCreateContextAttribsARB for a 3.0 context failed!\n"); + + /* OpenGL 3.0 allows offscreen rendering WITHOUT a drawable + * Neither AMD or Nvidia support it at this point. The WGL_ARB_create_context specs also say that + * it is hard because drivers use the HDC to enter the display driver and it sounds like they don't + * expect drivers to ever offer it. + */ + res = wglMakeCurrent(0, gl3Ctx); + ok(res == FALSE, "Wow, OpenGL 3.0 windowless rendering passed while it was expected not to!\n"); + if(res) + wglMakeCurrent(0, 0); + + if(gl3Ctx) + wglDeleteContext(gl3Ctx); + } +} + +START_TEST(opengl) +{ + HWND hwnd; + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "err: %d\n", GetLastError()); + if (hwnd) + { + HDC hdc; + int iPixelFormat, res; + HGLRC hglrc; + DWORD error; + ShowWindow(hwnd, SW_SHOW); + + hdc = GetDC(hwnd); + + iPixelFormat = ChoosePixelFormat(hdc, &pfd); + if(iPixelFormat == 0) + { + /* This should never happen as ChoosePixelFormat always returns a closest match, but currently this fails in Wine if we don't have glX */ + win_skip("Unable to find pixel format.\n"); + goto cleanup; + } + + /* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */ + hglrc = wglCreateContext(hdc); + ok(hglrc == NULL, "wglCreateContext should fail when no pixel format has been set, but it passed\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_PIXEL_FORMAT, "expected ERROR_INVALID_PIXEL_FORMAT for wglCreateContext without a pixelformat set, but received %#x\n", error); + + res = SetPixelFormat(hdc, iPixelFormat, &pfd); + ok(res, "SetPixelformat failed: %x\n", GetLastError()); + + test_dc(hwnd, hdc); + + hglrc = wglCreateContext(hdc); + res = wglMakeCurrent(hdc, hglrc); + ok(res, "wglMakeCurrent failed!\n"); + if(res) + { + trace("OpenGL renderer: %s\n", glGetString(GL_RENDERER)); + trace("OpenGL driver version: %s\n", glGetString(GL_VERSION)); + trace("OpenGL vendor: %s\n", glGetString(GL_VENDOR)); + } + else + { + skip("Skipping OpenGL tests without a current context\n"); + return; + } + + /* Initialisation of WGL functions depends on an implicit WGL context. For this reason we can't load them before making + * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). + */ + init_functions(); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ + if (!pwglGetExtensionsStringARB) + { + win_skip("wglGetExtensionsStringARB is not available\n"); + return; + } + + test_makecurrent(hdc); + test_setpixelformat(hdc); + test_sharelists(hdc); + test_colorbits(hdc); + test_gdi_dbuf(hdc); + test_acceleration(hdc); + + wgl_extensions = pwglGetExtensionsStringARB(hdc); + if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n"); + + if(strstr(wgl_extensions, "WGL_ARB_create_context")) + test_opengl3(hdc); + + if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) + test_make_current_read(hdc); + else + skip("WGL_ARB_make_current_read not supported, skipping test\n"); + + if(strstr(wgl_extensions, "WGL_ARB_pbuffer")) + test_pbuffers(hdc); + else + skip("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); + +cleanup: + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + } +} Propchange: trunk/rostests/winetests/opengl32/opengl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/opengl… ============================================================================== --- trunk/rostests/winetests/opengl32/opengl32.rbuild (added) +++ trunk/rostests/winetests/opengl32/opengl32.rbuild [iso-8859-1] Mon Jun 14 12:41:15 2010 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="opengl32_winetest" type="win32cui" installbase="bin" installname="opengl32_winetest.exe" allowwarnings="true"> + <compilerflag compiler="cc">-Wno-format</compilerflag> + <define name="__ROS_LONG64__" /> + <include base="opengl32_winetest">.</include> + <library>wine</library> + <library>opengl32</library> + <library>gdi32</library> + <library>user32</library> + <file>opengl.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/winetests/opengl32/opengl32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/opengl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/testli… ============================================================================== --- trunk/rostests/winetests/opengl32/testlist.c (added) +++ trunk/rostests/winetests/opengl32/testlist.c [iso-8859-1] Mon Jun 14 12:41:15 2010 @@ -1,0 +1,15 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_opengl(void); + +const struct test winetest_testlist[] = +{ + { "opengl", func_opengl }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/opengl32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 6 months

[dreimer] 47778: Sync winefile to Wine 1.2 RC3

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 14 10:49:56 2010 New Revision: 47778 URL: http://svn.reactos.org/svn/reactos?rev=47778&view=rev Log: Sync winefile to Wine 1.2 RC3 Modified: trunk/rosapps/applications/winfile/Nl.rc trunk/rosapps/applications/winfile/rsrc.rc trunk/rosapps/applications/winfile/winefile.c Modified: trunk/rosapps/applications/winfile/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Nl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] Mon Jun 14 10:49:56 2010 @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + /* Menu */ IDM_WINEFILE MENU FIXED IMPURE @@ -29,8 +31,8 @@ POPUP "&Bestand" { MENUITEM "&Openen\tEnter", ID_ACTIVATE MENUITEM "&Verplaatsen...\tF7", ID_FILE_MOVE - MENUITEM "&Kopiëren...\tF8", ID_FILE_COPY - MENUITEM "Naar &klembord...\tF9", 118 + MENUITEM "&KopiÃ«ren...\tF8", ID_FILE_COPY + MENUITEM "Naar klem&bord...\tF9", 118 MENUITEM "Ver&wijderen\tDel", ID_FILE_DELETE MENUITEM "&Naam wijzigen...", 109 MENUITEM "&Eigenschappen...\tAlt+Enter",ID_EDIT_PROPERTIES @@ -44,22 +46,22 @@ MENUITEM SEPARATOR MENUITEM "Nieuwe &map...", 111 MENUITEM "&Zoeken...", 104 - MENUITEM "Bestanden &selecteren...", 116 + MENUITEM "Bestanden s&electeren...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "A&fsluiten\tAlt+X", ID_FILE_EXIT + MENUITEM "&Afsluiten\tAlt+X", ID_FILE_EXIT #else - MENUITEM "A&fsluiten", ID_FILE_EXIT + MENUITEM "&Afsluiten", ID_FILE_EXIT #endif } POPUP "&Disk" { - MENUITEM "Disk &kopiëren...", 201 - MENUITEM "Disklabel maken...", 202 - MENUITEM SEPARATOR - MENUITEM "Disk &formatteren...", ID_FORMAT_DISK + MENUITEM "Schijf &kopiÃ«ren...", 201 + MENUITEM "Schijflabel maken...", 202 + MENUITEM SEPARATOR + MENUITEM "Schijf &formatteren...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Systeemdisk maken...", -1 /*TODO*/ + MENUITEM "Systeemschijf maken...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "Verbinding &maken met netwerkchijf",ID_CONNECT_NETWORK_DRIVE @@ -81,8 +83,8 @@ } POPUP "&Beeld" { - MENUITEM "&Hierarchie en mapinhoud", 413 - MENUITEM "&Alleen hierarchie", 411 + MENUITEM "&HiÃ«rarchie en mapinhoud", 413 + MENUITEM "Alleen h&iÃ«rarchie", 411 MENUITEM "Alleen &mapinhoud", 412 MENUITEM SEPARATOR MENUITEM "Sp&litsen", ID_VIEW_SPLIT @@ -91,7 +93,7 @@ MENUITEM "&Alle details", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Gedeeltelijke details...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Sorteer op &naam", ID_VIEW_SORT_NAME + MENUITEM "&Sorteer op naam", ID_VIEW_SORT_NAME MENUITEM "Sorteer op &type", ID_VIEW_SORT_TYPE MENUITEM "Sorteer op &grootte", ID_VIEW_SORT_SIZE MENUITEM "Sorteer op &datum", ID_VIEW_SORT_DATE @@ -102,10 +104,10 @@ POPUP "&Opties" { MENUITEM "&Bevestiging...", 501 MENUITEM "&Lettertype...", ID_SELECT_FONT - MENUITEM "Gereedschappenbalk &aanpassen...", 512 - MENUITEM SEPARATOR - MENUITEM "&Gereedschappenbalk", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Schijvenbalk", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Gereedschapsbalk &aanpassen...", 512 + MENUITEM SEPARATOR + MENUITEM "&Gereedschapsbalk", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Schijfbalk", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "S&tatusbalk", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS MENUITEM "&Volledig scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN @@ -123,7 +125,7 @@ } POPUP "&Venster" { - MENUITEM "Nieuw &venster", ID_WINDOW_NEW + MENUITEM "&Nieuw venster", ID_WINDOW_NEW MENUITEM "Trapsgewijs\tCtrl+F5", ID_WINDOW_CASCADE MENUITEM "&Boven elkaar", ID_WINDOW_TILE_HORZ MENUITEM "&Naast elkaar\tCtrl+F4", ID_WINDOW_TILE_VERT @@ -164,15 +166,15 @@ LTEXT "&Naam:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL GROUPBOX "Bestandstype",-1,7,23,87,56 - CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + CONTROL "&Mappen",IDC_VIEW_TYPE_DIRECTORIES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 CONTROL "&Programma's",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "Docu&menten",IDC_VIEW_TYPE_DOCUMENTS,"Button", + CONTROL "Do&cumenten",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 CONTROL "&Overige bestanden",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Toon Verborgen/&Systeem Bestanden",IDC_VIEW_TYPE_HIDDEN, + CONTROL "Toon verborgen/&systeembestanden",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Annuleren",IDCANCEL,104,24,50,14 @@ -187,9 +189,9 @@ PUSHBUTTON "Annuleren",IDCANCEL,191,29,50,14 LTEXT "&Bestandsnaam:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Volledig &Pad:",-1,7,18,59,9 + LTEXT "Volledig &pad:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Laatste Wijziging:",-1,7,29,59,9 + LTEXT "Laatste wijziging:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Versie:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP @@ -198,12 +200,12 @@ LTEXT "Grootte:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributen",-1,7,79,158,46 - CONTROL "A&lleen Lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "A&lleen-lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 CONTROL "V&erborgen",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archiveren",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Systeem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "Ge&comprimeerd",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Versie Informatie",-1,7,129,234,79 + GROUPBOX "&Versie-informatie",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -225,7 +227,7 @@ IDS_SHELL "Shell" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Nog niet geimplementeerd" - IDS_WINE_FILE "Wine File" + IDS_WINE_FILE "Winefile" } STRINGTABLE Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Mon Jun 14 10:49:56 2010 @@ -58,7 +58,6 @@ #include "Es.rc" #include "Hu.rc" #include "Ko.rc" -#include "Nl.rc" #include "No.rc" #include "Pl.rc" #include "Sv.rc" @@ -70,6 +69,7 @@ #include "It.rc" #include "Ja.rc" #include "Lt.rc" +#include "Nl.rc" #include "Pt.rc" #include "Ru.rc" #include "Si.rc" Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Mon Jun 14 10:49:56 2010 @@ -4505,7 +4505,6 @@ WNDCLASSEXW wcFrame; WNDCLASSW wcChild; - ATOM hChildClass; int col; INITCOMMONCONTROLSEX icc = { @@ -4551,7 +4550,7 @@ wcChild.lpszMenuName = 0; wcChild.lpszClassName = sWINEFILETREE; - hChildClass = RegisterClassW(&wcChild); + RegisterClassW(&wcChild); Globals.haccel = LoadAcceleratorsW(hinstance, MAKEINTRESOURCEW(IDA_WINEFILE));

14 years, 6 months

[dreimer] 47777: Make using the System Path Variable optional again, because make suffers from a bug with path variables with () in it. This makes RosBE almost unuseable in 64 bit Windows.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jun 14 10:49:27 2010 New Revision: 47777 URL: http://svn.reactos.org/svn/reactos?rev=47777&view=rev Log: Make using the System Path Variable optional again, because make suffers from a bug with path variables with () in it. This makes RosBE almost unuseable in 64 bit Windows. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon Jun 14 10:49:27 2010 @@ -64,10 +64,10 @@ $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" $global:_BUILDBOT_SVNSKIPMAINTRUNK = "0" -if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") { +if ("$ENV:_ROSBE_SYSPATH" -eq "1") { + $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" +} else { $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\" -} else { - $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH" } # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Jun 14 10:49:27 2010 @@ -41,7 +41,12 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% set _BUILDBOT_SVNSKIPMAINTRUNK=0 -set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH% +set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem" + +:: +:: Enable this one, if you want to use the System Path Var inside RosBE. +:: +REM set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH% :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison

14 years, 6 months

[akhaldi] 47775: [XDK] - Deduplicate FSRTL_COMMON_FCB_HEADER_LAYOUT in ntifs.h - Move ECP_HEADER from the ntifs template to fsrtltypes.h [DDK] - Update ntifs.h to reflect XDK changes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 13 13:55:30 2010 New Revision: 47775 URL: http://svn.reactos.org/svn/reactos?rev=47775&view=rev Log: [XDK] - Deduplicate FSRTL_COMMON_FCB_HEADER_LAYOUT in ntifs.h - Move ECP_HEADER from the ntifs template to fsrtltypes.h [DDK] - Update ntifs.h to reflect XDK changes. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/xdk/fsrtltypes.h trunk/reactos/include/xdk/ntifs.template.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=47… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Jun 13 13:55:30 2010 @@ -6202,20 +6202,6 @@ LARGE_INTEGER FileSize; \ LARGE_INTEGER ValidDataLength; -#define FSRTL_COMMON_FCB_HEADER_LAYOUT \ - CSHORT NodeTypeCode; \ - CSHORT NodeByteSize; \ - UCHAR Flags; \ - UCHAR IsFastIoPossible; \ - UCHAR Flags2; \ - UCHAR Reserved:4; \ - UCHAR Version:4; \ - PERESOURCE Resource; \ - PERESOURCE PagingIoResource; \ - LARGE_INTEGER AllocationSize; \ - LARGE_INTEGER FileSize; \ - LARGE_INTEGER ValidDataLength; - typedef struct _FSRTL_COMMON_FCB_HEADER { FSRTL_COMMON_FCB_HEADER_LAYOUT } FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER; @@ -6477,6 +6463,10 @@ #endif typedef PVOID PNOTIFY_SYNC; + +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; +#endif typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( @@ -8834,10 +8824,6 @@ #undef NLS_MB_CODE_PAGE_TAG #endif #define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag - -#if (NTDDI_VERSION >= NTDDI_WIN7) -typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; -#endif #if (NTDDI_VERSION >= NTDDI_VISTA) Modified: trunk/reactos/include/xdk/fsrtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtltypes.h?r… ============================================================================== --- trunk/reactos/include/xdk/fsrtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/fsrtltypes.h [iso-8859-1] Sun Jun 13 13:55:30 2010 @@ -283,6 +283,10 @@ typedef PVOID PNOTIFY_SYNC; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; +#endif + typedef BOOLEAN (NTAPI *PCHECK_FOR_TRAVERSE_ACCESS) ( IN PVOID NotifyContext, Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Jun 13 13:55:30 2010 @@ -1118,10 +1118,6 @@ #undef NLS_MB_CODE_PAGE_TAG #endif #define NLS_MB_CODE_PAGE_TAG NlsMbOemCodePageTag - -#if (NTDDI_VERSION >= NTDDI_WIN7) -typedef struct _ECP_HEADER ECP_HEADER, *PECP_HEADER; -#endif #if (NTDDI_VERSION >= NTDDI_VISTA)

14 years, 6 months

← Newer
1
...
11
12
13
14
15
16
17
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010