Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[rharabien] 54060: [USER32_APITEST] Fix GetSystemMetrics test output which was interpret by testman as crash.

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Oct 9 09:41:49 2011 New Revision: 54060 URL: http://svn.reactos.org/svn/reactos?rev=54060&view=rev Log: [USER32_APITEST] Fix GetSystemMetrics test output which was interpret by testman as crash. Modified: trunk/rostests/apitests/user32/GetSystemMetrics.c Modified: trunk/rostests/apitests/user32/GetSystemMetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetSystem… ============================================================================== --- trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] Sun Oct 9 09:41:49 2011 @@ -21,22 +21,22 @@ hDC = GetDC(0); ret = GetSystemMetrics(0); - ok(ret > 0, "ret = %d", ret); + ok(ret > 0, "ret = %d\n", ret); ret = GetSystemMetrics(64); - ok(ret == 0, "ret = %d", ret); + ok(ret == 0, "ret = %d\n", ret); ret = GetSystemMetrics(65); - ok(ret == 0, "ret = %d", ret); + ok(ret == 0, "ret = %d\n", ret); ret = GetSystemMetrics(66); - ok(ret == 0, "ret = %d", ret); + ok(ret == 0, "ret = %d\n", ret); ret = GetSystemMetrics(SM_CXSCREEN); - ok(ret == GetDeviceCaps(hDC, HORZRES), "ret = %d", ret); + ok(ret == GetDeviceCaps(hDC, HORZRES), "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CYSCREEN); - ok(ret == GetDeviceCaps(hDC, VERTRES), "ret = %d", ret); + ok(ret == GetDeviceCaps(hDC, VERTRES), "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CXVSCROLL); @@ -53,12 +53,12 @@ ret = GetSystemMetrics(SM_CXBORDER); SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); - ok(ret == UintVal, "ret = %d", ret); + ok(ret == UintVal, "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CYBORDER); SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); - ok(ret == UintVal, "ret = %d", ret); + ok(ret == UintVal, "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CXDLGFRAME); @@ -99,11 +99,11 @@ SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); ret = GetSystemMetrics(SM_CXFULLSCREEN); - ok(ret == rect.right, "ret = %d", ret); + ok(ret == rect.right, "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CYFULLSCREEN); - ok(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION), "ret = %d", ret); + ok(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION), "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CYKANJIWINDOW); @@ -305,7 +305,7 @@ ret = GetSystemMetrics(SM_SHOWSOUNDS); SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); - ok(ret == BoolVal, "ret = %d", ret); + ok(ret == BoolVal, "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CXMENUCHECK); @@ -366,12 +366,12 @@ #if(_WIN32_WINNT >= 0x0501) ret = GetSystemMetrics(SM_CXFOCUSBORDER); SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); - ok(ret == UintVal, "ret = %d", ret); + ok(ret == UintVal, "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_CYFOCUSBORDER); SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); - ok(ret == UintVal, "ret = %d", ret); + ok(ret == UintVal, "ret = %d\n", ret); ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); ret = GetSystemMetrics(SM_TABLETPC);

12 years, 11 months

[ekohl] 54059: [SETUPAPI] - SetupDiCreateDeviceInfoW: return the proper error code. Fixes a winetest. - Implements parts of SetupDiRegisterDeviceInfo.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 9 00:39:30 2011 New Revision: 54059 URL: http://svn.reactos.org/svn/reactos?rev=54059&view=rev Log: [SETUPAPI] - SetupDiCreateDeviceInfoW: return the proper error code. Fixes a winetest. - Implements parts of SetupDiRegisterDeviceInfo. Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Oct 9 00:39:30 2011 @@ -113,6 +113,7 @@ case CR_NO_SUCH_VALUE: return ERROR_FILE_NOT_FOUND; case CR_OUT_OF_MEMORY: return ERROR_NOT_ENOUGH_MEMORY; case CR_REGISTRY_ERROR: return ERROR_GEN_FAILURE; + case CR_ALREADY_SUCH_DEVINST: return ERROR_DEVINST_ALREADY_EXISTS; case CR_SUCCESS: return ERROR_SUCCESS; default: return ERROR_GEN_FAILURE; } @@ -1783,7 +1784,7 @@ set->hMachine); if (cr != CR_SUCCESS) { - SetLastError(ERROR_INVALID_DATA); + SetLastError(GetErrorCodeFromCrCode(cr)); return FALSE; } @@ -1837,6 +1838,10 @@ PSP_DEVINFO_DATA DupDeviceInfoData) { struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + WCHAR DevInstId[MAX_DEVICE_ID_LEN]; + DEVINST ParentDevInst; + CONFIGRET cr; + DWORD dwError = ERROR_SUCCESS; TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, CompareProc, CompareContext, DupDeviceInfoData); @@ -1857,10 +1862,43 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - FIXME("Stub %p %p 0x%lx %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, - CompareProc, CompareContext, DupDeviceInfoData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (Flags & ~SPRDI_FIND_DUPS) + { + TRACE("Unknown flags: 0x%08lx\n", Flags & ~SPRDI_FIND_DUPS); + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + if (Flags & SPRDI_FIND_DUPS) + { + FIXME("Unimplemented codepath!\n"); + } + + CM_Get_Device_ID_Ex(DeviceInfoData->DevInst, + DevInstId, + MAX_DEVICE_ID_LEN, + 0, + set->hMachine); + + CM_Get_Parent_Ex(&ParentDevInst, + DeviceInfoData->DevInst, + 0, + set->hMachine); + + cr = CM_Create_DevInst_Ex(&DeviceInfoData->DevInst, + DevInstId, + ParentDevInst, + CM_CREATE_DEVINST_NORMAL | CM_CREATE_DEVINST_DO_NOT_INSTALL, + set->hMachine); + if (cr != CR_SUCCESS) + { + dwError = ERROR_NO_SUCH_DEVINST; + } + + SetLastError(dwError); + + return (dwError == ERROR_SUCCESS); } /***********************************************************************

12 years, 11 months

[rharabien] 54058: [WIN32K] - Rename gKeyStateTable to gafAsyncKeyState: it's a proper name - Fix accelerators regression

by rharabien＠svn.reactos.org

