Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 40866: - Sync profile functions with Wine 1.1.20
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 16:40:35 2009 New Revision: 40866 URL: http://svn.reactos.org/svn/reactos?rev=40866&view=rev Log: - Sync profile functions with Wine 1.1.20 Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Sat May 9 16:40:35 2009 @@ -130,7 +130,7 @@ static __inline void PROFILE_ByteSwapShortBuffer(WCHAR * buffer, int len) { int i; - USHORT * shortbuffer = (USHORT *)buffer; + USHORT * shortbuffer = buffer; for (i = 0; i < len; i++) shortbuffer[i] = RtlUshortByteSwap(shortbuffer[i]); } @@ -293,7 +293,7 @@ INT flags = IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_REVERSE_SIGNATURE | IS_TEXT_UNICODE_ODD_LENGTH; - if (*len >= (int)sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8))) + if (*len >= sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8))) { *len = sizeof(bom_utf8); return ENCODING_UTF8; @@ -334,7 +334,7 @@ DPRINT("%p\n", hFile); dwFileSize = GetFileSize(hFile, NULL); - if (dwFileSize == INVALID_FILE_SIZE) + if (dwFileSize == INVALID_FILE_SIZE || dwFileSize == 0) return NULL; buffer_base = HeapAlloc(GetProcessHeap(), 0 , dwFileSize); @@ -359,40 +359,40 @@ case ENCODING_ANSI: DPRINT("ANSI encoding\n"); - len = MultiByteToWideChar(CP_ACP, 0, (char *)pBuffer, dwFileSize, NULL, 0); + len = MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, NULL, 0); szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } - MultiByteToWideChar(CP_ACP, 0, (char *)pBuffer, dwFileSize, szFile, len); + MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; case ENCODING_UTF8: DPRINT("UTF8 encoding\n"); - len = MultiByteToWideChar(CP_UTF8, 0, (char *)pBuffer, dwFileSize, NULL, 0); + len = MultiByteToWideChar(CP_UTF8, 0, pBuffer, dwFileSize, NULL, 0); szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } - MultiByteToWideChar(CP_UTF8, 0, (char *)pBuffer, dwFileSize, szFile, len); + MultiByteToWideChar(CP_UTF8, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; case ENCODING_UTF16LE: DPRINT("UTF16 Little Endian encoding\n"); - szFile = (WCHAR *)pBuffer;// + 1; + szFile = pBuffer;// + 1; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); break; case ENCODING_UTF16BE: DPRINT("UTF16 Big Endian encoding\n"); - szFile = (WCHAR *)pBuffer;// + 1; + szFile = pBuffer;// + 1; szEnd = (WCHAR *)((char *)pBuffer + dwFileSize); PROFILE_ByteSwapShortBuffer(szFile, dwFileSize / sizeof(WCHAR)); break; @@ -834,6 +834,7 @@ else { DPRINT("(%S): already opened, needs refreshing (mru=%d)\n", buffer, i); + PROFILE_Free(CurProfile->section); CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); CurProfile->LastWriteTime = LastWriteTime; } @@ -1459,8 +1460,7 @@ else if (PROFILE_Open( filename, TRUE )) { if (!section) { - DPRINT1("(NULL?, %S, %S, %S)?\n", - entry, string, filename); + SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); PROFILE_FlushFile(); @@ -1733,7 +1733,7 @@ { BOOL highnibble = TRUE; BYTE b = 0, val; - LPBYTE binbuf = (LPBYTE)buf; + LPBYTE binbuf = buf; end -= 2; /* don't include checksum in output data */ /* translate ASCII hex format into binary data */

1 0

[dchapyshev] 40865: - Convert some stuff to unicode
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 16:37:16 2009 New Revision: 40865 URL: http://svn.reactos.org/svn/reactos?rev=40865&view=rev Log: - Convert some stuff to unicode Modified: trunk/reactos/dll/win32/shell32/changenotify.c trunk/reactos/dll/win32/shell32/classes.c trunk/reactos/dll/win32/shell32/control.c trunk/reactos/dll/win32/shell32/desktop.c Modified: trunk/reactos/dll/win32/shell32/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/changenotify.c [iso-8859-1] Sat May 9 16:37:16 2009 @@ -380,9 +380,9 @@ ptr->wSignalledEvent |= wEventId; if (ptr->dwFlags & SHCNRF_NewDelivery) - SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM) ptr, (LPARAM) GetCurrentProcessId()); + SendMessageW(ptr->hwnd, ptr->uMsg, (WPARAM) ptr, (LPARAM) GetCurrentProcessId()); else - SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); + SendMessageW(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); TRACE("notifying %s, event %s(%x) after\n", NodeName( ptr ), DumpEvent( wEventId ),wEventId ); Modified: trunk/reactos/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] Sat May 9 16:37:16 2009 @@ -197,15 +197,15 @@ */ static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) { - char xriid[50]; - sprintf( xriid, "CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + WCHAR xriid[50]; + swprintf( xriid, L"CLSID\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7] ); - TRACE("%s\n",xriid ); - - return !RegOpenKeyExA(HKEY_CLASSES_ROOT, xriid, 0, KEY_READ, hkey); + TRACE("%S\n",xriid ); + + return !RegOpenKeyExW(HKEY_CLASSES_ROOT, xriid, 0, KEY_READ, hkey); } static BOOL HCR_RegGetDefaultIconW(HKEY hkey, LPWSTR szDest, DWORD len, int* picon_idx) Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Sat May 9 16:37:16 2009 @@ -72,7 +72,7 @@ for (i = 0; i < applet->count; i++) { ZeroMemory(&newinfo, sizeof(newinfo)); - newinfo.dwSize = sizeof(NEWCPLINFOA); + newinfo.dwSize = sizeof(NEWCPLINFOW); applet->info[i].dwSize = sizeof(NEWCPLINFOW); /* proc is supposed to return a null value upon success for * CPL_INQUIRE and CPL_NEWINQUIRE @@ -102,21 +102,12 @@ else { CopyMemory(&applet->info[i], &newinfo, newinfo.dwSize); - if (newinfo.dwSize != sizeof(NEWCPLINFOW)) + if (newinfo.dwSize != sizeof(NEWCPLINFOW)) { - applet->info[i].dwSize = sizeof(NEWCPLINFOW); - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szName, - sizeof(((LPNEWCPLINFOA)&newinfo)->szName) / sizeof(CHAR), - applet->info[i].szName, - sizeof(applet->info[i].szName) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szInfo, - sizeof(((LPNEWCPLINFOA)&newinfo)->szInfo) / sizeof(CHAR), - applet->info[i].szInfo, - sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szHelpFile, - sizeof(((LPNEWCPLINFOA)&newinfo)->szHelpFile) / sizeof(CHAR), - applet->info[i].szHelpFile, - sizeof(applet->info[i].szHelpFile) / sizeof(WCHAR)); + applet->info[i].dwSize = sizeof(NEWCPLINFOW); + lstrcpyW(applet->info[i].szName, newinfo.szName); + lstrcpyW(applet->info[i].szInfo, newinfo.szInfo); + lstrcpyW(applet->info[i].szHelpFile, newinfo.szHelpFile); } } } @@ -131,11 +122,11 @@ return NULL; } -static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTA* cs) +static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) { CPanel* panel = (CPanel*)cs->lpCreateParams; - SetWindowLongPtrA(hWnd, 0, (LONG_PTR)panel); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)panel); panel->status = 0; panel->hWnd = hWnd; } @@ -226,12 +217,12 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, WPARAM lParam1, LPARAM lParam2) { - CPanel* panel = (CPanel*)GetWindowLongPtrA(hWnd, 0); + CPanel* panel = (CPanel*)GetWindowLongPtrW(hWnd, 0); if (panel || wMsg == WM_CREATE) { switch (wMsg) { case WM_CREATE: - Control_WndProc_Create(hWnd, (CREATESTRUCTA*)lParam2); + Control_WndProc_Create(hWnd, (CREATESTRUCTW*)lParam2); return 0; case WM_DESTROY: { @@ -252,14 +243,14 @@ } } - return DefWindowProcA(hWnd, wMsg, lParam1, lParam2); -} - -static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) -{ - WNDCLASSA wc; - MSG msg; - const CHAR* appName = "Wine Control Panel"; + return DefWindowProcW(hWnd, wMsg, lParam1, lParam2); +} + +static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) +{ + WNDCLASSW wc; + MSG msg; + const WCHAR* appName = L"ReactOS Control Panel"; wc.style = CS_HREDRAW|CS_VREDRAW; wc.lpfnWndProc = Control_WndProc; wc.cbClsExtra = 0; @@ -269,11 +260,11 @@ wc.hCursor = 0; wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; - wc.lpszClassName = "Shell_Control_WndClass"; - - if (!RegisterClassA(&wc)) return; - - CreateWindowExA(0, wc.lpszClassName, appName, + wc.lpszClassName = L"Shell_Control_WndClass"; + + if (!RegisterClassW(&wc)) return; + + CreateWindowExW(0, wc.lpszClassName, appName, WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -282,17 +273,17 @@ if (!panel->first) { /* FIXME appName & message should be localized */ - MessageBoxA(panel->hWnd, "Cannot load any applets", appName, MB_OK); + MessageBoxW(panel->hWnd, L"Cannot load any applets", appName, MB_OK); return; } - while (GetMessageA(&msg, panel->hWnd, 0, 0)) { + while (GetMessageW(&msg, panel->hWnd, 0, 0)) { TranslateMessage(&msg); - DispatchMessageA(&msg); - } -} - -static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) + DispatchMessageW(&msg); + } +} + +static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) { HANDLE h; WIN32_FIND_DATAW fd; @@ -424,7 +415,7 @@ } } if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); } Control_UnloadApplet(applet); Modified: trunk/reactos/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… ============================================================================== --- trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] Sat May 9 16:37:16 2009 @@ -258,7 +258,7 @@ static HWND SHDESK_FindDesktopListView (SHDESK *This) { - return FindWindowEx (This->hWndShellView, + return FindWindowExW(This->hWndShellView, NULL, WC_LISTVIEW, NULL); @@ -410,10 +410,10 @@ id); if (hWnd != NULL) { - *pret = SendMessage(hWnd, - uMsg, - wParam, - lParam); + *pret = SendMessageW(hWnd, + uMsg, + wParam, + lParam); return S_OK; } @@ -552,12 +552,12 @@ MSG Msg; BOOL bRet; - while ((bRet = GetMessage(&Msg, NULL, 0, 0)) != 0) + while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) { if (bRet != -1) { TranslateMessage(&Msg); - DispatchMessage(&Msg); + DispatchMessageW(&Msg); } } @@ -684,7 +684,7 @@ wcProgman.cbWndExtra = sizeof(PSHDESK); wcProgman.hInstance = shell32_hInstance; wcProgman.hIcon = NULL; - wcProgman.hCursor = LoadCursor(NULL, + wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); wcProgman.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); wcProgman.lpszMenuName = NULL; @@ -732,7 +732,7 @@ rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); if (hWndDesk != NULL) - return (HANDLE)GetWindowLongPtr(hWndDesk, 0); + return (HANDLE)GetWindowLongPtrW(hWndDesk, 0); return NULL; }

1 0

