[prev in list] [next in list] [prev in thread] [next in thread]
List: ros-diffs
Subject: [ros-diffs] [CVS reactos] use "readable" parameter names in
From: weiden () osexperts ! com
Date: 2004-04-25 14:46:55
Message-ID: 20040425144655.EAF7B43AA () mok ! osexperts ! com
[Download RAW message or body]
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>reactos</tt></b><span id="info"> on \
MAIN</span></td></tr> <tr><td><tt>lib/gdi32/misc/<a \
href="#file1">stubs.c</a></tt></td><td align="right" id="added">+1</td><td \
align="right" id="removed">-35</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/stubs.c?rev=1.54&content-type=text/x-cvsweb-markup">1.54</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/stubs.c.diff?r1=text&tr1=1.54&r2=text&tr2=1.55&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/stubs.c?rev=1.55&content-type=text/x-cvsweb-markup">1.55</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file2">wingl.c</a></tt></td><td align="right" id="added">+20</td><td \
align="right" id="removed">-20</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/wingl.c?rev=1.3&content-type=text/x-cvsweb-markup">1.3</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/wingl.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/wingl.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a></td></tr>
<tr><td><tt>lib/gdi32/objects/<a href="#file3">bitblt.c</a></tt></td><td \
align="right" id="added">+131</td><td align="right" id="removed">-190</td><td \
nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/bitblt.c?rev=1.21&content-type=text/x-cvsweb-markup">1.21</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/bitblt.c.diff?r1=text&tr1=1.21&r2=text&tr2=1.22&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/bitblt.c?rev=1.22&content-type=text/x-cvsweb-markup">1.22</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file4">brush.c</a></tt></td><td align="right" id="added">+22</td><td \
align="right" id="removed">-10</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/brush.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/brush.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/brush.c?rev=1.5&content-type=text/x-cvsweb-markup">1.5</a></td></tr>
<tr><td><tt> /<a \
href="#file5">clip.c</a></tt></td><td align="right" id="added">+9</td><td \
align="right" id="removed">-9</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/clip.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/clip.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/clip.c?rev=1.5&content-type=text/x-cvsweb-markup">1.5</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file6">dc.c</a></tt></td><td align="right" id="added">+228</td><td \
align="right" id="removed">-197</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/dc.c?rev=1.29&content-type=text/x-cvsweb-markup">1.29</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/dc.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/dc.c?rev=1.30&content-type=text/x-cvsweb-markup">1.30</a></td></tr>
<tr><td><tt> /<a \
href="#file7">fillshap.c</a></tt></td><td align="right" id="added">+43</td><td \
align="right" id="removed">-43</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/fillshap.c?rev=1.10&content-type=text/x-cvsweb-markup">1.10</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/fillshap.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/fillshap.c?rev=1.11&content-type=text/x-cvsweb-markup">1.11</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file8">font.c</a></tt></td><td align="right" id="added">+17</td><td \
align="right" id="removed">-17</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/font.c?rev=1.3&content-type=text/x-cvsweb-markup">1.3</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/font.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/font.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a></td></tr>
<tr><td><tt> /<a \
href="#file9">line.c</a></tt></td><td align="right" id="added">+45</td><td \
align="right" id="removed">-43</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/line.c?rev=1.10&content-type=text/x-cvsweb-markup">1.10</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/line.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/line.c?rev=1.11&content-type=text/x-cvsweb-markup">1.11</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file10">linedda.c</a></tt></td><td align="right" id="added">+3</td><td \
align="right" id="removed">-3</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/linedda.c?rev=1.1&content-type=text/x-cvsweb-markup">1.1</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/linedda.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/linedda.c?rev=1.2&content-type=text/x-cvsweb-markup">1.2</a></td></tr>
<tr><td><tt> /<a \
href="#file11">metafile.c</a></tt></td><td align="right" id="added">+10</td><td \
align="right" id="removed">-10</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/metafile.c?rev=1.2&content-type=text/x-cvsweb-markup">1.2</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/metafile.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/metafile.c?rev=1.3&content-type=text/x-cvsweb-markup">1.3</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file12">pen.c</a></tt></td><td align="right" id="added">+4</td><td \
align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/pen.c?rev=1.5&content-type=text/x-cvsweb-markup">1.5</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/pen.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/pen.c?rev=1.6&content-type=text/x-cvsweb-markup">1.6</a></td></tr>
<tr><td><tt> /<a \
href="#file13">region.c</a></tt></td><td align="right" id="added">+69</td><td \
align="right" id="removed">-82</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/region.c?rev=1.13&content-type=text/x-cvsweb-markup">1.13</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/region.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.14&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/region.c?rev=1.14&content-type=text/x-cvsweb-markup">1.14</a></td></tr>
<tr class="alt"><td><tt> /<a \
href="#file14">text.c</a></tt></td><td align="right" id="added">+92</td><td \
align="right" id="removed">-92</td><td nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/text.c?rev=1.18&content-type=text/x-cvsweb-markup">1.18</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/text.c.diff?r1=text&tr1=1.18&r2=text&tr2=1.19&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/text.c?rev=1.19&content-type=text/x-cvsweb-markup">1.19</a></td></tr>
<tr><td><tt>subsys/win32k/objects/<a href="#file15">brush.c</a></tt></td><td \
align="right" id="added">+9</td><td align="right" id="removed">-2</td><td \
nowrap="nowrap" align="center"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects/brush.c?rev=1.35&content-type=text/x-cvsweb-markup">1.35</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects/brush.c.diff?r1=text&tr1=1.35&r2=text&tr2=1.36&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects/brush.c?rev=1.36&content-type=text/x-cvsweb-markup">1.36</a></td></tr>
<tr><td></td><td align="right" id="added">+703</td><td align="right" \
id="removed">-757</td><td></td></tr> </table>
<small id="info">15 modified files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">FIXME - Check if we're emulating win95, if so, forward to \
SetBrushOrgEx() */</a></li> </ul></div>
<pre class="comment">
use "readable" parameter names in functions
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc">misc</a><br \
/></span> <div class="fileheader"><big><b>stubs.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/stubs.c?rev=1.54&content-type=text/x-cvsweb-markup">1.54</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/stubs.c.diff?r1=text&tr1=1.54&r2=text&tr2=1.55&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/stubs.c?rev=1.55&content-type=text/x-cvsweb-markup">1.55</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.54 -r1.55
--- stubs.c 24 Apr 2004 14:21:36 -0000 1.54
+++ stubs.c 25 Apr 2004 14:46:53 -0000 1.55
@@ -1,4 +1,4 @@
</small></pre><pre class="diff" id="removed">-/* $Id: stubs.c,v 1.54 2004/04/24 \
14:21:36 weiden Exp $ </pre><pre class="diff" id="added">+/* $Id: stubs.c,v 1.55 \
2004/04/25 14:46:53 weiden Exp $ </pre><pre class="diff" id="context"> *
* reactos/lib/gdi32/misc/stubs.c
*
</pre><pre class="diff"><small id="info">@@ -1230,40 +1230,6 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-SetBrushOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
- )
-{
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-FixBrushOrgEx(
- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
- )
-{
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
</pre><pre class="diff" id="context"> UnrealizeObject(
HGDIOBJ a0
)
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc">misc</a><br \
/></span> <div class="fileheader"><big><b>wingl.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/wingl.c?rev=1.3&content-type=text/x-cvsweb-markup">1.3</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/wingl.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/misc/wingl.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- wingl.c 9 Apr 2004 20:03:13 -0000 1.3
+++ wingl.c 25 Apr 2004 14:46:53 -0000 1.4
@@ -99,14 +99,14 @@
</small></pre><pre class="diff" id="context"> */
INT
STDCALL
</pre><pre class="diff" id="removed">-ChoosePixelFormat(HDC hDC,
- CONST PIXELFORMATDESCRIPTOR * pfd)
</pre><pre class="diff" id="added">+ChoosePixelFormat(HDC hdc,
+ CONST PIXELFORMATDESCRIPTOR * ppfd)
</pre><pre class="diff" id="context"> {
if (glChoosePixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
</pre><pre class="diff" id="removed">- return(glChoosePixelFormat(h<span \
id="removedchars">DC, </span>pfd)); </pre><pre class="diff" id="added">+ \
return(glChoosePixelFormat(h<span id="addedchars">dc, p</span>pfd)); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -116,16 +116,16 @@
</small></pre><pre class="diff" id="context"> */
INT
STDCALL
</pre><pre class="diff" id="removed">-DescribePixelFormat(HDC hDC,
- INT PixelFormat,
- UINT BufSize,
- LPPIXELFORMATDESCRIPTOR pfd)
</pre><pre class="diff" id="added">+DescribePixelFormat(HDC hdc,
+ INT iPixelFormat,
+ UINT nBytes,
+ LPPIXELFORMATDESCRIPTOR ppfd)
</pre><pre class="diff" id="context"> {
if (glDescribePixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
</pre><pre class="diff" id="removed">- return(glDescribePixelFormat(hDC, \
PixelFormat, BufSize, pfd)); </pre><pre class="diff" id="added">+ \
return(glDescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd)); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -135,13 +135,13 @@
</small></pre><pre class="diff" id="context"> */
INT
STDCALL
</pre><pre class="diff" id="removed">-GetPixelFormat(HDC h<span \
id="removedchars">DC</span>) </pre><pre class="diff" id="added">+GetPixelFormat(HDC \
h<span id="addedchars">dc</span>) </pre><pre class="diff" id="context"> {
if (glGetPixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
</pre><pre class="diff" id="removed">- return(glGetPixelFormat(h<span \
id="removedchars">DC</span>)); </pre><pre class="diff" id="added">+ \
return(glGetPixelFormat(h<span id="addedchars">dc</span>)); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -151,15 +151,15 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-SetPixelFormat(HDC hDC,
- INT PixelFormat,
- CONST PIXELFORMATDESCRIPTOR * pfd)
</pre><pre class="diff" id="added">+SetPixelFormat(HDC hdc,
+ INT iPixelFormat,
+ CONST PIXELFORMATDESCRIPTOR * ppfd)
</pre><pre class="diff" id="context"> {
if (glSetPixelFormat == NULL)
if (OpenGLEnable() == FALSE)
return(0);
</pre><pre class="diff" id="removed">- return(glSetPixelFormat(hDC, PixelFormat, \
pfd)); </pre><pre class="diff" id="added">+ return(glSetPixelFormat(hdc, \
iPixelFormat, ppfd)); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -169,14 +169,14 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-SwapBuffers(HDC h<span \
id="removedchars">DC</span>) </pre><pre class="diff" id="added">+SwapBuffers(HDC \
h<span id="addedchars">dc</span>) </pre><pre class="diff" id="context"> {
if (glSwapBuffers == NULL)
if (OpenGLEnable() == FALSE)
return(0);
</pre><pre class="diff" id="removed">- return(glSwapBuffers(h<span \
id="removedchars">DC</span>)); </pre><pre class="diff" id="added">+ \
return(glSwapBuffers(h<span id="addedchars">dc</span>)); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -190,20 +190,20 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
GetEnhMetaFilePixelFormat(
</pre><pre class="diff" id="removed">- HENHMETAFILE hEmh,
- DWORD cbBufz,
</pre><pre class="diff" id="added">+ HENHMETAFILE hemf,
+ DWORD cbBuffer,
</pre><pre class="diff" id="context"> CONST PIXELFORMATDESCRIPTOR *ppfd
)
{
ENHMETAHEADER pemh;
</pre><pre class="diff" id="removed">- if(GetEnhMetaFileHeader(h<span \
id="removedchars">Emh</span>, sizeof(ENHMETAHEADER), &pemh)) </pre><pre \
class="diff" id="added">+ if(GetEnhMetaFileHeader(h<span id="addedchars">emf</span>, \
sizeof(ENHMETAHEADER), &pemh)) </pre><pre class="diff" id="context"> {
if(pemh.bOpenGL)
{
if(pemh.cbPixelFormat)
{
</pre><pre class="diff" id="removed">- memcpy((void*)ppfd, (const void \
*)pemh.offPixelFormat, cbBuf<span id="removedchars">z</span> ); </pre><pre \
class="diff" id="added">+ memcpy((void*)ppfd, (const void *)pemh.offPixelFormat, \
cbBuf<span id="addedchars">fer</span> ); </pre><pre class="diff" id="context"> \
return(pemh.cbPixelFormat); }
}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>bitblt.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/bitblt.c?rev=1.21&content-type=text/x-cvsweb-markup">1.21</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/bitblt.c.diff?r1=text&tr1=1.21&r2=text&tr2=1.22&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/bitblt.c?rev=1.22&content-type=text/x-cvsweb-markup">1.22</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.21 -r1.22
--- bitblt.c 9 Apr 2004 20:03:13 -0000 1.21
+++ bitblt.c 25 Apr 2004 14:46:54 -0000 1.22
@@ -1,4 +1,4 @@
</small></pre><pre class="diff" id="removed">-/* $Id: bitblt.c,v 1.21 2004/04/09 \
20:03:13 navaraf Exp $ </pre><pre class="diff" id="added">+/* $Id: bitblt.c,v 1.22 \
2004/04/25 14:46:54 weiden Exp $ </pre><pre class="diff" id="context"> *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
</pre><pre class="diff"><small id="info">@@ -22,17 +22,17 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-BitBlt(HDC hDCDest,
- INT XDest,
- INT YDest,
- INT Width,
- INT Height,
- HDC hDCSrc,
- INT XSrc,
- INT YSrc,
- DWORD ROP)
</pre><pre class="diff" id="added">+BitBlt(HDC hdcDest,
+ INT nXDest,
+ INT nYDest,
+ INT nWidth,
+ INT nHeight,
+ HDC hdcSrc,
+ INT nXSrc,
+ INT nYSrc,
+ DWORD dwRop)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiBitBlt(hDCDest, XDest, YDest, \
Width, Height, hDCSrc, XSrc, YSrc, ROP); </pre><pre class="diff" id="added">+ return \
NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, dwRop); \
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -41,13 +41,13 @@
</small></pre><pre class="diff" id="context"> */
HBITMAP
STDCALL
</pre><pre class="diff" id="removed">-CreateBitmap(INT Width,
- INT Height,
- UINT Planes,
- UINT BitsPerPel,
- CONST VOID *Bits)
</pre><pre class="diff" id="added">+CreateBitmap(INT nWidth,
+ INT nHeight,
+ UINT cPlanes,
+ UINT cBitsPerPel,
+ CONST VOID *lpvBits)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiCreateBitmap(Width, Height, \
Planes, BitsPerPel, Bits); </pre><pre class="diff" id="added">+ return \
NtGdiCreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -56,9 +56,9 @@
</small></pre><pre class="diff" id="context"> */
HBITMAP
STDCALL
</pre><pre class="diff" id="removed">-CreateBitmapIndirect(CONST BITMAP *<span \
id="removedchars">BM</span>) </pre><pre class="diff" \
id="added">+CreateBitmapIndirect(CONST BITMAP *<span id="addedchars">lpbm</span>) \
</pre><pre class="diff" id="context"> { </pre><pre class="diff" id="removed">- return \
NtGdiCreateBitmapIndirect(BM); </pre><pre class="diff" id="added">+ return \
NtGdiCreateBitmapIndirect(lpbm); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -67,11 +67,11 @@
</small></pre><pre class="diff" id="context"> */
HBITMAP
STDCALL
</pre><pre class="diff" id="removed">-CreateCompatibleBitmap(HDC hDC,
- INT Width,
- INT Height)
</pre><pre class="diff" id="added">+CreateCompatibleBitmap(HDC hdc,
+ INT nWidth,
+ INT nHeight)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiCreateCompatibleBitmap(hDC, Width, \
Height); </pre><pre class="diff" id="added">+ return \
NtGdiCreateCompatibleBitmap(hdc, nWidth, nHeight); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -80,11 +80,11 @@
</small></pre><pre class="diff" id="context"> */
HBITMAP
STDCALL
</pre><pre class="diff" id="removed">-CreateDiscardableBitmap(HDC hDC,
- INT Width,
- INT Height)
</pre><pre class="diff" id="added">+CreateDiscardableBitmap(HDC hdc,
+ INT nWidth,
+ INT nHeight)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiCreateDiscardableBitmap(hDC, \
Width, Height); </pre><pre class="diff" id="added">+ return \
NtGdiCreateDiscardableBitmap(hdc, nWidth, nHeight); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -93,14 +93,14 @@
</small></pre><pre class="diff" id="context"> */
HBITMAP
STDCALL
</pre><pre class="diff" id="removed">-CreateDIBitmap(HDC hDC,
- CONST BITMAPINFOHEADER *bmih,
- DWORD Init,
- CONST VOID *bInit,
- CONST BITMAPINFO *bmi,
- UINT Usage)
</pre><pre class="diff" id="added">+CreateDIBitmap(HDC hdc,
+ CONST BITMAPINFOHEADER *lpbmih,
+ DWORD fdwInit,
+ CONST VOID *lpbInit,
+ CONST BITMAPINFO *lpbmi,
+ UINT fuUsage)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiCreateDIBitmap(hDC, bmih, Init, \
bInit, bmi, Usage); </pre><pre class="diff" id="added">+ return \
NtGdiCreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, lpbmi, fuUsage); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -109,11 +109,11 @@
</small></pre><pre class="diff" id="context"> */
LONG
STDCALL
</pre><pre class="diff" id="removed">-GetBitmapBits(HBITMAP hBitmap,
- LONG Count,
- LPVOID Bits)
</pre><pre class="diff" id="added">+GetBitmapBits(HBITMAP hbmp,
+ LONG cbBuffer,
+ LPVOID lpvBits)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiGetBitmapBits(hBitmap, Count, \
Bits); </pre><pre class="diff" id="added">+ return NtGdiGetBitmapBits(hbmp, \
cbBuffer, lpvBits); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -123,9 +123,9 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetBitmapDimensionEx(HBITMAP hBitmap,
</pre><pre class="diff" id="removed">- LPSIZE Dimension)
</pre><pre class="diff" id="added">+ LPSIZE <span \
id="addedchars">lp</span>Dimension) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiGetBitmapDimensionEx(hBitmap, \
Dimension); </pre><pre class="diff" id="added">+ return \
NtGdiGetBitmapDimensionEx(hBitmap, lpDimension); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -134,15 +134,15 @@
</small></pre><pre class="diff" id="context"> */
int
STDCALL
</pre><pre class="diff" id="removed">-GetDIBits(HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- LPVOID Bits,
- LPBITMAPINFO bi,
- UINT Usage)
</pre><pre class="diff" id="added">+GetDIBits(HDC hdc,
+ HBITMAP hbmp,
+ UINT uStartScan,
+ UINT cScanLines,
+ LPVOID lpvBits,
+ LPBITMAPINFO lpbi,
+ UINT uUsage)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiGetDIBits(hDC, hBitmap, StartScan, \
ScanLines, Bits, bi, Usage); </pre><pre class="diff" id="added">+ return \
NtGdiGetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbi, uUsage); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -151,20 +151,20 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-MaskBlt(HDC hDCDest,
- INT XDest,
- INT YDest,
- INT Width,
- INT Height,
- HDC hDCSrc,
- INT XSrc,
- INT YSrc,
- HBITMAP hMaskBitmap,
</pre><pre class="diff" id="added">+MaskBlt(HDC hdcDest,
+ INT nXDest,
+ INT nYDest,
+ INT nWidth,
+ INT nHeight,
+ HDC hdcSrc,
+ INT nXSrc,
+ INT nYSrc,
+ HBITMAP hbmMask,
</pre><pre class="diff" id="context"> INT xMask,
INT yMask,
</pre><pre class="diff" id="removed">- DWORD ROP)
</pre><pre class="diff" id="added">+ DWORD dwRop)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiMaskBlt(hDCDest, XDest, YDest, \
Width, Height, hDCSrc, XSrc, YSrc, hMaskBitmap, xMask, yMask, ROP); </pre><pre \
class="diff" id="added">+ return NtGdiMaskBlt(hdcDest, nXDest, nYDest, nWidth, \
nHeight, hdcSrc, nXSrc, nYSrc, hbmMask, xMask, yMask, dwRop); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -173,18 +173,18 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-PlgBlt(HDC hDCDest,
- CONST POINT *Point,
- HDC hDCSrc,
- INT XSrc,
- INT YSrc,
- INT Width,
- INT Height,
- HBITMAP hMaskBitmap,
</pre><pre class="diff" id="added">+PlgBlt(HDC hdcDest,
+ CONST POINT *lpPoint,
+ HDC hdcSrc,
+ INT nXSrc,
+ INT nYSrc,
+ INT nWidth,
+ INT nHeight,
+ HBITMAP hbmMask,
</pre><pre class="diff" id="context"> INT xMask,
INT yMask)
{
</pre><pre class="diff" id="removed">- return NtGdiPlgBlt(hDCDest, Point, hDCSrc, \
XSrc, YSrc, Width, Height, hMaskBitmap, xMask, yMask); </pre><pre class="diff" \
id="added">+ return NtGdiPlgBlt(hdcDest, lpPoint, hdcSrc, nXSrc, nYSrc, nWidth, \
nHeight, hbmMask, xMask, yMask); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -193,11 +193,11 @@
</small></pre><pre class="diff" id="context"> */
LONG
STDCALL
</pre><pre class="diff" id="removed">-SetBitmapBits(HBITMAP hBitmap,
- DWORD Bytes,
- CONST VOID *Bits)
</pre><pre class="diff" id="added">+SetBitmapBits(HBITMAP hbmp,
+ DWORD cBytes,
+ CONST VOID *lpBits)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiSetBitmapBits(hBitmap, Bytes, \
Bits); </pre><pre class="diff" id="added">+ return NtGdiSetBitmapBits(hbmp, cBytes, \
lpBits); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -206,15 +206,15 @@
</small></pre><pre class="diff" id="context"> */
int
STDCALL
</pre><pre class="diff" id="removed">-SetDIBits(HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- CONST VOID *Bits,
- CONST BITMAPINFO *bmi,
- UINT ColorUse)
</pre><pre class="diff" id="added">+SetDIBits(HDC hdc,
+ HBITMAP hbmp,
+ UINT uStartScan,
+ UINT cScanLines,
+ CONST VOID *lpvBits,
+ CONST BITMAPINFO *lpbmi,
+ UINT fuColorUse)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiSetDIBits(hDC, hBitmap, StartScan, \
ScanLines, Bits, bmi, ColorUse); </pre><pre class="diff" id="added">+ return \
NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); \
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -223,21 +223,21 @@
</small></pre><pre class="diff" id="context"> */
int
STDCALL
</pre><pre class="diff" id="removed">-SetDIBitsToDevice(HDC h<span \
id="removedchars">DC</span>, </pre><pre class="diff" \
id="added">+SetDIBitsToDevice(HDC h<span id="addedchars">dc</span>, </pre><pre \
class="diff" id="context"> INT XDest, INT YDest,
</pre><pre class="diff" id="removed">- DWORD Width,
- DWORD Height,
</pre><pre class="diff" id="added">+ DWORD dwWidth,
+ DWORD dwHeight,
</pre><pre class="diff" id="context"> INT XSrc,
INT YSrc,
</pre><pre class="diff" id="removed">- UINT StartScan,
- UINT ScanLines,
- CONST VOID *Bits,
- CONST BITMAPINFO *bmi,
- UINT ColorUse)
</pre><pre class="diff" id="added">+ UINT uStartScan,
+ UINT cScanLines,
+ CONST VOID *lpvBits,
+ CONST BITMAPINFO *lpbmi,
+ UINT fuColorUse)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiSetDIBitsToDevice(hDC, XDest, \
YDest, Width, Height, XSrc, YSrc, StartScan, ScanLines,
- Bits, bmi, ColorUse);
</pre><pre class="diff" id="added">+ return NtGdiSetDIBitsToDevice(hdc, XDest, \
YDest, dwWidth, dwHeight, XSrc, YSrc, uStartScan, cScanLines, + lpvBits, lpbmi, \
fuColorUse); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -260,34 +260,14 @@
</small></pre><pre class="diff" id="context"> DWORD dwRop // raster \
operation code )
{
</pre><pre class="diff" id="removed">- //SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- if ( (nWidthDest==nWidthSrc) && (nHeightDest==nHeightSrc) )
- {
- return BitBlt(hdcDest,
- nXOriginDest, // x-coord of destination upper-left corner
- nYOriginDest, // y-coord of destination upper-left corner
- nWidthDest, // width of destination rectangle
- nHeightDest, // height of destination rectangle
- hdcSrc, // handle to source DC
- nXOriginSrc, // x-coordinate of source upper-left corner
- nYOriginSrc, // y-coordinate of source upper-left corner
- dwRop // raster operation code
- );
- } else
- {
- DPRINT1("FIXME: StretchBlt is in development phase now...\n");
- return NtGdiStretchBlt(hdcDest,
- nXOriginDest,
- nYOriginDest,
- nWidthDest,
- nHeightDest,
- hdcSrc,
- nXOriginSrc,
- nYOriginSrc,
- nWidthSrc,
- nHeightSrc,
- dwRop);
- }
</pre><pre class="diff" id="added">+ if ((nWidthDest != nWidthSrc) || (nHeightDest \
!= nHeightSrc)) + {
+ return NtGdiStretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, \
nHeightDest, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, \
nHeightSrc, dwRop); + }
+
+ return BitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, \
hdcSrc, + nXOriginSrc, nYOriginSrc, dwRop);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -296,22 +276,22 @@
</small></pre><pre class="diff" id="context"> */
int
STDCALL
</pre><pre class="diff" id="removed">-StretchDIBits(HDC h<span \
id="removedchars">DC</span>, </pre><pre class="diff" id="added">+StretchDIBits(HDC \
h<span id="addedchars">dc</span>, </pre><pre class="diff" id="context"> INT XDest,
INT YDest,
</pre><pre class="diff" id="removed">- INT DestWidth,
- INT DestHeight,
</pre><pre class="diff" id="added">+ INT nDestWidth,
+ INT nDestHeight,
</pre><pre class="diff" id="context"> INT XSrc,
INT YSrc,
</pre><pre class="diff" id="removed">- INT SrcWidth,
- INT SrcHeight,
- CONST VOID *Bits,
- CONST BITMAPINFO *BitsInfo,
- UINT Usage,
- DWORD ROP)
</pre><pre class="diff" id="added">+ INT nSrcWidth,
+ INT nSrcHeight,
+ CONST VOID *lpBits,
+ CONST BITMAPINFO *lpBitsInfo,
+ UINT iUsage,
+ DWORD dwRop)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiStretchDIBits(hDC, XDest, YDest, \
DestWidth, DestHeight, XSrc, YSrc,
- SrcWidth, SrcHeight, Bits, BitsInfo, Usage, ROP);
</pre><pre class="diff" id="added">+ return NtGdiStretchDIBits(hdc, XDest, YDest, \
nDestWidth, nDestHeight, XSrc, YSrc, + nSrcWidth, \
nSrcHeight, lpBits, lpBitsInfo, iUsage, dwRop); </pre><pre class="diff" id="context"> \
}
</pre><pre class="diff"><small id="info">@@ -320,14 +300,14 @@
</small></pre><pre class="diff" id="context"> */
HBITMAP
STDCALL
</pre><pre class="diff" id="removed">-CreateDIBSection(HDC hDC,
- CONST BITMAPINFO *bmi,
- UINT Usage,
- PVOID *Bits,
</pre><pre class="diff" id="added">+CreateDIBSection(HDC hdc,
+ CONST BITMAPINFO *pbmi,
+ UINT iUsage,
+ VOID **ppvBits,
</pre><pre class="diff" id="context"> HANDLE hSection,
DWORD dwOffset)
{
</pre><pre class="diff" id="removed">- return NtGdiCreateDIBSection(hDC, bmi, Usage, \
Bits, hSection, dwOffset); </pre><pre class="diff" id="added">+ return \
NtGdiCreateDIBSection(hdc, pbmi, iUsage, ppvBits, hSection, dwOffset); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -336,12 +316,12 @@
</small></pre><pre class="diff" id="context"> */
COLORREF
STDCALL
</pre><pre class="diff" id="removed">-SetPixel(HDC h<span \
id="removedchars">DC</span>, </pre><pre class="diff" id="added">+SetPixel(HDC h<span \
id="addedchars">dc</span>, </pre><pre class="diff" id="context"> INT X,
INT Y,
</pre><pre class="diff" id="removed">- COLORREF <span \
id="removedchars"> </span>Color) </pre><pre class="diff" id="added">+ COLORREF \
<span id="addedchars">cr</span>Color) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiSetPixel(hDC, X, Y, Color);
</pre><pre class="diff" id="added">+ return NtGdiSetPixel(hdc, X, Y, crColor);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -350,9 +330,9 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-SetPixelV ( HDC hDC, int XPos, int YPos, \
COLORREF Color ) </pre><pre class="diff" id="added">+SetPixelV ( HDC hdc, int X, int \
Y, COLORREF crColor ) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiSetPixelV ( hDC, XPos, YPos, Color \
); </pre><pre class="diff" id="added">+ return NtGdiSetPixelV(hdc, X, Y, crColor);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -361,9 +341,9 @@
</small></pre><pre class="diff" id="context"> */
COLORREF
STDCALL
</pre><pre class="diff" id="removed">-GetPixel(HDC hDC, int X, int Y)
</pre><pre class="diff" id="added">+GetPixel(HDC hdc, int nXPos, int nYPos)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiGetPixel(hDC, X, Y);
</pre><pre class="diff" id="added">+ return NtGdiGetPixel(hdc, nXPos, nYPos);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -371,9 +351,9 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
BOOL STDCALL
</pre><pre class="diff" id="removed">-PatBlt(HDC hDC, INT Left, INT Top, INT Width, \
INT Height, ULONG Rop) </pre><pre class="diff" id="added">+PatBlt(HDC hdc, INT \
nXLeft, INT nYLeft, INT nWidth, INT nHeight, DWORD dwRop) </pre><pre class="diff" \
id="context"> { </pre><pre class="diff" id="removed">- return NtGdiPatBlt(hDC, \
Left, Top, Width, Height, Rop); </pre><pre class="diff" id="added">+ return \
NtGdiPatBlt(hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); </pre><pre class="diff" \
id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -381,9 +361,9 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-PolyPatBlt(HDC hDC,DWORD dwRop,PPATRECT \
pRects,int cRects,ULONG Reserved) </pre><pre class="diff" id="added">+PolyPatBlt(HDC \
hdc, DWORD dwRop, PPATRECT lppRects, int cRects, ULONG Reserved) </pre><pre \
class="diff" id="context"> { </pre><pre class="diff" id="removed">- return \
NtGdiPolyPatBlt(hDC,dwRop,pRects,cRects,Reserved); </pre><pre class="diff" \
id="added">+ return NtGdiPolyPatBlt(hdc, dwRop, lppRects, cRects, Reserved); \
</pre><pre class="diff" id="context"> }
/******************************************************************************
</pre><pre class="diff"><small id="info">@@ -393,50 +373,11 @@
</small></pre><pre class="diff" id="context"> */
WINBOOL
STDCALL
</pre><pre class="diff" id="removed">-GdiTransparentBlt(HDC hdcDst, int xDst, int \
yDst, int cxDst, int cyDst,
- HDC hdcSrc, int xSrc, int ySrc, int cxSrc, int cySrc,
- COLORREF TransColor)
-{
- return (WINBOOL)NtGdiTransparentBlt(hdcDst, xDst, yDst, cxDst, cyDst, hdcSrc,
- xSrc, ySrc, cxSrc, cySrc, TransColor);
</pre><pre class="diff" id="added">+GdiTransparentBlt(HDC hdcDst, int nXOriginDest, \
int nYOriginDest, int nWidthDest, int nHeightDest, + HDC hdcSrc, int \
nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + \
COLORREF crTransparent) +{
+ return (WINBOOL)NtGdiTransparentBlt(hdcDst, nXOriginDest, nYOriginDest, \
nWidthDest, nHeightDest, hdcSrc, + nXOriginSrc, \
nYOriginSrc, nWidthSrc, nHeightSrc, crTransparent); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff" id="removed">-/*
-
-BOOL STDCALL NtGdiExtFloodFill(HDC hDC, INT XStart, INT YStart, COLORREF Color, \
UINT FillType)
-BOOL STDCALL NtGdiFloodFill(HDC hDC, INT XStart, INT YStart, COLORREF Fill)
-UINT STDCALL NtGdiGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, \
RGBQUAD *Colors)
-COLORREF STDCALL NtGdiGetPixel(HDC hDC,
- INT XPos,
- INT YPos)
-BOOL STDCALL NtGdiSetBitmapDimensionEx(HBITMAP hBitmap,
- INT Width,
- INT Height,
- LPSIZE Size)
-UINT STDCALL NtGdiSetDIBColorTable(HDC hDC,
- UINT StartIndex,
- UINT Entries,
- CONST RGBQUAD *Colors)
-BOOL STDCALL NtGdiSetPixelV(HDC hDC,
- INT X,
- INT Y,
- COLORREF Color)
-BOOL STDCALL NtGdiStretchBlt(HDC hDCDest,
- INT XOriginDest,
- INT YOriginDest,
- INT WidthDest,
- INT HeightDest,
- HDC hDCSrc,
- INT XOriginSrc,
- INT YOriginSrc,
- INT WidthSrc,
- INT HeightSrc,
- DWORD ROP)
-
-INT BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp)
-HBITMAP BITMAPOBJ_CopyBitmap(HBITMAP hBitmap)
-int DIB_GetDIBWidthBytes(int width, int depth)
-int DIB_GetDIBImageBytes (int width, int height, int depth)
-int DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse)
-
-*/
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>brush.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/brush.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/brush.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/brush.c?rev=1.5&content-type=text/x-cvsweb-markup">1.5</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- brush.c 19 Aug 2003 11:48:49 -0000 1.4
+++ brush.c 25 Apr 2004 14:46:54 -0000 1.5
@@ -14,10 +14,10 @@
</small></pre><pre class="diff" id="context"> HBRUSH
STDCALL
CreateSolidBrush(
</pre><pre class="diff" id="removed">- COLORREF a0
</pre><pre class="diff" id="added">+ COLORREF crColor
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateSolidBrush(a0);
</pre><pre class="diff" id="added">+ return NtGdiCreateSolidBrush(crColor);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -26,10 +26,10 @@
</small></pre><pre class="diff" id="context"> HBRUSH
STDCALL
CreateBrushIndirect(
</pre><pre class="diff" id="removed">- CONST LOGBRUSH *<span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ CONST \
LOGBRUSH *<span id="addedchars">lplb</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateBrushIndirect(a0);
</pre><pre class="diff" id="added">+ return NtGdiCreateBrushIndirect(lplb);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -38,11 +38,11 @@
</small></pre><pre class="diff" id="context"> HBRUSH
STDCALL
CreateDIBPatternBrushPt(
</pre><pre class="diff" id="removed">- CONST VOID *a0,
- UINT a1
</pre><pre class="diff" id="added">+ CONST VOID *lpPackedDIB,
+ UINT iUsage
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateDIBPatternBrushPt(a0,a1);
</pre><pre class="diff" id="added">+ return \
NtGdiCreateDIBPatternBrushPt(lpPackedDIB, iUsage); </pre><pre class="diff" \
id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -51,9 +51,21 @@
</small></pre><pre class="diff" id="context"> HBRUSH
STDCALL
CreateHatchBrush(
</pre><pre class="diff" id="removed">- int a0,
- COLORREF a1
</pre><pre class="diff" id="added">+ int fnStyle,
+ COLORREF clrref
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateHatchBrush(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiCreateHatchBrush(fnStyle, clrref);
+}
+
+/*
+ * @implemented
+ */
+HBRUSH
+STDCALL
+CreatePatternBrush(
+ HBITMAP hbmp
+ )
+{
+ return NtGdiCreatePatternBrush ( hbmp );
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>clip.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/clip.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/clip.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/clip.c?rev=1.5&content-type=text/x-cvsweb-markup">1.5</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- clip.c 21 Dec 2003 22:41:00 -0000 1.4
+++ clip.c 25 Apr 2004 14:46:54 -0000 1.5
@@ -16,7 +16,7 @@
</small></pre><pre class="diff" id="context"> * along with this program; if not, \
write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
</pre><pre class="diff" id="removed">-/* $Id: clip.c,v 1.4 2003/12/21 22:41:00 \
navaraf Exp $ </pre><pre class="diff" id="added">+/* $Id: clip.c,v 1.5 2004/04/25 \
14:46:54 weiden Exp $ </pre><pre class="diff" id="context"> *
* PROJECT: ReactOS gdi32.dll
* FILE: lib/gdi32/objects/clip.c
</pre><pre class="diff"><small id="info">@@ -34,9 +34,9 @@
</small></pre><pre class="diff" id="context"> */
int
STDCALL
</pre><pre class="diff" id="removed">-SelectClipRgn(HDC DC, HRGN Rgn)
</pre><pre class="diff" id="added">+SelectClipRgn(HDC hdc, HRGN hrgn)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiSelectClipRgn(<span \
id="removedchars">DC, R</span>gn); </pre><pre class="diff" id="added">+ return \
NtGdiSelectClipRgn(<span id="addedchars">hdc, hr</span>gn); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -45,14 +45,14 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
IntersectClipRect(
</pre><pre class="diff" id="removed">- HDC hDc,
- int a1,
- int a2,
- int a3,
- int a4
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiIntersectClipRect(hDc, a1, a2, \
a3, a4); </pre><pre class="diff" id="added">+ return NtGdiIntersectClipRect(hdc, \
nLeftRect, nTopRect, nRightRect, nBottomRect); </pre><pre class="diff" id="context"> \
}
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>dc.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/dc.c?rev=1.29&content-type=text/x-cvsweb-markup">1.29</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/dc.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/dc.c?rev=1.30&content-type=text/x-cvsweb-markup">1.30</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.29 -r1.30
--- dc.c 9 Apr 2004 20:03:13 -0000 1.29
+++ dc.c 25 Apr 2004 14:46:54 -0000 1.30
@@ -17,10 +17,10 @@
</small></pre><pre class="diff" id="context"> DWORD
STDCALL
GetObjectType(
</pre><pre class="diff" id="removed">- HGDIOBJ <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HGDIOBJ \
<span id="addedchars">h</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetObjectType(a0);
</pre><pre class="diff" id="added">+ return NtGdiGetObjectType(h);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -31,12 +31,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
DPtoLP(
</pre><pre class="diff" id="removed">- HDC a0,
- LPPOINT a1,
- int a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPPOINT lpPoints,
+ int nCount
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiDPtoLP(a0, a1, a2);
</pre><pre class="diff" id="added">+ return NtGdiDPtoLP(hdc, lpPoints, nCount);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -46,11 +46,11 @@
</small></pre><pre class="diff" id="context"> COLORREF
STDCALL
SetBkColor(
</pre><pre class="diff" id="removed">- HDC a0,
- COLORREF a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ COLORREF crColor
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetBkColor(a0, a1);
</pre><pre class="diff" id="added">+ return NtGdiSetBkColor(hdc, crColor);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -60,10 +60,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetGraphicsMode(
</pre><pre class="diff" id="removed">- HDC <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HDC <span \
id="addedchars">hdc</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetGraphicsMode(a0);
</pre><pre class="diff" id="added">+ return NtGdiGetGraphicsMode(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -77,7 +77,7 @@
</small></pre><pre class="diff" id="context"> int iMode
)
{
</pre><pre class="diff" id="removed">- <span \
id="removedchars"> </span>return \
NtGdiSetGraphicsMode(hdc, iMode); </pre><pre class="diff" id="added">+ return \
NtGdiSetGraphicsMode(hdc, iMode); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -87,10 +87,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetMapMode(
</pre><pre class="diff" id="removed">- HDC <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HDC <span \
id="addedchars">hdc</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetMapMode(a0);
</pre><pre class="diff" id="added">+ return NtGdiGetMapMode(hdc);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -99,11 +99,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetCurrentPositionEx(
</pre><pre class="diff" id="removed">- HDC a0,
- LPPOINT a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPPOINT lpPoint
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetCurrentPositionEx(a0, \
a1); </pre><pre class="diff" id="added">+ return NtGdiGetCurrentPositionEx(hdc, \
lpPoint); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -113,10 +113,10 @@
</small></pre><pre class="diff" id="context"> COLORREF
STDCALL
GetBkColor(
</pre><pre class="diff" id="removed">- HDC <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HDC <span \
id="addedchars">hdc</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetBkColor(a0);
</pre><pre class="diff" id="added">+ return NtGdiGetBkColor(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -126,10 +126,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetBkMode(
</pre><pre class="diff" id="removed">- HDC <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HDC <span \
id="addedchars">hdc</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetBkMode(a0);
</pre><pre class="diff" id="added">+ return NtGdiGetBkMode(hdc);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -138,11 +138,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetBrushOrgEx(
</pre><pre class="diff" id="removed">- HDC a0,
- LPPOINT a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPPOINT lppt
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetBrushOrgEx(a0, a1);
</pre><pre class="diff" id="added">+ return NtGdiGetBrushOrgEx(hdc, lppt);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -152,11 +152,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetROP2(
</pre><pre class="diff" id="removed">- HDC <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HDC <span \
id="addedchars">hdc</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetROP2(a0);
-
</pre><pre class="diff" id="added">+ return NtGdiGetROP2(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -166,11 +165,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetStretchBltMode(
</pre><pre class="diff" id="removed">- HDC <span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ HDC <span \
id="addedchars">hdc</span> </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetStretchBltMode(a0);
-
</pre><pre class="diff" id="added">+ return NtGdiGetStretchBltMode(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -181,11 +179,10 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
GetTextAlign(
</pre><pre class="diff" id="removed">- HDC h<span \
id="removedchars">D</span>c </pre><pre class="diff" id="added">+ HDC \
h<span id="addedchars">d</span>c </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetTextAlign(hDc);
-
</pre><pre class="diff" id="added">+ return NtGdiGetTextAlign(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -195,11 +192,10 @@
</small></pre><pre class="diff" id="context"> COLORREF
STDCALL
GetTextColor(
</pre><pre class="diff" id="removed">- HDC h<span \
id="removedchars">D</span>c </pre><pre class="diff" id="added">+ HDC \
h<span id="addedchars">d</span>c </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetTextColor(hDc);
-
</pre><pre class="diff" id="added">+ return NtGdiGetTextColor(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -209,12 +205,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetViewportExtEx(
</pre><pre class="diff" id="removed">- HDC h<span \
id="removedchars">D</span>c, </pre><pre class="diff" id="added">+ HDC \
h<span id="addedchars">d</span>c, </pre><pre class="diff" id="context"> \
LPSIZE lpSize )
{
</pre><pre class="diff" id="removed">- return NtGdiGetViewportExtEx(hDc, \
lpSize);
-
</pre><pre class="diff" id="added">+ return NtGdiGetViewportExtEx(hdc, lpSize);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -224,12 +219,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetViewportOrgEx(
</pre><pre class="diff" id="removed">- HDC h<span \
id="removedchars">D</span>c, </pre><pre class="diff" id="added">+ HDC \
h<span id="addedchars">d</span>c, </pre><pre class="diff" id="context"> \
LPPOINT lpPoint )
{
</pre><pre class="diff" id="removed">- return NtGdiGetViewportOrgEx(hDc, \
lpPoint);
-
</pre><pre class="diff" id="added">+ return NtGdiGetViewportOrgEx(hdc, lpPoint);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -239,11 +233,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetWindowExtEx(
</pre><pre class="diff" id="removed">- HDC h<span \
id="removedchars">D</span>c, </pre><pre class="diff" id="added">+ HDC \
h<span id="addedchars">d</span>c, </pre><pre class="diff" id="context"> \
LPSIZE lpSize )
{
</pre><pre class="diff" id="removed">- return NtGdiGetWindowExtEx(hDc, \
lpSize); </pre><pre class="diff" id="added">+ return NtGdiGetWindowExtEx(hdc, \
lpSize); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -253,11 +247,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetWindowOrgEx(
</pre><pre class="diff" id="removed">- HDC h<span \
id="removedchars">D</span>c, </pre><pre class="diff" id="added">+ HDC \
h<span id="addedchars">d</span>c, </pre><pre class="diff" id="context"> \
LPPOINT lpPoint )
{
</pre><pre class="diff" id="removed">- return NtGdiGetWindowOrgEx(hDc, \
lpPoint); </pre><pre class="diff" id="added">+ return NtGdiGetWindowOrgEx(hdc, \
lpPoint); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -267,12 +261,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
SetBkMode(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ int iBkMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetBkMode(a0, a1);
-
</pre><pre class="diff" id="added">+ return NtGdiSetBkMode(hdc, iBkMode);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -282,11 +275,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
SetROP2(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ int fnDrawMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetROP2(a0, a1);
</pre><pre class="diff" id="added">+ return NtGdiSetROP2(hdc, fnDrawMode);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -296,12 +289,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
SetStretchBltMode(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ int iStretchMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetStretchBltMode(a0, a1);
-
</pre><pre class="diff" id="added">+ return NtGdiSetStretchBltMode(hdc, \
iStretchMode); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -311,12 +303,11 @@
</small></pre><pre class="diff" id="context"> DWORD
STDCALL
GetRelAbs(
</pre><pre class="diff" id="removed">- HDC a0,
- DWORD a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ DWORD dwIgnore
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetRelAbs(a0);
-
</pre><pre class="diff" id="added">+ return NtGdiGetRelAbs(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -324,9 +315,9 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
HGDIOBJ STDCALL
</pre><pre class="diff" id="removed">-GetStockObject(int <span \
id="removedchars">Index</span>) </pre><pre class="diff" \
id="added">+GetStockObject(int <span id="addedchars">fnObject</span>) </pre><pre \
class="diff" id="context"> { </pre><pre class="diff" id="removed">- \
return(NtGdiGetStockObject(Index)); </pre><pre class="diff" id="added">+ return \
NtGdiGetStockObject(fnObject); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -334,9 +325,11 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
int STDCALL
</pre><pre class="diff" id="removed">-GetClipBox(HDC hDc, LPRECT Rect)
</pre><pre class="diff" id="added">+GetClipBox(
+ HDC hdc,
+ LPRECT lprc)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return(NtGdiGetClipBox(hDc, Rect));
</pre><pre class="diff" id="added">+ return NtGdiGetClipBox(hdc, lprc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -346,10 +339,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetPolyFillMode(
</pre><pre class="diff" id="removed">- HDC <span id="removedchars">a0</span>
</pre><pre class="diff" id="added">+ HDC <span id="addedchars">hdc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetPolyFillMode(a0);
</pre><pre class="diff" id="added">+ return NtGdiGetPolyFillMode(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -457,9 +450,9 @@
</small></pre><pre class="diff" id="context"> /*
* @implemented
*/
</pre><pre class="diff" id="removed">-BOOL STDCALL DeleteDC( HDC h<span \
id="removedchars">DC</span> ) </pre><pre class="diff" id="added">+BOOL STDCALL \
DeleteDC( HDC h<span id="addedchars">dc</span> ) </pre><pre class="diff" \
id="context"> { </pre><pre class="diff" id="removed">- return NtGdiDeleteDC(<span \
id="removedchars"> hDC </span>); </pre><pre class="diff" id="added">+ \
return NtGdiDeleteDC(<span id="addedchars">hdc</span>); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -469,10 +462,10 @@
</small></pre><pre class="diff" id="context"> HDC
STDCALL
CreateCompatibleDC(
</pre><pre class="diff" id="removed">- HDC h<span id="removedchars">DC</span>
</pre><pre class="diff" id="added">+ HDC h<span id="addedchars">dc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateCompatableDC(hDC);
</pre><pre class="diff" id="added">+ return NtGdiCreateCompatableDC(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -482,11 +475,11 @@
</small></pre><pre class="diff" id="context"> HGDIOBJ
STDCALL
SelectObject(
</pre><pre class="diff" id="removed">- HDC hDC,
- HGDIOBJ hGDIObj
</pre><pre class="diff" id="added">+ HDC hdc,
+ HGDIOBJ hgdiobj
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSelectObject(hDC, hGDIObj);
</pre><pre class="diff" id="added">+ return NtGdiSelectObject(hdc, hgdiobj);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -496,11 +489,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
SetMapMode(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ int fnMapMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetMapMode(<span \
id="removedchars"> a0, a1 </span>); </pre><pre class="diff" \
id="added">+ return NtGdiSetMapMode(<span \
id="addedchars">hdc, fnMapMode</span>); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -510,13 +503,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetViewportOrgEx(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ int X,
+ int Y,
+ LPPOINT lpPoint
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetViewportOrgEx( a0, a1, a2, a3 \
); </pre><pre class="diff" id="added">+ return NtGdiSetViewportOrgEx(hdc, X, Y, \
lpPoint); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -526,13 +519,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
OffsetViewportOrgEx(
</pre><pre class="diff" id="removed">- HDC DC,
- int XOffset,
- int YOffset,
- LPPOINT Point
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXOffset,
+ int nYOffset,
+ LPPOINT lpPoint
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiOffsetViewportOrgEx(DC, XOffset, \
YOffset, Point); </pre><pre class="diff" id="added">+ return \
NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -542,13 +535,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetWindowOrgEx(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ int X,
+ int Y,
+ LPPOINT lpPoint
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetWindowOrgEx( a0, a1, a2, a3 );
</pre><pre class="diff" id="added">+ return NtGdiSetWindowOrgEx(hdc, X, Y, lpPoint);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -557,15 +550,15 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-DeleteObject(HGDIOBJ <span \
id="removedchars">Obj</span>) </pre><pre class="diff" \
id="added">+DeleteObject(HGDIOBJ <span id="addedchars">hObject</span>) </pre><pre \
class="diff" id="context"> { </pre><pre class="diff" id="removed">- if (0 != \
((DWORD) <span id="removedchars">Obj</span> & 0x00800000)) </pre><pre \
class="diff" id="added">+ if (0 != ((DWORD) <span id="addedchars">hObject</span> \
& 0x00800000)) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- DPRINT1("Trying to delete system object \
0x%x\n", <span id="removedchars">Obj</span>); </pre><pre class="diff" id="added">+ \
DPRINT1("Trying to delete system object 0x%x\n", <span \
id="addedchars">hObject</span>); </pre><pre class="diff" id="context"> return \
FALSE; }
</pre><pre class="diff" id="removed">- return NtGdiDeleteObject(<span \
id="removedchars">Obj</span>); </pre><pre class="diff" id="added">+ return \
NtGdiDeleteObject(<span id="addedchars">hObject</span>); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -575,12 +568,12 @@
</small></pre><pre class="diff" id="context"> HPALETTE
STDCALL
SelectPalette(
</pre><pre class="diff" id="removed">- HDC a0,
- HPALETTE a1,
- BOOL a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ HPALETTE hpal,
+ BOOL bForceBackground
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSelectPalette( a0, a1,a2 );
</pre><pre class="diff" id="added">+ return NtGdiSelectPalette(hdc, hpal, \
bForceBackground); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -590,10 +583,10 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
RealizePalette(
</pre><pre class="diff" id="removed">- HDC <span id="removedchars">a0</span>
</pre><pre class="diff" id="added">+ HDC <span id="addedchars">hdc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiRealizePalette( a0 );
</pre><pre class="diff" id="added">+ return NtGdiRealizePalette(hdc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -603,12 +596,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
LPtoDP(
</pre><pre class="diff" id="removed">- HDC a0,
- LPPOINT a1,
- int a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPPOINT lpPoints,
+ int nCount
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiLPtoDP(a0, a1, a2);
</pre><pre class="diff" id="added">+ return NtGdiLPtoDP(hdc, lpPoints, nCount);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -618,11 +611,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
SetPolyFillMode(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ int iPolyFillMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetPolyFillMode(a0, a1);
</pre><pre class="diff" id="added">+ return NtGdiSetPolyFillMode(hdc, \
iPolyFillMode); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -632,11 +625,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetDeviceCaps(
</pre><pre class="diff" id="removed">- HDC DC,
- int Index
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nIndex
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetDeviceCaps(DC, Index);
</pre><pre class="diff" id="added">+ return NtGdiGetDeviceCaps(hdc, nIndex);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -645,10 +638,10 @@
</small></pre><pre class="diff" id="context"> HPALETTE
STDCALL
CreatePalette(
</pre><pre class="diff" id="removed">- CONST LOGPALETTE *<span \
id="removedchars">a0</span> </pre><pre class="diff" id="added">+ CONST \
LOGPALETTE *<span id="addedchars">lplgpl</span> </pre><pre class="diff" id="context"> \
) {
</pre><pre class="diff" id="removed">- return NtGdiCreatePalette((CONST \
PLOGPALETTE)a0); </pre><pre class="diff" id="added">+ return \
NtGdiCreatePalette((CONST PLOGPALETTE)lplgpl); </pre><pre class="diff" id="context"> \
}
/*
</pre><pre class="diff"><small id="info">@@ -657,11 +650,11 @@
</small></pre><pre class="diff" id="context"> COLORREF
STDCALL
GetNearestColor(
</pre><pre class="diff" id="removed">- HDC a0,
- COLORREF a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ COLORREF crColor
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetNearestColor(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiGetNearestColor(hdc, crColor);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -670,11 +663,11 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
GetNearestPaletteIndex(
</pre><pre class="diff" id="removed">- HPALETTE a0,
- COLORREF a1
</pre><pre class="diff" id="added">+ HPALETTE hpal,
+ COLORREF crColor
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetNearestPaletteIndex(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiGetNearestPaletteIndex(hpal, \
crColor); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -683,13 +676,13 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
GetPaletteEntries(
</pre><pre class="diff" id="removed">- HPALETTE a0,
- UINT a1,
- UINT a2,
- LPPALETTEENTRY a3
</pre><pre class="diff" id="added">+ HPALETTE hpal,
+ UINT iStartIndex,
+ UINT nEntries,
+ LPPALETTEENTRY lppe
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetPaletteEntries(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiGetPaletteEntries(hpal, \
iStartIndex, nEntries, lppe); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -698,13 +691,13 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
GetSystemPaletteEntries(
</pre><pre class="diff" id="removed">- HDC a0,
- UINT a1,
- UINT a2,
- LPPALETTEENTRY a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ UINT iStartIndex,
+ UINT nEntries,
+ LPPALETTEENTRY lppe
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return \
NtGdiGetSystemPaletteEntries(a0,a1,a2,a3); </pre><pre class="diff" id="added">+ \
return NtGdiGetSystemPaletteEntries(hdc, iStartIndex, nEntries, lppe); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -713,11 +706,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
RestoreDC(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nSavedDC
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiRestoreDC(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiRestoreDC(hdc, nSavedDC);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -727,10 +720,10 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
SaveDC(
</pre><pre class="diff" id="removed">- HDC <span id="removedchars">a0</span>
</pre><pre class="diff" id="added">+ HDC <span id="addedchars">hdc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSaveDC(a0);
</pre><pre class="diff" id="added">+ return NtGdiSaveDC(hdc);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -739,13 +732,13 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
SetPaletteEntries(
</pre><pre class="diff" id="removed">- HPALETTE a0,
- UINT a1,
- UINT a2,
- CONST PALETTEENTRY *a3
</pre><pre class="diff" id="added">+ HPALETTE hpal,
+ UINT iStart,
+ UINT cEntries,
+ CONST PALETTEENTRY *lppe
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetPaletteEntries(a0,a1,a2,(CONST \
PPALETTEENTRY)a3); </pre><pre class="diff" id="added">+ return \
NtGdiSetPaletteEntries(hpal, iStart, cEntries, (CONST PPALETTEENTRY)lppe); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -755,10 +748,10 @@
</small></pre><pre class="diff" id="context"> STDCALL
GetWorldTransform(
HDC hdc,
</pre><pre class="diff" id="removed">- LPXFORM a1
</pre><pre class="diff" id="added">+ LPXFORM lpXform
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetWorldTransform(hdc,a1);
</pre><pre class="diff" id="added">+ return NtGdiGetWorldTransform(hdc, lpXform);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -767,11 +760,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetWorldTransform(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST XFORM *a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST XFORM *lpXform
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetWorldTransform(a0,(CONST \
PXFORM)a1); </pre><pre class="diff" id="added">+ return NtGdiSetWorldTransform(hdc, \
(CONST PXFORM)lpXform); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -780,12 +773,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
ModifyWorldTransform(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST XFORM *a1,
- DWORD a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST XFORM *lpXform,
+ DWORD iMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiModifyWorldTransform(a0,(CONST \
PXFORM)a1,a2); </pre><pre class="diff" id="added">+ return \
NtGdiModifyWorldTransform(hdc, (CONST PXFORM)lpXform, iMode); </pre><pre class="diff" \
id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -794,12 +787,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
CombineTransform(
</pre><pre class="diff" id="removed">- LPXFORM a0,
- CONST XFORM *a1,
- CONST XFORM *a2
</pre><pre class="diff" id="added">+ LPXFORM lpxformResult,
+ CONST XFORM *lpxform1,
+ CONST XFORM *lpxform2
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCombineTransform(a0,(CONST \
PXFORM)a1,(CONST PXFORM)a2); </pre><pre class="diff" id="added">+ return \
NtGdiCombineTransform(lpxformResult, (CONST PXFORM)lpxform1, (CONST PXFORM)lpxform2); \
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -809,12 +802,12 @@
</small></pre><pre class="diff" id="context"> STDCALL
SetDIBColorTable(
HDC hdc,
</pre><pre class="diff" id="removed">- UINT a1,
- UINT a2,
- CONST RGBQUAD *a3
</pre><pre class="diff" id="added">+ UINT uStartIndex,
+ UINT cEntries,
+ CONST RGBQUAD *pColors
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return \
NtGdiSetDIBColorTable(hdc,a1,a2,(RGBQUAD*)a3); </pre><pre class="diff" id="added">+ \
return NtGdiSetDIBColorTable(hdc, uStartIndex, cEntries, (RGBQUAD*)pColors); \
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -826,7 +819,7 @@
</small></pre><pre class="diff" id="context"> HDC hdc
)
{
</pre><pre class="diff" id="removed">-<span id="removedchars"> </span>return \
NtGdiCreateHalftonePalette(hdc); </pre><pre class="diff" id="added">+<span \
id="addedchars"> </span>return NtGdiCreateHalftonePalette(hdc); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -835,13 +828,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetViewportExtEx(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- LPSIZE a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXExtent,
+ int nYExtent,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetViewportExtEx(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiSetViewportExtEx(hdc, nXExtent, \
nYExtent, lpSize); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -850,13 +843,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetWindowExtEx(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- LPSIZE a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXExtent,
+ int nYExtent,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetWindowExtEx(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiSetWindowExtEx(hdc, nXExtent, \
nYExtent, lpSize); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -865,13 +858,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
OffsetWindowOrgEx(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- LPPOINT a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXOffset,
+ int nYOffset,
+ LPPOINT lpPoint
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiOffsetWindowOrgEx(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiOffsetWindowOrgEx(hdc, nXOffset, \
nYOffset, lpPoint); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -880,13 +873,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetBitmapDimensionEx(
</pre><pre class="diff" id="removed">- HBITMAP a0,
- int a1,
- int a2,
- LPSIZE a3
</pre><pre class="diff" id="added">+ HBITMAP hBitmap,
+ int nWidth,
+ int nHeight,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetBitmapDimensionEx(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiSetBitmapDimensionEx(hBitmap, \
nWidth, nHeight, lpSize); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -895,11 +888,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
GetDCOrgEx(
</pre><pre class="diff" id="removed">- HDC a0,
- LPPOINT a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPPOINT lpPoint
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetDCOrgEx(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiGetDCOrgEx(hdc, lpPoint);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -908,14 +901,14 @@
</small></pre><pre class="diff" id="context"> LONG
STDCALL
GetDCOrg(
</pre><pre class="diff" id="removed">- HDC <span id="removedchars">a0</span>
</pre><pre class="diff" id="added">+ HDC <span id="addedchars">hdc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- // Officially obsolete by Microsoft
- POINT Pt;
- if (!NtGdiGetDCOrgEx(a0,&Pt))
- return 0;
- return(MAKELONG(Pt.x, Pt.y));
</pre><pre class="diff" id="added">+ // Officially obsolete by Microsoft
+ POINT Pt;
+ if (!NtGdiGetDCOrgEx(hdc, &Pt))
+ return 0;
+ return(MAKELONG(Pt.x, Pt.y));
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -924,11 +917,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
RectVisible(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST RECT *a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST RECT *lprc
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiRectVisible(a0,(RECT *)a1);
</pre><pre class="diff" id="added">+ return NtGdiRectVisible(hdc, (RECT *)lprc);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -937,15 +930,15 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
ExtEscape(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- LPCSTR a3,
- int a4,
- LPSTR a5
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nEscape,
+ int cbInput,
+ LPCSTR lpszInData,
+ int cbOutput,
+ LPSTR lpszOutData
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiExtEscape(a0, a1, a2, a3, a4, a5);
</pre><pre class="diff" id="added">+ return NtGdiExtEscape(hdc, nEscape, cbInput, \
lpszInData, cbOutput, lpszOutData); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -999,3 +992,41 @@
</small></pre><pre class="diff" id="context"> {
return NtGdiGetObject(Handle, Size, Buffer);
}
</pre><pre class="diff" id="added">+
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+SetBrushOrgEx(
+ HDC hdc,
+ int nXOrg,
+ int nYOrg,
+ LPPOINT lppt
+ )
+{
+ return NtGdiSetBrushOrgEx(hdc, nXOrg, nYOrg, lppt);
+}
+
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+FixBrushOrgEx(
+ HDC hdc,
+ int nXOrg,
+ int nYOrg,
+ LPPOINT lppt
+ )
+{
+ #if 0
<a name="task1" />+ /* <span class="task">FIXME</span> - Check if we're emulating \
win95, if so, forward to SetBrushOrgEx() */ + return SetBrushOrgEx(hdc, nXOrg, \
nYOrg, lppt); + #endif
+
+ return FALSE;
+}
+
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>fillshap.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/fillshap.c?rev=1.10&content-type=text/x-cvsweb-markup">1.10</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/fillshap.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/fillshap.c?rev=1.11&content-type=text/x-cvsweb-markup">1.11</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.10 -r1.11
--- fillshap.c 8 Feb 2004 21:37:52 -0000 1.10
+++ fillshap.c 25 Apr 2004 14:46:54 -0000 1.11
@@ -12,11 +12,11 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-Polygon(HDC h<span id="removedchars">DC</span>,
</pre><pre class="diff" id="added">+Polygon(HDC h<span id="addedchars">dc</span>,
</pre><pre class="diff" id="context"> CONST POINT *lpPoints,
int nCount)
{
</pre><pre class="diff" id="removed">- return NtGdiPolygon(hDC, (CONST \
PPOINT)lpPoints, nCount); </pre><pre class="diff" id="added">+ return \
NtGdiPolygon(hdc, (CONST PPOINT)lpPoints, nCount); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -25,13 +25,13 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-Rectangle(HDC hDC,
- int LeftRect,
- int TopRect,
- int RightRect,
- int BottomRect)
</pre><pre class="diff" id="added">+Rectangle(HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiRectangle(hDC, LeftRect, \
TopRect, RightRect, BottomRect); </pre><pre class="diff" id="added">+ return \
NtGdiRectangle(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -41,15 +41,15 @@
</small></pre><pre class="diff" id="context"> STDCALL
RoundRect(
HDC hdc,
</pre><pre class="diff" id="removed">- int left,
- int top,
- int right,
- int bottom,
- int width,
- int height
</pre><pre class="diff" id="added">+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nWidth,
+ int nHeight
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiRoundRect ( hdc, left, top, \
right, bottom, width, height ); </pre><pre class="diff" id="added">+ return \
NtGdiRoundRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect, nWidth, nHeight); \
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -58,13 +58,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
PolyPolygon(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST POINT *a1,
- CONST INT *a2,
- int a3
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST POINT *lpPoints,
+ CONST INT *lpPolyCounts,
+ int nCount
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return \
PolyPolygon(a0,(LPPOINT)a1,(LPINT)a2,a3); </pre><pre class="diff" id="added">+ \
return PolyPolygon(hdc, (LPPOINT)lpPoints, (LPINT)lpPolyCounts, nCount); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -73,13 +73,13 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-Ellipse(HDC hDc,
- int Left,
- int Top,
- int Right,
- int Bottom)
</pre><pre class="diff" id="added">+Ellipse(HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiEllipse(hDc, Left, Top, Right, \
Bottom); </pre><pre class="diff" id="added">+ return NtGdiEllipse(hdc, nLeftRect, \
nTopRect, nRightRect, nBottomRect); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -88,18 +88,18 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-Pie(HDC hDc,
- int Left,
- int Top,
- int Right,
- int Bottom,
- int XRadialStart,
- int YRadialStart,
- int XRadialEnd,
- int YRadialEnd)
</pre><pre class="diff" id="added">+Pie(HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nXRadial1,
+ int nYRadial1,
+ int nXRadial2,
+ int nYRadial2)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiPie(hDc, Left, Top, Right, \
Bottom, XRadialStart, YRadialStart,
- XRadialEnd, YRadialEnd);
</pre><pre class="diff" id="added">+ return NtGdiPie(hdc, nLeftRect, nTopRect, \
nRightRect, nBottomRect, nXRadial1, nYRadial1, + nXRadial2, \
nYRadial2); </pre><pre class="diff" id="context"> }
BOOL STDCALL
</pre><pre class="diff"><small id="info">@@ -111,7 +111,7 @@
</small></pre><pre class="diff" id="context"> UINT fuFillType // fill type
)
{
</pre><pre class="diff" id="removed">- return NtGdiExtFloodFill( hdc, nXStart, \
nYStart, crColor, fuFillType ); </pre><pre class="diff" id="added">+ return \
NtGdiExtFloodFill(hdc, nXStart, nYStart, crColor, fuFillType); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -125,7 +125,7 @@
</small></pre><pre class="diff" id="context"> COLORREF crFill // fill color
)
{
</pre><pre class="diff" id="removed">- return NtGdiFloodFill(hdc,nXStart, nYStart, \
crFill ); </pre><pre class="diff" id="added">+ return NtGdiFloodFill(hdc, nXStart, \
nYStart, crFill); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -135,12 +135,12 @@
</small></pre><pre class="diff" id="context"> GdiGradientFill(
HDC hdc,
PTRIVERTEX pVertex,
</pre><pre class="diff" id="removed">- ULONG <span id="removedchars">u</span>Vertex,
</pre><pre class="diff" id="added">+ ULONG <span id="addedchars">dwNum</span>Vertex,
</pre><pre class="diff" id="context"> PVOID pMesh,
</pre><pre class="diff" id="removed">- ULONG uMesh,
- ULONG ulMode
</pre><pre class="diff" id="added">+ ULONG dwNumMesh,
+ ULONG dwMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGradientFill(hdc, pVertex, \
uVertex, pMesh, uMesh, ulMode); </pre><pre class="diff" id="added">+ return \
NtGdiGradientFill(hdc, pVertex, dwNumVertex, pMesh, dwNumMesh, dwMode); </pre><pre \
class="diff" id="context"> }
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>font.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/font.c?rev=1.3&content-type=text/x-cvsweb-markup">1.3</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/font.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/font.c?rev=1.4&content-type=text/x-cvsweb-markup">1.4</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.3 -r1.4
--- font.c 9 Apr 2004 20:03:13 -0000 1.3
+++ font.c 25 Apr 2004 14:46:54 -0000 1.4
@@ -1,4 +1,4 @@
</small></pre><pre class="diff" id="removed">-/* $Id: font.c,v 1.3 2004/04/09 \
20:03:13 navaraf Exp $ </pre><pre class="diff" id="added">+/* $Id: font.c,v 1.4 \
2004/04/25 14:46:54 weiden Exp $ </pre><pre class="diff" id="context"> *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
</pre><pre class="diff"><small id="info">@@ -194,9 +194,9 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-TranslateCharsetInfo(DWORD *Src, LPCHARSETINFO \
Cs, DWORD Flags) </pre><pre class="diff" id="added">+TranslateCharsetInfo(DWORD \
*pSrc, LPCHARSETINFO lpCs, DWORD dwFlags) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiTranslateCharsetInfo(<span \
id="removedchars">Src, Cs, </span>Flags); </pre><pre class="diff" \
id="added">+ return NtGdiTranslateCharsetInfo(<span \
id="addedchars">pSrc, lpCs, dw</span>Flags); </pre><pre class="diff" \
id="context"> }
static int FASTCALL
</pre><pre class="diff"><small id="info">@@ -277,10 +277,10 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
int STDCALL
</pre><pre class="diff" id="removed">-EnumFontFamiliesExW(HDC Dc, LPLOGFONTW LogFont, \
FONTENUMPROCW EnumFontFamProc,
- LPARAM lParam, DWORD Flags)
</pre><pre class="diff" id="added">+EnumFontFamiliesExW(HDC hdc, LPLOGFONTW \
lpLogfont, FONTENUMPROCW lpEnumFontFamExProc, + LPARAM lParam, \
DWORD dwFlags) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return IntEnumFontFamilies(Dc, LogFont, \
EnumFontFamProc, lParam, TRUE); </pre><pre class="diff" id="added">+ return \
IntEnumFontFamilies(hdc, lpLogfont, lpEnumFontFamExProc, lParam, TRUE); </pre><pre \
class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -288,19 +288,19 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
int STDCALL
</pre><pre class="diff" id="removed">-EnumFontFamiliesW(HDC Dc, LPCWSTR Family, \
FONTENUMPROCW EnumFontFamProc, </pre><pre class="diff" \
id="added">+EnumFontFamiliesW(HDC hdc, LPCWSTR lpszFamily, FONTENUMPROCW \
lpEnumFontFamProc, </pre><pre class="diff" id="context"> LPARAM \
lParam) {
LOGFONTW LogFont;
ZeroMemory(&LogFont, sizeof(LOGFONTW));
LogFont.lfCharSet = DEFAULT_CHARSET;
</pre><pre class="diff" id="removed">- if (NULL != Family)
</pre><pre class="diff" id="added">+ if (NULL != <span \
id="addedchars">lpsz</span>Family) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- lstrcpynW(LogFont.lfFaceName, Family, \
LF_FACESIZE); </pre><pre class="diff" id="added">+ lstrcpynW(LogFont.lfFaceName, \
<span id="addedchars">lpsz</span>Family, LF_FACESIZE); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff" id="removed">- return IntEnumFontFamilies(<span \
id="removedchars">Dc, &LogFont, </span>EnumFontFamProc, lParam, TRUE); \
</pre><pre class="diff" id="added">+ return IntEnumFontFamilies(<span \
id="addedchars">hdc, &LogFont, lp</span>EnumFontFamProc, lParam, TRUE); \
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -308,15 +308,15 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
int STDCALL
</pre><pre class="diff" id="removed">-EnumFontFamiliesExA (HDC Dc, LPLOGFONTA \
LogFont, FONTENUMPROCA EnumFontFamProc, </pre><pre class="diff" \
id="added">+EnumFontFamiliesExA (HDC hdc, LPLOGFONTA lpLogfont, FONTENUMPROCA \
lpEnumFontFamExProc, </pre><pre class="diff" id="context"> \
LPARAM lParam, DWORD dwFlags) {
LOGFONTW LogFontW;
</pre><pre class="diff" id="removed">- RosRtlLogFontA2W(&LogFontW, <span \
id="removedchars">LogF</span>ont); </pre><pre class="diff" id="added">+ \
RosRtlLogFontA2W(&LogFontW, <span id="addedchars">lpLogf</span>ont); </pre><pre \
class="diff" id="context"> /* no need to convert LogFontW back to lpLogFont b/c \
it's an [in] parameter only */ </pre><pre class="diff" id="removed">- return \
IntEnumFontFamilies(Dc, &LogFontW, EnumFontFamProc, lParam, FALSE); </pre><pre \
class="diff" id="added">+ return IntEnumFontFamilies(hdc, &LogFontW, \
lpEnumFontFamExProc, lParam, FALSE); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -324,19 +324,19 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
int STDCALL
</pre><pre class="diff" id="removed">-EnumFontFamiliesA(HDC Dc, LPCSTR Family, \
FONTENUMPROCA EnumFontFamProc, </pre><pre class="diff" \
id="added">+EnumFontFamiliesA(HDC hdc, LPCSTR lpszFamily, FONTENUMPROCA \
lpEnumFontFamProc, </pre><pre class="diff" id="context"> LPARAM \
lParam) {
LOGFONTW LogFont;
ZeroMemory(&LogFont, sizeof(LOGFONTW));
LogFont.lfCharSet = DEFAULT_CHARSET;
</pre><pre class="diff" id="removed">- if (NULL != Family)
</pre><pre class="diff" id="added">+ if (NULL != <span \
id="addedchars">lpsz</span>Family) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- MultiByteToWideChar(CP_THREAD_ACP, 0, \
Family, -1, LogFont.lfFaceName, LF_FACESIZE); </pre><pre class="diff" id="added">+ \
MultiByteToWideChar(CP_THREAD_ACP, 0, <span id="addedchars">lpsz</span>Family, -1, \
LogFont.lfFaceName, LF_FACESIZE); </pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- return IntEnumFontFamilies(<span \
id="removedchars">Dc, &LogFont, </span>EnumFontFamProc, lParam, FALSE); \
</pre><pre class="diff" id="added">+ return IntEnumFontFamilies(<span \
id="addedchars">hdc, &LogFont, lp</span>EnumFontFamProc, lParam, \
FALSE); </pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file9" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>line.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/line.c?rev=1.10&content-type=text/x-cvsweb-markup">1.10</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/line.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/line.c?rev=1.11&content-type=text/x-cvsweb-markup">1.11</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.10 -r1.11
--- line.c 2 Dec 2003 11:45:37 -0000 1.10
+++ line.c 25 Apr 2004 14:46:54 -0000 1.11
@@ -14,18 +14,19 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
Arc(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2,
- int a3,
- int a4,
- int a5,
- int a6,
- int a7,
- int a8
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nXStartArc,
+ int nYStartArc,
+ int nXEndArc,
+ int nYEndArc
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiArc(a0,a1,a2,a3,a4,a5,a6,a7,a8);
</pre><pre class="diff" id="added">+ return NtGdiArc(hdc, nLeftRect, nTopRect, \
nRightRect, nBottomRect, + nXStartArc, nYStartArc, nXEndArc, \
nYEndArc); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -35,10 +36,10 @@
</small></pre><pre class="diff" id="context"> STDCALL
SetArcDirection(
HDC hdc,
</pre><pre class="diff" id="removed">- int a1
</pre><pre class="diff" id="added">+ int ArcDirection
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetArcDirection(hdc, a1);
</pre><pre class="diff" id="added">+ return NtGdiSetArcDirection(hdc, ArcDirection);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -51,7 +52,7 @@
</small></pre><pre class="diff" id="context"> HDC hdc
)
{
</pre><pre class="diff" id="removed">- <span \
id="removedchars"> </span>return \
NtGdiGetArcDirection(hdc); </pre><pre class="diff" id="added">+ return \
NtGdiGetArcDirection(hdc); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -60,9 +61,9 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-LineTo(HDC hDC, int XEnd, int YEnd)
</pre><pre class="diff" id="added">+LineTo(HDC hdc, int nXEnd, int nYEnd)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiLineTo(hDC, XEnd, YEnd);
</pre><pre class="diff" id="added">+ return NtGdiLineTo(hdc, nXEnd, nYEnd);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -71,9 +72,9 @@
</small></pre><pre class="diff" id="context"> */
BOOL
STDCALL
</pre><pre class="diff" id="removed">-MoveToEx(HDC hDC, int X, int Y, LPPOINT Point)
</pre><pre class="diff" id="added">+MoveToEx(HDC hdc, int X, int Y, LPPOINT lpPoint)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiMoveToEx(hDC, X, Y, Point);
</pre><pre class="diff" id="added">+ return NtGdiMoveToEx(hdc, X, Y, lpPoint);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -84,7 +85,7 @@
</small></pre><pre class="diff" id="context"> STDCALL
Polyline( HDC hdc, CONST POINT *lppt, int cPoints )
{
</pre><pre class="diff" id="removed">- <span id="removedchars"> </span>return \
NtGdiPolyline(hdc, (CONST LPPOINT) lppt, cPoints); </pre><pre class="diff" \
id="added">+ return NtGdiPolyline(hdc, (CONST LPPOINT) lppt, cPoints); </pre><pre \
class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -94,17 +95,18 @@
</small></pre><pre class="diff" id="context"> STDCALL
ArcTo(
HDC hdc,
</pre><pre class="diff" id="removed">- int a1,
- int a2,
- int a3,
- int a4,
- int a5,
- int a6,
- int a7,
- int a8
</pre><pre class="diff" id="added">+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect,
+ int nXRadial1,
+ int nYRadial1,
+ int nXRadial2,
+ int nYRadial2
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return \
NtGdiArcTo(hdc,a1,a2,a3,a4,a5,a6,a7,a8); </pre><pre class="diff" id="added">+ return \
NtGdiArcTo(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect, + \
nXRadial1, nYRadial1, nXRadial2, nYRadial2); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -114,12 +116,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
PolyBezier(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST POINT *a1,
- DWORD a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST POINT *lppt,
+ DWORD cPoints
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiPolyBezier(a0,(CONST \
PPOINT)a1,a2); </pre><pre class="diff" id="added">+ return NtGdiPolyBezier(hdc, \
(CONST PPOINT)lppt, cPoints); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -128,12 +130,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
PolyBezierTo(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST POINT *a1,
- DWORD a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST POINT *lppt,
+ DWORD cCount
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiPolyBezierTo(a0,(CONST \
PPOINT)a1,a2); </pre><pre class="diff" id="added">+ return NtGdiPolyBezierTo(hdc, \
(CONST PPOINT)lppt, cCount); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -143,12 +145,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
PolylineTo(
</pre><pre class="diff" id="removed">- HDC a0,
- CONST POINT *a1,
- DWORD a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ CONST POINT *lppt,
+ DWORD cCount
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiPolylineTo(a0,(CONST \
PPOINT)a1,a2); </pre><pre class="diff" id="added">+ return NtGdiPolylineTo(hdc, \
(CONST PPOINT)lppt, cCount); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -158,10 +160,10 @@
</small></pre><pre class="diff" id="context"> STDCALL
PolyPolyline(
HDC hdc,
</pre><pre class="diff" id="removed">- CONST POINT *a1,
- CONST DWORD *a2,
- DWORD a3
</pre><pre class="diff" id="added">+ CONST POINT *lppt,
+ CONST DWORD *lpdwPolyPoints,
+ DWORD cCount
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return \
NtGdiPolyPolyline(hdc,(LPPOINT)a1,(LPDWORD)a2,a3); </pre><pre class="diff" \
id="added">+ return NtGdiPolyPolyline(hdc, (LPPOINT)lppt, (LPDWORD)lpdwPolyPoints, \
cCount); </pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file10" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>linedda.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/linedda.c?rev=1.1&content-type=text/x-cvsweb-markup">1.1</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/linedda.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/linedda.c?rev=1.2&content-type=text/x-cvsweb-markup">1.2</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.1 -r1.2
--- linedda.c 16 Nov 2003 22:44:39 -0000 1.1
+++ linedda.c 25 Apr 2004 14:46:54 -0000 1.2
@@ -37,7 +37,7 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
BOOL STDCALL LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd,
</pre><pre class="diff" id="removed">- LINEDDAPROC callback, \
LPARAM lParam ) </pre><pre class="diff" id="added">+ \
LINEDDAPROC lpLineFunc, LPARAM lpData ) </pre><pre class="diff" id="context"> {
INT xadd = 1, yadd = 1;
INT err,erradd;
</pre><pre class="diff"><small id="info">@@ -54,7 +54,7 @@
</small></pre><pre class="diff" id="context"> if (dx > dy) { /* line is "more \
horizontal" */ err = 2*dy - dx; erradd = 2*dy - 2*dx;
for(cnt = 0;cnt <= dx; cnt++) {
</pre><pre class="diff" id="removed">- callback(nXStart,nYStart,lParam);
</pre><pre class="diff" id="added">+ lpLineFunc(nXStart,nYStart,lpData);
</pre><pre class="diff" id="context"> if (err > 0) {
nYStart += yadd;
err += erradd;
</pre><pre class="diff"><small id="info">@@ -66,7 +66,7 @@
</small></pre><pre class="diff" id="context"> } else { /* line is "more \
vertical" */ err = 2*dx - dy; erradd = 2*dx - 2*dy;
for(cnt = 0;cnt <= dy; cnt++) {
</pre><pre class="diff" id="removed">- callback(nXStart,nYStart,lParam);
</pre><pre class="diff" id="added">+ lpLineFunc(nXStart,nYStart,lpData);
</pre><pre class="diff" id="context"> if (err > 0) {
nXStart += xadd;
err += erradd;
</pre></div>
<hr /><a name="file11" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>metafile.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/metafile.c?rev=1.2&content-type=text/x-cvsweb-markup">1.2</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/metafile.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/metafile.c?rev=1.3&content-type=text/x-cvsweb-markup">1.3</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- metafile.c 9 Apr 2004 20:03:13 -0000 1.2
+++ metafile.c 25 Apr 2004 14:46:54 -0000 1.3
@@ -19,11 +19,11 @@
</small></pre><pre class="diff" id="context"> HMETAFILE
STDCALL
CopyMetaFileW(
</pre><pre class="diff" id="removed">- HMETAFILE Src,
- LPCWSTR File
</pre><pre class="diff" id="added">+ HMETAFILE hmfSrc,
+ LPCWSTR lpszFile
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCopyMetaFile ( Src, File );
</pre><pre class="diff" id="added">+ return NtGdiCopyMetaFile (hmfSrc, lpszFile);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -33,7 +33,7 @@
</small></pre><pre class="diff" id="context"> HMETAFILE
STDCALL
CopyMetaFileA(
</pre><pre class="diff" id="removed">- HMETAFILE Src,
</pre><pre class="diff" id="added">+ HMETAFILE <span id="addedchars">hmf</span>Src,
</pre><pre class="diff" id="context"> LPCSTR lpszFile
)
{
</pre><pre class="diff"><small id="info">@@ -46,7 +46,7 @@
</small></pre><pre class="diff" id="context"> SetLastError \
(RtlNtStatusToDosError(Status)); else
{
</pre><pre class="diff" id="removed">- rc = NtGdiCopyMetaFile ( Src, lpszFileW );
</pre><pre class="diff" id="added">+ rc = NtGdiCopyMetaFile ( <span \
id="addedchars">hmf</span>Src, lpszFileW ); </pre><pre class="diff" id="context">
HEAP_free ( lpszFileW );
}
</pre><pre class="diff"><small id="info">@@ -64,7 +64,7 @@
</small></pre><pre class="diff" id="context"> LPCWSTR lpszFile
)
{
</pre><pre class="diff" id="removed">-<span id="removedchars"> </span>return \
NtGdiCreateMetaFile ( lpszFile ); </pre><pre class="diff" id="added">+<span \
id="addedchars"> </span>return NtGdiCreateMetaFile ( lpszFile ); \
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -181,13 +181,13 @@
</small></pre><pre class="diff" id="context"> HDC
STDCALL
CreateEnhMetaFileW(
</pre><pre class="diff" id="removed">- HDC hdc,
</pre><pre class="diff" id="added">+ HDC hdc<span id="addedchars">Ref</span>,
</pre><pre class="diff" id="context"> LPCWSTR lpFileName,
CONST RECT *lpRect,
LPCWSTR lpDescription
)
{
</pre><pre class="diff" id="removed">- return NtGdiCreateEnhMetaFile ( hdc, \
lpFileName, (CONST LPRECT)lpRect, lpDescription ); </pre><pre class="diff" \
id="added">+ return NtGdiCreateEnhMetaFile ( hdc<span id="addedchars">Ref</span>, \
lpFileName, (CONST LPRECT)lpRect, lpDescription ); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -197,7 +197,7 @@
</small></pre><pre class="diff" id="context"> HDC
STDCALL
CreateEnhMetaFileA(
</pre><pre class="diff" id="removed">- HDC hdc,
</pre><pre class="diff" id="added">+ HDC hdc<span id="addedchars">Ref</span>,
</pre><pre class="diff" id="context"> LPCSTR lpFileName,
CONST RECT *lpRect,
LPCSTR lpDescription
</pre><pre class="diff"><small id="info">@@ -218,7 +218,7 @@
</small></pre><pre class="diff" id="context"> else
{
rc = NtGdiCreateEnhMetaFile (
</pre><pre class="diff" id="removed">- hdc, lpFileNameW, (CONST LPRECT)lpRect, \
lpDescriptionW ); </pre><pre class="diff" id="added">+ hdc<span \
id="addedchars">Ref</span>, lpFileNameW, (CONST LPRECT)lpRect, lpDescriptionW ); \
</pre><pre class="diff" id="context"> HEAP_free ( lpDescriptionW );
}
</pre></div>
<hr /><a name="file12" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>pen.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/pen.c?rev=1.5&content-type=text/x-cvsweb-markup">1.5</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/pen.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/pen.c?rev=1.6&content-type=text/x-cvsweb-markup">1.6</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.5 -r1.6
--- pen.c 19 Aug 2003 11:48:49 -0000 1.5
+++ pen.c 25 Apr 2004 14:46:54 -0000 1.6
@@ -13,9 +13,9 @@
</small></pre><pre class="diff" id="context"> */
HPEN
STDCALL
</pre><pre class="diff" id="removed">-CreatePen(INT PenStyle, INT Width, COLORREF \
Color) </pre><pre class="diff" id="added">+CreatePen(INT fnPenStyle, INT nWidth, \
COLORREF crColor) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiCreatePen(PenStyle, Width, \
Color); </pre><pre class="diff" id="added">+ return NtGdiCreatePen(fnPenStyle, \
nWidth, crColor); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -24,7 +24,7 @@
</small></pre><pre class="diff" id="context"> */
HPEN
STDCALL
</pre><pre class="diff" id="removed">-CreatePenIndirect(CONST LOGPEN *lgpn)
</pre><pre class="diff" id="added">+CreatePenIndirect(CONST LOGPEN *l<span \
id="addedchars">pl</span>gpn) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiCreatePenIndirect((CONST \
PLOGPEN)lgpn); </pre><pre class="diff" id="added">+ return \
NtGdiCreatePenIndirect((CONST PLOGPEN)lplgpn); </pre><pre class="diff" id="context"> \
} </pre></div>
<hr /><a name="file13" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>region.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/region.c?rev=1.13&content-type=text/x-cvsweb-markup">1.13</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/region.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.14&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/region.c?rev=1.14&content-type=text/x-cvsweb-markup">1.14</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.13 -r1.14
--- region.c 24 Apr 2004 14:21:36 -0000 1.13
+++ region.c 25 Apr 2004 14:46:54 -0000 1.14
@@ -14,12 +14,12 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
OffsetClipRgn(
</pre><pre class="diff" id="removed">- HDC a0,
- int a1,
- int a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXOffset,
+ int nYOffset
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiOffsetClipRgn(a0, a1, a2);
</pre><pre class="diff" id="added">+ return NtGdiOffsetClipRgn(hdc, nXOffset, \
nYOffset); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -29,14 +29,14 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetClipRgn(
</pre><pre class="diff" id="removed">- HDC a0,
- HRGN a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ HRGN hrgn
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- HRGN rgn = NtGdiGetClipRgn(<span \
id="removedchars">a0</span>); </pre><pre class="diff" id="added">+ HRGN rgn = \
NtGdiGetClipRgn(<span id="addedchars">hdc</span>); </pre><pre class="diff" \
id="context"> if(rgn) {
</pre><pre class="diff" id="removed">- if(NtGdiCombineRgn(<span \
id="removedchars">a1</span>, rgn, 0, RGN_COPY) != ERROR) return 1; </pre><pre \
class="diff" id="added">+ if(NtGdiCombineRgn(<span id="addedchars">hrgn</span>, rgn, \
0, RGN_COPY) != ERROR) return 1; </pre><pre class="diff" id="context"> else
return -1;
}
</pre><pre class="diff"><small id="info">@@ -45,31 +45,31 @@
</small></pre><pre class="diff" id="context">
/*
</pre><pre class="diff" id="removed">- * @<span \
id="removedchars">un</span>implemented </pre><pre class="diff" id="added">+ * \
@implemented </pre><pre class="diff" id="context"> */
HRGN
STDCALL
CreateEllipticRgn(
</pre><pre class="diff" id="removed">- int a0,
- int a1,
- int a2,
- int a3
</pre><pre class="diff" id="added">+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateEllipticRgn(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiCreateEllipticRgn(nLeftRect, \
nTopRect, nRightRect, nBottomRect); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff" id="removed">- * @<span \
id="removedchars">un</span>implemented </pre><pre class="diff" id="added">+ * \
@implemented </pre><pre class="diff" id="context"> */
HRGN
STDCALL
CreateEllipticRgnIndirect(
</pre><pre class="diff" id="removed">- CONST RECT *<span id="removedchars">a0</span>
</pre><pre class="diff" id="added">+ CONST RECT *<span id="addedchars">lprc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateEllipticRgnIndirect((RECT \
*)a0); </pre><pre class="diff" id="added">+ return \
NtGdiCreateEllipticRgnIndirect((RECT *)lprc); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -93,29 +93,16 @@
</small></pre><pre class="diff" id="context"> /*
* @implemented
*/
</pre><pre class="diff" id="removed">-HBRUSH
-STDCALL
-CreatePatternBrush(
- HBITMAP hbmp
- )
-{
- return NtGdiCreatePatternBrush ( hbmp );
-}
-
-
-/*
- * @implemented
- */
</pre><pre class="diff" id="context"> HRGN
STDCALL
CreateRectRgn(
</pre><pre class="diff" id="removed">- int a0,
- int a1,
- int a2,
- int a3
</pre><pre class="diff" id="added">+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateRectRgn(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiCreateRectRgn(nLeftRect, nTopRect, \
nRightRect, nBottomRect); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -125,10 +112,10 @@
</small></pre><pre class="diff" id="context"> HRGN
STDCALL
CreateRectRgnIndirect(
</pre><pre class="diff" id="removed">- CONST RECT *<span id="removedchars">a0</span>
</pre><pre class="diff" id="added">+ CONST RECT *<span id="addedchars">lprc</span>
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateRectRgnIndirect((RECT *)a0);
</pre><pre class="diff" id="added">+ return NtGdiCreateRectRgnIndirect((RECT \
*)lprc); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -146,8 +133,8 @@
</small></pre><pre class="diff" id="context"> int nHeightEllipse
)
{
</pre><pre class="diff" id="removed">- return NtGdiCreateRoundRectRgn (
- nLeftRect, nTopRect, nRightRect, nBottomRect, nWidthEllipse, nHeightEllipse );
</pre><pre class="diff" id="added">+ return NtGdiCreateRoundRectRgn(nLeftRect, \
nTopRect, nRightRect, nBottomRect, + nWidthEllipse, \
nHeightEllipse); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -157,11 +144,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
EqualRgn(
</pre><pre class="diff" id="removed">- HRGN a0,
- HRGN a1
</pre><pre class="diff" id="added">+ HRGN hSrcRgn1,
+ HRGN hSrcRgn2
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiEqualRgn(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiEqualRgn(hSrcRgn1, hSrcRgn2);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -171,12 +158,12 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
OffsetRgn(
</pre><pre class="diff" id="removed">- HRGN a0,
- int a1,
- int a2
</pre><pre class="diff" id="added">+ HRGN hrgn,
+ int nXOffset,
+ int nYOffset
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiOffsetRgn(a0,a1,a2);
</pre><pre class="diff" id="added">+ return NtGdiOffsetRgn(hrgn, nXOffset, \
nYOffset); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -186,11 +173,11 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
GetRgnBox(
</pre><pre class="diff" id="removed">- HRGN a0,
- LPRECT a1
</pre><pre class="diff" id="added">+ HRGN hrgn,
+ LPRECT lprc
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetRgnBox(a0,a1);
</pre><pre class="diff" id="added">+ return NtGdiGetRgnBox(hrgn, lprc);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -200,14 +187,14 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
SetRectRgn(
</pre><pre class="diff" id="removed">- HRGN a0,
- int a1,
- int a2,
- int a3,
- int a4
</pre><pre class="diff" id="added">+ HRGN hrgn,
+ int nLeftRect,
+ int nTopRect,
+ int nRightRect,
+ int nBottomRect
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetRectRgn(a0,a1,a2,a3,a4);
</pre><pre class="diff" id="added">+ return NtGdiSetRectRgn(hrgn, nLeftRect, \
nTopRect, nRightRect, nBottomRect); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -217,13 +204,13 @@
</small></pre><pre class="diff" id="context"> int
STDCALL
CombineRgn(
</pre><pre class="diff" id="removed">- HRGN a0,
- HRGN a1,
- HRGN a2,
- int a3
</pre><pre class="diff" id="added">+ HRGN hrgnDest,
+ HRGN hrgnSrc1,
+ HRGN hrgnSrc2,
+ int fnCombineMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCombineRgn(a0,a1,a2,a3);
</pre><pre class="diff" id="added">+ return NtGdiCombineRgn(hrgnDest, hrgnSrc1, \
hrgnSrc2, fnCombineMode); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -233,12 +220,12 @@
</small></pre><pre class="diff" id="context"> DWORD
STDCALL
GetRegionData(
</pre><pre class="diff" id="removed">- HRGN a0,
- DWORD a1,
- LPRGNDATA a2
</pre><pre class="diff" id="added">+ HRGN hRgn,
+ DWORD dwCount,
+ LPRGNDATA lpRgnData
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetRegionData(a0,a1,a2);
</pre><pre class="diff" id="added">+ return NtGdiGetRegionData(hRgn, dwCount, \
lpRgnData); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -248,11 +235,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
PaintRgn(
</pre><pre class="diff" id="removed">- HDC a0,
- HRGN a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ HRGN hrgn
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiPaintRgn( a0, a1 );
</pre><pre class="diff" id="added">+ return NtGdiPaintRgn(hdc, hrgn);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -262,12 +249,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
FillRgn(
</pre><pre class="diff" id="removed">- HDC a0,
- HRGN a1,
- HBRUSH a2
</pre><pre class="diff" id="added">+ HDC hdc,
+ HRGN hrgn,
+ HBRUSH hbr
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiFillRgn(a0, a1, a2);
</pre><pre class="diff" id="added">+ return NtGdiFillRgn(hdc, hrgn, hbr);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -276,12 +263,12 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
PtInRegion(
</pre><pre class="diff" id="removed">- HRGN a0,
- int a1,
- int a2
</pre><pre class="diff" id="added">+ HRGN hrgn,
+ int X,
+ int Y
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiPtInRegion(a0,a1,a2);
</pre><pre class="diff" id="added">+ return NtGdiPtInRegion(hrgn, X, Y);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -290,11 +277,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
RectInRegion(
</pre><pre class="diff" id="removed">- HRGN a0,
- CONST RECT *a1
</pre><pre class="diff" id="added">+ HRGN hrgn,
+ CONST RECT *lprc
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiRectInRegion(a0,(CONST PRECT)a1);
</pre><pre class="diff" id="added">+ return NtGdiRectInRegion(hrgn, (CONST \
PRECT)lprc); </pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -303,11 +290,11 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
InvertRgn(
</pre><pre class="diff" id="removed">- HDC hDc,
- HRGN hRgn
</pre><pre class="diff" id="added">+ HDC hdc,
+ HRGN hrgn
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiInvertRgn(hDc, hRgn);
</pre><pre class="diff" id="added">+ return NtGdiInvertRgn(hdc, hrgn);
</pre><pre class="diff" id="context"> }
/*
</pre><pre class="diff"><small id="info">@@ -323,5 +310,5 @@
</small></pre><pre class="diff" id="context"> int nHeight
)
{
</pre><pre class="diff" id="removed">-<span id="removedchars"> </span>return \
NtGdiFrameRgn(hdc, hrgn, hbr, nWidth, nHeight); </pre><pre class="diff" \
id="added">+<span id="addedchars"> </span>return NtGdiFrameRgn(hdc, hrgn, \
hbr, nWidth, nHeight); </pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file14" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib">lib</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32">gdi32</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>text.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/text.c?rev=1.18&content-type=text/x-cvsweb-markup">1.18</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/text.c.diff?r1=text&tr1=1.18&r2=text&tr2=1.19&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/lib/gdi32/objects/text.c?rev=1.19&content-type=text/x-cvsweb-markup">1.19</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.18 -r1.19
--- text.c 27 Mar 2004 21:07:33 -0000 1.18
+++ text.c 25 Apr 2004 14:46:54 -0000 1.19
@@ -17,11 +17,11 @@
</small></pre><pre class="diff" id="context"> UINT
STDCALL
SetTextAlign(
</pre><pre class="diff" id="removed">- HDC a0,
- UINT a1
</pre><pre class="diff" id="added">+ HDC hdc,
+ UINT fMode
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiSetTextAlign(a0, a1);
</pre><pre class="diff" id="added">+ return NtGdiSetTextAlign(hdc, fMode);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -31,24 +31,24 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
TextOutA(
</pre><pre class="diff" id="removed">- HDC hDC,
- int XStart,
- int YStart,
- LPCSTR String,
- int Count)
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXStart,
+ int nYStart,
+ LPCSTR lpString,
+ int cbString)
</pre><pre class="diff" id="context"> {
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
</pre><pre class="diff" id="removed">- if (NULL != String)
</pre><pre class="diff" id="added">+ if (NULL != <span \
id="addedchars">lp</span>String) </pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- RtlInitAnsiString(&StringA, \
(LPSTR)String); </pre><pre class="diff" id="added">+ RtlInitAnsiString(&StringA, \
(LPSTR)<span id="addedchars">lp</span>String); </pre><pre class="diff" id="context"> \
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); } else
StringU.Buffer = NULL;
</pre><pre class="diff" id="removed">- ret = TextOutW(hDC, XStart, YStart, \
StringU.Buffer, Count); </pre><pre class="diff" id="added">+ ret = TextOutW(hdc, \
nXStart, nYStart, StringU.Buffer, cbString); </pre><pre class="diff" id="context"> \
RtlFreeUnicodeString(&StringU); return ret;
}
</pre><pre class="diff"><small id="info">@@ -60,13 +60,13 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
TextOutW(
</pre><pre class="diff" id="removed">- HDC hDC,
- int XStart,
- int YStart,
- LPCWSTR String,
- int Count)
</pre><pre class="diff" id="added">+ HDC hdc,
+ int nXStart,
+ int nYStart,
+ LPCWSTR lpString,
+ int cbString)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return NtGdiTextOut(hDC, XStart, YStart, \
String, Count); </pre><pre class="diff" id="added">+ return NtGdiTextOut(hdc, \
nXStart, nYStart, lpString, cbString); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -74,9 +74,9 @@
</small></pre><pre class="diff" id="context"> * @implemented
*/
COLORREF STDCALL
</pre><pre class="diff" id="removed">-SetTextColor(HDC hDC, COLORREF color)
</pre><pre class="diff" id="added">+SetTextColor(HDC hdc, COLORREF crColor)
</pre><pre class="diff" id="context"> {
</pre><pre class="diff" id="removed">- return(NtGdiSetTextColor(hDC, color));
</pre><pre class="diff" id="added">+ return NtGdiSetTextColor(hdc, crColor);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -87,7 +87,7 @@
</small></pre><pre class="diff" id="context"> STDCALL
GetTextMetricsA(
HDC hdc,
</pre><pre class="diff" id="removed">- LPTEXTMETRICA tm
</pre><pre class="diff" id="added">+ LPTEXTMETRICA <span id="addedchars">lp</span>tm
</pre><pre class="diff" id="context"> )
{
TEXTMETRICW tmw;
</pre><pre class="diff"><small id="info">@@ -97,7 +97,7 @@
</small></pre><pre class="diff" id="context"> return FALSE;
}
</pre><pre class="diff" id="removed">- return TextMetricW2A(tm, &tmw);
</pre><pre class="diff" id="added">+ return TextMetricW2A(<span \
id="addedchars">lp</span>tm, &tmw); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -108,10 +108,10 @@
</small></pre><pre class="diff" id="context"> STDCALL
GetTextMetricsW(
HDC hdc,
</pre><pre class="diff" id="removed">- LPTEXTMETRICW tm
</pre><pre class="diff" id="added">+ LPTEXTMETRICW <span id="addedchars">lp</span>tm
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetTextMetrics(hdc, tm);
</pre><pre class="diff" id="added">+ return NtGdiGetTextMetrics(hdc, <span \
id="addedchars">lp</span>tm); </pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -121,20 +121,20 @@
</small></pre><pre class="diff" id="context"> BOOL
APIENTRY
GetTextExtentPointA(
</pre><pre class="diff" id="removed">- HDC hDC,
- LPCSTR String,
- int Count,
- LPSIZE Size
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPCSTR lpString,
+ int cbString,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
</pre><pre class="diff" id="removed">- RtlInitAnsiString(&StringA, \
(LPSTR)String); </pre><pre class="diff" id="added">+ RtlInitAnsiString(&StringA, \
(LPSTR)<span id="addedchars">lp</span>String); </pre><pre class="diff" id="context"> \
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
</pre><pre class="diff" id="removed">- ret = GetTextExtentPointW(hDC, \
StringU.Buffer, Count, Size); </pre><pre class="diff" id="added">+ ret = \
GetTextExtentPointW(hdc, StringU.Buffer, cbString, lpSize); </pre><pre class="diff" \
id="context"> RtlFreeUnicodeString(&StringU);
</pre><pre class="diff"><small id="info">@@ -148,13 +148,13 @@
</small></pre><pre class="diff" id="context"> BOOL
APIENTRY
GetTextExtentPointW(
</pre><pre class="diff" id="removed">- HDC hDC,
- LPCWSTR String,
- int Count,
- LPSIZE Size
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPCWSTR lpString,
+ int cbString,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetTextExtentPoint(hDC, String, \
Count, Size); </pre><pre class="diff" id="added">+ return \
NtGdiGetTextExtentPoint(hdc, lpString, cbString, lpSize); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -164,20 +164,20 @@
</small></pre><pre class="diff" id="context"> BOOL
APIENTRY
GetTextExtentPoint32A(
</pre><pre class="diff" id="removed">- HDC hDC,
- LPCSTR String,
- int Count,
- LPSIZE Size
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPCSTR lpString,
+ int cbString,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
</pre><pre class="diff" id="removed">- RtlInitAnsiString(&StringA, \
(LPSTR)String); </pre><pre class="diff" id="added">+ RtlInitAnsiString(&StringA, \
(LPSTR)<span id="addedchars">lp</span>String); </pre><pre class="diff" id="context"> \
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
</pre><pre class="diff" id="removed">- ret = GetTextExtentPoint32W(hDC, \
StringU.Buffer, Count, Size); </pre><pre class="diff" id="added">+ ret = \
GetTextExtentPoint32W(hdc, StringU.Buffer, cbString, lpSize); </pre><pre class="diff" \
id="context"> RtlFreeUnicodeString(&StringU);
</pre><pre class="diff"><small id="info">@@ -191,13 +191,13 @@
</small></pre><pre class="diff" id="context"> BOOL
APIENTRY
GetTextExtentPoint32W(
</pre><pre class="diff" id="removed">- HDC hDC,
- LPCWSTR String,
- int Count,
- LPSIZE Size
</pre><pre class="diff" id="added">+ HDC hdc,
+ LPCWSTR lpString,
+ int cbString,
+ LPSIZE lpSize
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiGetTextExtentPoint32(hDC, String, \
Count, Size); </pre><pre class="diff" id="added">+ return \
NtGdiGetTextExtentPoint32(hdc, lpString, cbString, lpSize); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -207,24 +207,24 @@
</small></pre><pre class="diff" id="context"> BOOL
STDCALL
ExtTextOutA(
</pre><pre class="diff" id="removed">- HDC h<span id="removedchars">DC</span>,
</pre><pre class="diff" id="added">+ HDC h<span id="addedchars">dc</span>,
</pre><pre class="diff" id="context"> int X,
int Y,
</pre><pre class="diff" id="removed">- UINT Options,
- CONST RECT *Rect,
- LPCSTR String,
- UINT Count,
- CONST INT *Spacings
</pre><pre class="diff" id="added">+ UINT fuOptions,
+ CONST RECT *lprc,
+ LPCSTR lpString,
+ UINT cbCount,
+ CONST INT *lpDx
</pre><pre class="diff" id="context"> )
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
BOOL ret;
</pre><pre class="diff" id="removed">- RtlInitAnsiString(&StringA, \
(LPSTR)String); </pre><pre class="diff" id="added">+ RtlInitAnsiString(&StringA, \
(LPSTR)<span id="addedchars">lp</span>String); </pre><pre class="diff" id="context"> \
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
</pre><pre class="diff" id="removed">- ret = ExtTextOutW(hDC, X, Y, Options, \
Rect, StringU.Buffer, Count, Spacings); </pre><pre class="diff" id="added">+ \
ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cbCount, lpDx); \
</pre><pre class="diff" id="context"> RtlFreeUnicodeString(&StringU);
</pre><pre class="diff"><small id="info">@@ -242,13 +242,13 @@
</small></pre><pre class="diff" id="context"> int X,
int Y,
UINT fuOptions,
</pre><pre class="diff" id="removed">- CONST RECT *lp<span \
id="removedchars">Rect</span>, </pre><pre class="diff" id="added">+ CONST \
RECT *lp<span id="addedchars">rc</span>, </pre><pre class="diff" id="context"> \
LPCWSTR lpString, UINT cbCount,
CONST INT *lpDx
)
{
</pre><pre class="diff" id="removed">- return NtGdiExtTextOut(hdc, X, Y, fuOptions, \
lp<span id="removedchars">Rect</span>, lpString, cbCount, lpDx); </pre><pre \
class="diff" id="added">+ return NtGdiExtTextOut(hdc, X, Y, fuOptions, lp<span \
id="addedchars">rc</span>, lpString, cbCount, lpDx); </pre><pre class="diff" \
id="context"> }
</pre><pre class="diff"><small id="info">@@ -258,12 +258,12 @@
</small></pre><pre class="diff" id="context"> HFONT
STDCALL
CreateFontIndirectA(
</pre><pre class="diff" id="removed">- CONST LOGFONTA *lf
</pre><pre class="diff" id="added">+ CONST LOGFONTA *l<span \
id="addedchars">pl</span>f </pre><pre class="diff" id="context"> )
{
LOGFONTW tlf;
</pre><pre class="diff" id="removed">- RosRtlLogFontA2W(&tlf, lf);
</pre><pre class="diff" id="added">+ RosRtlLogFontA2W(&tlf, l<span \
id="addedchars">pl</span>f); </pre><pre class="diff" id="context">
return NtGdiCreateFontIndirect(&tlf);
}
</pre><pre class="diff"><small id="info">@@ -275,10 +275,10 @@
</small></pre><pre class="diff" id="context"> HFONT
STDCALL
CreateFontIndirectW(
</pre><pre class="diff" id="removed">- CONST LOGFONTW *lf
</pre><pre class="diff" id="added">+ CONST LOGFONTW *l<span \
id="addedchars">pl</span>f </pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateFontIndirect((CONST \
LPLOGFONTW)lf); </pre><pre class="diff" id="added">+ return \
NtGdiCreateFontIndirect((CONST LPLOGFONTW)l<span id="addedchars">pl</span>f); \
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">@@ -288,31 +288,31 @@
</small></pre><pre class="diff" id="context"> HFONT
STDCALL
CreateFontA(
</pre><pre class="diff" id="removed">- int Height,
- int Width,
- int Escapement,
- int Orientation,
- int Weight,
- DWORD Italic,
- DWORD Underline,
- DWORD StrikeOut,
- DWORD CharSet,
- DWORD OutputPrecision,
- DWORD ClipPrecision,
- DWORD Quality,
- DWORD PitchAndFamily,
- LPCSTR Face
</pre><pre class="diff" id="added">+ int nHeight,
+ int nWidth,
+ int nEscapement,
+ int nOrientation,
+ int fnWeight,
+ DWORD fdwItalic,
+ DWORD fdwUnderline,
+ DWORD fdwStrikeOut,
+ DWORD fdwCharSet,
+ DWORD fdwOutputPrecision,
+ DWORD fdwClipPrecision,
+ DWORD fdwQuality,
+ DWORD fdwPitchAndFamily,
+ LPCSTR lpszFace
</pre><pre class="diff" id="context"> )
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
HFONT ret;
</pre><pre class="diff" id="removed">- RtlInitAnsiString(&StringA, (LPSTR)Face);
</pre><pre class="diff" id="added">+ RtlInitAnsiString(&StringA, (LPSTR)<span \
id="addedchars">lpsz</span>Face); </pre><pre class="diff" id="context"> \
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
</pre><pre class="diff" id="removed">- ret = CreateFontW(Height, Width, \
Escapement, Orientation, Weight, Italic, Underline, StrikeOut,
- CharSet, OutputPrecision, ClipPrecision, Quality, \
PitchAndFamily, StringU.Buffer); </pre><pre class="diff" id="added">+ ret = \
CreateFontW(nHeight, nWidth, nEscapement, nOrientation, fnWeight, fdwItalic, \
fdwUnderline, fdwStrikeOut, + fdwCharSet, \
fdwOutputPrecision, fdwClipPrecision, fdwQuality, fdwPitchAndFamily, StringU.Buffer); \
</pre><pre class="diff" id="context"> RtlFreeUnicodeString(&StringU);
</pre><pre class="diff"><small id="info">@@ -326,23 +326,23 @@
</small></pre><pre class="diff" id="context"> HFONT
STDCALL
CreateFontW(
</pre><pre class="diff" id="removed">- int Height,
- int Width,
- int Escapement,
- int Orientation,
- int Weight,
- DWORD Italic,
- DWORD Underline,
- DWORD StrikeOut,
- DWORD CharSet,
- DWORD OutputPrecision,
- DWORD ClipPrecision,
- DWORD Quality,
- DWORD PitchAndFamily,
- LPCWSTR Face
</pre><pre class="diff" id="added">+ int nHeight,
+ int nWidth,
+ int nEscapement,
+ int nOrientation,
+ int nWeight,
+ DWORD fnItalic,
+ DWORD fdwUnderline,
+ DWORD fdwStrikeOut,
+ DWORD fdwCharSet,
+ DWORD fdwOutputPrecision,
+ DWORD fdwClipPrecision,
+ DWORD fdwQuality,
+ DWORD fdwPitchAndFamily,
+ LPCWSTR lpszFace
</pre><pre class="diff" id="context"> )
{
</pre><pre class="diff" id="removed">- return NtGdiCreateFont(Height, Width, \
Escapement, Orientation, Weight, Italic, Underline, StrikeOut,
- CharSet, OutputPrecision, ClipPrecision, Quality, \
PitchAndFamily, Face); </pre><pre class="diff" id="added">+ return \
NtGdiCreateFont(nHeight, nWidth, nEscapement, nOrientation, nWeight, fnItalic, \
fdwUnderline, fdwStrikeOut, + fdwCharSet, fdwOutputPrecision, \
fdwClipPrecision, fdwQuality, fdwPitchAndFamily, lpszFace); </pre><pre class="diff" \
id="context"> }
</pre></div>
<hr /><a name="file15" /><div class="file">
<span class="pathname"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos">reactos</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys">subsys</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k">win32k</a>/<a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects">objects</a><br \
/></span> <div class="fileheader"><big><b>brush.c</b></big> <small id="info"><a \
href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects/brush.c?rev=1.35&content-type=text/x-cvsweb-markup">1.35</a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects/brush.c.diff?r1=text&tr1=1.35&r2=text&tr2=1.36&f=h">-></a> \
<a href="http://cvs.reactos.com/cgi-bin/cvsweb/reactos/subsys/win32k/objects/brush.c?rev=1.36&content-type=text/x-cvsweb-markup">1.36</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.35 -r1.36
--- brush.c 25 Apr 2004 11:34:13 -0000 1.35
+++ brush.c 25 Apr 2004 14:46:54 -0000 1.36
@@ -17,7 +17,7 @@
</small></pre><pre class="diff" id="context"> * along with this program; if not, \
write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
</pre><pre class="diff" id="removed">- * $Id: brush.c,v 1.35 2004/04/25 11:34:13 \
weiden Exp $ </pre><pre class="diff" id="added">+ * $Id: brush.c,v 1.36 2004/04/25 \
14:46:54 weiden Exp $ </pre><pre class="diff" id="context"> */
#undef WIN32_LEAN_AND_MEAN
</pre><pre class="diff"><small id="info">@@ -336,10 +336,17 @@
</small></pre><pre class="diff" id="context">
if (Point != NULL)
{
</pre><pre class="diff" id="added">+ NTSTATUS Status;
</pre><pre class="diff" id="context"> POINT SafePoint;
SafePoint.x = dc->w.brushOrgX;
SafePoint.y = dc->w.brushOrgY;
</pre><pre class="diff" id="removed">- MmCopyToCaller(Point, &SafePoint, \
sizeof(POINT)); </pre><pre class="diff" id="added">+ <span \
id="addedchars">Status = </span>MmCopyToCaller(Point, &SafePoint, \
sizeof(POINT)); + if(!NT_SUCCESS(Status))
+ {
+ DC_UnlockDc(hDC);
+ SetLastNtError(Status);
+ return FALSE;
+ }
</pre><pre class="diff" id="context"> }
dc->w.brushOrgX = XOrg;
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" \
title="commit -> email">CVSspam</a> 0.2.8</small></center> </body></html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic