Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 53379: [PNPMGR] - Print an debug message if IRP_MN_FILTER_RESOURCE_REQUIREMENTS fails - Don't let a broken driver remove our resource requirements list
by cgutman＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: cgutman Date: Mon Aug 22 17:01:33 2011 New Revision: 53379 URL: http://svn.reactos.org/svn/reactos?rev=53379&view=rev Log: [PNPMGR] - Print an debug message if IRP_MN_FILTER_RESOURCE_REQUIREMENTS fails - Don't let a broken driver remove our resource requirements list Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Mon Aug 22 17:01:33 2011 @@ -547,10 +547,10 @@ &Stack); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_SUPPORTED) { - DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); + DPRINT1("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); return Status; } - else if (NT_SUCCESS(Status)) + else if (NT_SUCCESS(Status) && IoStatusBlock.Information) { DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; }

1 0

[akhaldi] 53378: [SHELL32] Claudiu Mihail: * Return ERROR_FILE_NOT_FOUND when a file isn't found. Similar to r53373.
by akhaldi＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: akhaldi Date: Mon Aug 22 16:32:16 2011 New Revision: 53378 URL: http://svn.reactos.org/svn/reactos?rev=53378&view=rev Log: [SHELL32] Claudiu Mihail: * Return ERROR_FILE_NOT_FOUND when a file isn't found. Similar to r53373. Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Mon Aug 22 16:32:16 2011 @@ -1130,8 +1130,12 @@ add_file_to_entry(file, szCurFile); file->attributes = GetFileAttributesW( file->szFullPath ); file->bExists = (file->attributes != INVALID_FILE_ATTRIBUTES); - if (!file->bExists) flList->bAnyDontExist = TRUE; - if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; + + if (!file->bExists) + flList->bAnyDontExist = TRUE; + + if (IsAttribDir(file->attributes)) + flList->bAnyDirectories = TRUE; } /* advance to the next string */ @@ -1457,7 +1461,7 @@ bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); if (!bPathExists) - return ERROR_PATH_NOT_FOUND; + return ERROR_FILE_NOT_FOUND; } return ERROR_SUCCESS;

1 0

