Ros-diffs March 2011

ros-diffs@reactos.org

21 participants
276 discussions

[rharabien] 51106: Set last error to ERROR_INVALID_PARAMETER in NtGdiGetRandomRgn if invalid hdc is given Fixes gdi32:GetClipRgn apitest

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:32:46 2011 New Revision: 51106 URL: http://svn.reactos.org/svn/reactos?rev=51106&view=rev Log: Set last error to ERROR_INVALID_PARAMETER in NtGdiGetRandomRgn if invalid hdc is given Fixes gdi32:GetClipRgn apitest Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Mon Mar 21 14:32:46 2011 @@ -367,7 +367,7 @@ REGION_FreeRgnByHandle(hVisRgn); } - /* Return the old bitmp handle */ + /* Return the old bitmap handle */ return hbmpOld; } @@ -522,7 +522,7 @@ pdc = DC_LockDc(hdc); if (!pdc) { - EngSetLastError(ERROR_INVALID_HANDLE); + EngSetLastError(ERROR_INVALID_PARAMETER); return -1; }

13 years, 7 months

[rharabien] 51105: Don't assume WM_DESTROY is last message - listview sends notification after it. Confirmed in Windows 7. See issue #6026 for more details.

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:21:16 2011 New Revision: 51105 URL: http://svn.reactos.org/svn/reactos?rev=51105&view=rev Log: Don't assume WM_DESTROY is last message - listview sends notification after it. Confirmed in Windows 7. See issue #6026 for more details. Modified: trunk/reactos/dll/win32/devmgr/hwpage.c Modified: trunk/reactos/dll/win32/devmgr/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwpage.c?… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] Mon Mar 21 14:21:16 2011 @@ -964,6 +964,9 @@ case WM_DESTROY: { + /* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */ + SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL); + /* free devices list */ FreeDevicesList(hpd);

13 years, 7 months

[rharabien] 51104: Set last error to ERROR_PROC_NOT_FOUND in case of NULL module in GetProcAddress Check for error when freeing datafile Fixes 2 winetests

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:16:01 2011 New Revision: 51104 URL: http://svn.reactos.org/svn/reactos?rev=51104&view=rev Log: Set last error to ERROR_PROC_NOT_FOUND in case of NULL module in GetProcAddress Check for error when freeing datafile Fixes 2 winetests Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Mon Mar 21 14:16:01 2011 @@ -310,6 +310,12 @@ FARPROC fnExp = NULL; NTSTATUS Status; + if (!hModule) + { + SetLastError(ERROR_PROC_NOT_FOUND); + return NULL; + } + if (HIWORD(lpProcName) != 0) { RtlInitAnsiString (&ProcedureName, @@ -354,8 +360,7 @@ { /* this is a LOAD_LIBRARY_AS_DATAFILE module */ char *ptr = (char *)hLibModule - 1; - UnmapViewOfFile(ptr); - return TRUE; + return UnmapViewOfFile(ptr); } Status = LdrUnloadDll(hLibModule);

13 years, 7 months

