Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[greatlrd] 33065: fix the no init value in kbswith
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 11:10:27 2008 New Revision: 33065 URL: http://svn.reactos.org/svn/reactos?rev=33065&view=rev Log: fix the no init value in kbswith Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 20 11:10:27 2008 @@ -47,7 +47,7 @@ GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID) { DWORD dwBufLen; - DWORD dwTest; + DWORD dwTest = 0; HKEY hKey; TCHAR szTempLCID[CCH_LAYOUT_ID + 1];

1 0

[winesync] 33064: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: winesync Date: Sun Apr 20 11:01:17 2008 New Revision: 33064 URL: http://svn.reactos.org/svn/reactos?rev=33064&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/atl/atl.rbuild trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/atl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] Sun Apr 20 11:01:17 2008 @@ -1,27 +1,29 @@ -<module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="atl.spec.def" /> - <include base="atl">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x600</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ole32</library> - <library>oleaut32</library> - <library>user32</library> - <library>gdi32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>uuid</library> - <library>ntdll</library> - <file>atl_ax.c</file> - <file>atl_main.c</file> - <file>registrar.c</file> - <file>rsrc.rc</file> - <file>atliface.idl</file> - <include base="atl" root="intermediate">.</include> - <file>atl.spec</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="atl" type="win32dll" baseaddress="${BASEADDRESS_ATL}" installbase="system32" installname="atl.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="atl.spec.def" /> + <include base="atl">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>atl_ax.c</file> + <file>atl_main.c</file> + <file>registrar.c</file> + <file>rsrc.rc</file> + <file>atliface.idl</file> + <include base="atl" root="intermediate">.</include> + <file>atl.spec</file> + <library>wine</library> + <library>ole32</library> + <library>oleaut32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> +</module> +</group> Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Sun Apr 20 11:01:17 2008 @@ -27,7 +27,6 @@ #include "winreg.h" #include "objbase.h" #include "oaidl.h" -#include "string.h" #define ATL_INITGUID #include "atliface.h" @@ -171,7 +170,7 @@ }else { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { if(rep_iter->key_len == iter-iter2 - && !memicmp(iter2, rep_iter->key, rep_iter->key_len)) + && !memicmpW(iter2, rep_iter->key, rep_iter->key_len)) break; } if(!rep_iter) {

1 0

[hpoussin] 33063: Support memicmpW() Wine specific function
by hpoussin＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: hpoussin Date: Sun Apr 20 11:01:04 2008 New Revision: 33063 URL: http://svn.reactos.org/svn/reactos?rev=33063&view=rev Log: Support memicmpW() Wine specific function Modified: trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Sun Apr 20 11:01:04 2008 @@ -7,6 +7,7 @@ #include <winbase.h> #include <winnls.h> +#define memicmpW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) #define strlenW(s) wcslen((const wchar_t *)(s)) #define strcpyW(d,s) wcscpy((wchar_t *)(d),(const wchar_t *)(s)) #define strcatW(d,s) wcscat((wchar_t *)(d),(const wchar_t *)(s))

1 0