[tkreuzer] 53377: [CRT] add minimal versions of emmintrin.h, mmintrin.h, xmmintrin.h just enough for libsamplerate
by tkreuzer＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: tkreuzer Date: Mon Aug 22 16:29:01 2011 New Revision: 53377 URL: http://svn.reactos.org/svn/reactos?rev=53377&view=rev Log: [CRT] add minimal versions of emmintrin.h, mmintrin.h, xmmintrin.h just enough for libsamplerate Added: trunk/reactos/include/crt/emmintrin.h (with props) trunk/reactos/include/crt/mmintrin.h (with props) trunk/reactos/include/crt/xmmintrin.h (with props) Added: trunk/reactos/include/crt/emmintrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/emmintrin.h?re… ============================================================================== --- trunk/reactos/include/crt/emmintrin.h (added) +++ trunk/reactos/include/crt/emmintrin.h [iso-8859-1] Mon Aug 22 16:29:01 2011 @@ -1,0 +1,24 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#pragma once +#ifndef _INCLUDED_EMM +#define _INCLUDED_EMM + +#include <crtdefs.h> +#include <xmmintrin.h> + +typedef struct _CRT_ALIGN(16) __m128d +{ + double m128d_f64[2]; +} __m128d; + +extern __m128d _mm_load_sd(double const*); + +extern int _mm_cvtsd_si32(__m128d); + + +#endif /* _INCLUDED_EMM */ Propchange: trunk/reactos/include/crt/emmintrin.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/crt/mmintrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mmintrin.h?rev… ============================================================================== --- trunk/reactos/include/crt/mmintrin.h (added) +++ trunk/reactos/include/crt/mmintrin.h [iso-8859-1] Mon Aug 22 16:29:01 2011 @@ -1,0 +1,15 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#pragma once +#ifndef _MMINTRIN_H_INCLUDED +#define _MMINTRIN_H_INCLUDED + +#include <crtdefs.h> + + + +#endif /* _MMINTRIN_H_INCLUDED */ Propchange: trunk/reactos/include/crt/mmintrin.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/crt/xmmintrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/xmmintrin.h?re… ============================================================================== --- trunk/reactos/include/crt/xmmintrin.h (added) +++ trunk/reactos/include/crt/xmmintrin.h [iso-8859-1] Mon Aug 22 16:29:01 2011 @@ -1,0 +1,35 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#pragma once +#ifndef _INCLUDED_MM2 +#define _INCLUDED_MM2 + +#include <crtdefs.h> +#include <mmintrin.h> + +typedef union _CRT_ALIGN(16) __m128 +{ + float m128_f32[4]; + unsigned __int64 m128_u64[2]; + __int8 m128_i8[16]; + __int16 m128_i16[8]; + __int32 m128_i32[4]; + __int64 m128_i64[2]; + unsigned __int8 m128_u8[16]; + unsigned __int16 m128_u16[8]; + unsigned __int32 m128_u32[4]; +} __m128; + + +extern __m128 _mm_load_ss(float const*); +extern int _mm_cvt_ss2si(__m128); + +/* Alternate names */ +#define _mm_cvtss_si32 _mm_cvt_ss2si + + +#endif /* _INCLUDED_MM2 */ Propchange: trunk/reactos/include/crt/xmmintrin.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 53376: [SHELL32] Claudiu Mihail: * Formatting fixes. * autocomplete test fix.
by akhaldi＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: akhaldi Date: Mon Aug 22 16:28:51 2011 New Revision: 53376 URL: http://svn.reactos.org/svn/reactos?rev=53376&view=rev Log: [SHELL32] Claudiu Mihail: * Formatting fixes. * autocomplete test fix. Modified: branches/shell32_new-bringup/dll/win32/shell32/autocomplete.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/autocomplete.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/autocomplete.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/autocomplete.cpp [iso-8859-1] Mon Aug 22 16:28:51 2011 @@ -88,76 +88,93 @@ TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", this, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); - if (options & ACO_AUTOSUGGEST) TRACE(" ACO_AUTOSUGGEST\n"); - if (options & ACO_AUTOAPPEND) TRACE(" ACO_AUTOAPPEND\n"); - if (options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n"); - if (options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n"); - if (options & ACO_USETAB) FIXME(" ACO_USETAB not supported\n"); - if (options & ACO_UPDOWNKEYDROPSLIST) TRACE(" ACO_UPDOWNKEYDROPSLIST\n"); - if (options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); + if (options & ACO_AUTOSUGGEST) + TRACE(" ACO_AUTOSUGGEST\n"); + if (options & ACO_AUTOAPPEND) + TRACE(" ACO_AUTOAPPEND\n"); + if (options & ACO_SEARCH) + FIXME(" ACO_SEARCH not supported\n"); + if (options & ACO_FILTERPREFIXES) + FIXME(" ACO_FILTERPREFIXES not supported\n"); + if (options & ACO_USETAB) + FIXME(" ACO_USETAB not supported\n"); + if (options & ACO_UPDOWNKEYDROPSLIST) + TRACE(" ACO_UPDOWNKEYDROPSLIST\n"); + if (options & ACO_RTLREADING) + FIXME(" ACO_RTLREADING not supported\n"); hwndEdit = hwndEdit; - if (!SUCCEEDED (punkACL->QueryInterface(IID_IEnumString, (LPVOID *)&enumstr))) { - TRACE("No IEnumString interface\n"); - return E_NOINTERFACE; + if (!SUCCEEDED (punkACL->QueryInterface(IID_IEnumString, (LPVOID *)&enumstr))) + { + TRACE("No IEnumString interface\n"); + return E_NOINTERFACE; } wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this); - if (options & ACO_AUTOSUGGEST) { - HWND hwndParent; - - hwndParent = GetParent(hwndEdit); - - /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - hwndListBox = CreateWindowExW(0, lbName, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); - - if (hwndListBox) { - wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); - SetWindowLongPtrW(hwndListBox, GWLP_USERDATA, (LONG_PTR)this); + if (options & ACO_AUTOSUGGEST) + { + HWND hwndParent; + + hwndParent = GetParent(hwndEdit); + + /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ + hwndListBox = CreateWindowExW(0, lbName, NULL, + WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hwndParent, NULL, + (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); + + if (hwndListBox) + { + wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); + SetWindowLongPtrW(hwndListBox, GWLP_USERDATA, (LONG_PTR)this); + } } - } - - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwzsRegKeyPath) + 1) * sizeof(WCHAR)); - wcscpy(key, pwzsRegKeyPath); - value = const_cast<WCHAR *>(strrchrW(key, '\\')); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); - wcscpy(quickComplete, result); + + if (pwzsRegKeyPath) + { + WCHAR *key; + WCHAR result[MAX_PATH]; + WCHAR *value; + HKEY hKey = 0; + LONG res; + LONG len; + + /* pwszRegKeyPath contains the key as well as the value, so we split */ + key = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwzsRegKeyPath) + 1) * sizeof(WCHAR)); + wcscpy(key, pwzsRegKeyPath); + value = const_cast<WCHAR *>(strrchrW(key, '\\')); + *value = 0; + value++; + /* Now value contains the value and buffer the key */ + res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); + + if (res != ERROR_SUCCESS) + { + /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); } - RegCloseKey(hKey); - } - HeapFree(GetProcessHeap(), 0, key); + + if (res == ERROR_SUCCESS) + { + res = RegQueryValueW(hKey, value, result, &len); + if (res == ERROR_SUCCESS) + { + quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); + wcscpy(quickComplete, result); + } + RegCloseKey(hKey); + } + HeapFree(GetProcessHeap(), 0, key); } - if ((pwszQuickComplete) && (!quickComplete)) { - quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwszQuickComplete) + 1) * sizeof(WCHAR)); - wcscpy(quickComplete, pwszQuickComplete); + if ((pwszQuickComplete) && (!quickComplete)) + { + quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwszQuickComplete) + 1) * sizeof(WCHAR)); + wcscpy(quickComplete, pwszQuickComplete); } return S_OK; @@ -205,159 +222,206 @@ BOOL control, filled, displayall = FALSE; int cpt, height, sel; - if (!pThis->enabled) return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + if (!pThis->enabled) + { + return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + } switch (uMsg) { - case CB_SHOWDROPDOWN: - ShowWindow(pThis->hwndListBox, SW_HIDE); - break; - case WM_KILLFOCUS: - if ((pThis->options & ACO_AUTOSUGGEST) && - ((HWND)wParam != pThis->hwndListBox)) - { - ShowWindow(pThis->hwndListBox, SW_HIDE); - } - break; - case WM_KEYUP: - - GetWindowTextW(hwnd, (LPWSTR)hwndText, 255); - - switch(wParam) { - case VK_RETURN: - /* If quickComplete is set and control is pressed, replace the string */ - control = GetKeyState(VK_CONTROL) & 0x8000; - if (control && pThis->quickComplete) { - hwndQCText = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (wcslen(pThis->quickComplete)+wcslen(hwndText))*sizeof(WCHAR)); - sel = swprintf(hwndQCText, pThis->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - HeapFree(GetProcessHeap(), 0, hwndQCText); - } - - ShowWindow(pThis->hwndListBox, SW_HIDE); - return 0; - case VK_LEFT: - case VK_RIGHT: - return 0; - case VK_UP: - case VK_DOWN: - /* Two cases here : - - if the listbox is not visible, displays it - with all the entries if the style ACO_UPDOWNKEYDROPSLIST - is present but does not select anything. - - if the listbox is visible, change the selection - */ - if ( (pThis->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) - && (!IsWindowVisible(pThis->hwndListBox) && (! *hwndText)) ) - { - /* We must display all the entries */ - displayall = TRUE; - } else { - if (IsWindowVisible(pThis->hwndListBox)) { - int count; - - count = SendMessageW(pThis->hwndListBox, LB_GETCOUNT, 0, 0); - /* Change the selection */ - sel = SendMessageW(pThis->hwndListBox, LB_GETCURSEL, 0, 0); - if (wParam == VK_UP) - sel = ((sel-1)<0)?count-1:sel-1; - else - sel = ((sel+1)>= count)?-1:sel+1; - SendMessageW(pThis->hwndListBox, LB_SETCURSEL, sel, 0); - if (sel != -1) { - WCHAR *msg; - int len; - - len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); - msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); - SendMessageW(pThis->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(hwnd, EM_SETSEL, wcslen(msg), wcslen(msg)); - HeapFree(GetProcessHeap(), 0, msg); - } else { - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pThis->txtbackup); - SendMessageW(hwnd, EM_SETSEL, wcslen(pThis->txtbackup), wcslen(pThis->txtbackup)); - } - } - return 0; - } - break; - case VK_BACK: - case VK_DELETE: - if ((! *hwndText) && (pThis->options & ACO_AUTOSUGGEST)) { - ShowWindow(pThis->hwndListBox, SW_HIDE); - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } - if (pThis->options & ACO_AUTOAPPEND) { - DWORD b; - SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL); - if (b>1) { - hwndText[b-1] = '\0'; - } else { - hwndText[0] = '\0'; - SetWindowTextW(hwnd, hwndText); - } - } - break; - default: - ; - } - - SendMessageW(pThis->hwndListBox, LB_RESETCONTENT, 0, 0); - - HeapFree(GetProcessHeap(), 0, pThis->txtbackup); - pThis->txtbackup = (WCHAR *)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, (wcslen(hwndText)+1)*sizeof(WCHAR)); - wcscpy(pThis->txtbackup, hwndText); - - /* Returns if there is no text to search and we doesn't want to display all the entries */ - if ((!displayall) && (! *hwndText) ) - break; - - pThis->enumstr->Reset(); - filled = FALSE; - for(cpt = 0;;) { - hr = pThis->enumstr->Next(1, &strs, NULL); - if (hr != S_OK) - break; - - if ((LPWSTR)strstrW(strs, hwndText) == strs) { - - if (pThis->options & ACO_AUTOAPPEND) { - SetWindowTextW(hwnd, strs); - SendMessageW(hwnd, EM_SETSEL, wcslen(hwndText), wcslen(strs)); - break; - } - - if (pThis->options & ACO_AUTOSUGGEST) { - SendMessageW(pThis->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - filled = TRUE; - cpt++; - } - } - } - - if (pThis->options & ACO_AUTOSUGGEST) { - if (filled) { - height = SendMessageW(pThis->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(pThis->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - SetParent(pThis->hwndListBox, HWND_DESKTOP); - /* It seems that Windows XP displays 7 lines at most - and otherwise displays a vertical scroll bar */ - SetWindowPos(pThis->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, min(height * 7, height * (cpt + 1)), - SWP_SHOWWINDOW ); - } else { - ShowWindow(pThis->hwndListBox, SW_HIDE); - } - } - - break; - default: - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + case CB_SHOWDROPDOWN: + { + ShowWindow(pThis->hwndListBox, SW_HIDE); + }; break; + + case WM_KILLFOCUS: + { + if ((pThis->options & ACO_AUTOSUGGEST) && ((HWND)wParam != pThis->hwndListBox)) + { + ShowWindow(pThis->hwndListBox, SW_HIDE); + } + return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + }; break; + + case WM_KEYUP: + { + GetWindowTextW(hwnd, (LPWSTR)hwndText, 255); + + switch(wParam) + { + case VK_RETURN: + { + /* If quickComplete is set and control is pressed, replace the string */ + control = GetKeyState(VK_CONTROL) & 0x8000; + if (control && pThis->quickComplete) + { + hwndQCText = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (wcslen(pThis->quickComplete)+wcslen(hwndText))*sizeof(WCHAR)); + sel = swprintf(hwndQCText, pThis->quickComplete, hwndText); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); + SendMessageW(hwnd, EM_SETSEL, 0, sel); + HeapFree(GetProcessHeap(), 0, hwndQCText); + } + + ShowWindow(pThis->hwndListBox, SW_HIDE); + return 0; + }; break; + + case VK_LEFT: + case VK_RIGHT: + { + return 0; + }; break; + + case VK_UP: + case VK_DOWN: + { + /* Two cases here : + - if the listbox is not visible, displays it + with all the entries if the style ACO_UPDOWNKEYDROPSLIST + is present but does not select anything. + - if the listbox is visible, change the selection + */ + if ( (pThis->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) + && (!IsWindowVisible(pThis->hwndListBox) && (! *hwndText)) ) + { + /* We must display all the entries */ + displayall = TRUE; + } + else + { + if (IsWindowVisible(pThis->hwndListBox)) + { + int count; + + count = SendMessageW(pThis->hwndListBox, LB_GETCOUNT, 0, 0); + /* Change the selection */ + sel = SendMessageW(pThis->hwndListBox, LB_GETCURSEL, 0, 0); + if (wParam == VK_UP) + sel = ((sel-1)<0)?count-1:sel-1; + else + sel = ((sel+1)>= count)?-1:sel+1; + + SendMessageW(pThis->hwndListBox, LB_SETCURSEL, sel, 0); + + if (sel != -1) + { + WCHAR *msg; + int len; + + len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); + msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); + + SendMessageW(pThis->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); + SendMessageW(hwnd, EM_SETSEL, wcslen(msg), wcslen(msg)); + + HeapFree(GetProcessHeap(), 0, msg); + } + else + { + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pThis->txtbackup); + SendMessageW(hwnd, EM_SETSEL, wcslen(pThis->txtbackup), wcslen(pThis->txtbackup)); + } + } + return 0; + } + }; break; + + case VK_BACK: + case VK_DELETE: + { + if ((! *hwndText) && (pThis->options & ACO_AUTOSUGGEST)) + { + ShowWindow(pThis->hwndListBox, SW_HIDE); + return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + } + + if (pThis->options & ACO_AUTOAPPEND) + { + DWORD b; + SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL); + if (b>1) + { + hwndText[b-1] = '\0'; + } + else + { + hwndText[0] = '\0'; + SetWindowTextW(hwnd, hwndText); + } + } + }; break; + + default: + ; + } + + SendMessageW(pThis->hwndListBox, LB_RESETCONTENT, 0, 0); + + HeapFree(GetProcessHeap(), 0, pThis->txtbackup); + pThis->txtbackup = (WCHAR *)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, (wcslen(hwndText)+1)*sizeof(WCHAR)); + wcscpy(pThis->txtbackup, hwndText); + + /* Returns if there is no text to search and we doesn't want to display all the entries */ + if ((!displayall) && (! *hwndText) ) + break; + + pThis->enumstr->Reset(); + filled = FALSE; + + for(cpt = 0;;) + { + hr = pThis->enumstr->Next(1, &strs, NULL); + if (hr != S_OK) + break; + + if ((LPWSTR)strstrW(strs, hwndText) == strs) + { + + if (pThis->options & ACO_AUTOAPPEND) + { + SetWindowTextW(hwnd, strs); + SendMessageW(hwnd, EM_SETSEL, wcslen(hwndText), wcslen(strs)); + break; + } + + if (pThis->options & ACO_AUTOSUGGEST) + { + SendMessageW(pThis->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); + filled = TRUE; + cpt++; + } + } + } + + if (pThis->options & ACO_AUTOSUGGEST) + { + if (filled) + { + height = SendMessageW(pThis->hwndListBox, LB_GETITEMHEIGHT, 0, 0); + SendMessageW(pThis->hwndListBox, LB_CARETOFF, 0, 0); + GetWindowRect(hwnd, &r); + SetParent(pThis->hwndListBox, HWND_DESKTOP); + /* It seems that Windows XP displays 7 lines at most + and otherwise displays a vertical scroll bar */ + SetWindowPos(pThis->hwndListBox, HWND_TOP, + r.left, r.bottom + 1, r.right - r.left, min(height * 7, height * (cpt + 1)), + SWP_SHOWWINDOW ); + } + else + { + ShowWindow(pThis->hwndListBox, SW_HIDE); + } + } + + }; break; + + default: + { + return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); + } } @@ -370,25 +434,35 @@ WCHAR *msg; int sel, len; - switch (uMsg) { - case WM_MOUSEMOVE: - sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); - SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0); - break; - case WM_LBUTTONDOWN: - sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); - if (sel < 0) - break; - len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); - SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(pThis->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(pThis->hwndEdit, EM_SETSEL, 0, wcslen(msg)); - ShowWindow(hwnd, SW_HIDE); - HeapFree(GetProcessHeap(), 0, msg); - break; - default: - return CallWindowProcW(pThis->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + switch (uMsg) + { + case WM_MOUSEMOVE: + { + sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); + SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0); + }; break; + + case WM_LBUTTONDOWN: + { + sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); + + if (sel < 0) + break; + + len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, 0); + msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); + + SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); + SendMessageW(pThis->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); + SendMessageW(pThis->hwndEdit, EM_SETSEL, 0, wcslen(msg)); + ShowWindow(hwnd, SW_HIDE); + + HeapFree(GetProcessHeap(), 0, msg); + + }; break; + + default: + return CallWindowProcW(pThis->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } return 0; }