[dchapyshev] 40864: - SetWindowLong -> SetWindowLongPtr, GetWindowLong -> GetWindowLongPtr (for 64-bit compatible, see note in MSDN) Part 4/x
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 16:27:40 2009 New Revision: 40864 URL: http://svn.reactos.org/svn/reactos?rev=40864&view=rev Log: - SetWindowLong -> SetWindowLongPtr, GetWindowLong -> GetWindowLongPtr (for 64-bit compatible, see note in MSDN) Part 4/x Modified: trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/cpl/appwiz/remove.c trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/timedate/timezone.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/shellext/deskadp/deskadp.c trunk/reactos/dll/shellext/deskmon/deskmon.c trunk/reactos/dll/win32/browseui/bandsite.c trunk/reactos/dll/win32/netshell/lanstatusui.c trunk/reactos/dll/win32/newdev/wizard.c trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/folder_options.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/she_ocmenu.c trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shimgvw/shimgvw.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/display.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -197,7 +197,7 @@ break; case WM_HSCROLL: - switch (GetWindowLong((HWND) lParam, GWL_ID)) + switch (GetWindowLongPtr((HWND) lParam, GWL_ID)) { case IDC_CURSOR_BLINK_TRACK: i = SendDlgItemMessage(hwndDlg, IDC_CURSOR_BLINK_TRACK, TBM_GETPOS, 0, 0); Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -88,7 +88,7 @@ break; case WM_HSCROLL: - switch (GetWindowLong((HWND) lParam, GWL_ID)) + switch (GetWindowLongPtr((HWND) lParam, GWL_ID)) { case IDC_MOUSEKEYS_SPEED_TRACK: i = SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK, TBM_GETPOS, 0, 0); Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -138,7 +138,7 @@ } SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); return -1; } else Modified: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/remove.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/remove.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -449,16 +449,16 @@ switch (nCurrSel) { case 0: - SetWindowLong(GetDlgItem(hwndDlg, ListControl), - GWL_STYLE, LVS_ICON | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); + SetWindowLongPtr(GetDlgItem(hwndDlg, ListControl), + GWL_STYLE, LVS_ICON | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); break; case 1: - SetWindowLong(GetDlgItem(hwndDlg, ListControl), - GWL_STYLE,LVS_LIST | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); + SetWindowLongPtr(GetDlgItem(hwndDlg, ListControl), + GWL_STYLE,LVS_LIST | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); break; case 2: - SetWindowLong(GetDlgItem(hwndDlg, ListControl), - GWL_STYLE,LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); + SetWindowLongPtr(GetDlgItem(hwndDlg, ListControl), + GWL_STYLE,LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP); break; } } Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -93,7 +93,7 @@ else { /* options have already been applied */ - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } return TRUE; Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -143,18 +143,18 @@ if (res == IDCANCEL) { /* dont destroy when user presses cancel */ - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); } else if ( res == IDC_RADIO_APPLY_ALL ) { pConInfo->AppliedConfig = TRUE; - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); SendMessage(pConInfo->hConsoleWindow, PM_APPLY_CONSOLE_INFO, (WPARAM)pConInfo, (LPARAM)TRUE); } else if ( res == IDC_RADIO_APPLY_CURRENT ) { pConInfo->AppliedConfig = TRUE; - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); SendMessage(pConInfo->hConsoleWindow, PM_APPLY_CONSOLE_INFO, (WPARAM)pConInfo, (LPARAM)TRUE); } } Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -62,7 +62,7 @@ else { /* options have already been applied */ - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } return TRUE; Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -172,9 +172,9 @@ case PSN_WIZNEXT: { if (SendDlgItemMessage(hwndDlg, IDC_NOTCONNECTED, BM_GETCHECK, 0, 0) == BST_CHECKED) - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_NOTCONNECTEDPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_NOTCONNECTEDPAGE); else - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE); return TRUE; } @@ -244,7 +244,7 @@ case PSN_WIZBACK: { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_ISCONNECTEDPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_ISCONNECTEDPAGE); return TRUE; } } @@ -429,7 +429,7 @@ if (Index == 0) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); } else { @@ -443,7 +443,7 @@ pts = (PWSTR) Item.lParam; wcscpy(pDeviceStatusText, pts); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWSTATUSPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_HWSTATUSPAGE); } return TRUE; } @@ -499,9 +499,9 @@ case PSN_WIZNEXT: { if (SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_GETCHECK, 0, 0) == BST_CHECKED) - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRESSPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROGRESSPAGE); else - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWTYPESPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_HWTYPESPAGE); return TRUE; } @@ -542,7 +542,7 @@ case PSN_WIZBACK: { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE); return TRUE; } } @@ -735,7 +735,7 @@ case PSN_WIZBACK: { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); return TRUE; } } @@ -765,7 +765,7 @@ case PSN_WIZBACK: { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE); return TRUE; } } Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -454,7 +454,7 @@ { SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -102,7 +102,7 @@ _SEH2_LEAVE; } - if( (GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD) ) + if( (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_CHILD) ) { retVal = DDERR_INVALIDPARAMS; _SEH2_LEAVE; Modified: trunk/reactos/dll/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/deskadp.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/deskadp.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -421,9 +421,9 @@ { case PSN_APPLY: { - SetWindowLong(hwndDlg, - DWL_MSGRESULT, - ApplyDisplayAdapterChanges(This)); + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + ApplyDisplayAdapterChanges(This)); break; } Modified: trunk/reactos/dll/shellext/deskmon/deskmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/deskmon.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/deskmon.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -530,9 +530,9 @@ { case PSN_APPLY: { - SetWindowLong(hwndDlg, - DWL_MSGRESULT, - ApplyMonitorChanges(This)); + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + ApplyMonitorChanges(This)); break; } Modified: trunk/reactos/dll/win32/browseui/bandsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -129,8 +129,8 @@ DWORD dwStyle; /* FIXME: What about DBIF_VIEWMODE_FLOATING and DBIF_VIEWMODE_TRANSPARENT? */ - dwStyle = GetWindowLong(This->hWndRebar, - GWL_STYLE); + dwStyle = GetWindowLongPtr(This->hWndRebar, + GWL_STYLE); if (dwStyle & CCS_VERT) return DBIF_VIEWMODE_VERTICAL; @@ -988,8 +988,8 @@ if (This->hWndRebar == NULL) return E_FAIL; - dwStyle = dwPrevStyle = GetWindowLong(This->hWndRebar, - GWL_STYLE); + dwStyle = dwPrevStyle = GetWindowLongPtr(This->hWndRebar, + GWL_STYLE); if (dwMode & DBIF_VIEWMODE_VERTICAL) dwStyle |= CCS_VERT; @@ -998,9 +998,9 @@ if (dwStyle != dwPrevStyle) { - SetWindowLong(This->hWndRebar, - GWL_STYLE, - dwPrevStyle); + SetWindowLongPtr(This->hWndRebar, + GWL_STYLE, + dwPrevStyle); } return S_OK; Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -750,7 +750,7 @@ if (lppsn->hdr.code == PSN_APPLY || lppsn->hdr.code == PSN_RESET) { pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); - SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); pContext->hwndDlg = NULL; return TRUE; } Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -443,8 +443,8 @@ CenterWindow(hwndControl); /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Set title font */ SendDlgItemMessage( @@ -549,8 +549,8 @@ CenterWindow(hwndControl); /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); PopulateCustomPathCombo(GetDlgItem(hwndDlg, IDC_COMBO_PATH)); @@ -706,8 +706,8 @@ (LPARAM)DevInstData->buffer); /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); break; } @@ -741,7 +741,7 @@ case PSN_KILLACTIVE: if (hThread != 0) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, TRUE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, TRUE); return TRUE; } break; @@ -801,8 +801,8 @@ (LPARAM)DevInstData->drvInfoData.Description); /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); break; } @@ -847,7 +847,7 @@ case PSN_KILLACTIVE: if (hThread != 0) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, TRUE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, TRUE); return TRUE; } break; Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -109,13 +109,13 @@ WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; OPENFILENAMEW ofn = {0}; - PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLong(hwndDlg, DWLP_USER); + PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: pIconContext = (PPICK_ICON_CONTEXT)lParam; - SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -514,13 +514,13 @@ } if (lppsn->hdr.code == PSN_APPLY) { - lpstr = (LPWSTR)GetWindowLong(hwndDlg, DWLP_USER); + lpstr = (LPWSTR)GetWindowLongPtr(hwndDlg, DWLP_USER); if (lpstr && SendDlgItemMessageW(hwndDlg, 14000, WM_GETTEXT, sizeof(szPath)/sizeof(WCHAR), (LPARAM)szPath)) { szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; SetVolumeLabelW(lpstr, szPath); } - SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); + SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); return TRUE; } break; Modified: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -513,11 +513,11 @@ } break; case WM_DESTROY: - pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLong(hwndDlg, DWL_USER); + pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLongPtr(hwndDlg, DWL_USER); SHFree((LPVOID)pContext); break; case WM_NOTIFY: - pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLong(hwndDlg, DWL_USER); + pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLongPtr(hwndDlg, DWL_USER); lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { @@ -540,7 +540,7 @@ SetFileAttributesW(pContext->szFolderPath, Attribute); } - SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); + SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); return TRUE; } break; Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -536,7 +536,7 @@ SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code); SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code); - SetWindowLong(hwndDlg, DWL_USER, (LONG)pBuf); + SetWindowLongPtr(hwndDlg, DWL_USER, (LONG)pBuf); /* select first item */ hDlgCtrl = GetDlgItem(hwndDlg, 14009); @@ -610,7 +610,7 @@ break; case WM_DESTROY: - buf = (LPVOID) GetWindowLong(hwndDlg, DWL_USER); + buf = (LPVOID) GetWindowLongPtr(hwndDlg, DWL_USER); HeapFree(GetProcessHeap(), 0, buf); break; Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -636,12 +636,12 @@ LONG YOffset; OPEN_WITH_CONTEXT Context; - poainfo = (OPENASINFO*) GetWindowLong(hwndDlg, DWLP_USER); + poainfo = (OPENASINFO*) GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: - SetWindowLong(hwndDlg, DWLP_USER, (LONG)lParam); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); poainfo = (OPENASINFO*)lParam; if (!(poainfo->oaifInFlags & OAIF_ALLOW_REGISTRATION)) EnableWindow(GetDlgItem(hwndDlg, 14003), FALSE); Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -2633,7 +2633,7 @@ { //FIXME load localized error msg MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK ); - SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); + SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); return TRUE; } ptr = wcsrchr(szBuffer, L'.'); @@ -2641,7 +2641,7 @@ { // FIXME load localized error msg MessageBoxW( hwndDlg, L"You cannot create a link to a shortcut", L"Error", MB_ICONERROR ); - SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); + SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE ); return TRUE; } @@ -2649,7 +2649,7 @@ TRACE("This %p sLinkPath %S\n", This, This->sLinkPath); IPersistFile_fnSave( (IPersistFile*)&This->lpvtblPersistFile, This->sLinkPath, TRUE ); - SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); + SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); return TRUE; } break; Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -522,12 +522,12 @@ LONG exstyle; if( !IsWindow(hWnd) ) return; - exstyle = GetWindowLongA(hWnd,GWL_EXSTYLE); + exstyle = GetWindowLongPtrA(hWnd,GWL_EXSTYLE); if (b) exstyle |= WS_EX_ACCEPTFILES; else exstyle &= ~WS_EX_ACCEPTFILES; - SetWindowLongA(hWnd,GWL_EXSTYLE,exstyle); + SetWindowLongPtrA(hWnd,GWL_EXSTYLE,exstyle); } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -1437,7 +1437,7 @@ } if (StoreDriveSettings(hwndDlg)) { - SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); + SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR ); return TRUE; } } Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -267,8 +267,8 @@ TRACE("(%p)\n", This); - tmpstyle = GetWindowLongW(This->hWndList, GWL_STYLE); - SetWindowLongW(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); + tmpstyle = GetWindowLongPtrW(This->hWndList, GWL_STYLE); + SetWindowLongPtrW(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove)); } /********************************************************** Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -293,7 +293,7 @@ 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); SetClassLongPtr(hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - PrevProc = (WNDPROC) SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM) ImageView_DispWndProc); + PrevProc = (WNDPROC) SetWindowLongPtr(hDispWnd, GWL_WNDPROC, (LPARAM) ImageView_DispWndProc); ImageView_CreateToolBar(hwnd); } @@ -407,7 +407,7 @@ case WM_DESTROY: { ImageView_SaveSettings(hwnd); - SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM) PrevProc); + SetWindowLongPtr(hDispWnd, GWL_WNDPROC, (LPARAM) PrevProc); PostQuitMessage(0); break; } Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -1081,11 +1081,11 @@ */ LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags) { - LONG ret = GetWindowLongA(hwnd, offset); + LONG ret = GetWindowLongPtrA(hwnd, offset); LONG newFlags = (wFlags & wMask) | (ret & ~wFlags); if (newFlags != ret) - ret = SetWindowLongA(hwnd, offset, newFlags); + ret = SetWindowLongPtrA(hwnd, offset, newFlags); return ret; } Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -246,8 +246,8 @@ CenterWindow (hwndControl); /* Hide the system menu */ - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Hide and disable the 'Cancel' button */ hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); @@ -275,7 +275,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); if (SetupData.UnattendSetup) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE); return TRUE; } break; @@ -376,7 +376,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData.UnattendSetup) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE); return TRUE; } break; @@ -483,7 +483,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_OWNERORGANIZATION), WM_SETTEXT, 0, (LPARAM)SetupData.OwnerOrganization); if (WriteOwnerSettings(SetupData.OwnerName, SetupData.OwnerOrganization)) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_COMPUTERPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_COMPUTERPAGE); return TRUE; } } @@ -504,7 +504,7 @@ MessageBoxW(hwndDlg, ErrorName, Title, MB_ICONERROR | MB_OK); SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } @@ -515,7 +515,7 @@ if (!WriteOwnerSettings(OwnerName, OwnerOrganization)) { SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } @@ -623,7 +623,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData.UnattendSetup && WriteComputerSettings(SetupData.ComputerName, hwndDlg)) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE); return TRUE; } break; @@ -638,7 +638,7 @@ } MessageBoxW(hwndDlg, EmptyComputerName, Title, MB_ICONERROR | MB_OK); SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } @@ -648,7 +648,7 @@ if (!WriteComputerSettings(ComputerName, hwndDlg)) { SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } @@ -663,7 +663,7 @@ wcscpy(EmptyPassword, L"You must enter a password !"); } MessageBoxW(hwndDlg, EmptyPassword, Title, MB_ICONERROR | MB_OK); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } #else @@ -679,7 +679,7 @@ wcscpy(NotMatchPassword, L"The passwords you entered do not match. Please enter the desired password again."); } MessageBoxW(hwndDlg, NotMatchPassword, Title, MB_ICONERROR | MB_OK); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } @@ -695,7 +695,7 @@ wcscpy(WrongPassword, L"The password you entered contains invalid characters. Please enter a cleaned password."); } MessageBoxW(hwndDlg, WrongPassword, Title, MB_ICONERROR | MB_OK); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return TRUE; break; } @@ -901,7 +901,7 @@ } RunControlPanelApplet(hwndDlg, szBuffer); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; } break; @@ -1500,7 +1500,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup && WriteDateTimeSettings(hwndDlg, SetupData)) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROCESSPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROCESSPAGE); return TRUE; } break; Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -163,17 +163,17 @@ static inline LONG get_button_state( HWND hwnd ) { - return GetWindowLongW( hwnd, STATE_GWL_OFFSET ); + return GetWindowLongPtrW( hwnd, STATE_GWL_OFFSET ); } static inline void set_button_state( HWND hwnd, LONG state ) { - SetWindowLongW( hwnd, STATE_GWL_OFFSET, state ); + SetWindowLongPtrW( hwnd, STATE_GWL_OFFSET, state ); } static __inline void set_ui_state( HWND hwnd, LONG flags ) { - SetWindowLongW( hwnd, UISTATE_GWL_OFFSET, flags ); + SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags ); } static __inline LONG get_ui_state( HWND hwnd ) @@ -254,7 +254,7 @@ { RECT rect; POINT pt; - LONG style = GetWindowLongW( hWnd, GWL_STYLE ); + LONG style = GetWindowLongPtrW( hWnd, GWL_STYLE ); UINT btn_type = get_button_type( style ); LONG state; HANDLE oldHbitmap; @@ -479,7 +479,7 @@ if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; btn_type = wParam & 0x0f; style = (style & ~0x0f) | btn_type; - SetWindowLongW( hWnd, GWL_STYLE, style ); + SetWindowLongPtrW( hWnd, GWL_STYLE, style ); /* Only redraw if lParam flag is set.*/ if (lParam) @@ -528,7 +528,7 @@ { if (wParam) style |= WS_TABSTOP; else style &= ~WS_TABSTOP; - SetWindowLongW( hWnd, GWL_STYLE, style ); + SetWindowLongPtrW( hWnd, GWL_STYLE, style ); } if ((state & 3) != wParam) { @@ -667,8 +667,8 @@ */ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); + LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongPtrW( hwnd, GWL_EXSTYLE ); WCHAR *text; ICONINFO iconInfo; BITMAP bm; @@ -786,7 +786,7 @@ HBRUSH hbr = 0; UINT flags = IsWindowEnabled(hwnd) ? DSS_NORMAL : DSS_DISABLED; LONG state = get_button_state( hwnd ); - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE ); WCHAR *text = NULL; /* FIXME: To draw disabled label in Win31 look-and-feel, we probably @@ -845,7 +845,7 @@ COLORREF oldTxtColor; HFONT hFont; LONG state = get_button_state( hwnd ); - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE ); BOOL pushedState = (state & BUTTON_HIGHLIGHTED); HWND parent; @@ -934,7 +934,7 @@ UINT dtFlags; HFONT hFont; LONG state = get_button_state( hwnd ); - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE ); HWND parent; if (style & BS_PUSHLIKE) @@ -1069,7 +1069,7 @@ { if (!sibling) break; if ((hwnd != sibling) && - ((GetWindowLongW( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON)) + ((GetWindowLongPtrW( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON)) SendMessageW( sibling, BM_SETCHECK, BUTTON_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); @@ -1087,7 +1087,7 @@ HFONT hFont; UINT dtFlags; TEXTMETRICW tm; - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE ); HWND parent; if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -158,18 +158,18 @@ /* some braindead apps do try to use scrollbar/border flags */ lphc->dwStyle = style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL); - SetWindowLongW( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL) ); + SetWindowLongPtrW( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL) ); /* * We also have to remove the client edge style to make sure * we don't end-up with a non client area. */ - SetWindowLongW( hwnd, GWL_EXSTYLE, - GetWindowLongW( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE ); + SetWindowLongPtrW( hwnd, GWL_EXSTYLE, + GetWindowLongPtrW( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE ); if( !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) ) lphc->dwStyle |= CBS_HASSTRINGS; - if( !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) ) + if( !(GetWindowLongPtrW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) ) lphc->wState |= CBF_NOTIFY; TRACE("[%p], style = %08x\n", lphc, lphc->dwStyle ); Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -771,12 +771,12 @@ #endif case EM_SETREADONLY: if (wParam) { - SetWindowLongW( hwnd, GWL_STYLE, - GetWindowLongW( hwnd, GWL_STYLE ) | ES_READONLY ); + SetWindowLongPtrW( hwnd, GWL_STYLE, + GetWindowLongPtrW( hwnd, GWL_STYLE ) | ES_READONLY ); es->style |= ES_READONLY; } else { - SetWindowLongW( hwnd, GWL_STYLE, - GetWindowLongW( hwnd, GWL_STYLE ) & ~ES_READONLY ); + SetWindowLongPtrW( hwnd, GWL_STYLE, + GetWindowLongPtrW( hwnd, GWL_STYLE ) & ~ES_READONLY ); es->style &= ~ES_READONLY; } result = 1; @@ -3875,13 +3875,13 @@ if (es->password_char == c) return; - style = GetWindowLongW( es->hwndSelf, GWL_STYLE ); + style = GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ); es->password_char = c; if (c) { - SetWindowLongW( es->hwndSelf, GWL_STYLE, style | ES_PASSWORD ); + SetWindowLongPtrW( es->hwndSelf, GWL_STYLE, style | ES_PASSWORD ); es->style |= ES_PASSWORD; } else { - SetWindowLongW( es->hwndSelf, GWL_STYLE, style & ~ES_PASSWORD ); + SetWindowLongPtrW( es->hwndSelf, GWL_STYLE, style & ~ES_PASSWORD ); es->style &= ~ES_PASSWORD; } EDIT_UpdateText(es, NULL, TRUE); @@ -4513,7 +4513,7 @@ case SB_THUMBPOSITION: TRACE("SB_THUMBPOSITION %d\n", pos); es->flags &= ~EF_HSCROLL_TRACK; - if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) + if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) dx = pos - es->x_offset; else { @@ -4546,7 +4546,7 @@ #endif { LRESULT ret; - if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) + if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) ret = GetScrollPos(es->hwndSelf, SB_HORZ); else { @@ -5008,7 +5008,7 @@ if (lpcs->dwExStyle & WS_EX_CLIENTEDGE) es->style &= ~WS_BORDER; else if (es->style & WS_BORDER) - SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); + SetWindowLongPtrW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); return TRUE; } @@ -5475,7 +5475,7 @@ #endif { LRESULT ret; - if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL) + if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL) ret = GetScrollPos(es->hwndSelf, SB_VERT); else { Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -59,7 +59,7 @@ LONG style = WS_CLIPSIBLINGS; if (!IsWindowEnabled(owner)) style |= WS_DISABLED; - if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) + if( GetWindowLongPtrA( owner, GWL_STYLE ) & WS_CHILD ) hWnd = CreateWindowExA( 0, (LPCSTR)ICONTITLE_CLASS_ATOM, NULL, style | WS_CHILD, 0, 0, 1, 1, GetParent(owner), 0, instance, NULL ); @@ -68,8 +68,8 @@ style, 0, 0, 1, 1, owner, 0, instance, NULL ); WIN_SetOwner( hWnd, owner ); /* MDI depends on this */ - SetWindowLongW( hWnd, GWL_STYLE, - GetWindowLongW( hWnd, GWL_STYLE ) & ~(WS_CAPTION | WS_BORDER) ); + SetWindowLongPtrW( hWnd, GWL_STYLE, + GetWindowLongPtrW( hWnd, GWL_STYLE ) & ~(WS_CAPTION | WS_BORDER) ); return hWnd; } #endif @@ -142,7 +142,7 @@ } else { - if( GetWindowLongA( hwnd, GWL_STYLE ) & WS_CHILD ) + if( GetWindowLongPtrA( hwnd, GWL_STYLE ) & WS_CHILD ) { hBrush = (HBRUSH) GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND); if( hBrush ) @@ -222,7 +222,7 @@ if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: - if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD ) + if( GetWindowLongPtrW( owner, GWL_STYLE ) & WS_CHILD ) lParam = SendMessageW( owner, WM_ISACTIVEICON, 0, 0 ); else lParam = (owner == GetActiveWindow()); Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -2159,7 +2159,7 @@ if (!descr->lphc) { - if (GetWindowLongW( descr->self, GWL_EXSTYLE ) & WS_EX_DRAGDETECT) + if (GetWindowLongPtrW( descr->self, GWL_EXSTYLE ) & WS_EX_DRAGDETECT) { POINT pt; @@ -2236,7 +2236,7 @@ { /* Check to see the NC is a scrollbar */ INT nHitTestType=0; - LONG style = GetWindowLongW( descr->self, GWL_STYLE ); + LONG style = GetWindowLongPtrW( descr->self, GWL_STYLE ); /* Check Vertical scroll bar */ if (style & WS_VSCROLL) { @@ -2557,7 +2557,7 @@ GetClientRect( hwnd, &rect ); descr->self = hwnd; descr->owner = GetParent( descr->self ); - descr->style = GetWindowLongW( descr->self, GWL_STYLE ); + descr->style = GetWindowLongPtrW( descr->self, GWL_STYLE ); descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -336,7 +336,7 @@ break; case SB_CTL: - Vertical = (GetWindowLongW(Wnd, GWL_STYLE) & SBS_VERT) != 0; + Vertical = (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_VERT) != 0; break; default: @@ -498,7 +498,7 @@ ClientToScreen(Wnd, (LPPOINT) &ClientRect.right); GetWindowRect(Wnd, &WindowRect); } - Style = GetWindowLongW(Wnd, GWL_STYLE); + Style = GetWindowLongPtrW(Wnd, GWL_STYLE); switch (Bar) { @@ -520,7 +520,7 @@ break; case SB_VERT: - ExStyle = GetWindowLongW(Wnd, GWL_EXSTYLE); + ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE); if (0 != (ExStyle & WS_EX_LEFTSCROLLBAR)) { Rect->left = ClientRect.left - WindowRect.left - GetSystemMetrics(SM_CXVSCROLL); @@ -769,7 +769,7 @@ } SendMessageW(GetParent(Wnd), - (0 != (GetWindowLongW(Wnd, GWL_STYLE ) & SBS_VERT) ? + (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE ) & SBS_VERT) ? WM_VSCROLL : WM_HSCROLL), wParam, (LPARAM) Wnd); } @@ -810,7 +810,7 @@ memcpy(NewInfo.rgstate, ScrollBarInfo.rgstate, (CCHILDREN_SCROLLBAR + 1) * sizeof(DWORD)); if (SB_CTL == SBType - && 0 != (GetWindowLongW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX))) + && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX))) { switch(Msg) { @@ -850,7 +850,7 @@ } else { - Vertical = (0 != (GetWindowLongW(Wnd, GWL_STYLE) & SBS_VERT)); + Vertical = (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_VERT)); } WndOwner = (SB_CTL == SBType) ? GetParent(Wnd) : Wnd; WndCtl = (SB_CTL == SBType) ? Wnd : NULL; @@ -866,7 +866,7 @@ LastMousePos = LastClickPos; TrackThumbPos = ScrollBarInfo.xyThumbTop; PrevPt = Pt; - if (SB_CTL == SBType && 0 != (GetWindowLongW(Wnd, GWL_STYLE) & WS_TABSTOP)) + if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) { SetFocus(Wnd); } @@ -1376,11 +1376,11 @@ Dc = (0 != wParam ? (HDC) wParam : BeginPaint(Wnd, &Ps)); - if (GetWindowLongW(Wnd, GWL_STYLE) & SBS_SIZEGRIP) + if (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_SIZEGRIP) { IntScrollDrawSizeGrip(Wnd, Dc); } - else if (0 != (GetWindowLongW(Wnd, GWL_STYLE) & SBS_SIZEBOX)) + else if (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_SIZEBOX)) { RECT Rect; GetClientRect(Wnd, &Rect); Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -108,7 +108,7 @@ static __inline void set_ui_state( HWND hwnd, LONG flags ) { - SetWindowLongW( hwnd, UISTATE_GWL_OFFSET, flags ); + SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags ); } static __inline LONG get_ui_state( HWND hwnd ) @@ -435,7 +435,7 @@ LPARAM lParam, BOOL unicode ) { LRESULT lResult = 0; - LONG full_style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG full_style = GetWindowLongPtrW( hwnd, GWL_STYLE ); LONG style = full_style & SS_TYPEMASK; switch (uMsg) @@ -510,8 +510,8 @@ LPCWSTR textW; if (full_style & SS_SUNKEN) - SetWindowLongW( hwnd, GWL_EXSTYLE, - GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + SetWindowLongPtrW( hwnd, GWL_EXSTYLE, + GetWindowLongPtrW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); if(unicode) { Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -178,13 +178,13 @@ VOID DefWndSetRedraw(HWND hWnd, WPARAM wParam) { - LONG Style = GetWindowLong(hWnd, GWL_STYLE); + LONG Style = GetWindowLongPtr(hWnd, GWL_STYLE); /* Content can be redrawn after a change. */ if (wParam) { if (!(Style & WS_VISIBLE)) /* Not Visible */ { - SetWindowLong(hWnd, GWL_STYLE, WS_VISIBLE); + SetWindowLongPtr(hWnd, GWL_STYLE, WS_VISIBLE); } } else /* Content cannot be redrawn after a change. */ @@ -193,7 +193,7 @@ { RedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE ); Style &= ~WS_VISIBLE; - SetWindowLong(hWnd, GWL_STYLE, Style); /* clear bits */ + SetWindowLongPtr(hWnd, GWL_STYLE, Style); /* clear bits */ } } return; @@ -266,7 +266,7 @@ case HTBOTTOMLEFT: case HTTOPRIGHT: { - if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MAXIMIZE) + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE) { break; } @@ -840,7 +840,7 @@ DefWndHandleWindowPosChanging(HWND hWnd, WINDOWPOS* Pos) { POINT maxTrack, minTrack; - LONG style = GetWindowLongA(hWnd, GWL_STYLE); + LONG style = GetWindowLongPtrA(hWnd, GWL_STYLE); if (Pos->flags & SWP_NOSIZE) return 0; if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0)) @@ -872,7 +872,7 @@ RECT Rect; GetClientRect(hWnd, &Rect); - MapWindowPoints(hWnd, (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD ? + MapWindowPoints(hWnd, (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD ? GetParent(hWnd) : NULL), (LPPOINT) &Rect, 2); if (! (Pos->flags & SWP_NOCLIENTMOVE)) @@ -1145,7 +1145,7 @@ case WM_CONTEXTMENU: { - if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD) { if (bUnicode) { @@ -1162,7 +1162,7 @@ DWORD Style; LONG HitCode; - Style = GetWindowLongW(hWnd, GWL_STYLE); + Style = GetWindowLongPtrW(hWnd, GWL_STYLE); Pt.x = GET_X_LPARAM(lParam); Pt.y = GET_Y_LPARAM(lParam); @@ -1180,7 +1180,7 @@ if((SystemMenu = GetSystemMenu(hWnd, FALSE))) { - MenuInitSysMenuPopup(SystemMenu, GetWindowLongW(hWnd, GWL_STYLE), + MenuInitSysMenuPopup(SystemMenu, GetWindowLongPtrW(hWnd, GWL_STYLE), GetClassLongPtrW(hWnd, GCL_STYLE), HitCode); if(HitCode == HTCAPTION) @@ -1223,7 +1223,7 @@ { HICON hIcon; - if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE && + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MINIMIZE && (hIcon = (HICON)GetClassLongPtrW(hWnd, GCL_HICON)) != NULL) { RECT ClientRect; @@ -1268,7 +1268,7 @@ case WM_MOUSEACTIVATE: { - if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD) { LONG Ret; if (bUnicode) @@ -1293,7 +1293,7 @@ { /* Check if the window is minimized. */ if (LOWORD(wParam) != WA_INACTIVE && - !(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) + !(GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MINIMIZE)) { SetFocus(hWnd); } @@ -1302,7 +1302,7 @@ case WM_MOUSEWHEEL: { - if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD) { if (bUnicode) { @@ -1356,7 +1356,7 @@ case WM_SETCURSOR: { - ULONG Style = GetWindowLongW(hWnd, GWL_STYLE); + ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); if (Style & WS_CHILD) { @@ -1457,7 +1457,7 @@ if ((HIWORD(lParam) & KEYDATA_ALT) && wParam) { if (wParam == '\t' || wParam == '\x1b') break; - if (wParam == ' ' && (GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) + if (wParam == ' ' && (GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_CHILD)) SendMessageW( GetParent(hWnd), Msg, wParam, lParam ); else SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, wParam ); @@ -1478,7 +1478,7 @@ { iMenuSysKey = 0; /* FIXME: Check for a desktop. */ - if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu(); + if (!(GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu(); if (GetCapture() == hWnd) { ReleaseCapture(); @@ -1495,7 +1495,7 @@ */ case WM_QUERYDROPOBJECT: { - if (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES) + if (GetWindowLongPtrW(hWnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES) { return(1); } @@ -1953,7 +1953,7 @@ { DefSetText(hWnd, (PCWSTR)lParam, TRUE); - if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { DefWndNCPaint(hWnd, (HRGN)1, -1); } @@ -2095,7 +2095,7 @@ { DefSetText(hWnd, (PCWSTR)lParam, FALSE); - if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { DefWndNCPaint(hWnd, (HRGN)1, -1); } Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -450,7 +450,7 @@ do { - DWORD style = GetWindowLongW( hwndControl, GWL_STYLE ); + DWORD style = GetWindowLongPtrW( hwndControl, GWL_STYLE ); if ((style & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) { dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 ); @@ -539,7 +539,7 @@ ShowWindow( hwnd, SW_SHOWNORMAL ); bFirstEmpty = FALSE; } - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) + if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); @@ -875,10 +875,10 @@ SetFocus( dlgInfo->hwndFocus ); } } - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) + if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_CHILD)) SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0); - if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + if (template.style & WS_VISIBLE && !(GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ } @@ -962,9 +962,9 @@ break; /* Recurse into WS_EX_CONTROLPARENT controls */ - if (GetWindowLongW( hwndChild, GWL_EXSTYLE ) & WS_EX_CONTROLPARENT) - { - LONG dsStyle = GetWindowLongW( hwndChild, GWL_STYLE ); + if (GetWindowLongPtrW( hwndChild, GWL_EXSTYLE ) & WS_EX_CONTROLPARENT) + { + LONG dsStyle = GetWindowLongPtrW( hwndChild, GWL_STYLE ); if ((dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED) && (hwndTmp = DEFDLG_FindDefButton(hwndChild)) != NULL) return hwndTmp; @@ -1198,8 +1198,8 @@ while(hChildFirst) { - dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE); - exStyle = GetWindowLongA(hChildFirst,GWL_EXSTYLE); + dsStyle = GetWindowLongPtrA(hChildFirst,GWL_STYLE); + exStyle = GetWindowLongPtrA(hChildFirst,GWL_EXSTYLE); if( (exStyle & WS_EX_CONTROLPARENT) && (dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)) { HWND retWnd; @@ -1411,7 +1411,7 @@ BOOL CALLBACK GetDlgItemEnumProc (HWND hwnd, LPARAM lParam ) { GETDLGITEMINFO * info = (GETDLGITEMINFO *)lParam; - if(info->nIDDlgItem == GetWindowLongW( hwnd, GWL_ID )) + if(info->nIDDlgItem == GetWindowLongPtrW( hwnd, GWL_ID )) { info->control = hwnd; return FALSE; @@ -2092,7 +2092,7 @@ /* MSDN is wrong. fPrevious does not result in the last child */ /* Maybe that first one is valid. If so then we don't want to skip it*/ - if ((GetWindowLongW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) + if ((GetWindowLongPtrW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) { return hCtl; } @@ -2130,8 +2130,8 @@ hwnd = hwndNext; /* Wander down the leading edge of controlparents */ - while ( (GetWindowLongW (hwnd, GWL_EXSTYLE) & WS_EX_CONTROLPARENT) && - ((GetWindowLongW (hwnd, GWL_STYLE) & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) && + while ( (GetWindowLongPtrW (hwnd, GWL_EXSTYLE) & WS_EX_CONTROLPARENT) && + ((GetWindowLongPtrW (hwnd, GWL_STYLE) & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) && (hwndNext = GetWindow (hwnd, GW_CHILD))) hwnd = hwndNext; /* Question. If the control is a control parent but either has no @@ -2140,7 +2140,7 @@ * I believe it doesn't count. */ - if ((GetWindowLongW (hwnd, GWL_STYLE) & WS_GROUP)) + if ((GetWindowLongPtrW (hwnd, GWL_STYLE) & WS_GROUP)) { hwndLastGroup = hwnd; if (!fSkipping) @@ -2160,7 +2160,7 @@ } if (!fSkipping && - (GetWindowLongW (hwnd, GWL_STYLE) & (WS_VISIBLE|WS_DISABLED)) == + (GetWindowLongPtrW (hwnd, GWL_STYLE) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) { retvalue = hwnd; Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -110,7 +110,7 @@ EnableWindow(HWND hWnd, BOOL bEnable) { - LONG Style = GetWindowLongW(hWnd, GWL_STYLE); + LONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); /* check if updating is needed */ UINT bIsDisabled = (Style & WS_DISABLED); if ( (bIsDisabled && bEnable) || (!bIsDisabled && !bEnable) ) Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -272,7 +272,7 @@ for ( ; list[i]; i++) { if (GetWindow( list[i], GW_OWNER )) continue; - if ((GetWindowLongW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE) continue; + if ((GetWindowLongPtrW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE) continue; last = list[i]; if (bNext) goto found; } @@ -280,7 +280,7 @@ for (i = 0; list[i] && list[i] != hWnd; i++) { if (GetWindow( list[i], GW_OWNER )) continue; - if ((GetWindowLongW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE) continue; + if ((GetWindowLongPtrW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE) continue; last = list[i]; if (bNext) goto found; } @@ -382,7 +382,7 @@ HMENU oldFrameMenu = ci->hFrameMenu; ci->hFrameMenu = hmenuFrame; - if (IsZoomed(ci->hwndActiveChild) && (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE)) + if (IsZoomed(ci->hwndActiveChild) && (GetWindowLongPtrW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE)) MDI_AugmentFrameMenu( hwndFrame, ci->hwndActiveChild ); return (LRESULT)oldFrameMenu; @@ -460,7 +460,7 @@ visible = 0; for (i = 0; i < ci->nActiveChildren; i++) { - if (GetWindowLongW(ci->child[i], GWL_STYLE) & WS_VISIBLE) + if (GetWindowLongPtrW(ci->child[i], GWL_STYLE) & WS_VISIBLE) { id = ci->idFirstChild + visible; @@ -510,8 +510,8 @@ RECT rect; GetClientRect( client, &rect ); - AdjustWindowRectEx( &rect, GetWindowLongW( hwnd, GWL_STYLE ), - 0, GetWindowLongW( hwnd, GWL_EXSTYLE )); + AdjustWindowRectEx( &rect, GetWindowLongPtrW( hwnd, GWL_STYLE ), + 0, GetWindowLongPtrW( hwnd, GWL_EXSTYLE )); lpMinMax->ptMaxSize.x = rect.right -= rect.left; lpMinMax->ptMaxSize.y = rect.bottom -= rect.top; @@ -1249,7 +1249,7 @@ switch (LOWORD(wParam)) { case WM_CREATE: - if (GetWindowLongW((HWND)lParam, GWL_EXSTYLE) & WS_EX_MDICHILD) + if (GetWindowLongPtrW((HWND)lParam, GWL_EXSTYLE) & WS_EX_MDICHILD) { if (!ci->child) ci->child = HeapAlloc(GetProcessHeap(), 0, sizeof(HWND)); @@ -1284,7 +1284,7 @@ case WM_SIZE: if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild) && - (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) ) + (GetWindowLongPtrW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) ) { RECT rect; @@ -1293,8 +1293,8 @@ rect.right = LOWORD(lParam); rect.bottom = HIWORD(lParam); - AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE), - 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) ); + AdjustWindowRectEx(&rect, GetWindowLongPtrA(ci->hwndActiveChild, GWL_STYLE), + 0, GetWindowLongPtrA(ci->hwndActiveChild, GWL_EXSTYLE) ); MoveWindow(ci->hwndActiveChild, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 1); } @@ -1755,7 +1755,7 @@ int i; for (i = 0; list[i]; i++) { - DWORD style = GetWindowLongW( list[i], GWL_STYLE ); + DWORD style = GetWindowLongPtrW( list[i], GWL_STYLE ); if (style & WS_MAXIMIZE) { HeapFree( GetProcessHeap(), 0, list ); Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -2215,7 +2215,7 @@ if (IS_SYSTEM_MENU(MenuInfo)) { - MenuInitSysMenuPopup(ItemInfo.hSubMenu, GetWindowLongW(MenuInfo->Wnd, GWL_STYLE), + MenuInitSysMenuPopup(ItemInfo.hSubMenu, GetWindowLongPtrW(MenuInfo->Wnd, GWL_STYLE), GetClassLongPtrW(MenuInfo->Wnd, GCL_STYLE), HTSYSMENU); NcGetSysPopupPos(MenuInfo->Wnd, &Rect); @@ -2773,7 +2773,7 @@ if (NULL == NextMenu.hmenuNext || NULL == NextMenu.hwndNext) { - DWORD Style = GetWindowLongW(Mt->OwnerWnd, GWL_STYLE); + DWORD Style = GetWindowLongPtrW(Mt->OwnerWnd, GWL_STYLE); NewWnd = Mt->OwnerWnd; if (IS_SYSTEM_MENU(&TopMenuInfo)) { @@ -2811,7 +2811,7 @@ if (IsMenu(NewMenu) && IsWindow(NewWnd)) { - DWORD Style = GetWindowLongW(NewWnd, GWL_STYLE); + DWORD Style = GetWindowLongPtrW(NewWnd, GWL_STYLE); if (0 != (Style & WS_SYSMENU) && GetSystemMenu(NewWnd, FALSE) == NewMenu) @@ -3585,7 +3585,7 @@ /* find window that has a menu */ - while (!((GetWindowLongW( hWnd, GWL_STYLE ) & + while (!((GetWindowLongPtrW( hWnd, GWL_STYLE ) & (WS_CHILD | WS_POPUP)) != WS_CHILD)) if (!(hWnd = GetAncestor( hWnd, GA_PARENT ))) return; @@ -3594,7 +3594,7 @@ hTrackMenu = GetMenu( hWnd ); if (!hTrackMenu || IsIconic(hWnd) || wChar == ' ' ) { - if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return; + if (!(GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return; hTrackMenu = NtUserGetSystemMenu(hWnd, FALSE); uItem = 0; wParam |= HTSYSMENU; /* prevent item lookup */ Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -428,7 +428,7 @@ case LB_FINDSTRINGEXACT: case LB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) && (dwStyle & LBS_HASSTRINGS)) { @@ -443,7 +443,7 @@ case CB_FINDSTRINGEXACT: case CB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) && (dwStyle & CBS_HASSTRINGS)) { @@ -550,7 +550,7 @@ case LB_FINDSTRINGEXACT: case LB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) && (dwStyle & LBS_HASSTRINGS)) { @@ -565,7 +565,7 @@ case CB_FINDSTRINGEXACT: case CB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) && (dwStyle & CBS_HASSTRINGS)) { @@ -726,7 +726,7 @@ case LB_FINDSTRINGEXACT: case LB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) && (dwStyle & LBS_HASSTRINGS)) { @@ -741,7 +741,7 @@ case CB_FINDSTRINGEXACT: case CB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) && (dwStyle & CBS_HASSTRINGS)) { @@ -852,7 +852,7 @@ case LB_FINDSTRINGEXACT: case LB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) && (dwStyle & LBS_HASSTRINGS)) { @@ -867,7 +867,7 @@ case CB_FINDSTRINGEXACT: case CB_SELECTSTRING: { - DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) && (dwStyle & CBS_HASSTRINGS)) { Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -251,8 +251,8 @@ WindowRect.right -= WindowRect.left; WindowRect.bottom -= WindowRect.top; WindowRect.left = WindowRect.top = 0; - Style = GetWindowLongW(hWnd, GWL_STYLE); - ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); + Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); UserGetWindowBorders(Style, ExStyle, &WindowBorder, FALSE); InflateRect(&WindowRect, -WindowBorder.cx, -WindowBorder.cy); UserDrawCaptionButton(&WindowRect, Style, ExStyle, hDC, bDown, Type); @@ -281,7 +281,7 @@ if (!IsWindowVisible(hWnd)) return 0; - Style = GetWindowLongW(hWnd, GWL_STYLE); + Style = GetWindowLongPtrW(hWnd, GWL_STYLE); hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); if (hDC == 0) @@ -290,7 +290,7 @@ } Parent = GetParent(hWnd); - ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); + ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); if (Active == -1) { if (ExStyle & WS_EX_MDICHILD) @@ -474,7 +474,7 @@ /* FIXME: Correct drawing of size-box with WS_EX_LEFTSCROLLBAR */ if(Parent) GetClientRect(Parent, &ParentClientRect); - if (HASSIZEGRIP(Style, ExStyle, GetWindowLongW(Parent, GWL_STYLE), WindowRect, ParentClientRect)) + if (HASSIZEGRIP(Style, ExStyle, GetWindowLongPtrW(Parent, GWL_STYLE), WindowRect, ParentClientRect)) { DrawFrameControl(hDC, &TempRect, DFC_SCROLL, DFCS_SCROLLSIZEGRIP); } @@ -523,8 +523,8 @@ Result |= WVR_VALIDRECTS; } - Style = GetWindowLongW(hWnd, GWL_STYLE); - ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); + Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); if (!(Style & WS_MINIMIZE)) { @@ -665,8 +665,8 @@ RECT WindowRect, ClientRect, OrigWndRect; POINT ClientPoint; SIZE WindowBorders; - ULONG Style = GetWindowLongW(hWnd, GWL_STYLE); - ULONG ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE); + ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + ULONG ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); GetWindowRect(hWnd, &WindowRect); if (!PtInRect(&WindowRect, Point)) @@ -837,7 +837,7 @@ if(Parent) GetClientRect(Parent, &ParentRect); if (PtInRect(&TempRect, Point) && HASSIZEGRIP(Style, ExStyle, - GetWindowLongW(Parent, GWL_STYLE), OrigWndRect, ParentRect)) + GetWindowLongPtrW(Parent, GWL_STYLE), OrigWndRect, ParentRect)) { if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) return HTBOTTOMLEFT; @@ -880,7 +880,7 @@ WPARAM SCMsg; ULONG ButtonType, Style; - Style = GetWindowLongW(hWnd, GWL_STYLE); + Style = GetWindowLongPtrW(hWnd, GWL_STYLE); switch (wParam) { case HTCLOSE: @@ -962,7 +962,7 @@ } case HTSYSMENU: { - if (GetWindowLongW(hWnd, GWL_STYLE) & WS_SYSMENU) + if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_SYSMENU) { SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam); @@ -1013,7 +1013,7 @@ { ULONG Style; - Style = GetWindowLongW(hWnd, GWL_STYLE); + Style = GetWindowLongPtrW(hWnd, GWL_STYLE); switch(wParam) { case HTCAPTION: @@ -1185,14 +1185,14 @@ Rect->bottom = Rect->bottom - Rect->top; Rect->top = 0; - Style = GetWindowLongW(Wnd, GWL_STYLE); + Style = GetWindowLongPtrW(Wnd, GWL_STYLE); if (0 != (Style & WS_ICONIC)) { return; } /* Remove frame from rectangle */ - ExStyle = GetWindowLongW(Wnd, GWL_EXSTYLE); + ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE); if (HAS_THICKFRAME(Style, ExStyle)) { InflateRect(Rect, - GetSystemMetrics(SM_CXFRAME), - GetSystemMetrics(SM_CYFRAME)); @@ -1239,7 +1239,7 @@ NcGetInsideRect(Wnd, Rect); GetWindowRect(Wnd, &WindowRect); OffsetRect(Rect, WindowRect.left, WindowRect.top); - if (0 != (GetWindowLongW(Wnd, GWL_STYLE) & WS_CHILD)) + if (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_CHILD)) { ClientToScreen(GetParent(Wnd), (POINT *) Rect); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -302,7 +302,7 @@ lpParam = (LPVOID)&mdi; - if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) { if (dwStyle & WS_POPUP) { @@ -408,7 +408,7 @@ lpParam = (LPVOID)&mdi; - if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) { if (dwStyle & WS_POPUP) { @@ -1433,7 +1433,7 @@ // disabled. I think they stop processing messages but stay appearing // as enabled. - return !(GetWindowLongW(hWnd, GWL_STYLE) & WS_DISABLED); + return !(GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_DISABLED); } @@ -1443,7 +1443,7 @@ BOOL WINAPI IsZoomed(HWND hWnd) { - return (GetWindowLongW(hWnd, GWL_STYLE) & WS_MAXIMIZE) != 0; + return (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE) != 0; } @@ -1494,7 +1494,7 @@ BOOL WINAPI OpenIcon(HWND hWnd) { - if (!(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE)) + if (!(GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MINIMIZE)) return FALSE; ShowWindow(hWnd,SW_RESTORE); @@ -1555,7 +1555,7 @@ DefSetText(hWnd, (PCWSTR)lpString, TRUE); - if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { DefWndNCPaint(hWnd, (HRGN)1, -1); } @@ -1585,7 +1585,7 @@ DefSetText(hWnd, lpString, FALSE); - if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { DefWndNCPaint(hWnd, (HRGN)1, -1); } Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Sat May 9 16:27:40 2009 @@ -28,7 +28,7 @@ LONG style; if (!hwnd) return FALSE; - style = GetWindowLongW( hwnd, GWL_STYLE ); + style = GetWindowLongPtrW( hwnd, GWL_STYLE ); if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; return !(style & WS_DISABLED); @@ -46,7 +46,7 @@ { HWND hwndTo, fg; - if ((GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP) && (hwndTo = GetWindow( hwnd, GW_OWNER ))) + if ((GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_POPUP) && (hwndTo = GetWindow( hwnd, GW_OWNER ))) { hwndTo = GetAncestor( hwndTo, GA_ROOT ); if (can_activate_window( hwndTo )) goto done;