Author: rharabien Date: Sat Oct 8 23:33:26 2011 New Revision: 54058 URL: http://svn.reactos.org/svn/reactos?rev=54058&view=rev Log: [WIN32K] - Rename gKeyStateTable to gafAsyncKeyState: it's a proper name - Fix accelerators regression Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Sat Oct 8 23:33:26 2011 @@ -56,4 +56,4 @@ extern HANDLE ghKeyboardDevice; extern PTHREADINFO ptiRawInput; -extern BYTE gKeyStateTable[0x100]; +extern BYTE gafAsyncKeyState[0x100]; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Sat Oct 8 23:33:26 2011 @@ -110,7 +110,7 @@ &MenuItem, NULL); if (nPos != (UINT)-1) - hSubMenu = MenuItem->hSubMenu; + hSubMenu = SubMenu->head.h; else hMenu = NULL; } @@ -129,7 +129,7 @@ &MenuItem, NULL); if (nPos != (UINT)-1) - hSubMenu = MenuItem->hSubMenu; + hSubMenu = SubMenu->head.h; else hMenu = NULL; } @@ -138,7 +138,7 @@ /* If this is a menu item, there is no capturing enabled and window is not disabled, send WM_INITMENU */ if (hMenu && !IntGetCaptureWindow()) - { + { co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); if (hSubMenu) { @@ -154,7 +154,7 @@ - this is window menu and window is minimized */ if (!(Window->style & WS_DISABLED) && !(hMenu && IntGetMenuState(hMenu, pAccel->cmd, MF_BYCOMMAND) & (MF_DISABLED|MF_GRAYED)) && - !(hMenu && hMenu == (HMENU)Window->IDMenu && !(Window->style & WS_MINIMIZED))) + !(hMenu && hMenu == (HMENU)Window->IDMenu && (Window->style & WS_MINIMIZED))) { /* If this is system menu item, send WM_SYSCOMMAND, otherwise send WM_COMMAND */ if (hMenu && hMenu == Window->SystemMenu) @@ -426,8 +426,7 @@ { if (co_IntTranslateAccelerator(Window, &Message, &Accel->Table[i])) { - TRACE("NtUserTranslateAccelerator returns 1\n"); - RETURN( 1); + RETURN( 1); } /* Undocumented feature... */ @@ -441,7 +440,7 @@ if (Window) UserDerefObjectCo(Window); if (Accel) UserDerefObjectCo(Accel); - TRACE("NtUserTranslateAccelerator returns 0\n"); + TRACE("NtUserTranslateAccelerator returns %d\n", _ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 8 23:33:26 2011 @@ -10,7 +10,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserInput); -extern BYTE gKeyStateTable[]; extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread); extern PPROCESSINFO ppiScrnSaver; @@ -684,12 +683,12 @@ Msg.lParam = MAKELPARAM(MousePos.x, MousePos.y); Msg.pt = MousePos; - if (gKeyStateTable[VK_SHIFT] & KS_DOWN_BIT) + if (gafAsyncKeyState[VK_SHIFT] & KS_DOWN_BIT) { Msg.wParam |= MK_SHIFT; } - if (gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT) + if (gafAsyncKeyState[VK_CONTROL] & KS_DOWN_BIT) { Msg.wParam |= MK_CONTROL; } @@ -700,7 +699,7 @@ } if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { - gKeyStateTable[VK_LBUTTON] |= KS_DOWN_BIT; + gafAsyncKeyState[VK_LBUTTON] |= KS_DOWN_BIT; Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -708,7 +707,7 @@ } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { - gKeyStateTable[VK_LBUTTON] &= ~KS_DOWN_BIT; + gafAsyncKeyState[VK_LBUTTON] &= ~KS_DOWN_BIT; Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -716,7 +715,7 @@ } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { - gKeyStateTable[VK_MBUTTON] |= KS_DOWN_BIT; + gafAsyncKeyState[VK_MBUTTON] |= KS_DOWN_BIT; Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; @@ -724,7 +723,7 @@ } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { - gKeyStateTable[VK_MBUTTON] &= ~KS_DOWN_BIT; + gafAsyncKeyState[VK_MBUTTON] &= ~KS_DOWN_BIT; Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; @@ -732,7 +731,7 @@ } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { - gKeyStateTable[VK_RBUTTON] |= KS_DOWN_BIT; + gafAsyncKeyState[VK_RBUTTON] |= KS_DOWN_BIT; Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -740,7 +739,7 @@ } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { - gKeyStateTable[VK_RBUTTON] &= ~KS_DOWN_BIT; + gafAsyncKeyState[VK_RBUTTON] &= ~KS_DOWN_BIT; Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -759,14 +758,14 @@ Msg.message = WM_XBUTTONDOWN; if(mi->mouseData & XBUTTON1) { - gKeyStateTable[VK_XBUTTON1] |= KS_DOWN_BIT; + gafAsyncKeyState[VK_XBUTTON1] |= KS_DOWN_BIT; CurInfo->ButtonsDown |= MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->mouseData & XBUTTON2) { - gKeyStateTable[VK_XBUTTON2] |= KS_DOWN_BIT; + gafAsyncKeyState[VK_XBUTTON2] |= KS_DOWN_BIT; CurInfo->ButtonsDown |= MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); @@ -777,14 +776,14 @@ Msg.message = WM_XBUTTONUP; if(mi->mouseData & XBUTTON1) { - gKeyStateTable[VK_XBUTTON1] &= ~KS_DOWN_BIT; + gafAsyncKeyState[VK_XBUTTON1] &= ~KS_DOWN_BIT; CurInfo->ButtonsDown &= ~MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->mouseData & XBUTTON2) { - gKeyStateTable[VK_XBUTTON2] &= ~KS_DOWN_BIT; + gafAsyncKeyState[VK_XBUTTON2] &= ~KS_DOWN_BIT; CurInfo->ButtonsDown &= ~MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sat Oct 8 23:33:26 2011 @@ -10,7 +10,7 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserKbd); -BYTE gKeyStateTable[0x100]; +BYTE gafAsyncKeyState[0x100]; static PKEYBOARD_INDICATOR_TRANSLATION gpKeyboardIndicatorTrans = NULL; /* FUNCTIONS *****************************************************************/ @@ -25,7 +25,7 @@ NTAPI InitKeyboardImpl(VOID) { - RtlZeroMemory(&gKeyStateTable, sizeof(gKeyStateTable)); + RtlZeroMemory(&gafAsyncKeyState, sizeof(gafAsyncKeyState)); return STATUS_SUCCESS; } @@ -636,9 +636,9 @@ if (dwKey < 0x100) { - if (gKeyStateTable[dwKey] & KS_DOWN_BIT) + if (gafAsyncKeyState[dwKey] & KS_DOWN_BIT) dwRet |= 0xFFFF8000; // If down, windows returns 0xFFFF8000. - if (gKeyStateTable[dwKey] & KS_LOCK_BIT) + if (gafAsyncKeyState[dwKey] & KS_LOCK_BIT) dwRet |= 0x1; } else @@ -783,20 +783,20 @@ /* Get virtual key without shifts (VK_(L|R)* -> VK_*) */ wSimpleVk = IntSimplifyVk(wVk); wVkOtherSide = IntGetVkOtherSide(wVk); - PrevKeyState = gKeyStateTable[wSimpleVk]; + PrevKeyState = gafAsyncKeyState[wSimpleVk]; /* Update global keyboard state. Begin from lock bit */ if (!bKeyUp && !(PrevKeyState & KS_DOWN_BIT)) - gKeyStateTable[wVk] ^= KS_LOCK_BIT; + gafAsyncKeyState[wVk] ^= KS_LOCK_BIT; /* Update down bit */ if (bKeyUp) - gKeyStateTable[wVk] &= ~KS_DOWN_BIT; + gafAsyncKeyState[wVk] &= ~KS_DOWN_BIT; else - gKeyStateTable[wVk] |= KS_DOWN_BIT; + gafAsyncKeyState[wVk] |= KS_DOWN_BIT; /* Update key without shifts */ - gKeyStateTable[wSimpleVk] = gKeyStateTable[wVk] | gKeyStateTable[wVkOtherSide]; + gafAsyncKeyState[wSimpleVk] = gafAsyncKeyState[wVk] | gafAsyncKeyState[wVkOtherSide]; if (!bKeyUp) { @@ -806,7 +806,7 @@ if (gpKeyboardIndicatorTrans) IntKeyboardUpdateLeds(ghKeyboardDevice, wScanCode, - gKeyStateTable[wSimpleVk] & KS_LOCK_BIT, + gafAsyncKeyState[wSimpleVk] & KS_LOCK_BIT, gpKeyboardIndicatorTrans); } @@ -818,12 +818,12 @@ { if (wVk == VK_LWIN || wVk == VK_RWIN) IntKeyboardSendWinKeyMsg(); - else if(wSimpleVk == VK_MENU && !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT)) + else if(wSimpleVk == VK_MENU && !(gafAsyncKeyState[VK_CONTROL] & KS_DOWN_BIT)) co_IntKeyboardSendAltKeyMsg(); } /* Check if it is a hotkey */ - fModifiers = IntGetModifiers(gKeyStateTable); + fModifiers = IntGetModifiers(gafAsyncKeyState); if (GetHotKey(fModifiers, wSimpleVk, &Thread, &hWnd, &HotkeyId)) { if (!bKeyUp) @@ -848,8 +848,8 @@ wSysKey = (pKbdTbl->fLocaleFlags & KLLF_ALTGR) ? VK_LMENU : VK_MENU; if (wVk == VK_F10 || //uVkNoShift == VK_MENU || // FIXME: If only LALT is pressed WM_SYSKEYUP is generated instead of WM_KEYUP - ((gKeyStateTable[wSysKey] & KS_DOWN_BIT) && // FIXME - !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT))) + ((gafAsyncKeyState[wSysKey] & KS_DOWN_BIT) && // FIXME + !(gafAsyncKeyState[VK_CONTROL] & KS_DOWN_BIT))) { if (bKeyUp) Msg.message = WM_SYSKEYUP; @@ -870,7 +870,7 @@ { if (bExt) Msg.lParam |= LP_EXT_BIT; - if (gKeyStateTable[VK_MENU] & KS_DOWN_BIT) + if (gafAsyncKeyState[VK_MENU] & KS_DOWN_BIT) Msg.lParam |= LP_CONTEXT_BIT; if (PrevKeyState & KS_DOWN_BIT) Msg.lParam |= LP_PREV_STATE_BIT; @@ -947,7 +947,7 @@ KEYBDINPUT KbdInput; /* Support numlock */ - if ((wVk & KBDNUMPAD) && (gKeyStateTable[VK_NUMLOCK] & KS_LOCK_BIT)) + if ((wVk & KBDNUMPAD) && (gafAsyncKeyState[VK_NUMLOCK] & KS_LOCK_BIT)) { wVk = IntTranslateNumpadKey(wVk & 0xFF); } @@ -1451,19 +1451,19 @@ if (gpsi->aiSysMet[SM_SWAPBUTTON]) { - if (gKeyStateTable[VK_RBUTTON] & KS_DOWN_BIT) ret |= MK_LBUTTON; - if (gKeyStateTable[VK_LBUTTON] & KS_DOWN_BIT) ret |= MK_RBUTTON; + if (gafAsyncKeyState[VK_RBUTTON] & KS_DOWN_BIT) ret |= MK_LBUTTON; + if (gafAsyncKeyState[VK_LBUTTON] & KS_DOWN_BIT) ret |= MK_RBUTTON; } else { - if (gKeyStateTable[VK_LBUTTON] & KS_DOWN_BIT) ret |= MK_LBUTTON; - if (gKeyStateTable[VK_RBUTTON] & KS_DOWN_BIT) ret |= MK_RBUTTON; - } - if (gKeyStateTable[VK_MBUTTON] & KS_DOWN_BIT) ret |= MK_MBUTTON; - if (gKeyStateTable[VK_SHIFT] & KS_DOWN_BIT) ret |= MK_SHIFT; - if (gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT) ret |= MK_CONTROL; - if (gKeyStateTable[VK_XBUTTON1] & KS_DOWN_BIT) ret |= MK_XBUTTON1; - if (gKeyStateTable[VK_XBUTTON2] & KS_DOWN_BIT) ret |= MK_XBUTTON2; + if (gafAsyncKeyState[VK_LBUTTON] & KS_DOWN_BIT) ret |= MK_LBUTTON; + if (gafAsyncKeyState[VK_RBUTTON] & KS_DOWN_BIT) ret |= MK_RBUTTON; + } + if (gafAsyncKeyState[VK_MBUTTON] & KS_DOWN_BIT) ret |= MK_MBUTTON; + if (gafAsyncKeyState[VK_SHIFT] & KS_DOWN_BIT) ret |= MK_SHIFT; + if (gafAsyncKeyState[VK_CONTROL] & KS_DOWN_BIT) ret |= MK_CONTROL; + if (gafAsyncKeyState[VK_XBUTTON1] & KS_DOWN_BIT) ret |= MK_XBUTTON1; + if (gafAsyncKeyState[VK_XBUTTON2] & KS_DOWN_BIT) ret |= MK_XBUTTON2; return ret; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Oct 8 23:33:26 2011 @@ -1930,7 +1930,7 @@ MessageQueue->NewMessagesHandle = NULL; MessageQueue->ShowingCursor = 0; MessageQueue->CursorObject = NULL; - RtlCopyMemory(MessageQueue->KeyState, gKeyStateTable, sizeof(gKeyStateTable)); + RtlCopyMemory(MessageQueue->KeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); Status = ZwCreateEvent(&MessageQueue->NewMessagesHandle, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE);

12 years, 11 months

[fireball] 54057: [LDR] - Implement proper security cookie initialization code (same algorithm as in sdk/crt, however using as much data directly available as possible). - Don't initialize security...

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 8 22:33:56 2011 New Revision: 54057 URL: http://svn.reactos.org/svn/reactos?rev=54057&view=rev Log: [LDR] - Implement proper security cookie initialization code (same algorithm as in sdk/crt, however using as much data directly available as possible). - Don't initialize security cookie as a 32bit value when 16bit security cookie was requested. This fixes msi-related crashes (or any other executables which has 16bit security cookie set). See issue #6341 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Oct 8 22:33:56 2011 @@ -440,7 +440,7 @@ { PULONG_PTR Cookie; LARGE_INTEGER Counter; - //ULONG NewCookie; + ULONG NewCookie; /* Fetch address of the cookie */ Cookie = LdrpFetchAddressOfSecurityCookie(LdrEntry->DllBase, LdrEntry->SizeOfImage); @@ -448,40 +448,39 @@ if (Cookie) { /* Check if it's a default one */ - if (*Cookie == DEFAULT_SECURITY_COOKIE || - *Cookie == 0xBB40) - { - /* We need to initialize it */ - + if ((*Cookie == DEFAULT_SECURITY_COOKIE) || + (*Cookie == 0xBB40)) + { + /* Make up a cookie from a bunch of values which may uniquely represent + current moment of time, environment, etc */ NtQueryPerformanceCounter(&Counter, NULL); -#if 0 - GetSystemTimeAsFileTime (&systime.ft_struct); -#ifdef _WIN64 - cookie = systime.ft_scalar; -#else - cookie = systime.ft_struct.dwLowDateTime; - cookie ^= systime.ft_struct.dwHighDateTime; -#endif - - cookie ^= GetCurrentProcessId (); - cookie ^= GetCurrentThreadId (); - cookie ^= GetTickCount (); - - QueryPerformanceCounter (&perfctr); -#ifdef _WIN64 - cookie ^= perfctr.QuadPart; -#else - cookie ^= perfctr.LowPart; - cookie ^= perfctr.HighPart; -#endif - -#ifdef _WIN64 - cookie &= 0x0000ffffffffffffll; -#endif -#endif - *Cookie = Counter.LowPart; - - //Cookie = NULL; + + NewCookie = Counter.LowPart ^ Counter.HighPart; + NewCookie ^= (ULONG)NtCurrentTeb()->ClientId.UniqueProcess; + NewCookie ^= (ULONG)NtCurrentTeb()->ClientId.UniqueThread; + + /* Loop like it's done in KeQueryTickCount(). We don't want to call it directly. */ + while (SharedUserData->SystemTime.High1Time != SharedUserData->SystemTime.High2Time) + { + YieldProcessor(); + }; + + /* Calculate the milliseconds value and xor it to the cookie */ + NewCookie ^= Int64ShrlMod32(UInt32x32To64(SharedUserData->TickCountMultiplier, SharedUserData->TickCount.LowPart), 24) + + (SharedUserData->TickCountMultiplier * (SharedUserData->TickCount.High1Time << 8)); + + /* Make the cookie 16bit if necessary */ + if (*Cookie == 0xBB40) NewCookie &= 0xFFFF; + + /* If the result is 0 or the same as we got, just subtract one from the existing value + and that's it */ + if ((NewCookie == 0) || (NewCookie == *Cookie)) + { + NewCookie = *Cookie - 1; + } + + /* Set the new cookie value */ + *Cookie = NewCookie; } }

12 years, 11 months