1 0

[tkreuzer] 53375: [LIBSAMPLERATE] Update to version 0.1.8 Supports amd64 now
by tkreuzer＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: tkreuzer Date: Mon Aug 22 16:20:30 2011 New Revision: 53375 URL: http://svn.reactos.org/svn/reactos?rev=53375&view=rev Log: [LIBSAMPLERATE] Update to version 0.1.8 Supports amd64 now Added: trunk/reactos/lib/3rdparty/libsamplerate/high_qual_coeffs.h (with props) trunk/reactos/lib/3rdparty/libsamplerate/mid_qual_coeffs.h (with props) Modified: trunk/reactos/lib/3rdparty/libsamplerate/common.h trunk/reactos/lib/3rdparty/libsamplerate/config.h trunk/reactos/lib/3rdparty/libsamplerate/fastest_coeffs.h trunk/reactos/lib/3rdparty/libsamplerate/float_cast.h trunk/reactos/lib/3rdparty/libsamplerate/samplerate.c trunk/reactos/lib/3rdparty/libsamplerate/samplerate.h trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c trunk/reactos/lib/3rdparty/libsamplerate/src_sinc.c trunk/reactos/lib/3rdparty/libsamplerate/src_zoh.c trunk/reactos/lib/3rdparty/libsamplerate/unistd.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/3rdparty/libsamplerate/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/fastest_coeffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/float_cast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Added: trunk/reactos/lib/3rdparty/libsamplerate/high_qual_coeffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Added: trunk/reactos/lib/3rdparty/libsamplerate/mid_qual_coeffs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/samplerate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/samplerate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_sinc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_zoh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… Modified: trunk/reactos/lib/3rdparty/libsamplerate/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate…