[cfinck] 33062: - Add the actual function for switching the keyboard layout - Handle keyboard layout substitutes (like the "German (IBM)" layout) - Refactor many parts of the code: * Always close hKey handles after they were successfully opened * Build the keyboard layout menu one time and not everytime, when it's opened * Use smaller sizes for some string variables, defined with CCH_LAYOUT_ID and CCH_ULONG_DEC. This also ensures that we don't retrieve bigger values, which would be invalid. - Us
by cfinck＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: cfinck Date: Sun Apr 20 10:48:43 2008 New Revision: 33062 URL: http://svn.reactos.org/svn/reactos?rev=33062&view=rev Log: - Add the actual function for switching the keyboard layout - Handle keyboard layout substitutes (like the "German (IBM)" layout) - Refactor many parts of the code: * Always close hKey handles after they were successfully opened * Build the keyboard layout menu one time and not everytime, when it's opened * Use smaller sizes for some string variables, defined with CCH_LAYOUT_ID and CCH_ULONG_DEC. This also ensures that we don't retrieve bigger values, which would be invalid. - Use a consistent indentation Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 20 10:48:43 2008 @@ -1,4 +1,12 @@ -#include <kbswitch.h> +/* + * PROJECT: Keyboard Layout Switcher + * FILE: base\applications\kbswitch\kbswitch.c + * PURPOSE: Switching Keyboard Layouts + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * Colin Finck (mail(a)colinfinck.de) + */ + +#include "kbswitch.h" #define WM_NOTIFYICONMSG (WM_USER + 248) #define BUFSIZE 256 @@ -9,13 +17,13 @@ static VOID AddTrayIcon(HWND hwnd, HICON hIcon) { - NOTIFYICONDATA tnid; + NOTIFYICONDATA tnid; tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; tnid.uFlags = NIF_ICON | NIF_MESSAGE; - tnid.uCallbackMessage = WM_NOTIFYICONMSG; + tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = hIcon; Shell_NotifyIcon(NIM_ADD, &tnid); @@ -26,156 +34,199 @@ static VOID DelTrayIcon(HWND hwnd) { - NOTIFYICONDATA tnid; - - tnid.cbSize = sizeof(NOTIFYICONDATA); - tnid.hWnd = hwnd; - tnid.uID = 1; - - Shell_NotifyIcon(NIM_DELETE, &tnid); + NOTIFYICONDATA tnid; + + tnid.cbSize = sizeof(NOTIFYICONDATA); + tnid.hWnd = hwnd; + tnid.uID = 1; + + Shell_NotifyIcon(NIM_DELETE, &tnid); } static BOOL -GetLayoutName(LPCTSTR lcid, LPTSTR name) +GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID) +{ + DWORD dwBufLen; + DWORD dwTest; + HKEY hKey; + TCHAR szTempLCID[CCH_LAYOUT_ID + 1]; + + // Get the Layout ID + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szTempLCID); + + if(RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + } + + // Look for a substitude of this layout + if(RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szTempLCID); + + if(RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) + { + // No substitute found, then use the old LCID + lstrcpy(szLCID, szTempLCID); + } + + RegCloseKey(hKey); + } + else + { + // Substitutes key couldn't be opened, so use the old LCID + lstrcpy(szLCID, szTempLCID); + } + + return TRUE; +} + +static BOOL +GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName) { HKEY hKey; DWORD dwBufLen; - TCHAR szBuf[BUFSIZE]; - - _stprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"),lcid); + TCHAR szBuf[MAX_PATH]; + TCHAR szLCID[CCH_LAYOUT_ID + 1]; + + if(!GetLayoutID(szLayoutNum, szLCID)) + return FALSE; + + wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - dwBufLen = BUFSIZE; - if (RegQueryValueEx(hKey,_T("Layout Text"),NULL,NULL,(LPBYTE)name,&dwBufLen) == ERROR_SUCCESS) + dwBufLen = MAX_PATH * sizeof(TCHAR); + + if(RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS) { RegCloseKey(hKey); - return TRUE; - } - } - - return FALSE; + return FALSE; + } + + RegCloseKey(hKey); + } + + return TRUE; } static VOID -ActivateLayout(INT LayoutID) -{ - TCHAR szLayoutID[MAX_PATH], szNewLayout[MAX_PATH]; - HKEY hKey; - DWORD dwBufLen; - - _stprintf(szLayoutID, _T("%d"), LayoutID); - - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - dwBufLen = MAX_PATH; - if (RegQueryValueEx(hKey, szLayoutID, NULL, NULL, (LPBYTE)szNewLayout, &dwBufLen) == ERROR_SUCCESS) - { - MessageBox(0, szNewLayout, _T(""), MB_OK); - RegCloseKey(hKey); - } - } -} - -static VOID -ShowPopupMenu(HWND hwnd, POINT pt) -{ - HMENU hMenu; - HKEY hKey; - DWORD dwIndex = 0, dwSize, dwType; - LONG Ret; - TCHAR szBuf[MAX_PATH], szPreload[MAX_PATH], szName[MAX_PATH]; - - hMenu = CreatePopupMenu(); - - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), - 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - dwSize = MAX_PATH; - Ret = RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL, NULL); - if (Ret == ERROR_SUCCESS) - { - while (Ret == ERROR_SUCCESS) - { - dwSize = MAX_PATH; - RegQueryValueEx(hKey, szBuf, NULL, NULL, (LPBYTE)szPreload, &dwSize); - - GetLayoutName(szPreload, szName); - AppendMenu(hMenu, MF_STRING, _ttoi(szBuf), szName); - - dwIndex++; - - dwSize = MAX_PATH; - Ret = RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL, NULL); - } - } - } - - TrackPopupMenu(hMenu, 0, pt.x, pt.y, 0, hwnd, NULL); - DestroyMenu(hMenu); - RegCloseKey(hKey); +ActivateLayout(ULONG uLayoutNum) +{ + HKL hKl; + TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; + TCHAR szLCID[CCH_LAYOUT_ID + 1]; + DWORD Ret; + + _ultot(uLayoutNum, szLayoutNum, 10); + GetLayoutID(szLayoutNum, szLCID); + + // Switch to the new keyboard layout + hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); + Ret = SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); +} + +static HMENU +BuildPopupMenu() +{ + HMENU hMenu; + HKEY hKey; + DWORD dwIndex, dwSize; + TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; + TCHAR szName[MAX_PATH]; + + hMenu = CreatePopupMenu(); + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + for(dwIndex = 0; ; dwIndex++) + { + dwSize = sizeof(szLayoutNum); + if(RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if(!GetLayoutName(szLayoutNum, szName)) + break; + + AppendMenu(hMenu, MF_STRING, _ttoi(szLayoutNum), szName); + } + + RegCloseKey(hKey); + } + + return hMenu; } LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { - POINT pt; - - switch (Message) - { - case WM_CREATE: - AddTrayIcon(hwnd, LoadIcon(hInst, MAKEINTRESOURCE(IDI_MAIN))); - break; - - case WM_NOTIFYICONMSG: - switch (lParam) - { - case WM_LBUTTONDBLCLK: - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - { - GetCursorPos(&pt); - ShowPopupMenu(hwnd, pt); - } - break; - } - break; - - case WM_COMMAND: - ActivateLayout(LOWORD(wParam)); - break; - - case WM_DESTROY: - DelTrayIcon(hwnd); - PostQuitMessage(0); - break; - } - - return DefWindowProc(hwnd, Message, wParam, lParam); + static HMENU hPopupMenu; + + switch (Message) + { + case WM_CREATE: + AddTrayIcon(hwnd, LoadIcon(hInst, MAKEINTRESOURCE(IDI_MAIN))); + hPopupMenu = BuildPopupMenu(hwnd); + break; + + case WM_NOTIFYICONMSG: + switch (lParam) + { + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + { + POINT pt; + + GetCursorPos(&pt); + TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + } + break; + } + break; + + case WM_COMMAND: + ActivateLayout(LOWORD(wParam)); + break; + + case WM_DESTROY: + DestroyMenu(hPopupMenu); + DelTrayIcon(hwnd); + PostQuitMessage(0); + break; + } + + return DefWindowProc(hwnd, Message, wParam, lParam); } INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow) { - WNDCLASS WndClass = {0}; - MSG msg; - - hInst = hInstance; - - WndClass.style = 0; - WndClass.lpfnWndProc = (WNDPROC)WndProc; - WndClass.cbClsExtra = 0; - WndClass.cbWndExtra = 0; - WndClass.hInstance = hInstance; - WndClass.hIcon = NULL; - WndClass.hCursor = NULL; - WndClass.hbrBackground = NULL; - WndClass.lpszMenuName = NULL; - WndClass.lpszClassName = L"kbswitch"; - - if (!RegisterClass(&WndClass)) return 0; - - hwnd = CreateWindow(L"kbswitch", L"kbswitch", 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); + WNDCLASS WndClass = {0}; + MSG msg; + + hInst = hInstance; + + WndClass.style = 0; + WndClass.lpfnWndProc = (WNDPROC)WndProc; + WndClass.cbClsExtra = 0; + WndClass.cbWndExtra = 0; + WndClass.hInstance = hInstance; + WndClass.hIcon = NULL; + WndClass.hCursor = NULL; + WndClass.hbrBackground = NULL; + WndClass.lpszMenuName = NULL; + WndClass.lpszClassName = L"kbswitch"; + + if (!RegisterClass(&WndClass)) return 0; + + hwnd = CreateWindow(L"kbswitch", L"kbswitch", 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); while(GetMessage(&msg,NULL,0,0)) { Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Sun Apr 20 10:48:43 2008 @@ -1,6 +1,11 @@ +#include <stdlib.h> #include <windows.h> #include <tchar.h> -#include <stdio.h> -#include <stdlib.h> #include "resource.h" + +// Character Count of a layout ID like "00000409" +#define CCH_LAYOUT_ID 8 + +// Maximum Character Count of a ULONG in decimal +#define CCH_ULONG_DEC 10

1 0