[akhaldi] 54056: [SHELL32] * Sync brsfolder.cpp with Wine. * Reduce the scope of some variables.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 8 17:33:21 2011 New Revision: 54056 URL: http://svn.reactos.org/svn/reactos?rev=54056&view=rev Log: [SHELL32] * Sync brsfolder.cpp with Wine. * Reduce the scope of some variables. Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp trunk/reactos/dll/win32/shell32/enumidlist.cpp trunk/reactos/dll/win32/shell32/extracticon.cpp Modified: trunk/reactos/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/brsfolder.cpp [iso-8859-1] Sat Oct 8 17:33:21 2011 @@ -28,12 +28,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/* original margins and control size */ +typedef struct tagLAYOUT_DATA +{ + LONG left, width, right; + LONG top, height, bottom; +} LAYOUT_DATA; + typedef struct tagbrowse_info { HWND hWnd; HWND hwndTreeView; LPBROWSEINFOW lpBrowseInfo; LPITEMIDLIST pidlRet; + LAYOUT_DATA *layout; /* filled by LayoutInit, used by LayoutUpdate */ + SIZE szMin; } browse_info; typedef struct tagTV_ITEMDATA @@ -43,6 +52,27 @@ LPITEMIDLIST lpifq; /* Fully qualified PIDL */ IEnumIDList* pEnumIL; /* Children iterator */ } TV_ITEMDATA, *LPTV_ITEMDATA; + +typedef struct tagLAYOUT_INFO +{ + int iItemId; /* control id */ + DWORD dwAnchor; /* BF_* flags specifying which margins should remain constant */ +} LAYOUT_INFO; + +static const LAYOUT_INFO g_layout_info[] = +{ + {IDD_TITLE, BF_TOP|BF_LEFT|BF_RIGHT}, + {IDD_STATUS, BF_TOP|BF_LEFT|BF_RIGHT}, + {IDD_FOLDER, BF_TOP|BF_LEFT|BF_RIGHT}, + {IDD_TREEVIEW, BF_TOP|BF_BOTTOM|BF_LEFT|BF_RIGHT}, + {IDD_FOLDER, BF_BOTTOM|BF_LEFT}, + {IDD_FOLDERTEXT, BF_BOTTOM|BF_LEFT|BF_RIGHT}, + {IDD_MAKENEWFOLDER, BF_BOTTOM|BF_LEFT}, + {IDOK, BF_BOTTOM|BF_RIGHT}, + {IDCANCEL, BF_BOTTOM|BF_RIGHT} +}; + +#define LAYOUT_INFO_COUNT (sizeof(g_layout_info)/sizeof(g_layout_info[0])) #define SUPPORTEDFLAGS (BIF_STATUSTEXT | \ BIF_BROWSEFORCOMPUTER | \ @@ -75,6 +105,68 @@ return; lpBrowseInfo->lpfn( hWnd, msg, param, lpBrowseInfo->lParam ); } + +static LAYOUT_DATA *LayoutInit(HWND hwnd, const LAYOUT_INFO *layout_info, int layout_count) +{ + LAYOUT_DATA *data; + RECT rcWnd; + int i; + + GetClientRect(hwnd, &rcWnd); + data = (LAYOUT_DATA *)SHAlloc(sizeof(LAYOUT_DATA)*layout_count); + for (i = 0; i < layout_count; i++) + { + RECT r; + HWND hItem = GetDlgItem(hwnd, layout_info[i].iItemId); + + if (hItem == NULL) + ERR("Item %d not found\n", i); + GetWindowRect(hItem, &r); + MapWindowPoints(HWND_DESKTOP, hwnd, (LPPOINT)&r, 2); + + data[i].left = r.left; + data[i].right = rcWnd.right - r.right; + data[i].width = r.right - r.left; + + data[i].top = r.top; + data[i].bottom = rcWnd.bottom - r.bottom; + data[i].height = r.bottom - r.top; + } + return data; +} + +static void LayoutUpdate(HWND hwnd, LAYOUT_DATA *data, const LAYOUT_INFO *layout_info, int layout_count) +{ + RECT rcWnd; + int i; + + GetClientRect(hwnd, &rcWnd); + for (i = 0; i < layout_count; i++) + { + RECT r; + HWND hItem = GetDlgItem(hwnd, layout_info[i].iItemId); + + GetWindowRect(hItem, &r); + MapWindowPoints(HWND_DESKTOP, hwnd, (LPPOINT)&r, 2); + + if (layout_info[i].dwAnchor & BF_RIGHT) + { + r.right = rcWnd.right - data[i].right; + if (!(layout_info[i].dwAnchor & BF_LEFT)) + r.left = r.right - data[i].width; + } + + if (layout_info[i].dwAnchor & BF_BOTTOM) + { + r.bottom = rcWnd.bottom - data[i].bottom; + if (!(layout_info[i].dwAnchor & BF_TOP)) + r.top = r.bottom - data[i].height; + } + + SetWindowPos(hItem, NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER); + } +} + /****************************************************************************** * InitializeTreeView [Internal] @@ -124,16 +216,20 @@ } else { IShellFolder *lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); + ILFree(pidlChild); + ILFree(pidlParent); return; } hr = lpsfDesktop->BindToObject(pidlParent, 0, IID_IShellFolder, (LPVOID *)&lpsfParent); lpsfDesktop->Release(); } - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { WARN("Could not bind to parent shell folder! hr = %08x\n", hr); + ILFree(pidlChild); + ILFree(pidlParent); return; } @@ -144,18 +240,22 @@ hr = lpsfParent->AddRef(); } - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { WARN("Could not bind to root shell folder! hr = %08x\n", hr); lpsfParent->Release(); + ILFree(pidlChild); + ILFree(pidlParent); return; } flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); hr = lpsfRoot->EnumObjects(info->hWnd, flags, &pEnumChildren ); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { WARN("Could not get child iterator! hr = %08x\n", hr); lpsfParent->Release(); lpsfRoot->Release(); + ILFree(pidlChild); + ILFree(pidlParent); return; } @@ -164,6 +264,8 @@ pidlParent, pEnumChildren, TVI_ROOT ); SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); + ILFree(pidlChild); + ILFree(pidlParent); lpsfRoot->Release(); lpsfParent->Release(); } @@ -279,7 +381,7 @@ tvins.hInsertAfter = NULL; tvins.hParent = hParent; - return (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_INSERTITEM, 0, (LPARAM)&tvins ); + return TreeView_InsertItem( info->hwndTreeView, &tvins ); } /****************************************************************************** @@ -312,7 +414,7 @@ SetCapture( hwnd ); SetCursor( LoadCursorA( 0, (LPSTR)IDC_WAIT ) ); - while (NOERROR == lpe->Next(1,&pidlTemp,&ulFetched)) + while (S_OK == lpe->Next(1,&pidlTemp,&ulFetched)) { ULONG ulAttrs = SFGAO_HASSUBFOLDER | SFGAO_FOLDER; IEnumIDList* pEnumIL = NULL; @@ -377,18 +479,22 @@ if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) bEnabled = FALSE; } - if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) - { - dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; - r = lptvid->lpsfParent->GetAttributesOf(1, - (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || - ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) - { + + dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; + r = lptvid->lpsfParent->GetAttributesOf(1, + (LPCITEMIDLIST*)&lptvid->lpi, + &dwAttributes); + if (FAILED(r) || + ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) + { + if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) bEnabled = FALSE; - } - } - SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, (LPARAM)bEnabled); + EnableWindow(GetDlgItem(info->hWnd, IDD_MAKENEWFOLDER), FALSE); + } + else + EnableWindow(GetDlgItem(info->hWnd, IDD_MAKENEWFOLDER), TRUE); + + SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, bEnabled); } static LRESULT BrsFolder_Treeview_Delete( browse_info *info, NMTREEVIEWW *pnmtv ) @@ -426,7 +532,10 @@ } if (SUCCEEDED(r)) + { FillTreeView( info, lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); + lpsf2->Release(); + } /* My Computer is already sorted and trying to do a simple text * sort will only mess things up */ @@ -440,15 +549,60 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv ) { LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; - - lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; - info->pidlRet = lptvid->lpifq; + WCHAR name[MAX_PATH]; + + ILFree(info->pidlRet); + info->pidlRet = ILClone(lptvid->lpifq); + + if (GetName(lptvid->lpsfParent, lptvid->lpi, SHGDN_NORMAL, name)) + SetWindowTextW( GetDlgItem(info->hWnd, IDD_FOLDERTEXT), name ); + browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid ); return 0; } +static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) +{ + LPTV_ITEMDATA item_data; + WCHAR old_path[MAX_PATH], new_path[MAX_PATH], *p; + NMTREEVIEWW nmtv; + TVITEMW item; + + if(!pnmtv->item.pszText) + return 0; + + item.mask = TVIF_HANDLE|TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (LPTV_ITEMDATA)item.lParam; + + SHGetPathFromIDListW(item_data->lpifq, old_path); + if(!(p = strrchrW(old_path, '\\'))) + return 0; + p = new_path+(p-old_path+1); + memcpy(new_path, old_path, (p-new_path)*sizeof(WCHAR)); + strcpyW(p, pnmtv->item.pszText); + + if(!MoveFileW(old_path, new_path)) + return 0; + + SHFree(item_data->lpifq); + SHFree(item_data->lpi); + item_data->lpifq = SHSimpleIDListFromPathW(new_path); + item_data->lpsfParent->ParseDisplayName(NULL, NULL, pnmtv->item.pszText, + NULL, &item_data->lpi, NULL); + + item.mask = TVIF_HANDLE|TVIF_TEXT; + item.pszText = pnmtv->item.pszText; + SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); + + nmtv.itemNew.lParam = item.lParam; + BrsFolder_Treeview_Changed(info, &nmtv); + return 0; +} + static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh ) { NMTREEVIEWW *pnmtv = (NMTREEVIEWW *)lpnmh; @@ -471,6 +625,10 @@ case TVN_SELCHANGEDA: case TVN_SELCHANGEDW: return BrsFolder_Treeview_Changed( info, pnmtv ); + + case TVN_ENDLABELEDITA: + case TVN_ENDLABELEDITW: + return BrsFolder_Treeview_Rename( info, (LPNMTVDISPINFOW)pnmtv ); default: WARN("unhandled (%d)\n", pnmtv->hdr.code); @@ -493,14 +651,30 @@ if (lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS) FIXME("flags %x not implemented\n", lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS); + if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) + { + RECT rcWnd; + + info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT); + + /* TODO: Windows allows shrinking the windows a bit */ + GetWindowRect(hWnd, &rcWnd); + info->szMin.cx = rcWnd.right - rcWnd.left; + info->szMin.cy = rcWnd.bottom - rcWnd.top; + } + else + { + info->layout = NULL; + } + if (lpBrowseInfo->lpszTitle) - SetWindowTextW( GetDlgItem(hWnd, IDD_TITLE), lpBrowseInfo->lpszTitle ); + SetWindowTextW( GetDlgItem(hWnd, IDD_TITLE), lpBrowseInfo->lpszTitle ); else - ShowWindow( GetDlgItem(hWnd, IDD_TITLE), SW_HIDE ); + ShowWindow( GetDlgItem(hWnd, IDD_TITLE), SW_HIDE ); if (!(lpBrowseInfo->ulFlags & BIF_STATUSTEXT) || (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) - ShowWindow( GetDlgItem(hWnd, IDD_STATUS), SW_HIDE ); + ShowWindow( GetDlgItem(hWnd, IDD_STATUS), SW_HIDE ); /* Hide "Make New Folder" Button? */ if ((lpBrowseInfo->ulFlags & BIF_NONEWFOLDERBUTTON) @@ -535,6 +709,104 @@ browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); return TRUE; +} + +static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) +{ + SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)rename); + SendMessageW(info->hwndTreeView, TVM_EDITLABELW, 0, (LPARAM)rename); + return S_OK; +} + +static HRESULT BrsFolder_NewFolder(browse_info *info) +{ + DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); + IShellFolder *desktop, *cur; + ISFHelper *sfhelper; + WCHAR name[MAX_PATH]; + HTREEITEM parent, added; + LPTV_ITEMDATA item_data; + LPITEMIDLIST new_item; + TVITEMW item; + HRESULT hr; + int len; + + if(!info->pidlRet) { + ERR("Make new folder button should be disabled\n"); + return E_FAIL; + } + + /* Create new directory */ + hr = SHGetDesktopFolder(&desktop); + if(FAILED(hr)) + return hr; + hr = desktop->BindToObject(info->pidlRet, 0, IID_IShellFolder, (LPVOID *)&cur); + desktop->Release(); + if(FAILED(hr)) + return hr; + + hr = cur->QueryInterface(IID_ISFHelper, (LPVOID *)&sfhelper); + if(FAILED(hr)) + return hr; + + hr = SHGetPathFromIDListW(info->pidlRet, name); + if(FAILED(hr)) + goto cleanup; + + len = strlenW(name); + if(len<MAX_PATH) + name[len++] = '\\'; + hr = sfhelper->GetUniqueName(&name[len], MAX_PATH-len); + sfhelper->Release(); + if(FAILED(hr)) + goto cleanup; + + hr = E_FAIL; + if(!CreateDirectoryW(name, NULL)) + goto cleanup; + + /* Update parent of newly created directory */ + parent = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + if(!parent) + goto cleanup; + + SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)parent); + + memset(&item, 0, sizeof(TVITEMW)); + item.mask = TVIF_PARAM|TVIF_STATE; + item.hItem = parent; + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (LPTV_ITEMDATA)item.lParam; + if(!item_data) + goto cleanup; + + if(item_data->pEnumIL) + item_data->pEnumIL->Release(); + hr = cur->EnumObjects(info->hwndTreeView, flags, &item_data->pEnumIL); + if(FAILED(hr)) + goto cleanup; + + /* Update treeview */ + if(!(item.state&TVIS_EXPANDEDONCE)) { + item.mask = TVIF_STATE; + item.state = TVIS_EXPANDEDONCE; + item.stateMask = TVIS_EXPANDEDONCE; + SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); + } + + hr = cur->ParseDisplayName(NULL, NULL, name+len, NULL, &new_item, NULL); + if(FAILED(hr)) + goto cleanup; + + added = InsertTreeViewItem(info, cur, new_item, item_data->lpifq, NULL, parent); + cur->Release(); + SHFree(new_item); + + SendMessageW(info->hwndTreeView, TVM_SORTCHILDREN, FALSE, (LPARAM)parent); + return BrsFolder_Rename(info, added); + +cleanup: + return hr; } static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) @@ -559,7 +831,7 @@ return TRUE; case IDD_MAKENEWFOLDER: - FIXME("make new folder not implemented\n"); + BrsFolder_NewFolder(info); return TRUE; } return FALSE; @@ -573,7 +845,9 @@ TVITEMEXW item; BOOL bResult = FALSE; - /* If 'selection' is a string, convert to a Shell ID List. */ + memset(&item, 0, sizeof(item)); + + /* If 'selection' is a string, convert to a Shell ID List. */ if (is_str) { IShellFolder *psfDesktop; HRESULT hr; @@ -582,8 +856,8 @@ if (FAILED(hr)) goto done; - hr = psfDesktop->ParseDisplayName(NULL, NULL, - (LPOLESTR)selection, NULL, &pidlSelection, NULL); + hr = psfDesktop->ParseDisplayName(NULL, NULL, (LPOLESTR)selection, + NULL, &pidlSelection, NULL); psfDesktop->Release(); if (FAILED(hr)) goto done; @@ -603,11 +877,12 @@ goto done; /* Initialize item to point to the first child of the root folder. */ - memset(&item, 0, sizeof(item)); item.mask = TVIF_PARAM; - item.hItem = TreeView_GetRoot(info->hwndTreeView); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_ROOT, 0); + if (item.hItem) - item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, + (LPARAM)item.hItem); /* Walk the tree along the nodes corresponding to the remaining ITEMIDLIST */ while (item.hItem && !_ILIsEmpty(pidlCurrent)) { @@ -622,10 +897,12 @@ /* Only expand current node and move on to it's first child, * if we didn't already reach the last SHITEMID */ SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem); - item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, + (LPARAM)item.hItem); } } else { - item.hItem = TreeView_GetNextSibling(info->hwndTreeView, item.hItem); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_NEXT, + (LPARAM)item.hItem); } } @@ -645,6 +922,8 @@ static BOOL BrsFolder_OnSetSelectionW(browse_info *info, LPVOID selection, BOOL is_str) { HTREEITEM hItem; BOOL bResult; + + if (!selection) return FALSE; bResult = BrsFolder_OnSetExpanded(info, selection, is_str, &hItem); if (bResult) @@ -671,11 +950,34 @@ return result; } +static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) +{ + if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE)) + { + if (pos->cx < info->szMin.cx) + pos->cx = info->szMin.cx; + if (pos->cy < info->szMin.cy) + pos->cy = info->szMin.cy; + } + return 0; +} + +static INT BrsFolder_OnDestroy(browse_info *info) +{ + if (info->layout) + { + SHFree(info->layout); + info->layout = NULL; + } + + return 0; +} + /************************************************************************* * BrsFolderDlgProc32 (not an exported API function) */ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, - LPARAM lParam ) + LPARAM lParam ) { browse_info *info; @@ -693,6 +995,14 @@ case WM_COMMAND: return BrsFolder_OnCommand( info, wParam ); + + case WM_WINDOWPOSCHANGING: + return BrsFolder_OnWindowPosChanging( info, (WINDOWPOS *)lParam); + + case WM_SIZE: + if (info->layout) /* new style dialogs */ + LayoutUpdate(hWnd, info->layout, g_layout_info, LAYOUT_INFO_COUNT); + return 0; case BFFM_SETSTATUSTEXTA: TRACE("Set status %s\n", debugstr_a((LPSTR)lParam)); @@ -722,6 +1032,9 @@ case BFFM_SETEXPANDED: /* unicode only */ return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); + + case WM_DESTROY: + return BrsFolder_OnDestroy(info); } return FALSE; } @@ -806,11 +1119,14 @@ else templateName = swBrowseTemplateName; r = DialogBoxParamW( shell32_hInstance, templateName, lpbi->hwndOwner, - BrsFolderDlgProc, (LPARAM)&info ); + BrsFolderDlgProc, (LPARAM)&info ); if (SUCCEEDED(hr)) OleUninitialize(); if (!r) + { + ILFree(info.pidlRet); return NULL; + } return info.pidlRet; } Modified: trunk/reactos/dll/win32/shell32/enumidlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… ============================================================================== --- trunk/reactos/dll/win32/shell32/enumidlist.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/enumidlist.cpp [iso-8859-1] Sat Oct 8 17:33:21 2011 @@ -130,7 +130,6 @@ LPCWSTR lpszPath, DWORD dwFlags) { - LPITEMIDLIST pidl=NULL; WIN32_FIND_DATAW stffile; HANDLE hFile; WCHAR szPath[MAX_PATH]; @@ -157,6 +156,8 @@ if ( !(stffile.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) || (dwFlags & SHCONTF_INCLUDEHIDDEN) ) { + LPITEMIDLIST pidl = NULL; + if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && dwFlags & SHCONTF_FOLDERS && strcmpW(stffile.cFileName, dot) && strcmpW(stffile.cFileName, dotdot)) Modified: trunk/reactos/dll/win32/shell32/extracticon.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/extracti… ============================================================================== --- trunk/reactos/dll/win32/shell32/extracticon.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/extracticon.cpp [iso-8859-1] Sat Oct 8 17:33:21 2011 @@ -256,11 +256,12 @@ UINT nIconSize) { LPWSTR pszFileW = NULL; - int nLength; HRESULT hr; if (pszFile) { + int nLength; + nLength = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); if (nLength == 0) return E_FAIL; @@ -273,9 +274,8 @@ return E_FAIL; } } - - hr = Extract( - pszFileW, nIconIndex, phiconLarge, phiconSmall, nIconSize); + + hr = Extract(pszFileW, nIconIndex, phiconLarge, phiconSmall, nIconSize); if (pszFileW) CoTaskMemFree(pszFileW);