[rharabien] 51103: Don't destroy ImageList used by ListView if control was created without LVS_SHAREIMAGELISTS flag Fixes crashes when closing RegEdit, RApps and hardware tab in mouse settings.

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 21 14:07:29 2011 New Revision: 51103 URL: http://svn.reactos.org/svn/reactos?rev=51103&view=rev Log: Don't destroy ImageList used by ListView if control was created without LVS_SHAREIMAGELISTS flag Fixes crashes when closing RegEdit, RApps and hardware tab in mouse settings. Modified: trunk/reactos/base/applications/rapps/winmain.c trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Mon Mar 21 14:07:29 2011 @@ -10,7 +10,6 @@ HWND hMainWnd; HINSTANCE hInst; -HIMAGELIST hImageListView = NULL; HIMAGELIST hImageTreeView = NULL; INT SelectedEnumType = ENUM_ALL_COMPONENTS; SETTINGS_INFO SettingsInfo; @@ -168,8 +167,8 @@ { WCHAR szBuffer1[MAX_STR_LEN], szBuffer2[MAX_STR_LEN]; HICON hIcon; - - if (hImageListView) ImageList_Destroy(hImageListView); + HIMAGELIST hImageListView; + (VOID) ListView_DeleteAllItems(hListView); /* Create image list */ @@ -208,7 +207,11 @@ } /* Set image list for ListView */ - (VOID) ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); + hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); + + /* Destroy old image list */ + if (hImageListView) + ImageList_Destroy(hImageListView); SelectedEnumType = EnumType; @@ -725,7 +728,6 @@ FreeAvailableAppList(); if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - if (hImageListView) ImageList_Destroy(hImageListView); if (hImageTreeView) ImageList_Destroy(hImageTreeView); PostQuitMessage(0); Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Mon Mar 21 14:07:29 2011 @@ -65,7 +65,7 @@ ReleaseDC(hWnd, hdc); } -static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy) +static void ResizeWnd(int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(3); RECT rt, rs, rb; @@ -77,12 +77,12 @@ GetWindowRect(hStatusBar, &rs); cy = rs.bottom - rs.top; } - GetWindowRect(pChildWnd->hAddressBtnWnd, &rb); - cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); + GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb); + cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2; + DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } @@ -111,7 +111,7 @@ last_split = -1; GetClientRect(hWnd, &rt); g_pChildWnd->nSplitPos = x; - ResizeWnd(g_pChildWnd, rt.right, rt.bottom); + ResizeWnd(rt.right, rt.bottom); ReleaseCapture(); } @@ -125,7 +125,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - ChildWnd* pChildWnd = g_pChildWnd; HTREEITEM hSelection; HKEY hRootKey; LPCTSTR keyPath, s; @@ -143,18 +142,18 @@ /* TODO */ break; case ID_TREE_EXPANDBRANCH: - (void)TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_EXPAND); + (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND); break; case ID_TREE_COLLAPSEBRANCH: - (void)TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_COLLAPSE); + (void)TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_COLLAPSE); break; case ID_TREE_RENAME: - SetFocus(pChildWnd->hTreeWnd); - (void)TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); + SetFocus(g_pChildWnd->hTreeWnd); + (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd)); break; case ID_TREE_DELETE: - hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); - keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); + hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hSelection, &hRootKey); if (keyPath == 0 || *keyPath == 0) { @@ -164,18 +163,18 @@ DeleteNode(g_pChildWnd->hTreeWnd, 0); break; case ID_TREE_EXPORT: - ExportRegistryFile(pChildWnd->hTreeWnd); + ExportRegistryFile(g_pChildWnd->hTreeWnd); break; case ID_EDIT_FIND: FindDialog(hWnd); break; case ID_EDIT_COPYKEYNAME: - hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); - keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); + hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hSelection, &hRootKey); CopyKeyName(hWnd, hRootKey, keyPath); break; case ID_EDIT_NEW_KEY: - CreateNewKey(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); + CreateNewKey(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd)); break; case ID_EDIT_NEW_STRINGVALUE: case ID_EDIT_NEW_BINARYVALUE: @@ -183,8 +182,8 @@ SendMessage(hFrameWnd, WM_COMMAND, wParam, lParam); break; case ID_SWITCH_PANELS: - pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel; - SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); + g_pChildWnd->nFocusPanel = !g_pChildWnd->nFocusPanel; + SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd); break; default: if ((wID >= ID_TREE_SUGGESTION_MIN) && (wID <= ID_TREE_SUGGESTION_MAX)) @@ -196,7 +195,7 @@ s += _tcslen(s) + 1; wID--; } - SelectNode(pChildWnd->hTreeWnd, s); + SelectNode(g_pChildWnd->hTreeWnd, s); break; } return FALSE; @@ -317,7 +316,6 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { BOOL Result; - ChildWnd* pChildWnd = g_pChildWnd; switch (message) { @@ -329,45 +327,45 @@ /* load "My Computer" string */ LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); - g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); - - if (!pChildWnd) return 0; - _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); - pChildWnd->nSplitPos = 250; - pChildWnd->hWnd = hWnd; - pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, + g_pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); + if (!g_pChildWnd) return 0; + + _tcsncpy(g_pChildWnd->szPath, buffer, MAX_PATH); + g_pChildWnd->nSplitPos = 250; + g_pChildWnd->hWnd = hWnd; + g_pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); - pChildWnd->hAddressBtnWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Button"), _T("Â»"), WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON, + g_pChildWnd->hAddressBtnWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Button"), _T("Â»"), WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); - pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); - pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); - SetFocus(pChildWnd->hTreeWnd); + g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW); + g_pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, g_pChildWnd->szPath*/); + SetFocus(g_pChildWnd->hTreeWnd); /* set the address bar and button font */ - if ((pChildWnd->hAddressBarWnd) && (pChildWnd->hAddressBtnWnd)) + if ((g_pChildWnd->hAddressBarWnd) && (g_pChildWnd->hAddressBtnWnd)) { hFont = (HFONT)GetStockObject(DEFAULT_GUI_FONT); - SendMessage(pChildWnd->hAddressBarWnd, + SendMessage(g_pChildWnd->hAddressBarWnd, WM_SETFONT, (WPARAM)hFont, 0); - SendMessage(pChildWnd->hAddressBtnWnd, + SendMessage(g_pChildWnd->hAddressBtnWnd, WM_SETFONT, (WPARAM)hFont, 0); } /* Subclass the AddressBar */ - oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC); - SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc); - SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC, (DWORD_PTR)AddressBarProc); + oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWL_WNDPROC); + SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc); + SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWL_WNDPROC, (DWORD_PTR)AddressBarProc); break; } case WM_COMMAND: if(HIWORD(wParam) == BN_CLICKED) { - PostMessage(pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0); + PostMessage(g_pChildWnd->hAddressBarWnd, WM_KEYUP, VK_RETURN, 0); } else if (!_CmdWndProc(hWnd, message, wParam, lParam)) { @@ -383,7 +381,7 @@ POINT pt; GetCursorPos(&pt); ScreenToClient(hWnd, &pt); - if (pt.x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) + if (pt.x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { SetCursor(LoadCursor(0, IDC_SIZEWE)); return TRUE; @@ -392,10 +390,10 @@ goto def; case WM_DESTROY: DestroyTreeView(); - DestroyListView(pChildWnd->hListWnd); + DestroyListView(g_pChildWnd->hListWnd); DestroyMainMenu(); - HeapFree(GetProcessHeap(), 0, pChildWnd); - pChildWnd = NULL; + HeapFree(GetProcessHeap(), 0, g_pChildWnd); + g_pChildWnd = NULL; PostQuitMessage(0); break; case WM_LBUTTONDOWN: @@ -403,9 +401,9 @@ RECT rt; int x = (short)LOWORD(lParam); GetClientRect(hWnd, &rt); - if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) - { - last_split = pChildWnd->nSplitPos; + if (x>=g_pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<g_pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) + { + last_split = g_pChildWnd->nSplitPos; draw_splitbar(hWnd, last_split); SetCapture(hWnd); } @@ -432,7 +430,7 @@ RECT rt; draw_splitbar(hWnd, last_split); GetClientRect(hWnd, &rt); - ResizeWnd(pChildWnd, rt.right, rt.bottom); + ResizeWnd(rt.right, rt.bottom); last_split = -1; ReleaseCapture(); SetCursor(LoadCursor(0, IDC_ARROW)); @@ -476,9 +474,9 @@ break; case WM_SETFOCUS: - if (pChildWnd != NULL) - { - SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); + if (g_pChildWnd != NULL) + { + SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd); } break; @@ -486,22 +484,22 @@ break; case WM_NOTIFY: - if ((int)wParam == TREE_WINDOW) + if ((int)wParam == TREE_WINDOW && g_pChildWnd != NULL) { switch (((LPNMHDR)lParam)->code) { case TVN_ITEMEXPANDING: - return !OnTreeExpanding(pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); + return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); case TVN_SELCHANGED: { LPCTSTR keyPath, rootName; LPTSTR fullPath; HKEY hRootKey; - keyPath = GetItemPath(pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey); if (keyPath) { - RefreshListView(pChildWnd->hListWnd, hRootKey, keyPath); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath); rootName = get_root_key_name(hRootKey); fullPath = HeapAlloc(GetProcessHeap(), 0, (_tcslen(rootName) + 1 + _tcslen(keyPath) + 1) * sizeof(TCHAR)); if (fullPath) @@ -512,7 +510,7 @@ else fullPath = _tcscpy(fullPath, rootName); SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); - SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); + SendMessage(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); /* disable hive manipulation items temporarily (enable only if necessary) */ EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED); @@ -547,15 +545,15 @@ } break; case NM_SETFOCUS: - pChildWnd->nFocusPanel = 0; + g_pChildWnd->nFocusPanel = 0; break; case TVN_BEGINLABELEDIT: { LPNMTVDISPINFO ptvdi; /* cancel label edit for rootkeys */ ptvdi = (LPNMTVDISPINFO) lParam; - if (!TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem) || - !TreeView_GetParent(pChildWnd->hTreeWnd, TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem))) + if (!TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem) || + !TreeView_GetParent(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem))) return TRUE; break; } @@ -571,14 +569,14 @@ ptvdi = (LPNMTVDISPINFO) lParam; if (ptvdi->item.pszText) { - keyPath = GetItemPath(pChildWnd->hTreeWnd, TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem), &hRootKey); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem), &hRootKey); _sntprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), _T("%s\\%s"), keyPath, ptvdi->item.pszText); - keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); if (RegOpenKeyEx(hRootKey, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { lResult = FALSE; RegCloseKey(hKey); - (void)TreeView_EditLabel(pChildWnd->hTreeWnd, ptvdi->item.hItem); + (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, ptvdi->item.hItem); } else { @@ -594,15 +592,15 @@ } else { - if ((int)wParam == LIST_WINDOW) + if ((int)wParam == LIST_WINDOW && g_pChildWnd != NULL) { switch (((LPNMHDR)lParam)->code) { case NM_SETFOCUS: - pChildWnd->nFocusPanel = 1; + g_pChildWnd->nFocusPanel = 1; break; default: - if(!ListWndNotifyProc(pChildWnd->hListWnd, wParam, lParam, &Result)) + if(!ListWndNotifyProc(g_pChildWnd->hListWnd, wParam, lParam, &Result)) { goto def; } @@ -616,27 +614,27 @@ case WM_CONTEXTMENU: { POINT pt; - if((HWND)wParam == pChildWnd->hListWnd) + if((HWND)wParam == g_pChildWnd->hListWnd) { int i, cnt; BOOL IsDefault; pt.x = (short) LOWORD(lParam); pt.y = (short) HIWORD(lParam); - cnt = ListView_GetSelectedCount(pChildWnd->hListWnd); - i = ListView_GetNextItem(pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); + cnt = ListView_GetSelectedCount(g_pChildWnd->hListWnd); + i = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); if (pt.x == -1 && pt.y == -1) { RECT rc; if (i != -1) { rc.left = LVIR_BOUNDS; - SendMessage(pChildWnd->hListWnd, LVM_GETITEMRECT, i, (LPARAM) &rc); + SendMessage(g_pChildWnd->hListWnd, LVM_GETITEMRECT, i, (LPARAM) &rc); pt.x = rc.left + 8; pt.y = rc.top + 8; } else pt.x = pt.y = 0; - ClientToScreen(pChildWnd->hListWnd, &pt); + ClientToScreen(g_pChildWnd->hListWnd, &pt); } if(i == -1) { @@ -646,7 +644,7 @@ { HMENU mnu = GetSubMenu(hPopupMenus, PM_MODIFYVALUE); SetMenuDefaultItem(mnu, ID_EDIT_MODIFY, MF_BYCOMMAND); - IsDefault = IsDefaultValue(pChildWnd->hListWnd, i); + IsDefault = IsDefaultValue(g_pChildWnd->hListWnd, i); if(cnt == 1) EnableMenuItem(mnu, ID_EDIT_RENAME, MF_BYCOMMAND | (IsDefault ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); else @@ -657,7 +655,7 @@ TrackPopupMenu(mnu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } } - else if ((HWND)wParam == pChildWnd->hTreeWnd) + else if ((HWND)wParam == g_pChildWnd->hTreeWnd) { TVHITTESTINFO hti; HMENU hContextMenu; @@ -677,13 +675,13 @@ if (pt.x == -1 && pt.y == -1) { RECT rc; - hti.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); + hti.hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); if (hti.hItem != NULL) { - TreeView_GetItemRect(pChildWnd->hTreeWnd, hti.hItem, &rc, TRUE); + TreeView_GetItemRect(g_pChildWnd->hTreeWnd, hti.hItem, &rc, TRUE); pt.x = rc.left + 8; pt.y = rc.top + 8; - ClientToScreen(pChildWnd->hTreeWnd, &pt); + ClientToScreen(g_pChildWnd->hTreeWnd, &pt); hti.flags = TVHT_ONITEM; } else @@ -693,19 +691,19 @@ { hti.pt.x = pt.x; hti.pt.y = pt.y; - ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); - (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); + ScreenToClient(g_pChildWnd->hTreeWnd, &hti.pt); + (void)TreeView_HitTest(g_pChildWnd->hTreeWnd, &hti); } if (hti.flags & TVHT_ONITEM) { hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); - (void)TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); + (void)TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem); memset(&item, 0, sizeof(item)); item.mask = TVIF_STATE | TVIF_CHILDREN; item.hItem = hti.hItem; - (void)TreeView_GetItem(pChildWnd->hTreeWnd, &item); + (void)TreeView_GetItem(g_pChildWnd->hTreeWnd, &item); /* Set the Expand/Collapse menu item appropriately */ LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0])); @@ -734,7 +732,7 @@ } /* Come up with suggestions */ - keyPath = GetItemPath(pChildWnd->hTreeWnd, NULL, &hRootKey); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hRootKey); SuggestKeys(hRootKey, keyPath, Suggestions, sizeof(Suggestions) / sizeof(Suggestions[0])); if (Suggestions[0]) { @@ -758,16 +756,16 @@ s += _tcslen(s) + 1; } } - TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); + TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, g_pChildWnd->hWnd, NULL); } } break; } case WM_SIZE: - if (wParam != SIZE_MINIMIZED && pChildWnd != NULL) - { - ResizeWnd(pChildWnd, LOWORD(lParam), HIWORD(lParam)); + if (wParam != SIZE_MINIMIZED && g_pChildWnd != NULL) + { + ResizeWnd(LOWORD(lParam), HIWORD(lParam)); } /* fall through */ default: Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Mon Mar 21 14:07:29 2011 @@ -14,7 +14,6 @@ #include "input.h" static HWND MainDlgWnd; -static HIMAGELIST hImgList; // for SaveInputLang() static INT OldLayoutNum; @@ -299,7 +298,7 @@ } static VOID -InitLangList(HWND hWnd) +InitLangList(HWND hWnd, HIMAGELIST hImgList) { HKEY hKey, hSubKey; TCHAR szBuf[MAX_PATH], szPreload[CCH_LAYOUT_ID + 1], szSub[CCH_LAYOUT_ID + 1]; @@ -370,11 +369,19 @@ VOID UpdateLayoutsList(VOID) { - (VOID) ImageList_Destroy(hImgList); + HIMAGELIST hImgList; + + /* Clear the list */ (VOID) ListView_DeleteAllItems(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST)); + + /* Crate new list */ hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); - InitLangList(MainDlgWnd); - (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); + InitLangList(MainDlgWnd, hImgList); + hImgList = ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); + + /* Destroy old image list */ + if(hImgList) + (VOID) ImageList_Destroy(hImgList); } typedef struct _REG_KB_ENTRY_ @@ -728,12 +735,14 @@ { case WM_INITDIALOG: { + HIMAGELIST hImgList; + MainDlgWnd = hwndDlg; AddListColumn(hwndDlg); (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVS_EX_FULLROWSELECT); hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); - InitLangList(hwndDlg); + InitLangList(hwndDlg, hImgList); (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); } break; @@ -781,7 +790,6 @@ } break; case WM_DESTROY: - (VOID) ImageList_Destroy(hImgList); break; }