[dreimer] 33061: Synced Winhelp Updated README.WINE - Added atl.dll, pdh.dll, rasapi32, rasdlg, stdole2.tlb, tapi32, usp10, winhttp All of these are from wine. I called them Out of sync now. Change the way you want.
by dreimer＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dreimer Date: Sun Apr 20 10:38:34 2008 New Revision: 33061 URL: http://svn.reactos.org/svn/reactos?rev=33061&view=rev Log: Synced Winhelp Updated README.WINE - Added atl.dll, pdh.dll, rasapi32, rasdlg, stdole2.tlb, tapi32, usp10, winhttp All of these are from wine. I called them Out of sync now. Change the way you want. Modified: trunk/reactos/base/applications/winhelp/callback.c trunk/reactos/base/applications/winhelp/hlpfile.c trunk/reactos/base/applications/winhelp/lex.yy.c trunk/reactos/base/applications/winhelp/macro.lex.l trunk/reactos/base/applications/winhelp/winhelp.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/winhelp/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/callback.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/callback.c [iso-8859-1] Sun Apr 20 10:38:34 2008 @@ -127,16 +127,16 @@ WINE_FIXME("()\n"); } -static LONG CALLBACK WHD_GetInfo(WORD what, HWND hnd) +static ULONG_PTR CALLBACK WHD_GetInfo(WORD what, HWND hnd) { - LONG ret = 0; + ULONG_PTR ret = 0; WINE_TRACE("(%x %p)\n", what, hnd); switch (what) { case 0: break; - case 1: /* instance */ ret = (LONG)Globals.hInstance; break; - case 3: /* current window */ ret = (LONG)Globals.active_win->hMainWnd; break; + case 1: /* instance */ ret = (ULONG_PTR)Globals.hInstance; break; + case 3: /* current window */ ret = (ULONG_PTR)Globals.active_win->hMainWnd; break; case 2: /* main window */ case 4: /* handle to opened file */ case 5: /* foreground color */ Modified: trunk/reactos/base/applications/winhelp/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/hlpfile.c [iso-8859-1] Sun Apr 20 10:38:34 2008 @@ -158,11 +158,11 @@ static int comp_PageByHash(void *p, const void *key, int leaf, void** next) { - LONG lKey = (LONG)key; - LONG lTest = GET_UINT(p, 0); + LONG lKey = (LONG_PTR)key; + LONG lTest = (INT)GET_UINT(p, 0); *next = (char *)p+(leaf?8:6); - WINE_TRACE("Comparing '%u' with '%u'\n", lKey, lTest); + WINE_TRACE("Comparing '%d' with '%d'\n", lKey, lTest); if (lTest < lKey) return -1; if (lTest > lKey) return 1; return 0; @@ -184,7 +184,7 @@ if (hlpfile->version <= 16) return HLPFILE_PageByNumber(hlpfile, lHash); - ptr = HLPFILE_BPTreeSearch(hlpfile->Context, (void*)lHash, comp_PageByHash); + ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash); if (!ptr) { WINE_ERR("Page of hash %x not found in file %s\n", lHash, hlpfile->lpszPath); @@ -587,7 +587,7 @@ if (!dst) return NULL; HLPFILE_UncompressRLE(src, src + csz, &tmp, sz); if (tmp - dst != sz) - WINE_WARN("Bogus gfx sizes (RunLen): %u/%u\n", tmp - dst, sz); + WINE_WARN("Bogus gfx sizes (RunLen): %lu/%u\n", (SIZE_T)(tmp - dst), sz); break; case 2: /* LZ77 */ sz77 = HLPFILE_UncompressedLZ77_Size(src, src + csz); @@ -610,7 +610,7 @@ } HLPFILE_UncompressRLE(tmp, tmp + sz77, &tmp2, sz); if (tmp2 - dst != sz) - WINE_WARN("Bogus gfx sizes (LZ77+RunLen): %u / %u\n", tmp2 - dst, sz); + WINE_WARN("Bogus gfx sizes (LZ77+RunLen): %lu / %u\n", (SIZE_T)(tmp2 - dst), sz); HeapFree(GetProcessHeap(), 0, tmp); break; default: @@ -729,8 +729,8 @@ hsoff = GET_UINT(ptr, 4); ptr += 8; - WINE_TRACE("sz=%lu csz=%lu (%d,%d) offs=%lu/%u,%lu\n", - size, csize, lpmfp->xExt, lpmfp->yExt, off, ptr - beg, hsoff); + WINE_TRACE("sz=%lu csz=%lu (%d,%d) offs=%lu/%lu,%lu\n", + size, csize, lpmfp->xExt, lpmfp->yExt, off, (SIZE_T)(ptr - beg), hsoff); bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack); if (!bits) return FALSE; @@ -944,7 +944,7 @@ for (nc = 0; nc < ncol; nc++) { - WINE_TRACE("looking for format at offset %u for column %d\n", format - (buf + 0x15), nc); + WINE_TRACE("looking for format at offset %lu for column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); if (buf[0x14] == 0x23) format += 5; if (buf[0x14] == 0x01) @@ -1796,8 +1796,8 @@ if (newptr + (phend - phptr) > newend) { - WINE_FIXME("buffer overflow %p > %p for %d bytes\n", - newptr, newend, phend - phptr); + WINE_FIXME("buffer overflow %p > %p for %lu bytes\n", + newptr, newend, (SIZE_T)(phend - phptr)); return; } memcpy(newptr, phptr, phend - phptr); @@ -1902,8 +1902,8 @@ *dst += ch; } if (*dst != sdst) - WINE_WARN("Buffer X-flow: d(%u) instead of d(%u)\n", - *dst - (sdst - dstsz), dstsz); + WINE_WARN("Buffer X-flow: d(%lu) instead of d(%u)\n", + (SIZE_T)(*dst - (sdst - dstsz)), dstsz); } /************************************************************************** Modified: trunk/reactos/base/applications/winhelp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lex.yy.c [iso-8859-1] Sun Apr 20 10:38:34 2008 @@ -1721,7 +1721,7 @@ case 'I': if (t != INTEGER) {WINE_WARN("missing U\n");return -1;} - pa[idx] = (void*)yylval.integer; + pa[idx] = LongToPtr(yylval.integer); break; case 'B': if (t != BOOL_FUNCTION) Modified: trunk/reactos/base/applications/winhelp/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/macro.lex.l [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/macro.lex.l [iso-8859-1] Sun Apr 20 10:38:34 2008 @@ -175,7 +175,7 @@ case 'I': if (t != INTEGER) {WINE_WARN("missing U\n");return -1;} - pa[idx] = (void*)yylval.integer; + pa[idx] = LongToPtr(yylval.integer); break; case 'B': if (t != BOOL_FUNCTION) Modified: trunk/reactos/base/applications/winhelp/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/winhelp.c [iso-8859-1] Sun Apr 20 10:38:34 2008 @@ -466,10 +466,10 @@ oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0; win->hBrush = CreateSolidBrush(win->info->sr_color); - SetWindowLong(win->hMainWnd, 0, (LONG)win); - SetWindowLong(win->hButtonBoxWnd, 0, (LONG)win); - SetWindowLong(win->hTextWnd, 0, (LONG)win); - SetWindowLong(win->hHistoryWnd, 0, (LONG)win); + SetWindowLongPtr(win->hMainWnd, 0, (ULONG_PTR)win); + SetWindowLongPtr(win->hButtonBoxWnd, 0, (ULONG_PTR)win); + SetWindowLongPtr(win->hTextWnd, 0, (ULONG_PTR)win); + SetWindowLongPtr(win->hHistoryWnd, 0, (ULONG_PTR)win); WINHELP_InitFonts(win->hMainWnd); @@ -701,12 +701,12 @@ { case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; - SetWindowLong(hWnd, 0, (LONG) win); + SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); win->hMainWnd = hWnd; break; case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); /* Create button box and text Window */ CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, @@ -718,7 +718,7 @@ /* Fall through */ case WM_USER: case WM_WINDOWPOSCHANGED: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); GetClientRect(hWnd, &rect); /* Update button box and text Window */ @@ -738,7 +738,7 @@ break; case WM_COMMAND: - Globals.active_win = win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + Globals.active_win = win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); switch (wParam) { /* Menu FILE */ @@ -790,7 +790,7 @@ case VK_PRIOR: case VK_NEXT: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); curPos = GetScrollPos(win->hTextWnd, SB_VERT); GetScrollRange(win->hTextWnd, SB_VERT, &min, &max); @@ -841,13 +841,13 @@ { case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; - SetWindowLong(hWnd, 0, (LONG) win); + SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); win->hButtonBoxWnd = hWnd; break; case WM_WINDOWPOSCHANGING: winpos = (WINDOWPOS*) lParam; - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); /* Update buttons */ button_size.cx = 0; @@ -958,7 +958,7 @@ { case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; - SetWindowLong(hWnd, 0, (LONG) win); + SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); win->hTextWnd = hWnd; win->hBrush = CreateSolidBrush(win->info->sr_color); if (win->info->win_style & WS_POPUP) Globals.hPopupWnd = win->hMainWnd = hWnd; @@ -966,7 +966,7 @@ break; case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); /* Calculate vertical size and position of a popup window */ if (win->info->win_style & WS_POPUP) @@ -1090,7 +1090,7 @@ case WM_PAINT: hDc = BeginPaint(hWnd, &ps); - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); scroll_pos = GetScrollPos(hWnd, SB_VERT); /* No DPtoLP needed - MM_TEXT map mode */ @@ -1189,7 +1189,7 @@ break; case WM_MOUSEMOVE: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); if (WINHELP_IsOverLink(win, wParam, lParam)) SetCursor(win->hHandCur); /* set to hand pointer cursor to indicate a link */ @@ -1199,7 +1199,7 @@ break; case WM_LBUTTONDOWN: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); hPopupWnd = Globals.hPopupWnd; Globals.hPopupWnd = 0; @@ -1248,7 +1248,7 @@ break; case WM_NCDESTROY: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; @@ -1284,11 +1284,11 @@ { case WM_NCCREATE: win = (WINHELP_WINDOW*)((LPCREATESTRUCT)lParam)->lpCreateParams; - SetWindowLong(hWnd, 0, (LONG)win); + SetWindowLongPtr(hWnd, 0, (ULONG_PTR)win); win->hHistoryWnd = hWnd; break; case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); hDc = GetDC(hWnd); GetTextMetrics(hDc, &tm); GetWindowRect(hWnd, &r); @@ -1303,7 +1303,7 @@ ReleaseDC(hWnd, hDc); break; case WM_LBUTTONDOWN: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); hDc = GetDC(hWnd); GetTextMetrics(hDc, &tm); i = HIWORD(lParam) / tm.tmHeight; @@ -1313,7 +1313,7 @@ break; case WM_PAINT: hDc = BeginPaint(hWnd, &ps); - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); GetTextMetrics(hDc, &tm); for (i = 0; i < win->histIndex; i++) @@ -1324,7 +1324,7 @@ EndPaint(hWnd, &ps); break; case WM_DESTROY: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); if (hWnd == win->hHistoryWnd) win->hHistoryWnd = 0; break; @@ -1532,7 +1532,7 @@ */ static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE newsize) { - WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); HLPFILE_PARAGRAPH *p; WINHELP_LINE **line = &win->first_line; WINHELP_LINE_PART **part = 0; @@ -1854,7 +1854,7 @@ */ static void WINHELP_InitFonts(HWND hWnd) { - WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); LOGFONT logfontlist[] = { {-10, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}, Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Apr 20 10:38:34 2008 @@ -31,6 +31,7 @@ The following libraries are shared with Wine. reactos/dll/win32/advpack # Autosync +reactos/dll/win32/atl # Out of sync reactos/dll/win32/avifil32 # Autosync reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Autosync @@ -43,13 +44,13 @@ reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # Synced to Wine-20080106 +reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync +reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. -reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/mlang # Autosync @@ -71,8 +72,11 @@ reactos/dll/win32/oleaut32 # Autosync reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync +reactos/dll/win32/pdh # Out of sync reactos/dll/win32/powrprof # Autosync reactos/dll/win32/printui # Autosync +reactos/dll/win32/rasapi32 # Out of sync +reactos/dll/win32/rasdlg # Out of sync reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 @@ -85,11 +89,15 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync +reactos/dll/win32/stdole2.tlb # Out of Sync +reactos/dll/win32/tapi32 # Out of sync reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/urlmon # Autosync +reactos/dll/win32/usp10 # Out of sync reactos/dll/win32/uxtheme # Autosync reactos/dll/win32/version # Autosync reactos/dll/win32/wininet # Autosync +reactos/dll/win32/winhttp # Out of Sync reactos/dll/win32/wintrust # Out of sync reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628

1 0

[greatlrd] 33060: Let DxEngScreenAccessCheck() always return true for now until we implemete it it mean dxg.sys have preemptions to access the screen.
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 09:46:03 2008 New Revision: 33060 URL: http://svn.reactos.org/svn/reactos?rev=33060&view=rev Log: Let DxEngScreenAccessCheck() always return true for now until we implemete it it mean dxg.sys have preemptions to access the screen. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sun Apr 20 09:46:03 2008 @@ -656,7 +656,9 @@ DWORD DxEngScreenAccessCheck() { UNIMPLEMENTED; - return FALSE; + + /* we cheating here and tell dxg.sys it have always premitions to access the screen */ + return TRUE; } /************************************************************************/

1 0

[dreimer] 33059: Bug 3188: Lithuanian translation by Vytis Girdzijauskas (cman@cman.us)
by dreimer＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dreimer Date: Sun Apr 20 09:44:14 2008 New Revision: 33059 URL: http://svn.reactos.org/svn/reactos?rev=33059&view=rev Log: Bug 3188: Lithuanian translation by Vytis Girdzijauskas (cman(a)cman.us) Added: trunk/reactos/base/applications/mmc/lang/lt-LT.rc (with props) Modified: trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/setup/usetup/lang/lt-LT.h Added: trunk/reactos/base/applications/mmc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] Sun Apr 20 09:44:14 2008 @@ -1,0 +1,46 @@ +/* Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Byla" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Baigti\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Pagalba" + BEGIN + MENUITEM "&Apie ReactOS Valdymo Pultà...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Valdymo Pultas" + IDS_CONSOLETITLE "Pultas%1!u!" +END +/* Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "&Byla" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Baigti\tAlt+F4", ID_FILE_EXIT + END + + POPUP "&Pagalba" + BEGIN + MENUITEM "&Apie ReactOS Valdymo Pultà...", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Valdymo Pultas" + IDS_CONSOLETITLE "Pultas%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Sun Apr 20 09:44:14 2008 @@ -11,6 +11,7 @@ #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/ko-KO.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" @@ -24,3 +25,5 @@ + + Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Apr 20 09:44:14 2008 @@ -45,8 +45,8 @@ { 0, 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -121,8 +121,8 @@ { 0, 0, - " ENTER = TÒsti R = Taisyti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti R = Taisyti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -215,8 +215,8 @@ { 0, 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -339,8 +339,8 @@ { 0, 0, - " ENTER = Return", - TEXT_TYPE_STATUS + "ENTER = GrÔØti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -361,79 +361,79 @@ { 6, 8, - "The list below shows the current device settings.", - TEXT_STYLE_NORMAL - }, - { - 8, + "Ïemiau esantis sÐraÕas rodo dabartinius ÔrenginiÖ nustatymus.", + TEXT_STYLE_NORMAL + }, + { + 24, 11, - " Computer:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Kompiuteris:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 12, - " Display:", - TEXT_STYLE_NORMAL, - }, - { - 8, + "Ekranas:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT, + }, + { + 24, 13, - " Keyboard:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Klaviat×ra:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 14, - "Keyboard layout:", - TEXT_STYLE_NORMAL - }, - { - 8, + "Klav iÕdÓstymas:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, 16, - " Accept:", - TEXT_STYLE_NORMAL + "Naudoti:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, - 16, "Accept these device settings", + 16, "Naudoti Õiuos ÔrenginiÖ nustatymus", TEXT_STYLE_NORMAL }, { 6, 19, - "You can change the hardware settings by pressing the UP or DOWN keys", + "J×s galite pakeisti ÔrenginiÖ nustatymus. Spausdami klaviÕus AUK¾TYN", TEXT_STYLE_NORMAL }, { 6, 20, - "to select an entry. Then press the ENTER key to select alternative", + "arba ÏEMYN, pasirinkite punktÐ, kurÔ norite pakeisti. PaspaudÒ ENTER", TEXT_STYLE_NORMAL }, { 6, 21, - "settings.", + "galÓsite pasirinkti alternatyvÐ.", TEXT_STYLE_NORMAL }, { 6, 23, - "When all settings are correct, select \"Accept these device settings\"", + "Kai visi nustatymai bus teisingi, pasirinkite \"Naudoti Õiuos Ôrengi-", TEXT_STYLE_NORMAL }, { 6, 24, - "and press ENTER.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "niÖ nustatymus\" ir paspauskite ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -496,8 +496,8 @@ { 0, 0, - " ESC = Main page ENTER = Reboot", - TEXT_TYPE_STATUS + "ESC = Main page ENTER = Reboot", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -547,8 +547,8 @@ { 0, 0, - " ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -587,8 +587,8 @@ { 0, 0, - " Flushing cache", - TEXT_TYPE_STATUS + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -633,8 +633,8 @@ { 0, 0, - " Please wait ...", - TEXT_TYPE_STATUS, + "PraÕome palaukti...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { 0, @@ -684,8 +684,8 @@ { 0, 0, - " ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -730,8 +730,8 @@ { 0, 0, - " ENTER = Reboot computer", - TEXT_TYPE_STATUS + "ENTER = Reboot computer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -776,8 +776,8 @@ { 0, 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -835,8 +835,8 @@ { 0, 0, - " Please wait...", - TEXT_TYPE_STATUS + "PraÕome palaukti...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -869,8 +869,8 @@ { 0, 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -921,8 +921,8 @@ { 0, 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -941,27 +941,27 @@ TEXT_STYLE_UNDERLINE }, { - 11, + 0, 12, "Please wait while ReactOS Setup copies files to your ReactOS", - TEXT_STYLE_NORMAL - }, - { - 30, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 13, "installation folder.", - TEXT_STYLE_NORMAL - }, - { - 20, + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, 14, "This may take several minutes to complete.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 Please wait... ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Please wait... ", TEXT_TYPE_STATUS }, { @@ -1007,8 +1007,8 @@ { 0, 0, - " ENTER = TÒsti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1059,8 +1059,8 @@ { 0, 0, - " ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1111,8 +1111,8 @@ { 0, 0, - " ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1140,8 +1140,8 @@ { 0, 0, - " Building the file copy list...", - TEXT_TYPE_STATUS + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1187,8 +1187,8 @@ { 0, 0, - " ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", - TEXT_TYPE_STATUS + "ENTER = TÒsti ESC = AtÕaukti F3 = Baigti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1234,7 +1234,7 @@ { 0, 0, - " D = Delete Partition ESC = AtÕaukti F3 = Baigti", + "D = Delete Partition ESC = AtÕaukti F3 = Baigti", TEXT_TYPE_STATUS }, { @@ -1262,8 +1262,8 @@ { 0, 0, - " Creating registry hives...", - TEXT_TYPE_STATUS + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { 0, @@ -1404,7 +1404,7 @@ }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to set the initialize the registry.", + "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { @@ -1598,7 +1598,7 @@ {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE,