12 years, 11 months

[akhaldi] 54055: [CMAKE] * Temporarily go back to using the ret^H^H^H previous way of using debug info. Build will, for example, be slower, take double the disk space it needs right now, but... * I...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 8 16:47:57 2011 New Revision: 54055 URL: http://svn.reactos.org/svn/reactos?rev=54055&view=rev Log: [CMAKE] * Temporarily go back to using the ret^H^H^H previous way of using debug info. Build will, for example, be slower, take double the disk space it needs right now, but... * Introduce __ROS_DWARF__ for the meaning __ROS_CMAKE__ implied previously. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/include/reactos/rossym.h trunk/reactos/lib/CMakeLists.txt trunk/reactos/lib/rossym/CMakeLists.txt trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/tools/CMakeLists.txt trunk/reactos/tools/rsym/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=54055&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -61,7 +61,7 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl wrc gendib cabman cdmake mkhive obj2bin spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS widl wrc gendib cabman cdmake mkhive obj2bin spec2def geninc rsym FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() export(TARGETS gendib cabman cdmake mkhive obj2bin spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=54055&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -8,7 +8,8 @@ add_compile_flags("-pipe -fms-extensions") # Debugging (Note: DWARF-4 on 4.5.1 when we ship) -add_compile_flags("-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types") +# add_compile_flags("-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types") +add_compile_flags("-gstabs+") # Do not allow warnings add_compile_flags("-Werror") @@ -87,17 +88,29 @@ link_directories(${REACTOS_BINARY_DIR}/lib/sdk/crt) -set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") - -set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) + +set(CMAKE_C_LINK_EXECUTABLE + "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" + "${RSYM} <TARGET> <TARGET>") + +set(CMAKE_CXX_LINK_EXECUTABLE + "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" + "${RSYM} <TARGET> <TARGET>") set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") -set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") -set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") -set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +set(CMAKE_C_CREATE_SHARED_LIBRARY + "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" + "${RSYM} <TARGET> <TARGET>") +set(CMAKE_CXX_CREATE_SHARED_LIBRARY + "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" + "${RSYM} <TARGET> <TARGET>") +set(CMAKE_RC_CREATE_SHARED_LIBRARY + "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" + "${RSYM} <TARGET> <TARGET>") SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") Modified: trunk/reactos/include/reactos/rossym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rossym.h?r… ============================================================================== --- trunk/reactos/include/reactos/rossym.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/rossym.h [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -110,7 +110,7 @@ BOOLEAN (*MemGetProc)(PVOID FileContext, ULONG_PTR *Target, PVOID SourceMem, ULONG Size); } ROSSYM_CALLBACKS, *PROSSYM_CALLBACKS; -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ typedef struct _ROSSYM_OWN_FILECONTEXT { BOOLEAN (*ReadFileProc)(PVOID FileContext, PVOID Buffer, ULONG Size); BOOLEAN (*SeekFileProc)(PVOID FileContext, ULONG_PTR Position); @@ -123,7 +123,7 @@ #endif VOID RosSymInit(PROSSYM_CALLBACKS Callbacks); -#ifndef __ROS_CMAKE__ +#ifndef __ROS_DWARF__ VOID RosSymInitKernelMode(VOID); #endif VOID RosSymInitUserMode(VOID); @@ -135,7 +135,7 @@ BOOLEAN RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo); ULONG RosSymGetRawDataLength(PROSSYM_INFO RosSymInfo); VOID RosSymGetRawData(PROSSYM_INFO RosSymInfo, PVOID RawData); -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ BOOLEAN RosSymGetAddressInformation(PROSSYM_INFO RosSymInfo, ULONG_PTR RelativeAddress, PROSSYM_LINEINFO RosSymLineInfo); Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=540… ============================================================================== --- trunk/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/CMakeLists.txt [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -15,7 +15,7 @@ add_subdirectory(ppcmmu) add_subdirectory(pseh) add_subdirectory(recyclebin) -add_subdirectory(rossym_new) +add_subdirectory(rossym) add_subdirectory(rtl) add_subdirectory(sdk) add_subdirectory(smlib) Modified: trunk/reactos/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/CMakeLists.txt [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -1,27 +1,19 @@ if(MSVC) -add_library(rossym dummy.c) + add_library(rossym dummy.c) else() -add_definitions(-D_NTSYSTEM_) -list(APPEND SOURCE - delete.c - dwarf386.c - dwarfabbrev.c - dwarfaranges.c - dwarfcfa.c - dwarfinfo.c - dwarfget.c - dwarfopen.c - dwarfpc.c - dwarfpubnames.c - find.c - fromfile.c - iofile.c - init.c - initkm.c - initum.c - pe.c - zwfile.c) -add_library(rossym ${SOURCE}) -add_dependencies(rossym psdk bugcodes) + add_definitions(-D_NTSYSTEM_) + list(APPEND SOURCE + delete.c + find.c + fromfile.c + frommem.c + fromraw.c + getraw.c + init.c + initkm.c + initum.c + zwfile.c) + add_library(rossym ${SOURCE}) + add_dependencies(rossym psdk bugcodes) endif() Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -389,7 +389,8 @@ endif() if(DBG OR KDBG) - list(APPEND SOURCE kdbg/kdb_symbols.cmake.c) + #list(APPEND SOURCE kdbg/kdb_symbols.cmake.c) + list(APPEND SOURCE kdbg/kdb_symbols.c) endif() list(APPEND SOURCE Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -100,7 +100,7 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ BOOLEAN Paging, #endif PIO_STATUS_BLOCK ReadStatus) @@ -145,7 +145,7 @@ return STATUS_NO_MEMORY; } -#ifndef __ROS_CMAKE__ +#ifndef __ROS_DWARF__ Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; #else Irp->Flags |= (Paging ? IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE : 0) | IRP_SYNCHRONOUS_API; @@ -159,7 +159,7 @@ IrpSp->FileObject = FileObject; IrpSp->CompletionRoutine = MiSimpleReadComplete; -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ ObReferenceObject(FileObject); #endif Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -181,7 +181,7 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ BOOLEAN Paging, #endif PIO_STATUS_BLOCK ReadStatus); Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -83,7 +83,7 @@ KdbSymGetAddressInformation( IN PROSSYM_INFO RosSymInfo, IN ULONG_PTR RelativeAddress, -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ IN PROSSYM_LINEINFO RosSymLineInfo #else OUT PULONG LineNumber OPTIONAL, Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -90,7 +90,7 @@ static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); #endif @@ -139,7 +139,7 @@ { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame addr", KdbpCmdBackTrace }, -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ { "dt", "dt [mod] [type] [addr]", "Print a struct. Addr is optional.", KdbpCmdPrintStruct }, #endif @@ -460,7 +460,7 @@ return TRUE; } -#ifdef __ROS_CMAKE__ +#ifdef __ROS_DWARF__ /*!\brief Print a struct */ Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -15,6 +15,7 @@ add_subdirectory(unicode) if(NOT MSVC) +add_subdirectory(rsym) add_subdirectory(widl) add_subdirectory(wpp) add_subdirectory(wrc) Modified: trunk/reactos/tools/rsym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/CMakeLists.txt?… ============================================================================== --- trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] Sat Oct 8 16:47:57 2011 @@ -1,3 +1,7 @@ -add_executable(rsym rsym_common.c rsym.cmake.c) +if(ARCH MATCHES i386) + add_executable(rsym rsym_common.c rsym.c) +elseif(ARCH MATCHES amd64) + add_executable(rsym rsym_common.c rsym64.c) +endif() add_executable(raddr2line rsym_common.c raddr2line.c)