13 years, 7 months

[jimtabor] 51102: [Win32k] - Setup RectInRegion for internal use.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Mar 21 02:20:24 2011 New Revision: 51102 URL: http://svn.reactos.org/svn/reactos?rev=51102&view=rev Log: [Win32k] - Setup RectInRegion for internal use. Modified: trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/rect.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Mon Mar 21 02:20:24 2011 @@ -44,6 +44,7 @@ BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL IntCreatePolyPolygonRgn(PPOINT, PULONG, INT, INT); INT FASTCALL IntGdiOffsetRgn(PROSRGNDATA,INT,INT); +BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL); INT FASTCALL IntGdiCombineRgn(PROSRGNDATA, PROSRGNDATA, PROSRGNDATA, INT); INT FASTCALL REGION_Complexity(PROSRGNDATA); Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] Mon Mar 21 02:20:24 2011 @@ -16,7 +16,6 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id$ */ #include <win32k.h> Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Mon Mar 21 02:20:24 2011 @@ -3204,6 +3204,27 @@ return hrgn; } +BOOL +FASTCALL +IntRectInRegion( + HRGN hRgn, + LPRECTL rc +) +{ + PROSRGNDATA Rgn; + BOOL Ret; + + if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) + { + return ERROR; + } + + Ret = REGION_RectInRegion(Rgn, rc); + RGNOBJAPI_Unlock(Rgn); + return Ret; +} + + // // NtGdi Exported Functions // @@ -3765,15 +3786,8 @@ LPRECTL unsaferc ) { - PROSRGNDATA Rgn; RECTL rc = {0}; - BOOL Ret; NTSTATUS Status = STATUS_SUCCESS; - - if (!(Rgn = RGNOBJAPI_Lock(hRgn, NULL))) - { - return ERROR; - } _SEH2_TRY { @@ -3788,15 +3802,12 @@ if (!NT_SUCCESS(Status)) { - RGNOBJAPI_Unlock(Rgn); SetLastNtError(Status); DPRINT1("NtGdiRectInRegion: bogus rc\n"); return ERROR; } - Ret = REGION_RectInRegion(Rgn, &rc); - RGNOBJAPI_Unlock(Rgn); - return Ret; + return IntRectInRegion(hRgn, &rc); } BOOL

