Author: cgutman
Date: Wed Aug 29 14:23:40 2012
New Revision: 57199
URL: http://svn.reactos.org/svn/reactos?rev=57199&view=rev
Log:
[WS2_32]
- Fix a memory overwrite bug in some crappy WINE code that leads to nasty memory corruption of the service cache entry. This corrupts the first field of the cache, causing it to always reallocate memory because it thinks the size is 0. This would be even worse if the code didn't overwrite the other 12 bytes of corruption with proper data on the next lines. This also caused the aliases value to be garbage because it pointed at uninitialized data.
Modified:
trunk/reactos/dll/win32/ws2_32/misc/ns.c
Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Aug 29 14:23:40 2012
@@ -1275,7 +1275,7 @@
WS_DbgPrint(MAX_TRACE,("Aliase %d: %s\n", i, Aliases[i]));
}
- memcpy(p->Getservbyname,
+ memcpy(p->Getservbyname->Aliases,
Aliases,
sizeof(Aliases));
@@ -1457,7 +1457,7 @@
WS_DbgPrint(MAX_TRACE,("Aliases %d: %s\n", i, Aliases[i]));
}
- memcpy(p->Getservbyport,Aliases,sizeof(Aliases));
+ memcpy(p->Getservbyport->Aliases,Aliases,sizeof(Aliases));
/* Create the struct proper */
p->Getservbyport->ServerEntry.s_name = ServiceName;
Author: tkreuzer
Date: Tue Aug 28 20:24:55 2012
New Revision: 57194
URL: http://svn.reactos.org/svn/reactos?rev=57194&view=rev
Log:
[USER32]
Use LONG instead of DWORD for a signed value
Modified:
trunk/reactos/win32ss/user/user32/windows/nonclient.c
Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Tue Aug 28 20:24:55 2012
@@ -216,7 +216,7 @@
{
HMENU hSysMenu = GetSystemMenu(hWnd, FALSE);
UINT MenuState = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */
-
+
/* FIXME: A tool window has a smaller Close button */
if (ExStyle & WS_EX_TOOLWINDOW)
@@ -336,10 +336,10 @@
/* Firstly the "thick" frame */
if ((Style & WS_THICKFRAME) && !(Style & WS_MINIMIZE))
{
- DWORD Width =
+ LONG Width =
(GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXDLGFRAME)) *
GetSystemMetrics(SM_CXBORDER);
- DWORD Height =
+ LONG Height =
(GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYDLGFRAME)) *
GetSystemMetrics(SM_CYBORDER);
@@ -661,7 +661,7 @@
/* Lotus Notes draws menu descriptions in the caption of its main
* window. When it wants to restore original "system" view, it just
* sends WM_NCACTIVATE message to itself. Any optimizations here in
- * attempt to minimize redrawings lead to a not restored caption.
+ * attempt to minimize redrawings lead to a not restored caption.
*/
if (wParam)
NtUserxSetWindowState(Wnd, WNDSACTIVEFRAME);
Author: jgardou
Date: Tue Aug 28 19:16:02 2012
New Revision: 57193
URL: http://svn.reactos.org/svn/reactos?rev=57193&view=rev
Log:
[I_KNEW_IT_WOULD_HAPPEN]
- Fix build
Added:
trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl (with props)
Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl (added)
+++ trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl [iso-8859-1] Tue Aug 28 19:16:02 2012
@@ -1,0 +1,40 @@
+/*
+ * COM Classes for ddraw
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * 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
+ */
+
+[
+ helpstring("DirectDraw Object"),
+ threading(both),
+ uuid(d7b70ee0-4340-11cf-b063-0020afc2cd35)
+]
+coclass DirectDraw { interface IDirectDraw7; }
+
+[
+ helpstring("DirectDraw 7 Object"),
+ threading(both),
+ uuid(3c305196-50db-11d3-9cfe-00c04fd930c5)
+]
+coclass DirectDraw7 { interface IDirectDraw7; }
+
+[
+ helpstring("DirectDraw Clipper Object"),
+ threading(both),
+ uuid(593817a0-7db3-11cf-a2de-00aa00b93356)
+]
+coclass DirectDrawClipper { interface IDirectDrawClipper; }
Propchange: trunk/reactos/dll/directx/wine/ddraw/ddraw_classes.idl
------------------------------------------------------------------------------
svn:eol-style = native