12 years, 11 months

[tkreuzer] 54054: [RTL] - Fix possible integer overflow in RtlpInitializeHeapSegment - Simplify loop in RtlIsDosDeviceName_Ustr - Make MonthLengths an array of UCHARs instead of ints - Remove point...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 8 13:50:14 2011 New Revision: 54054 URL: http://svn.reactos.org/svn/reactos?rev=54054&view=rev Log: [RTL] - Fix possible integer overflow in RtlpInitializeHeapSegment - Simplify loop in RtlIsDosDeviceName_Ustr - Make MonthLengths an array of UCHARs instead of ints - Remove pointless loops in RtlTimeToTimeFields - Fix MSVC warnings Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/path.c trunk/reactos/lib/rtl/registry.c trunk/reactos/lib/rtl/time.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=54054… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sat Oct 8 13:50:14 2011 @@ -1794,7 +1794,7 @@ status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileStandardInformation); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, shared, base, info.EndOfFile.QuadPart); + status = parse_manifest(acl, ai, filename, directory, shared, base, (SIZE_T)info.EndOfFile.QuadPart); NtUnmapViewOfSection( NtCurrentProcess(), base ); NtClose( mapping ); Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=54054&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Oct 8 13:50:14 2011 @@ -913,9 +913,9 @@ /* Initialise the Heap Entries contained within the Heap Segment */ Segment->FirstEntry = &Segment->Entry + Segment->Entry.Size; - Segment->LastValidEntry = (PHEAP_ENTRY) ((ULONG_PTR) (Segment) + SegmentReserve); - - if ((Segment->Entry.Size << HEAP_ENTRY_SHIFT) < SegmentCommit) + Segment->LastValidEntry = (PHEAP_ENTRY)((ULONG_PTR)Segment + SegmentReserve); + + if (((SIZE_T)Segment->Entry.Size << HEAP_ENTRY_SHIFT) < SegmentCommit) { HeapEntry = Segment->FirstEntry; Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=54054&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Oct 8 13:50:14 2011 @@ -47,7 +47,7 @@ { UNICODE_STRING PathCopy; PWCHAR Start, End; - ULONG PathChars, ColonCount = 0; + USHORT PathChars, ColonCount = 0; USHORT ReturnOffset = 0, ReturnLength; WCHAR c; @@ -94,19 +94,18 @@ } /* Check for extension or space, and truncate */ - c = PathCopy.Buffer[PathChars - 1]; do { /* Stop if we hit something else than a space or period */ + c = PathCopy.Buffer[PathChars - 1]; if ((c != '.') && (c != ' ')) break; - /* Fixup the lengths and get the next character */ + /* Fixup the lengths */ PathCopy.Length -= sizeof(WCHAR); - if (--PathChars) c = PathCopy.Buffer[PathChars - 1]; /* Remember this for later */ ColonCount++; - } while (PathChars); + } while (--PathChars); /* Anything still left? */ if (PathChars) Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=540… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Sat Oct 8 13:50:14 2011 @@ -118,7 +118,7 @@ { ULONG InfoLength; SIZE_T Length, SpareLength, c; - LONG RequiredLength; + ULONG RequiredLength; PCHAR SpareData, DataEnd; ULONG Type; PWCHAR Name, p, ValueEnd; @@ -341,7 +341,7 @@ Status = RtlExpandEnvironmentStrings_U(Environment, &Source, &Destination, - (PULONG)&RequiredLength); + &RequiredLength); Type = REG_SZ; /* Check for success */ Modified: trunk/reactos/lib/rtl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/time.c?rev=54054&r… ============================================================================== --- trunk/reactos/lib/rtl/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/time.c [iso-8859-1] Sat Oct 8 13:50:14 2011 @@ -38,14 +38,14 @@ static const int YearLengths[2] = - { - DAYSPERNORMALYEAR, DAYSPERLEAPYEAR - }; -static const int MonthLengths[2][MONSPERYEAR] = - { - { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, - { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - }; +{ + DAYSPERNORMALYEAR, DAYSPERLEAPYEAR +}; +static const UCHAR MonthLengths[2][MONSPERYEAR] = +{ + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } +}; static __inline int IsLeapYear(int Year) { @@ -76,7 +76,7 @@ TIME_FIELDS CurrentTimeFields; TIME_FIELDS CutoverSystemTimeFields; LARGE_INTEGER CutoverSystemTime; - CSHORT MonthLength; + UCHAR MonthLength; CSHORT Days; BOOLEAN NextYearsCutover = FALSE; @@ -255,31 +255,19 @@ IN PLARGE_INTEGER Time, OUT PTIME_FIELDS TimeFields) { - const int *Months; - int SecondsInDay, CurYear; - int LeapYear, CurMonth; - long int Days; - LONGLONG IntTime = (LONGLONG)Time->QuadPart; + const UCHAR *Months; + ULONG SecondsInDay, CurYear; + ULONG LeapYear, CurMonth; + ULONG Days; + ULONGLONG IntTime = Time->QuadPart; /* Extract millisecond from time and convert time into seconds */ TimeFields->Milliseconds = (CSHORT) ((IntTime % TICKSPERSEC) / TICKSPERMSEC); IntTime = IntTime / TICKSPERSEC; /* Split the time into days and seconds within the day */ - Days = IntTime / SECSPERDAY; + Days = (ULONG)(IntTime / SECSPERDAY); SecondsInDay = IntTime % SECSPERDAY; - - /* Adjust the values for days and seconds in day */ - while (SecondsInDay < 0) - { - SecondsInDay += SECSPERDAY; - Days--; - } - while (SecondsInDay >= SECSPERDAY) - { - SecondsInDay -= SECSPERDAY; - Days++; - } /* compute time of day */ TimeFields->Hour = (CSHORT) (SecondsInDay / SECSPERHOUR); @@ -297,20 +285,20 @@ while (1) { LeapYear = IsLeapYear(CurYear); - if (Days < (long) YearLengths[LeapYear]) + if (Days < YearLengths[LeapYear]) { break; } CurYear++; - Days = Days - (long) YearLengths[LeapYear]; + Days = Days - YearLengths[LeapYear]; } TimeFields->Year = (CSHORT) CurYear; /* Compute month of year */ LeapYear = IsLeapYear(CurYear); Months = MonthLengths[LeapYear]; - for (CurMonth = 0; Days >= (long) Months[CurMonth]; CurMonth++) - Days = Days - (long) Months[CurMonth]; + for (CurMonth = 0; Days >= Months[CurMonth]; CurMonth++) + Days = Days - Months[CurMonth]; TimeFields->Month = (CSHORT) (CurMonth + 1); TimeFields->Day = (CSHORT) (Days + 1); } Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5405… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sat Oct 8 13:50:14 2011 @@ -2495,8 +2495,7 @@ IN PCUNICODE_STRING MatchString, OUT PUSHORT Position) { - SHORT i; - USHORT j; + USHORT i, j; switch (Flags) { @@ -2520,7 +2519,7 @@ case 1: { - for (i = SearchString->Length / sizeof(WCHAR) - 1; i >= 0; i--) + for (i = SearchString->Length / sizeof(WCHAR) - 1; (i + 1) > 0; i--) { for (j = 0; j < MatchString->Length / sizeof(WCHAR); j++) { @@ -2561,7 +2560,7 @@ case 3: { - for (i = SearchString->Length / sizeof(WCHAR) - 1; i >= 0; i--) + for (i = SearchString->Length / sizeof(WCHAR) - 1; (i + 1) > 0; i--) { j = 0;