13 years, 7 months

[gadamopoulos] 51101: [win32k] - Fix disconnecting from a desktop when IntSetThreadDesktop gets NULL parameter

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 20 14:28:12 2011 New Revision: 51101 URL: http://svn.reactos.org/svn/reactos?rev=51101&view=rev Log: [win32k] - Fix disconnecting from a desktop when IntSetThreadDesktop gets NULL parameter Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Mar 20 14:28:12 2011 @@ -1798,7 +1798,7 @@ IntSetThreadDesktop(IN HDESK hDesktop, IN BOOL FreeOnFailure) { - PDESKTOP DesktopObject, OldDesktop; + PDESKTOP DesktopObject = NULL, OldDesktop; HDESK hOldDesktop; PTHREADINFO W32Thread; NTSTATUS Status; @@ -1809,24 +1809,28 @@ MapHeap = (PsGetCurrentProcess() != PsInitialSystemProcess); W32Thread = PsGetCurrentThreadWin32Thread(); - /* Validate the new desktop. */ - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &DesktopObject); - - if (!NT_SUCCESS(Status)) + if(hDesktop != NULL) { - DPRINT("Validation of desktop handle (0x%X) failed\n", hDesktop); - return FALSE; - } - - if (W32Thread->rpdesk == DesktopObject) - { - /* Nothing to do */ - ObDereferenceObject(DesktopObject); - return TRUE; + /* Validate the new desktop. */ + Status = IntValidateDesktopHandle( + hDesktop, + UserMode, + 0, + &DesktopObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Validation of desktop handle (0x%X) failed\n", hDesktop); + return FALSE; + } + + if (W32Thread->rpdesk == DesktopObject) + { + /* Nothing to do */ + ObDereferenceObject(DesktopObject); + return TRUE; + } + } if (!IsListEmpty(&W32Thread->WindowListHead))