1 0

[dchapyshev] 40863: - SetWindowLong -> SetWindowLongPtr, GetWindowLong -> GetWindowLongPtr (for 64-bit compatible, see note in MSDN) Part 3/x
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 16:18:13 2009 New Revision: 40863 URL: http://svn.reactos.org/svn/reactos?rev=40863&view=rev Log: - SetWindowLong -> SetWindowLongPtr, GetWindowLong -> GetWindowLongPtr (for 64-bit compatible, see note in MSDN) Part 3/x Modified: trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mstsc/win32.c trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/optnmenu.c trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c trunk/reactos/base/shell/explorer/dialogs/settings.cpp trunk/reactos/base/shell/explorer/utility/utility.h trunk/reactos/base/shell/explorer/utility/window.cpp Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -302,7 +302,7 @@ return 1; if (!_tcscmp(ClassName, TEXT("Button"))) { - DWORD dwStyle = GetWindowLong(hCtlWnd, GWL_STYLE) & 0xF; + DWORD dwStyle = GetWindowLongPtr(hCtlWnd, GWL_STYLE) & 0xF; /* Set states for press/release, but only for push buttons */ if (dwStyle == BS_PUSHBUTTON || dwStyle == BS_DEFPUSHBUTTON || dwStyle == BS_OWNERDRAW) { @@ -1136,7 +1136,7 @@ popup.rcMargins.bottom = -1; popup.rcMargins.left = -1; popup.rcMargins.right = -1; - popup.idString = GetWindowLong((HWND)wp, GWL_ID); + popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID); HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); } #endif Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1] Sat May 9 16:18:13 2009 @@ -275,7 +275,7 @@ // LRESULT CALLBACK CardWindow::CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - CardWindow *cw = (CardWindow *)GetWindowLong(hwnd, 0); + CardWindow *cw = (CardWindow *)GetWindowLongPtr(hwnd, 0); return cw->WndProc(hwnd, iMsg, wParam, lParam); } @@ -366,7 +366,7 @@ // // associate this class with the window // - SetWindowLong(hwnd, 0, (LONG_PTR)cs->lpCreateParams); + SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams); return 1; Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -14,13 +14,13 @@ SetListViewStyle(HWND hListView, DWORD View) { - DWORD Style = GetWindowLong(hListView, GWL_STYLE); + DWORD Style = GetWindowLongPtr(hListView, GWL_STYLE); if ((Style & LVS_TYPEMASK) != View) { - SetWindowLong(hListView, - GWL_STYLE, - (Style & ~LVS_TYPEMASK) | View); + SetWindowLongPtr(hListView, + GWL_STYLE, + (Style & ~LVS_TYPEMASK) | View); } } Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -520,11 +520,11 @@ height = (prect->bottom - prect->top) - (g_yoff + g_xoff); if (height < g_height || width < g_width) { - style = GetWindowLong(g_Wnd, GWL_STYLE); + style = GetWindowLongPtr(g_Wnd, GWL_STYLE); if (!(style & WS_HSCROLL)) { style |= WS_HSCROLL | WS_VSCROLL; - SetWindowLong(g_Wnd, GWL_STYLE, style); + SetWindowLongPtr(g_Wnd, GWL_STYLE, style); g_xscroll = 0; g_yscroll = 0; SetScrollPos(g_Wnd, SB_HORZ, g_xscroll, 1); @@ -533,12 +533,12 @@ } else if (height >= g_height && width >= g_width) { - style = GetWindowLong(g_Wnd, GWL_STYLE); + style = GetWindowLongPtr(g_Wnd, GWL_STYLE); if (style & WS_HSCROLL) { style &= ~WS_HSCROLL; style &= ~WS_VSCROLL; - SetWindowLong(g_Wnd, GWL_STYLE, style); + SetWindowLongPtr(g_Wnd, GWL_STYLE, style); g_xscroll = 0; g_yscroll = 0; } Modified: trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1] Sat May 9 16:18:13 2009 @@ -152,7 +152,7 @@ #else // load the icon from the resource file -crn(a)ozemail.com.au 16/12/98 if(!hIcon) { - hIcon = LoadIcon ((HANDLE)GetWindowLong(hConsoleWindow, + hIcon = LoadIcon ((HANDLE)GetWindowLongPtr(hConsoleWindow, GWL_HINSTANCE), "TELNETICON"); } #endif Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -192,16 +192,16 @@ hControl = GetDlgItem(hDlg, IDC_LOOKAT_VALUES); if (hControl) { - lStyle = GetWindowLong(hControl, GWL_STYLE); - SetWindowLong(hControl, GWL_STYLE, lStyle | WS_DISABLED); + lStyle = GetWindowLongPtr(hControl, GWL_STYLE); + SetWindowLongPtr(hControl, GWL_STYLE, lStyle | WS_DISABLED); } /* Looking at data is not yet implemented */ hControl = GetDlgItem(hDlg, IDC_LOOKAT_DATA); if (hControl) { - lStyle = GetWindowLong(hControl, GWL_STYLE); - SetWindowLong(hControl, GWL_STYLE, lStyle | WS_DISABLED); + lStyle = GetWindowLongPtr(hControl, GWL_STYLE); + SetWindowLongPtr(hControl, GWL_STYLE, lStyle | WS_DISABLED); } /* Match whole string */ @@ -278,12 +278,12 @@ hControl = GetDlgItem(hDlg, IDOK); if (hControl) { - lStyle = GetWindowLong(hControl, GWL_STYLE); + lStyle = GetWindowLongPtr(hControl, GWL_STYLE); if (s_szSavedFindValue[0]) lStyle &= ~WS_DISABLED; else lStyle |= WS_DISABLED; - SetWindowLong(hControl, GWL_STYLE, lStyle); + SetWindowLongPtr(hControl, GWL_STYLE, lStyle); RedrawWindow(hControl, NULL, NULL, RDW_INVALIDATE); } break; Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -126,7 +126,7 @@ INT bufsize, cvislines; GetClientRect(hed->hWndSelf, &rcClient); - hed->style = GetWindowLong(hed->hWndSelf, GWL_STYLE); + hed->style = GetWindowLongPtr(hed->hWndSelf, GWL_STYLE); bufsize = (hed->hBuffer ? (INT) LocalSize(hed->hBuffer) : 0); hed->nLines = max(bufsize / hed->ColumnsPerLine, 1); Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -220,7 +220,7 @@ void UpdateApplicationListControlViewSetting(void) { - DWORD dwStyle = GetWindowLongW(hApplicationPageListCtrl, GWL_STYLE); + DWORD dwStyle = GetWindowLongPtrW(hApplicationPageListCtrl, GWL_STYLE); dwStyle &= ~(LVS_REPORT | LVS_ICON | LVS_LIST | LVS_SMALLICON); @@ -229,7 +229,7 @@ case ID_VIEW_SMALL: dwStyle |= LVS_SMALLICON; break; case ID_VIEW_DETAILS: dwStyle |= LVS_REPORT; break; } - SetWindowLongW(hApplicationPageListCtrl, GWL_STYLE, dwStyle); + SetWindowLongPtrW(hApplicationPageListCtrl, GWL_STYLE, dwStyle); RefreshApplicationPage(); } @@ -298,7 +298,7 @@ !IsWindowVisible(hWnd) || (GetParent(hWnd) != NULL) || (GetWindow(hWnd, GW_OWNER) != NULL) || - (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + (GetWindowLongPtrW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { return TRUE; /* Skip this window */ } @@ -422,7 +422,7 @@ !IsWindowVisible(pAPLI->hWnd) || (GetParent(pAPLI->hWnd) != NULL) || (GetWindow(pAPLI->hWnd, GW_OWNER) != NULL) || - (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + (GetWindowLongPtrW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { ImageList_Remove(hImageListLarge, item.iItem); ImageList_Remove(hImageListSmall, item.iItem); Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -102,7 +102,7 @@ hdc = BeginPaint(hWnd, &ps); - WindowId = GetWindowLongW(hWnd, GWL_ID); + WindowId = GetWindowLongPtrW(hWnd, GWL_ID); switch (WindowId) { Modified: trunk/reactos/base/applications/taskmgr/optnmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/optnmenu.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/optnmenu.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -40,7 +40,7 @@ * Check or uncheck the always on top menu item * and update main window. */ - if ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) + if ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) { CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED); TaskManagerSettings.AlwaysOnTop = FALSE; Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -250,7 +250,7 @@ GetCursorPos(&pt); - OnTop = ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); + OnTop = ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_TRAY_POPUP)); hPopupMenu = GetSubMenu(hMenu, 0); @@ -758,7 +758,7 @@ hMenu = GetMenu(hMainWnd); hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); - OnTop = ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); + OnTop = ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0); OpenIcon(hMainWnd); SetForegroundWindow(hMainWnd); Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -194,8 +194,8 @@ /* Center the wizard window */ CenterWindow (hwndControl); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Hide and disable the 'Cancel' button at the moment, * we use this button to cancel the setup process @@ -259,8 +259,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow (hwndControl, SW_SHOW); @@ -349,9 +349,9 @@ break; case PSN_QUERYCANCEL: - SetWindowLong(hwndDlg, - DWL_MSGRESULT, - MessageBox(GetParent(hwndDlg), + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); @@ -408,8 +408,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED); @@ -433,9 +433,9 @@ break; case PSN_QUERYCANCEL: - SetWindowLong(hwndDlg, - DWL_MSGRESULT, - MessageBox(GetParent(hwndDlg), + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); @@ -480,8 +480,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Set title font */ /*SendDlgItemMessage(hwndDlg, @@ -530,9 +530,9 @@ break; case PSN_QUERYCANCEL: - SetWindowLong(hwndDlg, - DWL_MSGRESULT, - MessageBox(GetParent(hwndDlg), + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); @@ -680,8 +680,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Set title font */ /*SendDlgItemMessage(hwndDlg, @@ -762,9 +762,9 @@ break; case PSN_QUERYCANCEL: - SetWindowLong(hwndDlg, - DWL_MSGRESULT, - MessageBox(GetParent(hwndDlg), + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); @@ -799,8 +799,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -853,8 +853,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -910,8 +910,8 @@ hwndControl = GetParent(hwndDlg); - dwStyle = GetWindowLong(hwndControl, GWL_STYLE); - SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); + SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Set title font */ /*SendDlgItemMessage(hwndDlg, Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -389,7 +389,7 @@ { if(DriverFilesFound) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); return TRUE; } break; @@ -421,7 +421,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); break; case PSN_WIZNEXT: - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSTALLING_VMWARE_TOOLS); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_INSTALLING_VMWARE_TOOLS); break; } break; @@ -567,13 +567,13 @@ { PropSheet_SetWizButtons(GetParent(hwndDlg), 0); InstTerminateInstaller(FALSE); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1); return -1; } else { SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSERT_VMWARE_TOOLS); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_INSERT_VMWARE_TOOLS); } break; } @@ -713,12 +713,12 @@ { if(StartVMwConfigWizard) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); return TRUE; } if(DriverFilesFound) { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); return TRUE; } break; @@ -797,7 +797,7 @@ break; case PSN_WIZBACK: { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); return TRUE; } case PSN_WIZNEXT: @@ -815,7 +815,7 @@ UninstallDriver = (i == IDC_UNINSTALL); - SetWindowLong(hwndDlg, DWL_MSGRESULT, SelPage[i - IDC_CONFIGSETTINGS]); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, SelPage[i - IDC_CONFIGSETTINGS]); return TRUE; } } @@ -849,7 +849,7 @@ break; case PSN_WIZBACK: { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); return TRUE; } case PSN_WIZNEXT: @@ -876,7 +876,7 @@ WCHAR Msg[1024]; LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR)); MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); return TRUE; } break; @@ -925,7 +925,7 @@ WCHAR Msg[1024]; LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR)); MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); return TRUE; } ShowUninstNotice(GetParent(hwndDlg)); Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -222,7 +222,7 @@ if (uMsg == WM_MOUSEMOVE) { - i = GetWindowLong(hWnd, GWL_ID); + i = GetWindowLongPtr(hWnd, GWL_ID); if (nTopic != i) { nTopic = i; Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -38,17 +38,17 @@ ASSERT((~dwStyleMask & dwStyle) == 0); - PrevStyle = GetWindowLong(hWnd, - GWL_STYLE); + PrevStyle = GetWindowLongPtr(hWnd, + GWL_STYLE); if (PrevStyle != 0 && (PrevStyle & dwStyleMask) != dwStyle) { Style = PrevStyle & ~dwStyleMask; Style |= dwStyle; - PrevStyle = SetWindowLong(hWnd, - GWL_STYLE, - Style); + PrevStyle = SetWindowLongPtr(hWnd, + GWL_STYLE, + Style); } return PrevStyle; @@ -63,17 +63,17 @@ ASSERT((~dwStyleMask & dwStyle) == 0); - PrevStyle = GetWindowLong(hWnd, - GWL_EXSTYLE); + PrevStyle = GetWindowLongPtr(hWnd, + GWL_EXSTYLE); if (PrevStyle != 0 && (PrevStyle & dwStyleMask) != dwStyle) { Style = PrevStyle & ~dwStyleMask; Style |= dwStyle; - PrevStyle = SetWindowLong(hWnd, - GWL_EXSTYLE, - Style); + PrevStyle = SetWindowLongPtr(hWnd, + GWL_EXSTYLE, + Style); } return PrevStyle; Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -1326,8 +1326,8 @@ /* Don't list popup windows and also no tool windows */ if (GetWindow(hWnd, GW_OWNER) == NULL && - !(GetWindowLong(hWnd, - GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + !(GetWindowLongPtr(hWnd, + GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { TaskSwitchWnd_AddTask(This, hWnd); Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -269,8 +269,8 @@ NMHDR nmh; nmh.hwndFrom = This->hWnd; - nmh.idFrom = GetWindowLong(This->hWnd, - GWL_ID); + nmh.idFrom = GetWindowLongPtr(This->hWnd, + GWL_ID); nmh.code = NTNWM_REALIGN; SendMessage(This->hWndNotify, @@ -716,11 +716,11 @@ RECT rcClient = { 0, 0, 0, 0 }; if (AdjustWindowRectEx(&rcClient, - GetWindowLong(This->hWnd, - GWL_STYLE), + GetWindowLongPtr(This->hWnd, + GWL_STYLE), FALSE, - GetWindowLong(This->hWnd, - GWL_EXSTYLE))) + GetWindowLongPtr(This->hWnd, + GWL_EXSTYLE))) { This->szNonClient.cx = rcClient.right - rcClient.left; This->szNonClient.cy = rcClient.bottom - rcClient.top; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat May 9 16:18:13 2009 @@ -362,11 +362,11 @@ RECT rcMin = {0}; AdjustWindowRectEx(&rcMin, - GetWindowLong(This->hWnd, - GWL_STYLE), + GetWindowLongPtr(This->hWnd, + GWL_STYLE), FALSE, - GetWindowLong(This->hWnd, - GWL_EXSTYLE)); + GetWindowLongPtr(This->hWnd, + GWL_EXSTYLE)); *pRect = rcMin; } Modified: trunk/reactos/base/shell/explorer/dialogs/settings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dialog… ============================================================================== --- trunk/reactos/base/shell/explorer/dialogs/settings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/dialogs/settings.cpp [iso-8859-1] Sat May 9 16:18:13 2009 @@ -104,7 +104,7 @@ { switch(pnmh->code) { case PSN_QUERYINITIALFOCUS: - SetWindowLong(_hwnd, DWL_MSGRESULT, (LPARAM)GetDlgItem(_hwnd, IDC_ICON_ALIGN_0+_alignment_cur)); + SetWindowLongPtr(_hwnd, DWL_MSGRESULT, (LPARAM)GetDlgItem(_hwnd, IDC_ICON_ALIGN_0+_alignment_cur)); break; case PSN_APPLY: Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat May 9 16:18:13 2009 @@ -143,9 +143,9 @@ #endif -#define SetDlgCtrlID(hwnd, id) SetWindowLong(hwnd, GWL_ID, id) -#define SetWindowStyle(hwnd, val) (DWORD)SetWindowLong(hwnd, GWL_STYLE, val) -#define SetWindowExStyle(h, val) (DWORD)SetWindowLong(hwnd, GWL_EXSTYLE, val) +#define SetDlgCtrlID(hwnd, id) SetWindowLongPtr(hwnd, GWL_ID, id) +#define SetWindowStyle(hwnd, val) (DWORD)SetWindowLongPtr(hwnd, GWL_STYLE, val) +#define SetWindowExStyle(h, val) (DWORD)SetWindowLongPtr(hwnd, GWL_EXSTYLE, val) #define Window_SetIcon(hwnd, type, hicon) (HICON)SendMessage(hwnd, WM_SETICON, type, (LPARAM)(hicon)) Modified: trunk/reactos/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] Sat May 9 16:18:13 2009 @@ -732,7 +732,7 @@ return TRUE; // message has been processed case WM_NOTIFYFORMAT: - SetWindowLong(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT return TRUE; // message has been processed case WM_NCDESTROY: @@ -1418,7 +1418,7 @@ return TRUE; // message has been processed case WM_NOTIFYFORMAT: - SetWindowLong(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT return TRUE; // message has been processed case WM_NCDESTROY:

