26 Feb
2010
26 Feb
'10
7:16 p.m.
Author: fireball
Date: Fri Feb 26 20:16:22 2010
New Revision: 45689
URL: http://svn.reactos.org/svn/reactos?rev=45689&view=rev
Log:
- Merge 45687:45688 by Maarten Kroese. Fixes issues with context menus in ReactOS
Explorer.
Modified:
branches/arwinss/reactos/ (props changed)
branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed)
branches/arwinss/reactos/dll/directx/dsound_new/ (props changed)
branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c (props changed)
branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec (props changed)
branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c (props changed)
branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed)
branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed)
branches/arwinss/reactos/dll/win32/gdi32/ (props changed)
branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed)
branches/arwinss/reactos/dll/win32/shell32/shlmenu.c
branches/arwinss/reactos/dll/win32/user32/ (props changed)
branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed)
branches/arwinss/reactos/include/ndk/amd64/ (props changed)
branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed)
branches/arwinss/reactos/include/psdk/ (props changed)
branches/arwinss/reactos/lib/sdk/crt/time/ (props changed)
branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props
changed)
branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed)
branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed)
branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed)
branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed)
branches/arwinss/reactos/tools/rsym/log2lines.c (props changed)
branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed)
branches/arwinss/reactos/tools/rsym/rsym.c (props changed)
branches/arwinss/reactos/tools/rsym/rsym.h (props changed)
branches/arwinss/reactos/tools/rsym/rsym.mak (props changed)
branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed)
Propchange: branches/arwinss/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36930,36936,36992,38148-38151,38264-38265,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/directx/dsound_new/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
-/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539
+/trunk/reactos/dll/directx/dsound_new:43669-44421,45011,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
/branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
-/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539
+/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539
+/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682
/branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539
+/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45011,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/dll/win32/gdi32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/win32/gdi32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646
Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Modified: branches/arwinss/reactos/dll/win32/shell32/shlmenu.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell…
==============================================================================
--- branches/arwinss/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/shell32/shlmenu.c [iso-8859-1] Fri Feb 26 20:16:22
2010
@@ -116,7 +116,7 @@
static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
{ IShellFolder *lpsf, *lpsf2;
ULONG ulItemAttr = SFGAO_FOLDER;
- UINT uID, uFlags, uEnumFlags;
+ UINT uID, uEnumFlags;
LPFNFMCALLBACK lpfnCallback;
LPCITEMIDLIST pidl;
WCHAR sTemp[MAX_PATH];
@@ -148,7 +148,6 @@
return 0;
uID = menudata->uID;
- uFlags = menudata->uFlags;
uEnumFlags = menudata->uEnumFlags;
lpfnCallback = menudata->lpfnCallback;
menudata->bInitialized = FALSE;
@@ -157,7 +156,7 @@
if (SUCCEEDED (SHGetDesktopFolder(&lpsf)))
{
- if (SUCCEEDED(IShellFolder_BindToObject(lpsf,
pidl,0,(REFIID)&IID_IShellFolder,(LPVOID *)&lpsf2)))
+ if (SUCCEEDED(IShellFolder_BindToObject(lpsf, pidl,0,&IID_IShellFolder,(LPVOID
*)&lpsf2)))
{
IEnumIDList *lpe = NULL;
@@ -314,9 +313,9 @@
if (lpText != FM_SEPARATOR)
{
- int len = wcslen (lpText);
- myItem = (LPFMITEM) SHAlloc( sizeof(FMITEM) + len*sizeof(WCHAR));
- wcscpy (myItem->szItemText, lpText);
+ int len = strlenW (lpText);
+ myItem = SHAlloc(sizeof(FMITEM) + len*sizeof(WCHAR));
+ strcpyW (myItem->szItemText, lpText);
myItem->cchItemText = len;
myItem->iIconIndex = icon;
myItem->hMenu = hMenu;
@@ -377,12 +376,15 @@
{
BOOL ret;
- if ((SHELL_OsIsUnicode() && (lpText!=FM_SEPARATOR)) || (lpText == NULL))
+ if (!lpText) return FALSE;
+
+ if (SHELL_OsIsUnicode() || lpText == FM_SEPARATOR)
ret = FileMenu_AppendItemW(hMenu, lpText, uID, icon, hMenuPopup, nItemHeight);
else
{
DWORD len = MultiByteToWideChar( CP_ACP, 0, lpText, -1, NULL, 0 );
LPWSTR lpszText = HeapAlloc ( GetProcessHeap(), 0, len*sizeof(WCHAR) );
+ if (!lpszText) return FALSE;
MultiByteToWideChar( CP_ACP, 0, lpText, -1, lpszText, len );
ret = FileMenu_AppendItemW(hMenu, lpszText, uID, icon, hMenuPopup, nItemHeight);
HeapFree( GetProcessHeap(), 0, lpszText );
@@ -577,7 +579,7 @@
COLORREF clrPrevText, clrPrevBkgnd;
int xi,yi,xt,yt;
HIMAGELIST hImageList;
- RECT TextRect, BorderRect;
+ RECT TextRect;
LPFMINFO menuinfo;
TRACE("%p %p %s\n", hWnd, lpdis, debugstr_w(pMyItem->szItemText));
@@ -600,9 +602,6 @@
if (menuinfo->nBorderWidth)
TextRect.left += menuinfo->nBorderWidth;
- BorderRect.right = menuinfo->nBorderWidth;
-/* FillRect(lpdis->hDC, &BorderRect, CreateSolidBrush(
menuinfo->crBorderColor));
-*/
TextRect.left += FM_LEFTBORDER;
xi = TextRect.left + FM_SPACE1;
yi = TextRect.top + FM_Y_SPACE/2;
@@ -843,8 +842,7 @@
* Shell_MergeMenus [SHELL32.67]
*/
HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust,
UINT uIDAdjustMax, ULONG uFlags)
-{
- INT nItem;
+{ int nItem;
HMENU hmSubMenu;
BOOL bAlreadySeparated;
MENUITEMINFOW miiSrc;
@@ -855,10 +853,11 @@
hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
if (!hmDst || !hmSrc)
- { return uIDMax;
- }
+ return uIDMax;
nItem = GetMenuItemCount(hmDst);
+ if (nItem == -1)
+ return uIDMax;
if (uInsert >= (UINT)nItem) /* insert position inside menu? */
{
@@ -892,7 +891,6 @@
if (!GetMenuItemInfoW(hmSrc, nItem, TRUE, &miiSrc))
{
-MessageBoxW(NULL, L"GetMenuItemInfoW failed", NULL, MB_OK);
continue;
}
@@ -902,10 +900,8 @@
{
/* This is a separator; don't put two of them in a row */
if (bAlreadySeparated)
- {
-MessageBoxW(NULL, L"bAlreadySeparated failed", NULL, MB_OK);
continue;
- }
+
bAlreadySeparated = TRUE;
}
else if (miiSrc.hSubMenu)
@@ -914,10 +910,9 @@
{
miiSrc.wID += uIDAdjust; /* add uIDAdjust to the ID */
- if (miiSrc.wID > uIDAdjustMax) /* skip ID's higher uIDAdjustMax */
- {MessageBoxW(NULL, L"uIDAdjustMax 111 failed", NULL, MB_OK);
+ if (uIDAdjustMax != 0xFFFF && miiSrc.wID > uIDAdjustMax) /* skip
ID's higher uIDAdjustMax */
continue;
- }
+
if (uIDMax <= miiSrc.wID) /* remember the highest ID */
uIDMax = miiSrc.wID + 1;
}
@@ -942,10 +937,9 @@
{
miiSrc.wID += uIDAdjust; /* add uIDAdjust to the ID */
- if (miiSrc.wID > uIDAdjustMax) /* skip ID's higher uIDAdjustMax */{
-MessageBoxW(NULL, L"uIDAdjustMax max 222 failed", NULL, MB_OK);
+ if (uIDAdjustMax != 0xFFFF && miiSrc.wID > uIDAdjustMax) /* skip
ID's higher uIDAdjustMax */
continue;
- }
+
if (uIDMax <= miiSrc.wID) /* remember the highest ID */
uIDMax = miiSrc.wID + 1;
@@ -956,7 +950,6 @@
*/
if (!InsertMenuItemW(hmDst, uInsert, TRUE, &miiSrc))
{
-MessageBoxW(NULL, L"InsertMenuItemW failed", NULL, MB_OK);
return(uIDMax);
}
}
Propchange: branches/arwinss/reactos/dll/win32/user32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646
Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646
Propchange: branches/arwinss/reactos/include/ndk/amd64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35683,35739,35762,35777,35805,35823,35827,35952,35966,36172,36360,36445,36502-36503,36505,36899,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631
-/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/include/ndk/amd64:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631
-/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/include/psdk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/include/psdk:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/lib/sdk/crt/time/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,4 +1,4 @@
/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414
-/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/lib/sdk/crt/time:42678-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678
Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
-/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/server/current:45044
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/server/current/request.h:43136,43398,43708,45044
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/server/current/user.h:43708,45044
Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,3 +1,3 @@
/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080
-/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
/vendor/wine/server/current:43708,44715,45044,45206,45646
Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/tools/rsym/rsym.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/tools/rsym/rsym.h:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688
Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 26 20:16:22 2010
@@ -1,2 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601
-/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539
+/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688