13 years, 7 months

[jimtabor] 51100: [User32_ApiTests] - Patch by Thomas Faber: Tests for new DeferWindowPos implementation. See bug 6025.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Mar 20 12:59:07 2011 New Revision: 51100 URL: http://svn.reactos.org/svn/reactos?rev=51100&view=rev Log: [User32_ApiTests] - Patch by Thomas Faber: Tests for new DeferWindowPos implementation. See bug 6025. Added: trunk/rostests/apitests/user32/DeferWindowPos.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rbuild Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Sun Mar 20 12:59:07 2011 @@ -9,6 +9,7 @@ GetSystemMetrics.c GetIconInfo.c GetPeekMessage.c + DeferWindowPos.c testlist.c user32_apitest.rc) Added: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c (added) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Sun Mar 20 12:59:07 2011 @@ -1,0 +1,170 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for DeferWindowPos function family + * PROGRAMMERS: Thomas Faber + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +#define ok_windowpos(hwnd, x, y, w, h, wnd) do { RECT rt; GetWindowRect(hwnd, &rt); \ + ok(rt.left == (x) && rt.top == (y) && rt.right == (x)+(w) && rt.bottom == (y)+(h), \ + "Unexpected %s position: (%ld, %ld) - (%ld, %ld)\n", wnd, rt.left, rt.top, rt.right, rt.bottom); } while (0) + +#define ok_lasterr(err, s) ok(GetLastError() == (err), "%s error = %lu\n", s, GetLastError()) + +static void Test_DeferWindowPos(HWND hWnd, HWND hWnd2) +{ + HDWP hDwp; + BOOL ret; + + /* close invalid handles */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + ret = EndDeferWindowPos(NULL); + ok(ret == 0, "EndDeferWindowPos succeeded with invalid handle\n"); + ok_lasterr(ERROR_INVALID_DWP_HANDLE, "EndDeferWindowPos"); + + SetLastError(DNS_ERROR_RCODE_NXRRSET); + ret = EndDeferWindowPos((HDWP)-1); + ok(ret == 0, "EndDeferWindowPos succeeded with invalid handle\n"); + ok_lasterr(ERROR_INVALID_DWP_HANDLE, "EndDeferWindowPos"); + + /* negative window count */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(-1); + ok(hDwp == NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(ERROR_INVALID_PARAMETER, "BeginDeferWindowPos"); + + /* zero windows */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(0); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "EndDeferWindowPos"); + + /* more windows than expected */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(0); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok(GetLastError() == ERROR_SUCCESS /* win7 sp1/x64 */ + || GetLastError() == ERROR_INVALID_WINDOW_HANDLE /* 2k3 sp1/x86 */, + "EndDeferWindowPos error = %lu\n", GetLastError()); + ok_windowpos(hWnd, 10, 20, 200, 210, "Window 1"); + + /* more windows than expected 2 */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(1); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 30, 20, 190, 195, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd2, NULL, 20, 30, 195, 190, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(ERROR_SUCCESS, "EndDeferWindowPos"); + ok_windowpos(hWnd, 30, 20, 190, 195, "Window 1"); + ok_windowpos(hWnd2, 20, 30, 195, 190, "Window 2"); + + /* fewer windows than expected */ + MoveWindow(hWnd, 10, 20, 200, 210, FALSE); + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(2); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 20, 10, 210, 200, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "EndDeferWindowPos"); + ok_windowpos(hWnd, 10, 20, 200, 210, "Window 1"); + + /* no operation, 1 window */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(1); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 20, 10, 210, 200, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "EndDeferWindowPos"); + ok_windowpos(hWnd, 10, 20, 200, 210, "Window 1"); + + /* same window twice */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(2); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 80, 90, 220, 210, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 100, 110, 230, 250, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(ERROR_SUCCESS, "EndDeferWindowPos"); + ok_windowpos(hWnd, 100, 110, 230, 250, "Window 1"); + + /* move & resize operation, 1 window */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(1); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 20, 10, 210, 200, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(ERROR_SUCCESS, "EndDeferWindowPos"); + ok_windowpos(hWnd, 20, 10, 210, 200, "Window 1"); + + /* move & resize operation, 2 windows */ + SetLastError(DNS_ERROR_RCODE_NXRRSET); + hDwp = BeginDeferWindowPos(2); + ok(hDwp != NULL, "BeginDeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "BeginDeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd, NULL, 50, 60, 230, 240, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + hDwp = DeferWindowPos(hDwp, hWnd2, NULL, 70, 80, 250, 260, SWP_NOZORDER); + ok(hDwp != NULL, "DeferWindowPos failed\n"); + ok_lasterr(DNS_ERROR_RCODE_NXRRSET, "DeferWindowPos"); + ret = EndDeferWindowPos(hDwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + ok_lasterr(ERROR_SUCCESS, "EndDeferWindowPos"); + ok_windowpos(hWnd, 50, 60, 230, 240, "Window 1"); + ok_windowpos(hWnd2, 70, 80, 250, 260, "Window 2"); +} + +START_TEST(DeferWindowPos) +{ + HWND hWnd = CreateWindowExW(0, L"EDIT", L"abc", 0, 10, 20, + 200, 210, NULL, NULL, GetModuleHandle(NULL), NULL); + HWND hWnd2 = CreateWindowExW(0, L"EDIT", L"def", 0, 30, 40, + 220, 230, NULL, NULL, GetModuleHandle(NULL), NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd2 != NULL, "CreateWindow failed\n"); + ok_windowpos(hWnd, 10, 20, 200, 210, "Window 1"); + ok_windowpos(hWnd2, 30, 40, 220, 230, "Window 2"); + + Test_DeferWindowPos(hWnd, hWnd2); + + DestroyWindow(hWnd2); + DestroyWindow(hWnd); +} Propchange: trunk/rostests/apitests/user32/DeferWindowPos.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sun Mar 20 12:59:07 2011 @@ -12,6 +12,7 @@ extern void func_GetSystemMetrics(void); extern void func_GetIconInfo(void); extern void func_GetPeekMessage(void); +extern void func_DeferWindowPos(void); const struct test winetest_testlist[] = { @@ -22,6 +23,7 @@ { "GetSystemMetrics", func_GetSystemMetrics }, { "GetIconInfo", func_GetIconInfo }, { "GetPeekMessage", func_GetPeekMessage }, + { "DeferWindowPos", func_DeferWindowPos }, { 0, 0 } }; Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Sun Mar 20 12:59:07 2011 @@ -17,6 +17,7 @@ <file>GetSystemMetrics.c</file> <file>GetIconInfo.c</file> <file>GetPeekMessage.c</file> + <file>DeferWindowPos.c</file> </module> </group>