1 0

[dgorbachev] 40862: Add Romanian translations for Joy, Main, and PowerCfg CPLs. Petru Dimitriu. Bug #4482.
by dgorbachev＠svn.reactos.org 09 May '09

09 May '09

Author: dgorbachev Date: Sat May 9 16:08:59 2009 New Revision: 40862 URL: http://svn.reactos.org/svn/reactos?rev=40862&view=rev Log: Add Romanian translations for Joy, Main, and PowerCfg CPLs. Petru Dimitriu. Bug #4482. Added: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/main/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc (with props) Modified: trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/powercfg/lang/en-US.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc Added: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/ro-RO.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -1,0 +1,84 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Controloare pentru jocuri" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Aceste setãri vã permit sã configuraþi dispozitivele pentru controlul jocurilor instalate pe acest computer.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "D&ispozitive pentru jocuri instalate", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Adãugare...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "&Eliminare", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Proprietãþi", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "A&vansat...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "&Reparare...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Adãugare controlor jocurilor" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Alegeþi un controlor din lista de mai jos ºi apoi faceþi clic pe OK. Dacã dispozitivul pe care îl cãutaþi nu apare, faceþi clic pe Altul.", -1, 35, 7, 210, 33 + LTEXT "&Dispozitive:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "&Activare cârmã ºi pedale", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "&Port joc:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "&Altul...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Dispozitiv destinat jocurilor particularizat" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Caracteristici speciale", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "&Joystick tridimensional", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "&Gamepad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "&Controlor pt. jocuri cu maºini", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Axe", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Cârmã/pedale", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Axa Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "&Butoane", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Include control &punct vizual", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "N&ume controlor:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Setãri avansate" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Anulare", IDCANCEL, 163, 65, 50, 14 + LTEXT "Alegeþi dispozitivul de folosit pt. programe vechi.", -1, 7, 7, 208, 10 + LTEXT "&Dispozitiv preferat:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Controlori pentru jocuri" + IDS_CPLSYSTEMDESCRIPTION "Adãugare, eliminare sau configurare controlori pentru jocuri, precum joystickuri sau gamepaduri." + IDS_CONTROLLER "Controlor" + IDS_STATUS "Stare" +END Propchange: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=40… ============================================================================== --- trunk/reactos/dll/cpl/joy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/rsrc.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -11,6 +11,7 @@ #include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -1,0 +1,172 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vitezã" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repetare caractere", -1, 5, 5, 236, 135 + ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15 + LTEXT "Întârziere &reptare:", -1, 40, 18, 100, 10 + LTEXT "Lung", -1, 40, 33, 20, 10 + LTEXT "Scurt", -1, 200, 33, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17 + ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15 + LTEXT "&Ratã de repetiþie:", -1, 40, 70, 100, 10 + LTEXT "Lent", -1, 40, 85, 20, 10 + LTEXT "Rapid", -1, 200, 85, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 + LTEXT "Faceþi clic aici ºi þineþi apãsatã o tastã pentru a testa rata de repetiþie:", -1, 15, 105, 216, 10 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Ratã &clipire cursor:", -1, 5, 145, 236, 50 + LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 + LTEXT "Deloc", -1, 40, 165, 25, 10 + LTEXT "Rapidã", -1, 200, 165, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dispozitive" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 240, 78 +STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU +CAPTION "Înþepenire clic" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Scurtã", -1, 50, 35, 27, 10 + LTEXT "Lungã", -1, 157, 35, 27, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17 + PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 + PUSHBUTTON "&Anulare", IDCANCEL, 174, 59, 60, 14 + LTEXT "&Ajustaþi cât trebuie sã þineþi apãsat un buton al mausului pentru a-l înþepeni.",-1,37,5,200,27 + ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Buton" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Configuraþie butoane", -1, 5, 5, 236, 70 + CHECKBOX "&Inversare butoane maus", IDC_SWAP_MOUSE_BUTTONS, 10, 18, 156, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 171, 14, 65, 57, WS_EX_STATICEDGE + LTEXT "Bifaþi pentru a interschimba butoanele mausului. Astfel butonul drept poate fi folosit pentru clicul simplu sau pentru dublu-clic.", -1, 10, 36, 156, 30 + GROUPBOX "Vitezã dublu-clic", -1, 5, 78, 236, 70 + LTEXT "Faceþi dublu-clic pe dosar pentru a testa setãrile. Dacã acesta nu se miºcã, atunci setaþi viteza mai lentã.", -1, 10, 90, 156, 28 + LTEXT "V&itezã: Lentã", -1, 10, 123, 50, 10 + LTEXT "Rapidã", -1, 136, 123, 24, 10 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE + GROUPBOX "Înþepenire clic", -1, 5, 150, 236, 70 + CHECKBOX "&Pornire ÎnþepenireClic", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Setãri...", IDC_BUTTON_CLICK_LOCK, 172, 161, 60, 14 + LTEXT "Vã permite sã trageþi elemente sau sã le selectaþi fãrã a þine apãsat butonul mausului încontinuu. Pentru a activa, apãsaþi ºi þineþi apãsat puþin. Pentru a dezactiva, faceþi clic din nou.", -1, 10, 180, 224, 30 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Cursor" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Schemã", -1, 5, 5, 181, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 12, 15, 167, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Sal&vare ca...", IDC_BUTTON_SAVEAS_SCHEME, 65, 31, 60, 14 + PUSHBUTTON "&ªtergere", IDC_BUTTON_DELETE_SCHEME, 128, 31, 50, 14 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 196, 9, 45, 41, WS_EX_STATICEDGE + LTEXT "&Particularizat", -1, 5, 57, 60, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 68, 236, 124, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY + CHECKBOX "&Activare umbrã cursor", IDC_CHECK_DROP_SHADOW, 5, 198, 105, 10 + PUSHBUTTON "Folosire i&mplicite", IDC_BUTTON_USE_DEFAULT_CURSOR, 117, 196, 65, 14 + PUSHBUTTON "&Rãsfoire...", IDC_BUTTON_BROWSE_CURSOR, 186, 196, 55, 14 +END + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53 +STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU +CAPTION "Salvare schemã" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Salvare schemã cursor ca:", -1, 5, 5, 181, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&OK", IDOK, 63, 35, 60, 14 + PUSHBUTTON "&Anulare", IDCANCEL, 126, 35, 60, 14 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Opþiuni cursor" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Miºcare", -1, 5, 5, 236, 60 + LTEXT "Alegeþi viteza cursorului:", -1, 52, 15, 110, 10 + LTEXT "Lentã", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "Rapidã", -1, 170, 30, 20, 10 + ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 18, 20, 32, 32 + CHECKBOX "&Creºtere precizie", IDC_CHECK_POINTER_PRECISION, 52, 50, 140, 10 + GROUPBOX "Zburare automatã", -1, 5, 70, 236, 40 + CHECKBOX "M&utare cursor în mod automat pe butonul implicit al ferestrelor de dialog.", + IDC_CHECK_SNAP_TO, 52, 84, 183, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 18, 83, 15, 15 + GROUPBOX "Vizibilitate", -1, 5, 115, 236, 95 + CHECKBOX "&Afiºare urme cursor:", IDC_CHECK_POINTER_TRAIL, 52, 128, 125, 10 + LTEXT "Scurte", IDC_TEXT_TRAIL_SHORT, 54, 143, 25, 10 + LTEXT "Lungi", IDC_TEXT_TRAIL_LONG, 157, 143, 30, 10 + ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 + CHECKBOX "&Ascundere cursor în timupul scrierii", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 + ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + CHECKBOX "&Arãtare locaþie cursor când apãs tasta CTRL", + IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Rotiþã" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Derulare", -1, 5, 5, 236, 80 + ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 + LTEXT "Învârtire rotiþã pentru a derula", -1, 60, 15, 150, 10 + RADIOBUTTON "Urmãtorul numãr de linii odatã:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Cuprinsul unui ecran odatã", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Maus" + IDS_CPLDESCRIPTION_1 "Schimbare setãri maus" + IDS_CPLNAME_2 "Tastaturã" + IDS_CPLDESCRIPTION_2 "Schimbare setãri tastaturã" + IDS_ARROW "Selectare normalã" + IDS_HELP "Selectare ajutor" + IDS_APPSTARTING "Lucru în fundal" + IDS_WAIT "Ocupat" + IDS_CROSSHAIR "Selectare precizie" + IDS_IBEAM "Selectare text" + IDS_NWPEN "Scriere de mânã" + IDS_NO "Indisponibil" + IDS_SIZENS "Redimensionare verticalã" + IDS_SIZEWE "Redimensionare orizontalã" + IDS_SIZENWSE "Redimensionare diagonalã 1" + IDS_SIZENESW "Redimensionare diagonalã 2" + IDS_SIZEALL "Mutare" + IDS_UPARROW "Selectare alternativã" + IDS_HAND "Selectare legãturã web" + IDS_NONE "(Niciuna)" + IDS_SYSTEM_SCHEME "(schemã de sistem)" + IDS_BROWSE_FILTER "Cursoare (*.ani, *.cur)\0*.ani;*.cur\0Cursoare animate (*.ani)\0*.ani\0Cursoare statice (*.cur)\0*.cur\0Toate fiºierele\0*.*\0\0" + IDS_BROWSE_TITLE "Rãsfoire" + IDS_REMOVE_TITLE "Confirmare eliminare schemã" + IDS_REMOVE_TEXT "Sunteþi sigur cã vreþi sã eliminaþi schema '%s'?" + IDS_OVERWRITE_TITLE "Confirmare suprascriere schemã" + IDS_OVERWRITE_TEXT "Numele de schemã ales este deja în folosinþã. Vreþi sã suprascrieþi schema actualã?" + IDS_ANIMATE_CURSOR "Cursoare animate" +END Propchange: trunk/reactos/dll/cpl/main/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/rsrc.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -15,6 +15,7 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/powercfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -1,4 +1,4 @@ -// English (en) resources by Lohegrim (Lohnegrim at gmx dot net) +// English (en-US) resources by Lohegrim (Lohnegrim at gmx dot net) // Updated: 2009-05-02 Jingjing Fu (jingjingf AT 188.com) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US Added: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -1,0 +1,166 @@ +// Romanian (ro-RO) resources + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Scheme de consum curent" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "Selectaþi o schemã de consum de curent cât mai potrivitã pentru dumneavoastrã. Aveþi în vedere cã modificãrile aduse se vor memora în schema selectatã.", + -1,37, 6, 209, 36 + GROUPBOX "S&cheme de consum curent", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&Salvare...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&ªtergere", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Necunoscut", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Când computerul e:",IDC_SAT, 12, 109, 60, 12 + LTEXT "Alimentat la prizã",IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "Pe baterii",IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "Închidere &monitor:",IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Închidere discuri fixe:",IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "S&tare de veghe:",IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Sistemul &hiberneazã:",IDC_HYBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alarme" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Alarmã baterie slabã",-1, 6, 7, 239, 104 + CONTROL "Activare alarmã &baterie slabã când nivelul de energie atinge:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + LTEXT "necunoscut",IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "0%",-1, 28, 43, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "Acþiune alarmã...",-1, 17, 69, 70, 14,WS_DISABLED + LTEXT "Notificare:",-1, 95, 71, 57, 10 + LTEXT "Necunoscut",IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "Acþiune:",-1, 95, 83, 55, 10 + LTEXT "Necunoscut",IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "Rulare program:",-1, 95, 95, 55, 10 + LTEXT "Necunoscut",IDC_ALARMPROG1, 154, 95, 84, 10 + + GROUPBOX "Alarmã baterie foarte slabã",-1, 6, 120, 239, 106 + CONTROL "Activare alarmã baterie &f. slabã când nivelul de energie atinge:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + LTEXT "necunoscut",IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "0%",-1, 28, 154, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%",-1, 214, 154, 25, 10 + PUSHBUTTON "Acþtiune alarmã...",-1, 17, 183, 70, 14, WS_DISABLED + LTEXT "Notificare:",-1, 95, 185, 50, 10 + LTEXT "Necunoscut",IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "Acþiune:",-1, 95, 198, 45, 10 + LTEXT "Necunoscut",IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "Rulare program:",-1, 95, 211, 50, 10 + LTEXT "Necunoscut",IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avansat" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 + LTEXT "Alegeþi setãrile se salvare energie pe care le doriþi.",-1, 37, 6, 207, 20 + GROUPBOX "Opþiuni",-1, 6, 30, 240, 65 + CONTROL "Afiºare pictogramã în tray mereu",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 43, 220, 10 + CONTROL "&Solicitare parolã când computerul îþi revine din starea de veghe",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 60, 220, 10 + CONTROL "&Întunecare ecran când computerul merge pe baterii",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 78, 220, 10 + GROUPBOX "Butoane computer",-1, 6, 101, 240, 127 + LTEXT "&Când pliez computerul meu portabil:", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "C&ând apãs butonul pornire-oprire:", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Cân&d apãs butonul pentru stare de veghe:", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hibernare" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "Când computerul hiberneazã, el reþine ce are stocat în memorie pe hard disk ºi se închide. Când reporniþi computerul mai târziu, îºi revine la starea iniþialã.", + -1, 37, 6, 210, 35 + GROUPBOX "Hibernare",-1, 6, 41, 240, 32 + CONTROL "Activare &hibernare",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "Spaþiu disc",-1, 6, 80, 240, 76 + LTEXT "Spaþiu disc liber:",-1, 15, 95, 140, 10 + LTEXT "Necunoscut",IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "Spaþiu disc necesar pentru hibernare:",-1, 15, 115, 140, 10 + LTEXT "Necunoscut",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "Trebuie sã eliberaþi din spaþiul de disc înainte de a putea activa hibernarea. ",IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Opþiuni consum de energie" + IDS_CPLDESCRIPTION_1 "Configureazã metodele de salvare energie pentru acest computer." + IDS_PROCENT "%i%%" + IDS_SOUND "Sunet" + IDS_TEXT "Text" + IDS_CONFIG1 "Setãri pentru schema de energie %1" + IDS_CONFIG2 "Setãri avansate pentru %1" + + IDS_SIZEBYTS "%i octeþi" + IDS_SIZEMB "%i MO" + + IDS_NOACTION "Nimic" + + IDS_PowerActionNone1 "Nicio acþiune" + IDS_PowerActionUnknown "Necunoscut" + IDS_PowerActionSleep "Intrare în stare de veghe" + IDS_PowerActionHibernate "Hibernare" + IDS_PowerActionShutdown "Închidere" + IDS_PowerActionRestart "Repornire" + IDS_PowerActionShutdownOff "Închidere ºi deconectare de la curent" + IDS_PowerActionWarmEject "Solicitare acþiune de la mine" + IDS_PowerActionNone2 "Nimic" + + IDS_TIMEOUT1 "Dupã 1 min" + IDS_TIMEOUT2 "Dupã 2 min" + IDS_TIMEOUT3 "Dupã 3 min" + IDS_TIMEOUT4 "Dupã 5 min" + IDS_TIMEOUT5 "Dupã 10 min" + IDS_TIMEOUT6 "Dupã 15 min" + IDS_TIMEOUT7 "Dupã 20 min" + IDS_TIMEOUT8 "Dupã 25 min" + IDS_TIMEOUT9 "Dupã 30 min" + IDS_TIMEOUT10 "Dupã 45 min" + IDS_TIMEOUT11 "Dupã 1 orã" + IDS_TIMEOUT12 "Dupã 2 ore" + IDS_TIMEOUT13 "Dupã 3 ore" + IDS_TIMEOUT14 "Dupã 4 ore" + IDS_TIMEOUT15 "Dupã 5 ore" + IDS_TIMEOUT16 "Niciodatã" + + IDS_DEL_SCHEME "Sunteþi sigur cã vreþi sã eliminaþi aceastã schemã?" + IDS_DEL_SCHEME_TITLE "Eliminare schemã" +END + + Propchange: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Sat May 9 16:08:59 2009 @@ -13,6 +13,7 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc"