12 years, 11 months

[akhaldi] 54053: [SHELL32] * Use the previous registration mechanism. Fixes several shell32 regressions. * Dedicated to Claudiu Mihail and Johannes Anderwald.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 8 13:19:45 2011 New Revision: 54053 URL: http://svn.reactos.org/svn/reactos?rev=54053&view=rev Log: [SHELL32] * Use the previous registration mechanism. Fixes several shell32 regressions. * Dedicated to Claudiu Mihail and Johannes Anderwald. Added: trunk/reactos/dll/win32/shell32/regsvr.c (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellpath.cpp Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Oct 8 13:19:45 2011 @@ -69,6 +69,7 @@ she_ocmenu.cpp shv_item_new.cpp folder_options.cpp + regsvr.c shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) Added: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c (added) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Sat Oct 8 13:19:45 2011 @@ -1,0 +1,853 @@ +/* + * self-registerable dll functions for shell32.dll +* + * Copyright (C) 2003 John K. Hohm + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdio.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include "shresdef.h" +#include "wine/debug.h" + +#define CHARS_IN_GUID 39 + +extern HRESULT SHELL_RegisterShellFolders(void); + +extern const GUID CLSID_AdminFolderShortcut; +extern const GUID CLSID_StartMenu; +extern const GUID CLSID_MenuBandSite; +extern const GUID CLSID_OpenWith; +extern const GUID CLSID_UnixFolder; +extern const GUID CLSID_UnixDosFolder; +extern const GUID CLSID_FontsFolderShortcut; +extern const GUID SHELL32_AdvtShortcutProduct; +extern const GUID SHELL32_AdvtShortcutComponent; +extern const GUID CLSID_ShellFolderViewOC; + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + UINT idName; /* can be 0 to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + DWORD flags; + DWORD dwAttributes; + DWORD dwCallForAttributes; + LPCSTR clsid_str; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + UINT idDefaultIcon; /* can be 0 to omit */ +// CLSID const *clsid_menu; /* can be NULL to omit */ +}; + +/* flags for regsvr_coclass.flags */ +#define SHELLEX_MAYCHANGEDEFAULTMENU 0x00000001 +#define SHELLFOLDER_WANTSFORPARSING 0x00000002 +#define SHELLFOLDER_ATTRIBUTES 0x00000004 +#define SHELLFOLDER_CALLFORATTRIBUTES 0x00000008 +#define SHELLFOLDER_WANTSFORDISPLAY 0x00000010 +#define SHELLFOLDER_HIDEASDELETEPERUSER 0x00000020 + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +struct regsvr_namespace +{ + CLSID const *clsid; /* CLSID of the namespace extension. NULL for end of list */ + LPCWSTR parent; /* Mount point (MyComputer, Desktop, ..). */ + LPCWSTR value; /* Display name of the extension. */ +}; + +static HRESULT register_namespace_extensions(struct regsvr_namespace const *list); +static HRESULT unregister_namespace_extensions(struct regsvr_namespace const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const shellex_keyname[8] = { + 's', 'h', 'e', 'l', 'l', 'e', 'x', 0 }; +static WCHAR const shellfolder_keyname[12] = { + 'S', 'h', 'e', 'l', 'l', 'F', 'o', 'l', 'd', 'e', 'r', 0 }; +static WCHAR const mcdm_keyname[21] = { + 'M', 'a', 'y', 'C', 'h', 'a', 'n', 'g', 'e', 'D', 'e', 'f', + 'a', 'u', 'l', 't', 'M', 'e', 'n', 'u', 0 }; +static WCHAR const defaulticon_keyname[] = { + 'D','e','f','a','u','l','t','I','c','o','n',0}; +static WCHAR const contextmenu_keyname[] = { 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'e', 'n', 'u', 'H', 'a', 'n', 'd', 'l', 'e', 'r', 's', 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; +static char const wfparsing_valuename[] = "WantsFORPARSING"; +static char const wfdisplay_valuename[] = "WantsFORDISPLAY"; +static char const hideasdeleteperuser_valuename[] = "HideAsDeletePerUser"; +static char const attributes_valuename[] = "Attributes"; +static char const cfattributes_valuename[] = "CallForAttributes"; +static char const localized_valuename[] = "LocalizedString"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + swprintf(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (wcslen(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->idName) { + char buffer[64]; + sprintf(buffer, "@shell32.dll,-%u", list->idName); + res = RegSetValueExA(clsid_key, localized_valuename, 0, REG_SZ, + (CONST BYTE*)(buffer), strlen(buffer)+1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->idDefaultIcon) { + HKEY icon_key; + char buffer[64]; + + res = RegCreateKeyExW(clsid_key, defaulticon_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &icon_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + sprintf(buffer, "shell32.dll,-%u", list->idDefaultIcon); + res = RegSetValueExA(icon_key, NULL, 0, REG_SZ, + (CONST BYTE*)(buffer), strlen(buffer)+1); + RegCloseKey(icon_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->flags & SHELLEX_MAYCHANGEDEFAULTMENU) { + HKEY shellex_key, mcdm_key; + + res = RegCreateKeyExW(clsid_key, shellex_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellex_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + res = RegCreateKeyExW(shellex_key, mcdm_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &mcdm_key, NULL); + RegCloseKey(shellex_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + RegCloseKey(mcdm_key); + } + + if (list->flags & + (SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES|SHELLFOLDER_WANTSFORDISPLAY|SHELLFOLDER_HIDEASDELETEPERUSER)) + { + HKEY shellfolder_key; + + res = RegCreateKeyExW(clsid_key, shellfolder_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellfolder_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + if (list->flags & SHELLFOLDER_WANTSFORPARSING) + res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1); + if (list->flags & SHELLFOLDER_ATTRIBUTES) + res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, + (const BYTE *)&list->dwAttributes, sizeof(DWORD)); + if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) + res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD, + (const BYTE *)&list->dwCallForAttributes, sizeof(DWORD)); + if (list->flags & SHELLFOLDER_WANTSFORDISPLAY) + res = RegSetValueExA(shellfolder_key, wfdisplay_valuename, 0, REG_SZ, (const BYTE *)"", 1); + if (list->flags & SHELLFOLDER_HIDEASDELETEPERUSER) + res = RegSetValueExA(shellfolder_key, hideasdeleteperuser_valuename, 0, REG_SZ, (const BYTE *)"", 1); + RegCloseKey(shellfolder_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->clsid_str) { + res = register_key_defvalueA(clsid_key, clsid_keyname, + list->clsid_str); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + HKEY progid_key; + + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_key_defvalueW(progid_key, clsid_keyname, buf); + RegCloseKey(progid_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + if (IsEqualIID(list->clsid, &CLSID_RecycleBin)) {//if (list->clsid_menu) { + HKEY shellex_key, cmenu_key, menuhandler_key; + res = RegCreateKeyExW(clsid_key, shellex_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellex_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + res = RegCreateKeyExW(shellex_key, contextmenu_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &cmenu_key, NULL); + if (res != ERROR_SUCCESS) { + RegCloseKey(shellex_key); + goto error_close_clsid_key; + } + + StringFromGUID2(list->clsid, buf, 39); //clsid_menu + res = RegCreateKeyExW(cmenu_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &menuhandler_key, NULL); + RegCloseKey(menuhandler_key); + RegCloseKey(cmenu_key); + RegCloseKey(shellex_key); + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/********************************************************************** + * register_namespace_extensions + */ +static WCHAR *get_namespace_key(struct regsvr_namespace const *list) { + static const WCHAR wszExplorerKey[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\',0 }; + static const WCHAR wszNamespace[] = { '\\','N','a','m','e','s','p','a','c','e','\\',0 }; + WCHAR *pwszKey, *pwszCLSID; + + pwszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszExplorerKey)+sizeof(wszNamespace)+ + sizeof(WCHAR)*(wcslen(list->parent)+CHARS_IN_GUID)); + if (!pwszKey) + return NULL; + + wcscpy(pwszKey, wszExplorerKey); + wcscat(pwszKey, list->parent); + wcscat(pwszKey, wszNamespace); + if (FAILED(StringFromCLSID(list->clsid, &pwszCLSID))) { + HeapFree(GetProcessHeap(), 0, pwszKey); + return NULL; + } + wcscat(pwszKey, pwszCLSID); + CoTaskMemFree(pwszCLSID); + + return pwszKey; +} + +static HRESULT register_namespace_extensions(struct regsvr_namespace const *list) { + WCHAR *pwszKey; + HKEY hKey; + + for (; list->clsid; list++) { + pwszKey = get_namespace_key(list); + + /* Create the key and set the value. */ + if (pwszKey && ERROR_SUCCESS == + RegCreateKeyExW(HKEY_LOCAL_MACHINE, pwszKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL)) + { + RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)list->value, sizeof(WCHAR)*(wcslen(list->value)+1)); + RegCloseKey(hKey); + } + + HeapFree(GetProcessHeap(), 0, pwszKey); + } + return S_OK; +} + +static HRESULT unregister_namespace_extensions(struct regsvr_namespace const *list) { + WCHAR *pwszKey; + + for (; list->clsid; list++) { + pwszKey = get_namespace_key(list); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, pwszKey); + HeapFree(GetProcessHeap(), 0, pwszKey); + } + return S_OK; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (wcslen(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static GUID const CLSID_Desktop = { + 0x00021400, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + +static GUID const CLSID_Shortcut = { + 0x00021401, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; + +static struct regsvr_coclass const coclass_list[] = { + { &CLSID_Desktop, + "Desktop", + IDS_DESKTOP, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_ControlPanel, + "Shell Control Panel Folder", + IDS_CONTROLPANEL, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_WANTSFORDISPLAY|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_HIDEASDELETEPERUSER, + SFGAO_FOLDER|SFGAO_HASSUBFOLDER, + 0, + NULL, + NULL, + IDI_SHELL_CONTROL_PANEL1 + }, + { &CLSID_DragDropHelper, + "Shell Drag and Drop Helper", + 0, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_Printers, + "Printers & Fax", + IDS_PRINTERS, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES, + SFGAO_FOLDER, + 0, + NULL, + NULL, + IDI_SHELL_PRINTERS_FOLDER + }, + { &CLSID_MyComputer, + "My Computer", + IDS_MYCOMPUTER, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_NetworkPlaces, + "My Network Places", + IDS_NETWORKPLACE, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES, + SFGAO_FOLDER|SFGAO_HASPROPSHEET, + 0, + NULL, + NULL, + IDI_SHELL_MY_NETWORK_PLACES + }, + { &CLSID_FontsFolderShortcut, + "Fonts", + IDS_FONTS, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES, + SFGAO_FOLDER, + 0, + NULL, + NULL, + IDI_SHELL_FONTS_FOLDER + }, + { &CLSID_AdminFolderShortcut, + "Administrative Tools", + IDS_ADMINISTRATIVETOOLS, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES, + SFGAO_FOLDER, + 0, + NULL, + NULL, + IDI_SHELL_ADMINTOOLS //FIXME + }, + { &CLSID_Shortcut, + "Shortcut", + 0, + NULL, + "shell32.dll", + "Apartment", + SHELLEX_MAYCHANGEDEFAULTMENU + }, + { &CLSID_AutoComplete, + "AutoComplete", + 0, + NULL, + "shell32.dll", + "Apartment", + }, + { &CLSID_FolderShortcut, + "Foldershortcut", + 0, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES, + SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_LINK, + SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR + }, + { &CLSID_MyDocuments, + "My Documents", + IDS_PERSONAL, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES, + SFGAO_FILESYSANCESTOR|SFGAO_FOLDER|SFGAO_HASSUBFOLDER, + SFGAO_FILESYSTEM + }, + { &CLSID_RecycleBin, + "Trash", + IDS_RECYCLEBIN_FOLDER_NAME, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_CALLFORATTRIBUTES, + SFGAO_FOLDER|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET, + 0, + NULL, + NULL, + IDI_SHELL_FULL_RECYCLE_BIN +// &CLSID_RecycleBin + }, + { &CLSID_ShellFSFolder, + "Shell File System Folder", + 0, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_ShellFolderViewOC, + "Microsoft Shell Folder View Router", + 0, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_StartMenu, + "Start Menu", + 0, + NULL, + "shell32.dll", + "Apartment" + }, + { &CLSID_MenuBandSite, + "Menu Site", + 0, + NULL, + "shell32.dll", + "Apartment" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * namespace extensions list + */ +static const WCHAR wszDesktop[] = { 'D','e','s','k','t','o','p',0 }; +static const WCHAR wszSlash[] = { '/', 0 }; +static const WCHAR wszMyDocuments[] = { 'M','y',' ','D','o','c','u','m','e','n','t','s', 0 }; +static const WCHAR wszRecycleBin[] = { 'T','r','a','s','h', 0 }; +static const WCHAR wszMyComputer[] = { 'M','y','C','o','m','p','u','t','e','r',0 }; +static const WCHAR wszControlPanel[] = { 'C','o','n','t','r','o','l','P','a','n','e','l',0 }; +static const WCHAR wszFolderOptions[] = { 'F','o','l','d','e','r',' ','O','p','t','i','o','n','s',0 }; +static const WCHAR wszNethoodFolder[] = { 'N','e','t','h','o','o','d',' ','f','o','l','d','e','r',0}; +static const WCHAR wszPrinters[] = { 'P','r','i','n','t','e','r','s',0 }; +static const WCHAR wszFonts[] = { 'F','o','n','t','s',0 }; +static const WCHAR wszAdminTools[] = { 'A','d','m','i','n','T','o','o','l','s',0 }; +extern const GUID CLSID_FolderOptions; + +static struct regsvr_namespace const namespace_extensions_list[] = { +#if 0 + { + &CLSID_UnixDosFolder, + wszDesktop, + wszSlash + }, +#endif + { + &CLSID_MyDocuments, + wszDesktop, + wszMyDocuments + }, + { + &CLSID_NetworkPlaces, + wszDesktop, + wszNethoodFolder + }, + { + &CLSID_RecycleBin, + wszDesktop, + wszRecycleBin + }, + { + &CLSID_ControlPanel, + wszMyComputer, + wszControlPanel + }, + { + &CLSID_FolderOptions, + wszControlPanel, + wszFolderOptions + }, + { + &CLSID_FontsFolderShortcut, + wszControlPanel, + wszFonts + }, + { + &CLSID_Printers, + wszControlPanel, + wszPrinters + }, + { + &CLSID_AdminFolderShortcut, + wszControlPanel, + wszAdminTools + }, + { NULL } +}; + +/*********************************************************************** + * DllRegisterServer (SHELL32.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = SHELL_RegisterShellFolders(); + if (SUCCEEDED(hr)) + hr = register_namespace_extensions(namespace_extensions_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (SHELL32.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + if (SUCCEEDED(hr)) + hr = unregister_namespace_extensions(namespace_extensions_list); + return hr; +} Propchange: trunk/reactos/dll/win32/shell32/regsvr.c ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Sat Oct 8 13:19:45 2011 @@ -76,6 +76,7 @@ <file>startmenu.cpp</file> <file>stubs.cpp</file> <file>ros-systray.cpp</file> + <file>regsvr.c</file> <file>fprop.cpp</file> <file>drive.cpp</file> <file>she_ocmenu.cpp</file> Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Oct 8 13:19:45 2011 @@ -1445,7 +1445,7 @@ TRACE("-- pointer to class factory: %p\n", *ppv); return hResult; } - +#if 0 /*********************************************************************** * DllRegisterServer (BROWSEUI.@) */ @@ -1461,7 +1461,7 @@ { return gModule.DllUnregisterServer(FALSE); } - +#endif /************************************************************************* * DllInstall [SHELL32.@] * Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Sat Oct 8 13:19:45 2011 @@ -205,7 +205,7 @@ extern const GUID CLSID_UnixDosFolder; /* Default shell folder value registration */ -HRESULT SHELL_RegisterShellFolders(void); +EXTERN_C HRESULT SHELL_RegisterShellFolders(void); /* Detect Shell Links */ BOOL SHELL_IsShortcut(LPCITEMIDLIST); Modified: trunk/reactos/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.cpp [iso-8859-1] Sat Oct 8 13:19:45 2011 @@ -1848,7 +1848,7 @@ /* Register the default values in the registry, as some apps seem to depend * on their presence. The set registered was taken from Windows XP. */ -HRESULT SHELL_RegisterShellFolders(void) +EXTERN_C HRESULT SHELL_RegisterShellFolders(void) { HRESULT hr;