1 0

[akhaldi] 53374: * Merge r53373 from trunk.
by akhaldi＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: akhaldi Date: Mon Aug 22 15:31:21 2011 New Revision: 53374 URL: http://svn.reactos.org/svn/reactos?rev=53374&view=rev Log: * Merge r53373 from trunk. Modified: branches/shell32_new-bringup/ (props changed) branches/shell32_new-bringup/dll/win32/kernel32/client/file/create.c Propchange: branches/shell32_new-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 15:31:21 2011 @@ -9,4 +9,4 @@ /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 -/trunk/reactos:51893-53318 +/trunk/reactos:51893-53318,53373 Modified: branches/shell32_new-bringup/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/k… ============================================================================== --- branches/shell32_new-bringup/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/kernel32/client/file/create.c [iso-8859-1] Mon Aug 22 15:31:21 2011 @@ -212,7 +212,7 @@ NULL)) { WARN("Invalid path\n"); - SetLastError(ERROR_PATH_NOT_FOUND); + SetLastError(ERROR_FILE_NOT_FOUND); return INVALID_HANDLE_VALUE; }

1 0

[akhaldi] 53373: [KERNEL32] * CreateFile: If the specified file or device does not exist, the function fails and the last-error code is set to ERROR_FILE_NOT_FOUND. Spotted by Claudiu and Vic.
by akhaldi＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: akhaldi Date: Mon Aug 22 15:26:11 2011 New Revision: 53373 URL: http://svn.reactos.org/svn/reactos?rev=53373&view=rev Log: [KERNEL32] * CreateFile: If the specified file or device does not exist, the function fails and the last-error code is set to ERROR_FILE_NOT_FOUND. Spotted by Claudiu and Vic. Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Mon Aug 22 15:26:11 2011 @@ -212,7 +212,7 @@ NULL)) { WARN("Invalid path\n"); - SetLastError(ERROR_PATH_NOT_FOUND); + SetLastError(ERROR_FILE_NOT_FOUND); return INVALID_HANDLE_VALUE; }