1 0

[dreimer] 40861: Hopefully the last stuff to do. Built ROS HEAD with cmd and PS with the new GCC successfully.
by dreimer＠svn.reactos.org 09 May '09

09 May '09

Author: dreimer Date: Sat May 9 15:34:41 2009 New Revision: 40861 URL: http://svn.reactos.org/svn/reactos?rev=40861&view=rev Log: Hopefully the last stuff to do. Built ROS HEAD with cmd and PS with the new GCC successfully. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat May 9 15:34:41 2009 @@ -8,11 +8,16 @@ - New binutils and GCC builds optimized for i686 and with proper relative include directories (Colin Finck) - Remove unneeded components such as the MingW32 Runtime DLL (Colin Finck) - Make it possible to set different settings for any arch in RosBE. (Daniel Reimer, Timo Kreuzer) - +- Updated: SVN 1.6.1 included (Daniel Reimer) +- Finally fully integrate the PS Version of RosBE and make it default in Windows 7 (Daniel Reimer) + This made following stuff needed: + * Let the Installer change the Security Level of Powershell to Remote Signed. + * Generate Shortcuts for the PS Versions. + * Fix some typos in the PS files to fully work with the new GCC *** April 07th, 2009 - RosBE 1.4.1 Released -- Updated:SVN 1.6 included (Daniel Reimer) +- Updated: SVN 1.6 included (Daniel Reimer) - Fixed: Sped up starting of rosbe (Daniel Reimer) - Fixed: Hopefully fixed bison. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sat May 9 15:34:41 2009 @@ -194,12 +194,12 @@ SetOverwrite try File /r Components\Tools\svn.exe File /r Components\Tools\intl3_svn.dll - File /r Components\Tools\libapr.dll + File /r Components\Tools\libapr-1.dll File /r Components\Tools\libeay32.dll File /r Components\Tools\ssleay32.dll - File /r Components\Tools\libaprutil.dll + File /r Components\Tools\libaprutil-1.dll File /r Components\Tools\libdb44.dll - File /r Components\Tools\libapriconv.dll + File /r Components\Tools\libapriconv-1.dll File /r Components\Tools\libsasl.dll File /r Components\Tools\libsvn_client-1.dll File /r Components\Tools\libsvn_delta-1.dll