1 0

[dreimer] 33058: Bug 3188: Lithuanian translation by Vytis Girdzijauskas (cman@cman.us)
by dreimer＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: dreimer Date: Sun Apr 20 09:44:13 2008 New Revision: 33058 URL: http://svn.reactos.org/svn/reactos?rev=33058&view=rev Log: Bug 3188: Lithuanian translation by Vytis Girdzijauskas (cman(a)cman.us) Added: trunk/rosapps/downloader/lang/lt-LT.rc (with props) Modified: trunk/rosapps/downloader/rsrc.rc Added: trunk/rosapps/downloader/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/lt-LT.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/lt-LT.rc (added) +++ trunk/rosapps/downloader/lang/lt-LT.rc [iso-8859-1] Sun Apr 20 09:44:13 2008 @@ -1,0 +1,63 @@ +/* Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Siunèiama..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Atðaukti", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Nuostatos" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Siuntø katalogas:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Pasirinkti...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Naikinti diegimo bylas baigus diegimà", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Atnaujinimø serveris:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Atðaukti", IDCANCEL, 207, 90, 54, 15 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "Download ! - ReactOS atsiuntimø tvarkytuvë" + IDS_WELCOME_TITLE "Jus sveikina ReactOS atsiuntimø tvarkytuvë" + IDS_WELCOME "Praðome pasirinkti kategorijà kairëje. \nÈia yra versija 1.1." + IDS_NO_APP_TITLE "Nepasirinkta programa" + IDS_NO_APP "Praðome pasirinkti programà prieð paspaudþiant siuntimo mygtukà, jei jums reikalinga pagalba, praðome spausti ant klaustuko virðutiniame deðiniajame kampe." + IDS_UPDATE_TITLE "Atnaujinti" + IDS_UPDATE "Atsipraðome, bet ði funkcija dar nesukurta." + IDS_HELP_TITLE "Pagalba" + IDS_HELP "Pasirinkite kategorijà kairëje, tuomet pasirinkite programà ir spauskite siuntimo mygtukà. Norëdami atnaujinti programos informacijà, spaukite mygtukà, kuris yra ðalia nuostatø mygtuko." + IDS_NO_APPS "Atsipraðome, bet ðioje kategorijoje programø dar nëra. Jûs galite padëti pridëdami daugiau programø." + IDS_CHOOSE_APP "Praðome pasirinkti programà." + IDS_CHOOSE_SUB "Praðome pasirinkti pokategorá." + IDS_CHOOSE_CATEGORY "Praðome pasirinkti kategorijà." + IDS_CHOOSE_BOTH "Praðome pasirinkti pokategorá arba programà." + IDS_XMLERROR_1 "Nepavyko rasti xml bylos!" + IDS_XMLERROR_2 "Nepavyko nuskaityti xml bylos!" + IDS_DOWNLOAD_ERROR "Nepavyko parsiøsti bylos.\nPraðome patikrinti interneto ryðá." + IDS_VERSION "Versija: " + IDS_LICENCE "Licencija: " + IDS_MAINTAINER "Palaikymas: " + IDS_APPS_TITLE "Programos" + IDS_CATS_TITLE "Kategorijos" + IDS_CHOOSE_FOLDER "Praðome pasirinkti katalogà..." + IDS_NOTCREATE_REGKEY "Nepavyko sukurti registro rakto." + IDS_DOWNLOAD_FOLDER "Downloader" + IDS_UNABLECREATE_FOLDER "Nepavyko sukurti katalogo su ðiuo vardu!" + IDS_UPDATE_URL "http://svn.reactos.org" + IDS_INSTALL_DEP "%s reikalingas paleisti %s. Diegti %s dabar?" + TTT_HELPBUTTON "Pateikia informacijà apie naudojimàsi programa" + TTT_UPDATEBUTTON "Dar nëra" + TTT_PROFBUTTON "Leidþia konfiguruoti programà" +END Propchange: trunk/rosapps/downloader/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=330… ============================================================================== --- trunk/rosapps/downloader/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/downloader/rsrc.rc [iso-8859-1] Sun Apr 20 09:44:13 2008 @@ -32,6 +32,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc" +#include "lang/lt-LT.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc"

1 0