1 0

[tkreuzer] 53372: [VIDEOPORT] Fix amd64 exports
by tkreuzer＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: tkreuzer Date: Mon Aug 22 15:10:25 2011 New Revision: 53372 URL: http://svn.reactos.org/svn/reactos?rev=53372&view=rev Log: [VIDEOPORT] Fix amd64 exports Modified: trunk/reactos/drivers/video/videoprt/videoprt.spec Modified: trunk/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Aug 22 15:10:25 2011 @@ -45,11 +45,11 @@ @ stdcall VideoPortInitialize(ptr ptr ptr ptr) @ stdcall VideoPortInt10(ptr ptr) @ fastcall -arch=i386,arm VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement -@ fastcall -arch=amd64 VideoPortInterlockedDecrement(ptr) +@ fastcall -arch=x86_64 VideoPortInterlockedDecrement(ptr) @ fastcall -arch=i386,arm VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ fastcall -arch=amd64 VideoPortInterlockedExchange(ptr long) +@ fastcall -arch=x86_64 VideoPortInterlockedExchange(ptr long) @ fastcall -arch=i386,arm VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement -@ fastcall -arch=amd64 VideoPortInterlockedIncrement(ptr) +@ fastcall -arch=x86_64 VideoPortInterlockedIncrement(ptr) @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long) @@ -62,32 +62,32 @@ @ stdcall VideoPortQueryPerformanceCounter(ptr ptr) @ stdcall VideoPortQueryServices(ptr long ptr) @ stdcall -arch=i386,arm VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime -@ stdcall -arch=amd64 VideoPortQuerySystemTime(ptr) +@ stdcall -arch=x86_64 VideoPortQuerySystemTime(ptr) @ stdcall VideoPortQueueDpc(ptr ptr ptr) @ stdcall -arch=i386,arm VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall -arch=amd64 VideoPortReadPortUchar(ptr) +@ stdcall -arch=x86_64 VideoPortReadPortUchar(ptr) @ stdcall -arch=i386,arm VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall -arch=amd64 VideoPortReadPortUshort(ptr) +@ stdcall -arch=x86_64 VideoPortReadPortUshort(ptr) @ stdcall -arch=i386,arm VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall -arch=amd64 VideoPortReadPortUlong(ptr) +@ stdcall -arch=x86_64 VideoPortReadPortUlong(ptr) @ stdcall -arch=i386,arm VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall -arch=amd64 VideoPortReadPortBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortReadPortBufferUchar(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall -arch=amd64 VideoPortReadPortBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortReadPortBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG -@ stdcall -arch=amd64 VideoPortReadPortBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortReadPortBufferUlong(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall -arch=amd64 VideoPortReadRegisterUchar(ptr) +@ stdcall -arch=x86_64 VideoPortReadRegisterUchar(ptr) @ stdcall -arch=i386,arm VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall -arch=amd64 VideoPortReadRegisterUshort(ptr) +@ stdcall -arch=x86_64 VideoPortReadRegisterUshort(ptr) @ stdcall -arch=i386,arm VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG -@ stdcall -arch=amd64 VideoPortReadRegisterUlong(ptr) +@ stdcall -arch=x86_64 VideoPortReadRegisterUlong(ptr) @ stdcall -arch=i386,arm VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall -arch=amd64 VideoPortReadRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortReadRegisterBufferUchar(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall -arch=amd64 VideoPortReadRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortReadRegisterBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG -@ stdcall -arch=amd64 VideoPortReadRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortReadRegisterBufferUlong(ptr ptr long) @ stdcall VideoPortReadStateEvent(ptr ptr) @ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) @ stdcall VideoPortReleaseBuffer(ptr ptr) @@ -115,29 +115,29 @@ @ stdcall VideoPortVerifyAccessRanges(ptr long ptr) @ stdcall VideoPortWaitForSingleObject(ptr ptr ptr) @ stdcall -arch=i386,arm VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall -arch=amd64 VideoPortWritePortUchar(ptr long) +@ stdcall -arch=x86_64 VideoPortWritePortUchar(ptr long) @ stdcall -arch=i386,arm VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall -arch=amd64 VideoPortWritePortUshort(ptr long) +@ stdcall -arch=x86_64 VideoPortWritePortUshort(ptr long) @ stdcall -arch=i386,arm VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall -arch=amd64 VideoPortWritePortUlong(ptr long) +@ stdcall -arch=x86_64 VideoPortWritePortUlong(ptr long) @ stdcall -arch=i386,arm VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall -arch=amd64 VideoPortWritePortBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortWritePortBufferUchar(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall -arch=amd64 VideoPortWritePortBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortWritePortBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG -@ stdcall -arch=amd64 VideoPortWritePortBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortWritePortBufferUlong(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall -arch=amd64 VideoPortWriteRegisterUchar(ptr long) +@ stdcall -arch=x86_64 VideoPortWriteRegisterUchar(ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall -arch=amd64 VideoPortWriteRegisterUshort(ptr long) +@ stdcall -arch=x86_64 VideoPortWriteRegisterUshort(ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG -@ stdcall -arch=amd64 VideoPortWriteRegisterUlong(ptr long) +@ stdcall -arch=x86_64 VideoPortWriteRegisterUlong(ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall -arch=amd64 VideoPortWriteRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUchar(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall -arch=amd64 VideoPortWriteRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUshort(ptr ptr long) @ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -@ stdcall -arch=amd64 VideoPortWriteRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=x86_64 VideoPortWriteRegisterBufferUlong(ptr ptr long) @ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VpNotifyEaData(ptr ptr)