1 0

[dgorbachev] 40860: Update Romanian translations. Petru Dimitriu, bug #4482.
by dgorbachev＠svn.reactos.org 09 May '09

09 May '09

Author: dgorbachev Date: Sat May 9 14:35:32 2009 New Revision: 40860 URL: http://svn.reactos.org/svn/reactos?rev=40860&view=rev Log: Update Romanian translations. Petru Dimitriu, bug #4482. Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] Sat May 9 14:35:32 2009 @@ -132,18 +132,18 @@ BEGIN IDS_TITLE "ReactOS Explorer" IDS_START "Începe" - IDS_LOGOFF "Închide sesiunea ..." - IDS_SHUTDOWN "Oprire calculator ..." - IDS_RESTART "Restart..." - IDS_LAUNCH "Pornire ..." + IDS_LOGOFF "Închidere sesiune ..." + IDS_SHUTDOWN "Închidere computer ..." + IDS_RESTART "Repornire computer..." + IDS_LAUNCH "Lansare program ..." IDS_START_HELP "Ajutor" - IDS_SEARCH_FILES "Cãutare Files..." + IDS_SEARCH_FILES "Cãutare fiºier..." IDS_DOCUMENTS "Documente" IDS_FAVORITES "Preferinþe" IDS_PROGRAMS "Programe" IDS_SETTINGS "Setãri" IDS_EXPLORE "Explorare" - IDS_EMPTY "(Empty)" + IDS_EMPTY "(gol)" IDS_RECENT "Documente Recente" IDS_ADMIN "Administrare" END @@ -169,25 +169,25 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Reþea" - IDS_CONNECTIONS "Conecþii" + IDS_CONNECTIONS "Conexuni" IDS_DRIVES "Discuri" - IDS_SEARCH_COMPUTER "Search Computer..." - IDS_SETTINGS_MENU "Settings Menu" - IDS_CONTROL_PANEL "Control Panel" - IDS_PRINTERS "Printers" - IDS_BROWSE "Browse Files" - IDS_SEARCH_PRG "Search Programm..." - IDS_ALL_USERS "All Users\\" + IDS_SEARCH_COMPUTER "Cãutare computer..." + IDS_SETTINGS_MENU "Meniu setãri" + IDS_CONTROL_PANEL "Panou de control" + IDS_PRINTERS "Imprimante" + IDS_BROWSE "Rãsfoire prin fiºiere" + IDS_SEARCH_PRG "Cãutare program..." + IDS_ALL_USERS "Toþi utilizatorii\\" IDS_SEARCH "Cãutare..." IDS_ABOUT_EXPLORER "&Despre Explorer..." IDS_LAUNCH_MANY_PROGRAMS "You have selected more than one program.\nAre you sure you want to launch all of them?" - IDS_DESKTOPBAR_SETTINGS "Desktop Settings" - IDS_DESKTOP "Desktop" - IDS_TASKBAR "Taskbar" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" + IDS_DESKTOPBAR_SETTINGS "Setãri spaþiu de lucru" + IDS_DESKTOP "Spaþiu de lucru" + IDS_TASKBAR "Barã de activitãþi" + IDS_NAMECOLUMN "Nume" + IDS_PATHCOLUMN "Cale" + IDS_MENUCOLUMN "Cale meniu" END #endif // Romanian resources Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sat May 9 14:35:32 2009 @@ -133,8 +133,8 @@ GROUPBOX "&Zonã ecran",1818,3,127,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 - LTEXT "Mai mic",1815,9,137,15,8,NOT WS_GROUP - LTEXT "Mai mare",1816,93,137,21,8,NOT WS_GROUP + LTEXT "Mic",1815,9,137,15,8,NOT WS_GROUP + LTEXT "Mare",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Culori",1817,125,127,115,43 COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |

1 0

[dchapyshev] 40859: - SetClassLong -> SetClassLongPtr, GetClassLong -> GetClassLongPtr (for 64-bit compatible, see note in MSDN) Part 2/x
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 14:11:04 2009 New Revision: 40859 URL: http://svn.reactos.org/svn/reactos?rev=40859&view=rev Log: - SetClassLong -> SetClassLongPtr, GetClassLong -> GetClassLongPtr (for 64-bit compatible, see note in MSDN) Part 2/x Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/spy.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -292,7 +292,7 @@ WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); - SetClassLong(hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); + SetClassLongPtr(hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); PrevProc = (WNDPROC) SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM) ImageView_DispWndProc); ImageView_CreateToolBar(hwnd); Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -4105,7 +4105,7 @@ #ifdef __REACTOS__ if (es->hwndParent && es->hwndParent != GetDesktopWindow()) { - if (GetClassLongW (es->hwndParent, GCW_ATOM) == (DWORD)MAKEINTATOM(32770)) + if (GetClassLongPtrW (es->hwndParent, GCW_ATOM) == (DWORD)MAKEINTATOM(32770)) return TRUE; } return FALSE; Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -224,7 +224,7 @@ case HTCLIENT: { - HICON hCursor = (HICON)GetClassLongW(hWnd, GCL_HCURSOR); + HICON hCursor = (HICON)GetClassLongPtrW(hWnd, GCL_HCURSOR); if (hCursor) { SetCursor(hCursor); @@ -554,7 +554,7 @@ if( iconic ) /* create a cursor for dragging */ { - HICON hIcon = (HICON)GetClassLongW(hwnd, GCL_HICON); + HICON hIcon = (HICON)GetClassLongPtrW(hwnd, GCL_HICON); if(!hIcon) hIcon = (HICON)SendMessageW( hwnd, WM_QUERYDRAGICON, 0, 0L); if( hIcon ) hDragCursor = CursorIconToCursor( hIcon, TRUE ); if( !hDragCursor ) iconic = FALSE; @@ -1181,7 +1181,7 @@ if((SystemMenu = GetSystemMenu(hWnd, FALSE))) { MenuInitSysMenuPopup(SystemMenu, GetWindowLongW(hWnd, GWL_STYLE), - GetClassLongW(hWnd, GCL_STYLE), HitCode); + GetClassLongPtrW(hWnd, GCL_STYLE), HitCode); if(HitCode == HTCAPTION) Flags = TPM_LEFTBUTTON | TPM_RIGHTBUTTON; @@ -1224,7 +1224,7 @@ HICON hIcon; if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE && - (hIcon = (HICON)GetClassLongW(hWnd, GCL_HICON)) != NULL) + (hIcon = (HICON)GetClassLongPtrW(hWnd, GCL_HICON)) != NULL) { RECT ClientRect; INT x, y; @@ -1322,13 +1322,13 @@ case WM_ICONERASEBKGND: { RECT Rect; - HBRUSH hBrush = (HBRUSH)GetClassLongW(hWnd, GCL_HBRBACKGROUND); + HBRUSH hBrush = (HBRUSH)GetClassLongPtrW(hWnd, GCL_HBRBACKGROUND); if (NULL == hBrush) { return 0; } - if (GetClassLongW(hWnd, GCL_STYLE) & CS_PARENTDC) + if (GetClassLongPtrW(hWnd, GCL_STYLE) & CS_PARENTDC) { /* can't use GetClipBox with a parent DC or we fill the whole parent */ GetClientRect(hWnd, &Rect); @@ -1410,7 +1410,7 @@ if (wParam == VK_F4) /* Try to close the window */ { - if (!(GetClassLongW(top, GCL_STYLE) & CS_NOCLOSE)) + if (!(GetClassLongPtrW(top, GCL_STYLE) & CS_NOCLOSE)) { if (bUnicode) PostMessageW(top, WM_SYSCOMMAND, SC_CLOSE, 0); @@ -1507,7 +1507,7 @@ UINT Len; HICON hIcon; - hIcon = (HICON)GetClassLongW(hWnd, GCL_HICON); + hIcon = (HICON)GetClassLongPtrW(hWnd, GCL_HICON); if (hIcon) { return ((LRESULT)hIcon); @@ -1534,8 +1534,8 @@ case WM_SETICON: { INT Index = (wParam != 0) ? GCL_HICON : GCL_HICONSM; - HICON hOldIcon = (HICON)GetClassLongW(hWnd, Index); - SetClassLongW(hWnd, Index, lParam); + HICON hOldIcon = (HICON)GetClassLongPtrW(hWnd, Index); + SetClassLongPtrW(hWnd, Index, lParam); SetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); @@ -1545,7 +1545,7 @@ case WM_GETICON: { INT Index = (wParam == ICON_BIG) ? GCL_HICON : GCL_HICONSM; - return (GetClassLongW(hWnd, Index)); + return (GetClassLongPtrW(hWnd, Index)); } case WM_HELP: Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -235,7 +235,7 @@ static BOOL is_close_enabled(HWND hwnd, HMENU hSysMenu) { - if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return FALSE; + if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_NOCLOSE) return FALSE; if (!hSysMenu) hSysMenu = GetSystemMenu(hwnd, FALSE); if (hSysMenu) Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -2216,7 +2216,7 @@ if (IS_SYSTEM_MENU(MenuInfo)) { MenuInitSysMenuPopup(ItemInfo.hSubMenu, GetWindowLongW(MenuInfo->Wnd, GWL_STYLE), - GetClassLongW(MenuInfo->Wnd, GCL_STYLE), HTSYSMENU); + GetClassLongPtrW(MenuInfo->Wnd, GCL_STYLE), HTSYSMENU); NcGetSysPopupPos(MenuInfo->Wnd, &Rect); Rect.top = Rect.bottom; Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -134,10 +134,10 @@ SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); return hIcon; } @@ -499,7 +499,7 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect) { LRESULT Result = 0; - DWORD Style = GetClassLongW(hWnd, GCL_STYLE); + DWORD Style = GetClassLongPtrW(hWnd, GCL_STYLE); DWORD ExStyle; SIZE WindowBorders; RECT OrigRect; Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Sat May 9 14:11:04 2009 @@ -2010,7 +2010,7 @@ /* save and restore error code over the next call */ save_error = GetLastError(); /* special code to detect a property sheet dialog */ - if ((GetClassLongW(sp_e->msg_hwnd, GCW_ATOM) == (LONG)WC_DIALOG) && + if ((GetClassLongPtrW(sp_e->msg_hwnd, GCW_ATOM) == (LONG)WC_DIALOG) && (GetPropW(sp_e->msg_hwnd, PropSheetInfoStr))) { strcpyW(sp_e->wnd_class, WC_PROPSHEETW); }

