Author: dreimer
Date: Wed May 6 13:54:09 2009
New Revision: 40816
URL: http://svn.reactos.org/svn/reactos?rev=40816&view=rev
Log:
sync winhlp32 and wordpad with Wine 1.1.20
Modified:
trunk/reactos/base/applications/winhlp32/winhelp.c
trunk/reactos/base/applications/wordpad/Nl.rc
trunk/reactos/base/applications/wordpad/Tr.rc
trunk/reactos/base/applications/wordpad/print.c
trunk/reactos/base/applications/wordpad/wordpad.c
Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhelp.c?rev=40816&r1=40815&r2=40816&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Wed May 6
13:54:09 2009
@@ -353,7 +353,7 @@
return 0;
}
- wh = (WINHELP*)cds->lpData;
+ wh = cds->lpData;
if (wh)
{
@@ -1154,7 +1154,7 @@
*/
static void cb_KWBTree(void *p, void **next, void *cookie)
{
- HWND hListWnd = (HWND)cookie;
+ HWND hListWnd = cookie;
int count;
WINE_TRACE("Adding '%s' to search list\n", (char *)p);
Modified: trunk/reactos/base/applications/wordpad/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Nl.rc?rev=40816&r1=40815&r2=40816&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Wed May 6
13:54:09 2009
@@ -241,4 +241,5 @@
STRING_OPEN_FAILED, "Bestand kon niet geopend worden."
STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te
openen."
STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd"
-END
+ STRING_MAX_TAB_STOPS, "Onmogelijk om meer dan 32 tab stops toe te
voegen."
+END
Modified: trunk/reactos/base/applications/wordpad/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Tr.rc?rev=40816&r1=40815&r2=40816&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Wed May 6
13:54:09 2009
@@ -225,16 +225,3 @@
BEGIN
STRING_UNITS_CM, "cm"
END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- STRING_DEFAULT_FILENAME, "Document"
- STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?"
- STRING_SEARCH_FINISHED, "Finished searching the document."
- STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library."
- STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text
format, " \
- "which will cause all formatting to be lost.
" \
- "Are you sure that you wish to do this?"
- STRING_INVALID_NUMBER, "Invalid number format"
- STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported"
-END
Modified: trunk/reactos/base/applications/wordpad/print.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/print.c?rev=40816&r1=40815&r2=40816&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Wed May 6
13:54:09 2009
@@ -489,7 +489,7 @@
return preview.page != 0;
}
-static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics,
long EditLeftmost)
+static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics,
LONG EditLeftmost)
{
static HDC hdc;
@@ -564,7 +564,7 @@
BitBlt(hdcRuler, 0, 0, drawRect->right, drawRect->bottom, hdc, 0, 0,
SRCAND);
}
-static void paint_ruler(HWND hWnd, long EditLeftmost, BOOL NewMetrics)
+static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics)
{
PAINTSTRUCT ps;
HDC hdc = BeginPaint(hWnd, &ps);
@@ -603,7 +603,7 @@
LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
static WNDPROC pPrevRulerProc;
- static long EditLeftmost;
+ static LONG EditLeftmost;
static BOOL NewMetrics;
switch(msg)
Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/wordpad.c?rev=40816&r1=40815&r2=40816&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed May 6
13:54:09 2009
@@ -2233,7 +2233,7 @@
case ID_EDIT_READONLY:
{
- long nStyle = GetWindowLong(hwndEditor, GWL_STYLE);
+ LONG nStyle = GetWindowLong(hwndEditor, GWL_STYLE);
if (nStyle & ES_READONLY)
SendMessageW(hwndEditor, EM_SETREADONLY, 0, 0);
else