1 0

[tkreuzer] 53371: [VIDEOPORT] Fix build
by tkreuzer＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: tkreuzer Date: Mon Aug 22 15:04:17 2011 New Revision: 53371 URL: http://svn.reactos.org/svn/reactos?rev=53371&view=rev Log: [VIDEOPORT] Fix build Modified: trunk/reactos/drivers/video/videoprt/videoprt.spec Modified: trunk/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Aug 22 15:04:17 2011 @@ -47,9 +47,9 @@ @ fastcall -arch=i386,arm VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement @ fastcall -arch=amd64 VideoPortInterlockedDecrement(ptr) @ fastcall -arch=i386,arm VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ fastcall VideoPortInterlockedExchange(ptr long) +@ fastcall -arch=amd64 VideoPortInterlockedExchange(ptr long) @ fastcall -arch=i386,arm VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement -@ fastcall VideoPortInterlockedIncrement(ptr) +@ fastcall -arch=amd64 VideoPortInterlockedIncrement(ptr) @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long)

1 0

[tkreuzer] 53370: [VIDEOPRT] Add neccessary function stubs for amd64
by tkreuzer＠svn.reactos.org 22 Aug '11

22 Aug '11

Author: tkreuzer Date: Mon Aug 22 14:11:14 2011 New Revision: 53370 URL: http://svn.reactos.org/svn/reactos?rev=53370&view=rev Log: [VIDEOPRT] Add neccessary function stubs for amd64 Modified: trunk/reactos/drivers/video/videoprt/stubs.c trunk/reactos/drivers/video/videoprt/videoprt.spec Modified: trunk/reactos/drivers/video/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/stu… ============================================================================== --- trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/stubs.c [iso-8859-1] Mon Aug 22 14:11:14 2011 @@ -90,3 +90,261 @@ UNIMPLEMENTED; return 0; } + +#ifdef _M_AMD64 +UCHAR +NTAPI +VideoPortReadPortUchar( + PUCHAR Port) +{ + return READ_PORT_UCHAR(Port); +} + +USHORT +NTAPI +VideoPortReadPortUshort( + PUSHORT Port) +{ + return READ_PORT_USHORT(Port); +} + +ULONG +NTAPI +VideoPortReadPortUlong( + PULONG Port) +{ + return READ_PORT_ULONG(Port); +} + +VOID +NTAPI +VideoPortReadPortBufferUchar( + PUCHAR Port, + PUCHAR Buffer, + ULONG Count) +{ + READ_PORT_BUFFER_UCHAR(Port, Buffer, Count); +} + +VOID +NTAPI +VideoPortReadPortBufferUshort( + PUSHORT Port, + PUSHORT Buffer, + ULONG Count) +{ + READ_PORT_BUFFER_USHORT(Port, Buffer, Count); +} + +VOID +NTAPI +VideoPortReadPortBufferUlong( + PULONG Port, + PULONG Buffer, + ULONG Count) +{ + READ_PORT_BUFFER_ULONG(Port, Buffer, Count); +} + +UCHAR +NTAPI +VideoPortReadRegisterUchar( + PUCHAR Register) +{ + return READ_REGISTER_UCHAR(Register); +} + +USHORT +NTAPI +VideoPortReadRegisterUshort( + PUSHORT Register) +{ + return READ_REGISTER_USHORT(Register); +} + +ULONG +NTAPI +VideoPortReadRegisterUlong( + PULONG Register) +{ + return READ_REGISTER_ULONG(Register); +} + +VOID +NTAPI +VideoPortReadRegisterBufferUchar( + PUCHAR Register, + PUCHAR Buffer, + ULONG Count) +{ + READ_REGISTER_BUFFER_UCHAR(Register, Buffer, Count); +} + +VOID +NTAPI +VideoPortReadRegisterBufferUshort( + PUSHORT Register, + PUSHORT Buffer, + ULONG Count) +{ + READ_REGISTER_BUFFER_USHORT(Register, Buffer, Count); +} + +VOID +NTAPI +VideoPortReadRegisterBufferUlong( + PULONG Register, + PULONG Buffer, + ULONG Count) +{ + READ_REGISTER_BUFFER_ULONG(Register, Buffer, Count); +} + +VOID +NTAPI +VideoPortWritePortUchar( + PUCHAR Port, + UCHAR Value) +{ + WRITE_PORT_UCHAR(Port, Value); +} + +VOID +NTAPI +VideoPortWritePortUshort( + PUSHORT Port, + USHORT Value) +{ + WRITE_PORT_USHORT(Port, Value); +} + +VOID +NTAPI +VideoPortWritePortUlong( + PULONG Port, + ULONG Value) +{ + WRITE_PORT_ULONG(Port, Value); +} + +VOID +NTAPI +VideoPortWritePortBufferUchar( + PUCHAR Port, + PUCHAR Buffer, + ULONG Count) +{ + WRITE_PORT_BUFFER_UCHAR(Port, Buffer, Count); +} + +VOID +NTAPI +VideoPortWritePortBufferUshort( + PUSHORT Port, + PUSHORT Buffer, + ULONG Count) +{ + WRITE_PORT_BUFFER_USHORT(Port, Buffer, Count); +} + +VOID +NTAPI +VideoPortWritePortBufferUlong( + PULONG Port, + PULONG Buffer, + ULONG Count) +{ + WRITE_PORT_BUFFER_ULONG(Port, Buffer, Count); +} + +VOID +NTAPI +VideoPortWriteRegisterUchar( + PUCHAR Register, + UCHAR Value) +{ + WRITE_REGISTER_UCHAR(Register, Value); +} + +VOID +NTAPI +VideoPortWriteRegisterUshort( + PUSHORT Register, + USHORT Value) +{ + WRITE_REGISTER_USHORT(Register, Value); +} + +VOID +NTAPI +VideoPortWriteRegisterUlong( + PULONG Register, + ULONG Value) +{ + WRITE_REGISTER_ULONG(Register, Value); +} + +VOID +NTAPI +VideoPortWriteRegisterBufferUchar( + PUCHAR Register, + PUCHAR Buffer, + ULONG Count) +{ + WRITE_REGISTER_BUFFER_UCHAR(Register, Buffer, Count); +} + +VOID +NTAPI +VideoPortWriteRegisterBufferUshort( + PUSHORT Register, + PUSHORT Buffer, + ULONG Count) +{ + WRITE_REGISTER_BUFFER_USHORT(Register, Buffer, Count); +} + +VOID +NTAPI +VideoPortWriteRegisterBufferUlong( + PULONG Register, + PULONG Buffer, + ULONG Count) +{ + WRITE_REGISTER_BUFFER_ULONG(Register, Buffer, Count); +} + +LONG +FASTCALL +VideoPortInterlockedDecrement( + IN PLONG Addend) +{ + return _InterlockedDecrement(Addend); +} + +LONG +FASTCALL +VideoPortInterlockedIncrement( + IN PLONG Addend) +{ + return _InterlockedIncrement(Addend); +} + +LONG +FASTCALL +VideoPortInterlockedExchange( + IN OUT PLONG Target, + IN LONG Value) +{ + return InterlockedExchange(Target, Value); +} + +VOID +NTAPI +VideoPortQuerySystemTime( + OUT PLARGE_INTEGER CurrentTime) +{ + KeQuerySystemTime(CurrentTime); +} + +#endif /* _M_AMD64 */ Modified: trunk/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Aug 22 14:11:14 2011 @@ -44,9 +44,12 @@ @ stdcall VideoPortGetVgaStatus(ptr ptr) @ stdcall VideoPortInitialize(ptr ptr ptr ptr) @ stdcall VideoPortInt10(ptr ptr) -@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement -@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ fastcall -arch=i386,arm VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ fastcall -arch=amd64 VideoPortInterlockedDecrement(ptr) +@ fastcall -arch=i386,arm VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ fastcall VideoPortInterlockedExchange(ptr long) +@ fastcall -arch=i386,arm VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ fastcall VideoPortInterlockedIncrement(ptr) @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long) @@ -58,20 +61,33 @@ @ stdcall VideoPortPutDmaAdapter(ptr ptr) @ stdcall VideoPortQueryPerformanceCounter(ptr ptr) @ stdcall VideoPortQueryServices(ptr long ptr) -@ stdcall VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime +@ stdcall -arch=i386,arm VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime +@ stdcall -arch=amd64 VideoPortQuerySystemTime(ptr) @ stdcall VideoPortQueueDpc(ptr ptr ptr) -@ stdcall VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG -@ stdcall VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG -@ stdcall VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall -arch=i386,arm VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall -arch=amd64 VideoPortReadPortUchar(ptr) +@ stdcall -arch=i386,arm VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall -arch=amd64 VideoPortReadPortUshort(ptr) +@ stdcall -arch=i386,arm VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall -arch=amd64 VideoPortReadPortUlong(ptr) +@ stdcall -arch=i386,arm VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall -arch=amd64 VideoPortReadPortBufferUchar(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall -arch=amd64 VideoPortReadPortBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall -arch=amd64 VideoPortReadPortBufferUlong(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall -arch=amd64 VideoPortReadRegisterUchar(ptr) +@ stdcall -arch=i386,arm VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall -arch=amd64 VideoPortReadRegisterUshort(ptr) +@ stdcall -arch=i386,arm VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall -arch=amd64 VideoPortReadRegisterUlong(ptr) +@ stdcall -arch=i386,arm VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall -arch=amd64 VideoPortReadRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall -arch=amd64 VideoPortReadRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall -arch=amd64 VideoPortReadRegisterBufferUlong(ptr ptr long) @ stdcall VideoPortReadStateEvent(ptr ptr) @ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) @ stdcall VideoPortReleaseBuffer(ptr ptr) @@ -98,18 +114,30 @@ @ stdcall VideoPortUnmapMemory(ptr ptr ptr) @ stdcall VideoPortVerifyAccessRanges(ptr long ptr) @ stdcall VideoPortWaitForSingleObject(ptr ptr ptr) -@ stdcall VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG -@ stdcall VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG -@ stdcall VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall -arch=i386,arm VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall -arch=amd64 VideoPortWritePortUchar(ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall -arch=amd64 VideoPortWritePortUshort(ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall -arch=amd64 VideoPortWritePortUlong(ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall -arch=amd64 VideoPortWritePortBufferUchar(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall -arch=amd64 VideoPortWritePortBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall -arch=amd64 VideoPortWritePortBufferUlong(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall -arch=amd64 VideoPortWriteRegisterUchar(ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall -arch=amd64 VideoPortWriteRegisterUshort(ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall -arch=amd64 VideoPortWriteRegisterUlong(ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall -arch=amd64 VideoPortWriteRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall -arch=amd64 VideoPortWriteRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386,arm VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall -arch=amd64 VideoPortWriteRegisterBufferUlong(ptr ptr long) @ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VpNotifyEaData(ptr ptr)

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