1 0

[dchapyshev] 40858: - SetClassLong -> SetClassLongPtr, GetClassLong -> GetClassLongPtr (for 64-bit compatible, see note in MSDN) Part 1/x
by dchapyshev＠svn.reactos.org 09 May '09

09 May '09

Author: dchapyshev Date: Sat May 9 14:06:22 2009 New Revision: 40858 URL: http://svn.reactos.org/svn/reactos?rev=40858&view=rev Log: - SetClassLong -> SetClassLongPtr, GetClassLong -> GetClassLongPtr (for 64-bit compatible, see note in MSDN) Part 1/x Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sat May 9 14:06:22 2009 @@ -259,7 +259,7 @@ { // set background brush for the short moment of displaying the // background color while moving foreground windows - SetClassLong(hwnd, GCL_HBRBACKGROUND, COLOR_BACKGROUND+1); + SetClassLongPtr(hwnd, GCL_HBRBACKGROUND, COLOR_BACKGROUND+1); _display_version = RegGetDWORDValue(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), TEXT("PaintDesktopVersion"), 1); } Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat May 9 14:06:22 2009 @@ -109,7 +109,7 @@ _hwndStartButton = hwndStart; // disable double clicks - SetClassLong(hwndStart, GCL_STYLE, GetClassLong(hwndStart, GCL_STYLE) & ~CS_DBLCLKS); + SetClassLongPtr(hwndStart, GCL_STYLE, GetClassLongPtr(hwndStart, GCL_STYLE) & ~CS_DBLCLKS); // create task bar _hwndTaskBar = TaskBar::Create(_hwnd); Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Sat May 9 14:06:22 2009 @@ -333,10 +333,10 @@ SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); - - if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + + if (!hIcon) + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); if (!hIcon) SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon); @@ -358,10 +358,10 @@ if (allow_from_class) { if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); } if (!hIcon)

1 0

[mjmartin] 40857: - MmProtectAnonMem: Search all Regions in Memory Area up to Length for MEM_COMMIT prior to altering memory protection. Fixes 6 kernel32_winetest for virtual memory.
by mjmartin＠svn.reactos.org 09 May '09

09 May '09

Author: mjmartin Date: Sat May 9 13:54:50 2009 New Revision: 40857 URL: http://svn.reactos.org/svn/reactos?rev=40857&view=rev Log: - MmProtectAnonMem: Search all Regions in Memory Area up to Length for MEM_COMMIT prior to altering memory protection. Fixes 6 kernel32_winetest for virtual memory. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat May 9 13:54:50 2009 @@ -1034,26 +1034,48 @@ PULONG OldProtect) { PMM_REGION Region; - NTSTATUS Status; - - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, NULL); - if (Region->Type == MEM_COMMIT) - { - /* FIXME: check if the whole range is committed - * before altering the memory */ + NTSTATUS Status = STATUS_SUCCESS; + ULONG LengthCount = 0; + + /* Search all Regions in MemoryArea up to Length */ + /* Every Region up to Length must be committed for success */ + for (;;) + { + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (PVOID)((ULONG_PTR)BaseAddress + (ULONG_PTR)LengthCount), NULL); + + /* If a Region was found and it is committed */ + if ((Region) && (Region->Type == MEM_COMMIT)) + { + LengthCount += Region->Length; + if (Length <= LengthCount) break; + continue; + } + /* If Region was found and it is not commited */ + else if (Region) + { + Status = STATUS_NOT_COMMITTED; + break; + } + /* If no Region was found at all */ + else if (LengthCount == 0) + { + Status = STATUS_INVALID_ADDRESS; + break; + } + } + + if (NT_SUCCESS(Status)) + { *OldProtect = Region->Protect; Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, Length, Region->Type, Protect, MmModifyAttributes); } - else - { - Status = STATUS_NOT_COMMITTED; - } - return(Status); + + return (Status); } NTSTATUS NTAPI

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