[greatlrd] 33057: add dump of edd_directdraw_global so we can easy see what it contain.
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 09:10:08 2008 New Revision: 33057 URL: http://svn.reactos.org/svn/reactos?rev=33057&view=rev Log: add dump of edd_directdraw_global so we can easy see what it contain. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 20 09:10:08 2008 @@ -10,6 +10,7 @@ #include <w32k.h> #include <debug.h> +#define DXDDRAWDEBUG 1 PGD_DXDDSTARTUPDXGRAPHICS gpfnStartupDxGraphics = NULL; PGD_DXDDCLEANUPDXGRAPHICS gpfnCleanupDxGraphics = NULL; @@ -21,6 +22,7 @@ DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl]; HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext; +void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl); EDD_DIRECTDRAW_GLOBAL eDdirectDraw_Global; @@ -119,7 +121,7 @@ } /* dump sort list for debuging */ -#if 1 +#if DXDDRAWDEBUG DPRINT1("ghDxGraphics address 0x%08lx\n",ghDxGraphics); DPRINT1("gpfnStartupDxGraphics address 0x%08lx\n",gpfnStartupDxGraphics); DPRINT1("gpfnCleanupDxGraphics address 0x%08lx\n",gpfnCleanupDxGraphics); @@ -155,7 +157,8 @@ PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject; NTSTATUS Status; PEPROCESS Proc = NULL; - PDC pDC; + PDC pDC; + HANDLE DxHandle; if (hdc == NULL) { @@ -195,7 +198,13 @@ } DPRINT1("Calling dxg.sys DdCreateDirectDrawObject\n"); - return pfnDdCreateDirectDrawObject(hdc); + DxHandle = pfnDdCreateDirectDrawObject(hdc); + +#if DXDDRAWDEBUG + dump_edd_directdraw_global(&eDdirectDraw_Global); +#endif + + return DxHandle; } /*++ @@ -244,7 +253,7 @@ if (pfnDxgGenericThunk == NULL) { - DPRINT1("Warning: no pfnDxgGenericThunk\n"); + DPRINT1("Warning: no pfnDxgGenericThunk\n"); return DDHAL_DRIVER_NOTHANDLED; } @@ -263,7 +272,7 @@ if (pfnDdGetDriverState == NULL) { - DPRINT1("Warning: no pfnDdGetDriverState\n"); + DPRINT1("Warning: no pfnDdGetDriverState\n"); return DDHAL_DRIVER_NOTHANDLED; } @@ -283,7 +292,7 @@ if (pfnDdColorControl == NULL) { - DPRINT1("Warning: no pfnDdColorControl\n"); + DPRINT1("Warning: no pfnDdColorControl\n"); return DDHAL_DRIVER_NOTHANDLED; } @@ -308,7 +317,7 @@ if (pfnDdCreateSurfaceObject == NULL) { - DPRINT1("Warning: no pfnDdCreateSurfaceObject\n"); + DPRINT1("Warning: no pfnDdCreateSurfaceObject\n"); return DDHAL_DRIVER_NOTHANDLED; } @@ -358,6 +367,7 @@ DPRINT1("Warning: no pfnDdDeleteSurfaceObject\n"); return DDHAL_DRIVER_NOTHANDLED; } + /* try see if the handle is vaidl */ DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n"); return pfnDdDeleteSurfaceObject(hSurface); @@ -606,6 +616,293 @@ } - +/* internal debug api */ +void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) +{ + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",pEddgbl->dhpdev); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->dwReserved1 : 0x%08lx\n",pEddgbl->dwReserved1); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->dwReserved2 : 0x%08lx\n",pEddgbl->dwReserved2); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_000c[0] : 0x%08lx\n",pEddgbl->unk_000c[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_000c[1] : 0x%08lx\n",pEddgbl->unk_000c[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_000c[2] : 0x%08lx\n",pEddgbl->unk_000c[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->cDriverReferences : 0x%08lx\n",pEddgbl->cDriverReferences); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_01c[0] : 0x%08lx\n",pEddgbl->unk_01c[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_01c[1] : 0x%08lx\n",pEddgbl->unk_01c[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_01c[2] : 0x%08lx\n",pEddgbl->unk_01c[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->llAssertModeTimeout : 0x%llx\n",pEddgbl->llAssertModeTimeout); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->dwNumHeaps : 0x%08lx\n",pEddgbl->dwNumHeaps); + // VIDEOMEMORY *pvmList; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->pvmList : 0x%08lx\n",pEddgbl->pvmList); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->dwNumFourCC : 0x%08lx\n",pEddgbl->dwNumFourCC); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->pdwFourCC : 0x%08lx\n",pEddgbl->pdwFourCC); + // DD_HALINFO ddHalInfo; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->ddHalInfo : 0x%08lx\n",pEddgbl->ddHalInfo); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[0] : 0x%08lx\n",pEddgbl->unk_1e0[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[1] : 0x%08lx\n",pEddgbl->unk_1e0[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[2] : 0x%08lx\n",pEddgbl->unk_1e0[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[3] : 0x%08lx\n",pEddgbl->unk_1e0[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[4] : 0x%08lx\n",pEddgbl->unk_1e0[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[5] : 0x%08lx\n",pEddgbl->unk_1e0[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[6] : 0x%08lx\n",pEddgbl->unk_1e0[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[7] : 0x%08lx\n",pEddgbl->unk_1e0[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[8] : 0x%08lx\n",pEddgbl->unk_1e0[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[9] : 0x%08lx\n",pEddgbl->unk_1e0[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[10] : 0x%08lx\n",pEddgbl->unk_1e0[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[11] : 0x%08lx\n",pEddgbl->unk_1e0[11]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[12] : 0x%08lx\n",pEddgbl->unk_1e0[12]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[13] : 0x%08lx\n",pEddgbl->unk_1e0[13]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[14] : 0x%08lx\n",pEddgbl->unk_1e0[14]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[15] : 0x%08lx\n",pEddgbl->unk_1e0[15]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[16] : 0x%08lx\n",pEddgbl->unk_1e0[16]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[17] : 0x%08lx\n",pEddgbl->unk_1e0[17]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[18] : 0x%08lx\n",pEddgbl->unk_1e0[18]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[19] : 0x%08lx\n",pEddgbl->unk_1e0[19]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[20] : 0x%08lx\n",pEddgbl->unk_1e0[20]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[21] : 0x%08lx\n",pEddgbl->unk_1e0[21]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[22] : 0x%08lx\n",pEddgbl->unk_1e0[22]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[23] : 0x%08lx\n",pEddgbl->unk_1e0[23]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[24] : 0x%08lx\n",pEddgbl->unk_1e0[24]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[25] : 0x%08lx\n",pEddgbl->unk_1e0[25]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[26] : 0x%08lx\n",pEddgbl->unk_1e0[26]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[27] : 0x%08lx\n",pEddgbl->unk_1e0[27]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[28] : 0x%08lx\n",pEddgbl->unk_1e0[28]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[29] : 0x%08lx\n",pEddgbl->unk_1e0[29]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[30] : 0x%08lx\n",pEddgbl->unk_1e0[30]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[31] : 0x%08lx\n",pEddgbl->unk_1e0[31]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[32] : 0x%08lx\n",pEddgbl->unk_1e0[32]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[33] : 0x%08lx\n",pEddgbl->unk_1e0[33]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[34] : 0x%08lx\n",pEddgbl->unk_1e0[34]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[35] : 0x%08lx\n",pEddgbl->unk_1e0[35]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[36] : 0x%08lx\n",pEddgbl->unk_1e0[36]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[37] : 0x%08lx\n",pEddgbl->unk_1e0[37]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[38] : 0x%08lx\n",pEddgbl->unk_1e0[38]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[39] : 0x%08lx\n",pEddgbl->unk_1e0[39]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[40] : 0x%08lx\n",pEddgbl->unk_1e0[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[41] : 0x%08lx\n",pEddgbl->unk_1e0[41]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[42] : 0x%08lx\n",pEddgbl->unk_1e0[42]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[43] : 0x%08lx\n",pEddgbl->unk_1e0[43]); + // DD_CALLBACKS ddCallbacks; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->ddCallbacks : 0x%08lx\n",pEddgbl->ddCallbacks); + // DD_SURFACECALLBACKS ddSurfaceCallbacks; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks : 0x%08lx\n",pEddgbl->ddSurfaceCallbacks); + // DD_PALETTECALLBACKS ddPaletteCallbacks; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks : 0x%08lx\n",pEddgbl->ddPaletteCallbacks); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[0] : 0x%08lx\n",pEddgbl->unk_314[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[1] : 0x%08lx\n",pEddgbl->unk_314[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[2] : 0x%08lx\n",pEddgbl->unk_314[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[3] : 0x%08lx\n",pEddgbl->unk_314[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[4] : 0x%08lx\n",pEddgbl->unk_314[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[5] : 0x%08lx\n",pEddgbl->unk_314[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[6] : 0x%08lx\n",pEddgbl->unk_314[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[7] : 0x%08lx\n",pEddgbl->unk_314[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[8] : 0x%08lx\n",pEddgbl->unk_314[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[9] : 0x%08lx\n",pEddgbl->unk_314[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[10] : 0x%08lx\n",pEddgbl->unk_314[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[11] : 0x%08lx\n",pEddgbl->unk_314[11]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[12] : 0x%08lx\n",pEddgbl->unk_314[12]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[13] : 0x%08lx\n",pEddgbl->unk_314[13]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[14] : 0x%08lx\n",pEddgbl->unk_314[14]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[15] : 0x%08lx\n",pEddgbl->unk_314[15]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[16] : 0x%08lx\n",pEddgbl->unk_314[16]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[17] : 0x%08lx\n",pEddgbl->unk_314[17]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[18] : 0x%08lx\n",pEddgbl->unk_314[18]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[19] : 0x%08lx\n",pEddgbl->unk_314[19]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[20] : 0x%08lx\n",pEddgbl->unk_314[20]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[21] : 0x%08lx\n",pEddgbl->unk_314[21]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[22] : 0x%08lx\n",pEddgbl->unk_314[22]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[23] : 0x%08lx\n",pEddgbl->unk_314[23]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[24] : 0x%08lx\n",pEddgbl->unk_314[24]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[25] : 0x%08lx\n",pEddgbl->unk_314[25]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[26] : 0x%08lx\n",pEddgbl->unk_314[26]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[27] : 0x%08lx\n",pEddgbl->unk_314[27]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[28] : 0x%08lx\n",pEddgbl->unk_314[28]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[29] : 0x%08lx\n",pEddgbl->unk_314[29]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[30] : 0x%08lx\n",pEddgbl->unk_314[30]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[31] : 0x%08lx\n",pEddgbl->unk_314[31]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[32] : 0x%08lx\n",pEddgbl->unk_314[32]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[33] : 0x%08lx\n",pEddgbl->unk_314[33]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[34] : 0x%08lx\n",pEddgbl->unk_314[34]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[35] : 0x%08lx\n",pEddgbl->unk_314[35]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[36] : 0x%08lx\n",pEddgbl->unk_314[36]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[37] : 0x%08lx\n",pEddgbl->unk_314[37]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[38] : 0x%08lx\n",pEddgbl->unk_314[38]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[39] : 0x%08lx\n",pEddgbl->unk_314[39]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[40] : 0x%08lx\n",pEddgbl->unk_314[40]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[41] : 0x%08lx\n",pEddgbl->unk_314[41]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[42] : 0x%08lx\n",pEddgbl->unk_314[42]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[43] : 0x%08lx\n",pEddgbl->unk_314[43]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[44] : 0x%08lx\n",pEddgbl->unk_314[44]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[45] : 0x%08lx\n",pEddgbl->unk_314[45]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[46] : 0x%08lx\n",pEddgbl->unk_314[46]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_314[47] : 0x%08lx\n",pEddgbl->unk_314[47]); + // D3DNTHAL_CALLBACKS d3dNtHalCallbacks; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks : 0x%08lx\n",pEddgbl->d3dNtHalCallbacks); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[0] : 0x%08lx\n",pEddgbl->unk_460[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[1] : 0x%08lx\n",pEddgbl->unk_460[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[2] : 0x%08lx\n",pEddgbl->unk_460[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[3] : 0x%08lx\n",pEddgbl->unk_460[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[4] : 0x%08lx\n",pEddgbl->unk_460[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[5] : 0x%08lx\n",pEddgbl->unk_460[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_460[6] : 0x%08lx\n",pEddgbl->unk_460[6]); + // D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2 : 0x%08lx\n",pEddgbl->d3dNtHalCallbacks2); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[0] : 0x%08lx\n",pEddgbl->unk_498[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[1] : 0x%08lx\n",pEddgbl->unk_498[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[2] : 0x%08lx\n",pEddgbl->unk_498[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[3] : 0x%08lx\n",pEddgbl->unk_498[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[4] : 0x%08lx\n",pEddgbl->unk_498[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[5] : 0x%08lx\n",pEddgbl->unk_498[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[6] : 0x%08lx\n",pEddgbl->unk_498[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[7] : 0x%08lx\n",pEddgbl->unk_498[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[8] : 0x%08lx\n",pEddgbl->unk_498[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[9] : 0x%08lx\n",pEddgbl->unk_498[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[10] : 0x%08lx\n",pEddgbl->unk_498[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[11] : 0x%08lx\n",pEddgbl->unk_498[11]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[12] : 0x%08lx\n",pEddgbl->unk_498[12]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[13] : 0x%08lx\n",pEddgbl->unk_498[13]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[14] : 0x%08lx\n",pEddgbl->unk_498[14]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[15] : 0x%08lx\n",pEddgbl->unk_498[15]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[16] : 0x%08lx\n",pEddgbl->unk_498[16]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_498[17] : 0x%08lx\n",pEddgbl->unk_498[17]); + // DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%08lx\n",pEddgbl->d3dNtHalCallbacks3); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[0] : 0x%08lx\n",pEddgbl->unk_4ec[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[1] : 0x%08lx\n",pEddgbl->unk_4ec[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[2] : 0x%08lx\n",pEddgbl->unk_4ec[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[3] : 0x%08lx\n",pEddgbl->unk_4ec[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[4] : 0x%08lx\n",pEddgbl->unk_4ec[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[5] : 0x%08lx\n",pEddgbl->unk_4ec[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[6] : 0x%08lx\n",pEddgbl->unk_4ec[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[7] : 0x%08lx\n",pEddgbl->unk_4ec[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[8] : 0x%08lx\n",pEddgbl->unk_4ec[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[9] : 0x%08lx\n",pEddgbl->unk_4ec[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[10] : 0x%08lx\n",pEddgbl->unk_4ec[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[11] : 0x%08lx\n",pEddgbl->unk_4ec[11]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[12] : 0x%08lx\n",pEddgbl->unk_4ec[12]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[13] : 0x%08lx\n",pEddgbl->unk_4ec[13]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[14] : 0x%08lx\n",pEddgbl->unk_4ec[14]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[15] : 0x%08lx\n",pEddgbl->unk_4ec[15]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[16] : 0x%08lx\n",pEddgbl->unk_4ec[16]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_4ec[17] : 0x%08lx\n",pEddgbl->unk_4ec[17]); + // D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%08lx\n",pEddgbl->d3dNtHalCallbacks3); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[0] : 0x%08lx\n",pEddgbl->unk_54c[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[1] : 0x%08lx\n",pEddgbl->unk_54c[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[2] : 0x%08lx\n",pEddgbl->unk_54c[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[3] : 0x%08lx\n",pEddgbl->unk_54c[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[4] : 0x%08lx\n",pEddgbl->unk_54c[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[5] : 0x%08lx\n",pEddgbl->unk_54c[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[6] : 0x%08lx\n",pEddgbl->unk_54c[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[7] : 0x%08lx\n",pEddgbl->unk_54c[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[8] : 0x%08lx\n",pEddgbl->unk_54c[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[9] : 0x%08lx\n",pEddgbl->unk_54c[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[10] : 0x%08lx\n",pEddgbl->unk_54c[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[11] : 0x%08lx\n",pEddgbl->unk_54c[11]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[12] : 0x%08lx\n",pEddgbl->unk_54c[12]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[13] : 0x%08lx\n",pEddgbl->unk_54c[13]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[14] : 0x%08lx\n",pEddgbl->unk_54c[14]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[15] : 0x%08lx\n",pEddgbl->unk_54c[15]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[16] : 0x%08lx\n",pEddgbl->unk_54c[16]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[17] : 0x%08lx\n",pEddgbl->unk_54c[17]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[18] : 0x%08lx\n",pEddgbl->unk_54c[18]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[19] : 0x%08lx\n",pEddgbl->unk_54c[19]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[20] : 0x%08lx\n",pEddgbl->unk_54c[20]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[21] : 0x%08lx\n",pEddgbl->unk_54c[21]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_54c[22] : 0x%08lx\n",pEddgbl->unk_54c[22]); + // EDD_DIRECTDRAW_LOCAL* peDirectDrawLocalList; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->peDirectDrawLocalList : 0x%08lx\n",pEddgbl->peDirectDrawLocalList); + // EDD_SURFACE* peSurface_LockList; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->peSurface_LockList : 0x%08lx\n",pEddgbl->peSurface_LockList); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->fl : 0x%08lx\n",pEddgbl->fl); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->cSurfaceLocks : 0x%08lx\n",pEddgbl->cSurfaceLocks); + // PKEVENT pAssertModeEvent; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->pAssertModeEvent : 0x%08lx\n",pEddgbl->pAssertModeEvent); + // EDD_SURFACE *peSurfaceCurrent; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->peSurfaceCurrent : 0x%08lx\n",pEddgbl->peSurfaceCurrent); + // EDD_SURFACE *peSurfacePrimary; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->peSurfacePrimary : 0x%08lx\n",pEddgbl->peSurfacePrimary); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->bSuspended : 0x%08lx\n",pEddgbl->bSuspended); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[0] : 0x%08lx\n",pEddgbl->unk_5c8[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[1] : 0x%08lx\n",pEddgbl->unk_5c8[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[2] : 0x%08lx\n",pEddgbl->unk_5c8[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[3] : 0x%08lx\n",pEddgbl->unk_5c8[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[4] : 0x%08lx\n",pEddgbl->unk_5c8[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[5] : 0x%08lx\n",pEddgbl->unk_5c8[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[6] : 0x%08lx\n",pEddgbl->unk_5c8[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[7] : 0x%08lx\n",pEddgbl->unk_5c8[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[8] : 0x%08lx\n",pEddgbl->unk_5c8[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[9] : 0x%08lx\n",pEddgbl->unk_5c8[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[10] : 0x%08lx\n",pEddgbl->unk_5c8[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_5c8[11] : 0x%08lx\n",pEddgbl->unk_5c8[11]); + // RECTL rcbounds; + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->rcbounds : 0x%08lx\n",pEddgbl->rcbounds); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->hDev : 0x%08lx\n",pEddgbl->hDev); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->hPDev : 0x%08lx\n",pEddgbl->hPDev); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks : 0x%08lx\n",pEddgbl->ddPaletteCallbacks); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[0] : 0x%08lx\n",pEddgbl->unk_610[0]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[1] : 0x%08lx\n",pEddgbl->unk_610[1]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[2] : 0x%08lx\n",pEddgbl->unk_610[2]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[3] : 0x%08lx\n",pEddgbl->unk_610[3]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[4] : 0x%08lx\n",pEddgbl->unk_610[4]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[5] : 0x%08lx\n",pEddgbl->unk_610[5]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[6] : 0x%08lx\n",pEddgbl->unk_610[6]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[7] : 0x%08lx\n",pEddgbl->unk_610[7]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[8] : 0x%08lx\n",pEddgbl->unk_610[8]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[9] : 0x%08lx\n",pEddgbl->unk_610[9]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[10] : 0x%08lx\n",pEddgbl->unk_610[10]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[11] : 0x%08lx\n",pEddgbl->unk_610[11]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[12] : 0x%08lx\n",pEddgbl->unk_610[12]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[13] : 0x%08lx\n",pEddgbl->unk_610[13]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[14] : 0x%08lx\n",pEddgbl->unk_610[14]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[15] : 0x%08lx\n",pEddgbl->unk_610[15]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[16] : 0x%08lx\n",pEddgbl->unk_610[16]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[17] : 0x%08lx\n",pEddgbl->unk_610[17]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[18] : 0x%08lx\n",pEddgbl->unk_610[18]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[19] : 0x%08lx\n",pEddgbl->unk_610[19]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[20] : 0x%08lx\n",pEddgbl->unk_610[20]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[21] : 0x%08lx\n",pEddgbl->unk_610[21]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[22] : 0x%08lx\n",pEddgbl->unk_610[22]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[23] : 0x%08lx\n",pEddgbl->unk_610[23]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[24] : 0x%08lx\n",pEddgbl->unk_610[24]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[25] : 0x%08lx\n",pEddgbl->unk_610[25]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[26] : 0x%08lx\n",pEddgbl->unk_610[26]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[27] : 0x%08lx\n",pEddgbl->unk_610[27]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[28] : 0x%08lx\n",pEddgbl->unk_610[28]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[29] : 0x%08lx\n",pEddgbl->unk_610[29]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[30] : 0x%08lx\n",pEddgbl->unk_610[30]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[31] : 0x%08lx\n",pEddgbl->unk_610[31]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[32] : 0x%08lx\n",pEddgbl->unk_610[32]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[33] : 0x%08lx\n",pEddgbl->unk_610[33]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[34] : 0x%08lx\n",pEddgbl->unk_610[34]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[35] : 0x%08lx\n",pEddgbl->unk_610[35]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[36] : 0x%08lx\n",pEddgbl->unk_610[36]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[37] : 0x%08lx\n",pEddgbl->unk_610[37]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[38] : 0x%08lx\n",pEddgbl->unk_610[38]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[39] : 0x%08lx\n",pEddgbl->unk_610[39]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[40] : 0x%08lx\n",pEddgbl->unk_610[40]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[41] : 0x%08lx\n",pEddgbl->unk_610[41]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[42] : 0x%08lx\n",pEddgbl->unk_610[42]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[43] : 0x%08lx\n",pEddgbl->unk_610[43]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[44] : 0x%08lx\n",pEddgbl->unk_610[44]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[45] : 0x%08lx\n",pEddgbl->unk_610[45]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[46] : 0x%08lx\n",pEddgbl->unk_610[46]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[47] : 0x%08lx\n",pEddgbl->unk_610[47]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[48] : 0x%08lx\n",pEddgbl->unk_610[48]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[49] : 0x%08lx\n",pEddgbl->unk_610[49]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[50] : 0x%08lx\n",pEddgbl->unk_610[50]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[51] : 0x%08lx\n",pEddgbl->unk_610[51]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[52] : 0x%08lx\n",pEddgbl->unk_610[52]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[53] : 0x%08lx\n",pEddgbl->unk_610[53]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[54] : 0x%08lx\n",pEddgbl->unk_610[54]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[55] : 0x%08lx\n",pEddgbl->unk_610[55]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[56] : 0x%08lx\n",pEddgbl->unk_610[56]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[57] : 0x%08lx\n",pEddgbl->unk_610[57]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[58] : 0x%08lx\n",pEddgbl->unk_610[58]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[59] : 0x%08lx\n",pEddgbl->unk_610[59]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_1e0[60] : 0x%08lx\n",pEddgbl->unk_610[60]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[61] : 0x%08lx\n",pEddgbl->unk_610[61]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_610[62] : 0x%08lx\n",pEddgbl->unk_610[62]); + DPRINT1("PEDD_DIRECTDRAW_GLOBAL->unk_70C : 0x%08lx\n",pEddgbl->unk_70C); +} /* EOF */