13 years, 7 months

[jimtabor] 51099: - Fix a miss var for testing.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Mar 20 11:29:51 2011 New Revision: 51099 URL: http://svn.reactos.org/svn/reactos?rev=51099&view=rev Log: - Fix a miss var for testing. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sun Mar 20 11:29:51 2011 @@ -187,7 +187,7 @@ RtlZeroMemory(psmwp->acvr, count * sizeof(CVR)); psmwp->bHandle = TRUE; psmwp->ccvr = 0; // actualCount - psmwp->ccvrAlloc = Param; // suggestedCount + psmwp->ccvrAlloc = count; // suggestedCount RETURN((DWORD_PTR)hDwp); }

13 years, 7 months

[osiejka] 51098: [CACLS] - Danish translation by Wilhelm Wiens [RAPPS] - Polish translations of SumatraPDF entry by Adam Stachowicz [SETUP] - Polish translation of 'VBR only' in the reactos.exe

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Mar 20 11:25:34 2011 New Revision: 51098 URL: http://svn.reactos.org/svn/reactos?rev=51098&view=rev Log: [CACLS] - Danish translation by Wilhelm Wiens [RAPPS] - Polish translations of SumatraPDF entry by Adam Stachowicz [SETUP] - Polish translation of 'VBR only' in the reactos.exe Added: trunk/reactos/base/applications/cacls/lang/da-DA.rc (with props) Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/setup/reactos/lang/pl-PL.rc Added: trunk/reactos/base/applications/cacls/lang/da-DA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/da-DA.rc (added) +++ trunk/reactos/base/applications/cacls/lang/da-DA.rc [iso-8859-1] Sun Mar 20 11:25:34 2011 @@ -1,0 +1,79 @@ +/* + * German language file by Daniel Reimer <EmuandCo> 2006-06-15 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Ændringer fil-ACL'er (Access Control List) eller viser dem.\n\n\ +CACLS Filenavn [/T] [/E] [/C] [/G Bruger:Adgang] [/R Bruger [...]]\n\ + [/P Bruger:Adgang [...]] [/D Bruger [...]]\n\ + Filnavn Viser ACL'er for angivet filer.\n\ + /T Ændre ACL'er for angivene filer i mapper\n\ + og alle undermapper.\n\ + /E Bearbejde ACL i stedet for at erstatte.\n\ + /C Forandre ACL'er ved adgangfejl videre.\n\ + /G Bruger:Adgang Tillade angivene adgangsformer.\n\ + Adgang kan være: R læse\n\ + W skrive\n\ + C ændre (At skrive)\n\ + F Fuld adgang\n\ + /R Bruger Fjerne adgangsrette af brugeren (kun gyldig med /E).\n\ + /P Bruger:Adgang Erstatte adgangsretterne af brugeren.\n\ + Adgang kan være: N Ingen\n\ + R Læse\n\ + W Skrive\n\ + C ændre (Skrive)\n\ + F fuld adgang\n\ + /D Bruger Forbyde adgang for brugeren.\n\ +Mellemrum(Wildcards) bliver understøttet i filenavn.\n\ +Man kan angive flere bruger i en kommando.\n\n\ +Forkortninger:\n\ + CI - Container overtagelse.\n\ + ACE-Bidragen bliver overtaget fra mapperne.\n\ + OI - Objekt overtagelse.\n\ + ACE-Bidragen bliver overtaget fra filerne.\n\ + IO - Kun overtagelse.\n\ + ACE'ens egenskab passer ikke sammen med\n\ + de aktuelle filer/mapper.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(special access:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +END Propchange: trunk/reactos/base/applications/cacls/lang/da-DA.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cacls/lang/da-DA.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] Sun Mar 20 11:25:34 2011 @@ -4,6 +4,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" +#include "lang/da-DA.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] Sun Mar 20 11:25:34 2011 @@ -16,3 +16,6 @@ [Section.0410] Description = Sumatra PDF Ã¨ un visualizzatore di file PDF. E' molto leggero ed Ã¨ open source. + +[Section.0415] +Description = Sumatra PDF to maÅy, darmowy, otwarty czytnik PDF. Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Sun Mar 20 11:25:34 2011 @@ -4,6 +4,7 @@ * https://sourceforge.net/projects/reactospl * http://rogers.cyberdusk.pl/ * update - niski (bjauy(a)o2.pl) + * updated by Caemyr (Olaf Siejka), Mar 2011 */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -97,7 +98,8 @@ CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Wgraj bootloader na dysk twardy (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Wgraj bootloader na dysk twardy (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Wgraj bootloader na dysk twardy (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Anuluj", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE

13 years, 7 months

[pschweitzer] 51097: [MSI] Fix build according to Christoph recommandations

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 20 10:10:52 2011 New Revision: 51097 URL: http://svn.reactos.org/svn/reactos?rev=51097&view=rev Log: [MSI] Fix build according to Christoph recommandations Modified: trunk/reactos/dll/win32/msi/msi.rc Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=5… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] Sun Mar 20 10:10:52 2011 @@ -66,9 +66,6 @@ /* @makedep: msiserver.tlb */ 1 TYPELIB msiserver.tlb -/* @makedep: msiserver.rgs */ -1 WINE_REGISTRY msiserver.rgs - /* @makedep: instadvert.bmp */ 0x1001 BITMAP instadvert.bmp

13 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2011