12 years, 11 months

[jimtabor] 54052: - Add register class name proc.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 8 02:18:04 2011 New Revision: 54052 URL: http://svn.reactos.org/svn/reactos?rev=54052&view=rev Log: - Add register class name proc. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Oct 8 02:18:04 2011 @@ -4365,6 +4365,9 @@ ATOM WINAPI RegisterClassW(CONST WNDCLASSW*); ATOM WINAPI RegisterClassExA(CONST WNDCLASSEXA*); ATOM WINAPI RegisterClassExW(CONST WNDCLASSEXW*); +#if(_WIN32_WINNT >= 0x0501) +typedef BOOLEAN (WINAPI * PREGISTERCLASSNAMEW)(LPCWSTR); +#endif UINT WINAPI RegisterClipboardFormatA(LPCSTR); UINT WINAPI RegisterClipboardFormatW(LPCWSTR); #if (WINVER >= 0x0500)

12 years, 11 months

[rharabien] 54051: [WIN32K] - Do not call UserSetCursor in MsqCleanupMessageQueue because it uses current thread queue instead of queue in cleanup (they can be different). See issue #6530 for more ...

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Oct 7 20:23:24 2011 New Revision: 54051 URL: http://svn.reactos.org/svn/reactos?rev=54051&view=rev Log: [WIN32K] - Do not call UserSetCursor in MsqCleanupMessageQueue because it uses current thread queue instead of queue in cleanup (they can be different). See issue #6530 for more details. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Fri Oct 7 20:23:24 2011 @@ -399,8 +399,6 @@ /* Do now some process cleanup that requires a valid win32 thread */ if(ptiCurrent->ppi->cThreads == 0) { - UserSetCursor(NULL, TRUE); - /* Check if we have registered the user api hook */ if(ptiCurrent->ppi == ppiUahServer) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Oct 7 20:23:24 2011 @@ -2094,9 +2094,19 @@ { PCURICON_OBJECT pCursor = MessageQueue->CursorObject; - /* Change to another cursor if we going to dereference current one */ + /* Change to another cursor if we going to dereference current one + Note: we can't use UserSetCursor because it uses current thread + message queue instead of queue given for cleanup */ if (IntGetSysCursorInfo()->CurrentCursorObject == pCursor) - UserSetCursor(NULL, TRUE); + { + HDC hdcScreen; + + /* Get the screen DC */ + hdcScreen = IntGetScreenDC(); + if (hdcScreen) + GreMovePointer(hdcScreen, -1, -1); + IntGetSysCursorInfo()->CurrentCursorObject = NULL; + } UserDereferenceObject(pCursor); }

12 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
37
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 October 2011