1 0

[greatlrd] 33056: take pfnDxDdCanCreateSurface offline for now
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 08:08:25 2008 New Revision: 33056 URL: http://svn.reactos.org/svn/reactos?rev=33056&view=rev Log: take pfnDxDdCanCreateSurface offline for now Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Sun Apr 20 08:08:25 2008 @@ -29,11 +29,11 @@ if (pfnDdCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCreateSurface"); + DPRINT1("Warring no pfnDdCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurface"); + DPRINT1("Calling on dxg.sys pfnDdCreateSurface\n"); return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); } @@ -50,11 +50,11 @@ if (pfnDdWaitForVerticalBlank == NULL) { - DPRINT1("Warring no pfnDdWaitForVerticalBlank"); + DPRINT1("Warring no pfnDdWaitForVerticalBlank\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdWaitForVerticalBlank"); + DPRINT1("Calling on dxg.sys pfnDdWaitForVerticalBlank\n"); return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); } @@ -70,12 +70,15 @@ if (pfnDdCanCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCanCreateSurface"); + DPRINT1("Warring no pfnDdCanCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCanCreateSurface"); - return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); + DPRINT1("Calling on dxg.sys DdCanCreateSurface\n"); + DPRINT1("FIXME it crash when it trying call on pfnDdCanCreateSurface\n"); + /* FIXME it crash when it trying call on pfnDdCanCreateSurface */ + // return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); + return 0; } /************************************************************************/ @@ -90,11 +93,11 @@ if (pfnDdGetScanLine == NULL) { - DPRINT1("Warring no pfnDdGetScanLine"); + DPRINT1("Warring no pfnDdGetScanLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetScanLine"); + DPRINT1("Calling on dxg.sys pfnDdGetScanLine\n"); DPRINT1("FIXME it crash when it trying call on pfnDdGetScanLine\n"); /* FIXME it crash when it trying call on pfnDdGetScanLine */ // return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); @@ -120,11 +123,11 @@ if (pfnDdCreateSurfaceEx == NULL) { - DPRINT1("Warring no pfnDdCreateSurfaceEx"); + DPRINT1("Warring no pfnDdCreateSurfaceEx\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx"); + DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx\n"); return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008