Hi all,
- add "huge exe file" case to security-patched kernel warning
- mention libjpeg-dev with JPEG noncompile warning
- spelling fixes etc.
Index: dlls/commdlg/colordlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/colordlg.c,v
retrieving revision 1.38
diff -u -r1.38 colordlg.c
--- dlls/commdlg/colordlg.c 21 Nov 2002 23:55:10 -0000 1.38
+++ dlls/commdlg/colordlg.c 15 Dec 2002 13:25:52 -0000
@@ -934,7 +934,7 @@
lpp->s = CC_RGBtoHSL('S', r, g, b);
lpp->l = CC_RGBtoHSL('L', r, g, b);
- /* Doing it the long way becaus CC_EditSetRGB/HSL doesn'nt seem to work */
+ /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */
SetDlgItemInt(hDlg, 703, lpp->h, TRUE);
SetDlgItemInt(hDlg, 704, lpp->s, TRUE);
SetDlgItemInt(hDlg, 705, lpp->l, TRUE);
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.3
diff -u -r1.3 virtual.c
--- dlls/ntdll/virtual.c 21 Nov 2002 03:45:03 -0000 1.3
+++ dlls/ntdll/virtual.c 15 Dec 2002 13:25:54 -0000
@@ -688,7 +688,7 @@
if (!relocs->VirtualAddress || !relocs->Size)
{
if (nt->OptionalHeader.ImageBase == 0x400000)
- ERR("Standard load address for a Win32 program (0x00400000) not available - security-patched kernel ?\n");
+ ERR("Standard load address for a Win32 program (0x00400000) not available - security-patched kernel or HUGE exe file ?\n");
else
ERR( "FATAL: Need to relocate module from addr %lx, but there are no relocation records\n",
nt->OptionalHeader.ImageBase );
Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.20
diff -u -r1.20 olepicture.c
--- dlls/oleaut32/olepicture.c 11 Nov 2002 19:54:22 -0000 1.20
+++ dlls/oleaut32/olepicture.c 15 Dec 2002 13:25:54 -0000
@@ -921,7 +921,7 @@
hr = S_OK;
HeapFree(GetProcessHeap(),0,bits);
#else
- ERR("Trying to load JPEG picture, but JPEG supported not compiled in.\n");
+ ERR("Trying to load JPEG picture, but JPEG (libjpeg-dev) support not compiled in.\n");
hr = E_FAIL;
#endif
break;
Index: dlls/shdocvw/events.c
===================================================================
RCS file: /home/wine/wine/dlls/shdocvw/events.c,v
retrieving revision 1.6
diff -u -r1.6 events.c
--- dlls/shdocvw/events.c 31 May 2002 23:25:51 -0000 1.6
+++ dlls/shdocvw/events.c 15 Dec 2002 13:25:55 -0000
@@ -179,7 +179,7 @@
static HRESULT WINAPI WBCP_Unadvise(LPCONNECTIONPOINT iface,
DWORD dwCookie)
{
- FIXME("stub: cookie to disconnect = %ld\n", dwCookie);
+ FIXME("stub: cookie to disconnect = %lx\n", dwCookie);
return S_OK;
}
Index: dlls/shlwapi/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/thread.c,v
retrieving revision 1.6
diff -u -r1.6 thread.c
--- dlls/shlwapi/thread.c 5 Dec 2002 20:33:07 -0000 1.6
+++ dlls/shlwapi/thread.c 15 Dec 2002 13:25:55 -0000
@@ -65,7 +65,7 @@
* Failure: NULL, if any parameters are invalid.
*
* NOTES
- * This function always returns returns NULL if the underlying OS version
+ * This function always returns NULL if the underlying OS version
* Wine is impersonating does not use security descriptors (i.e. anything
* before Windows NT).
*/
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.116
diff -u -r1.116 socket.c
--- dlls/winsock/socket.c 6 Dec 2002 23:19:21 -0000 1.116
+++ dlls/winsock/socket.c 15 Dec 2002 13:25:58 -0000
@@ -2813,7 +2813,7 @@
unsigned int clear_flags = 0;
fd = _get_sock_fd_type ( s, 0, &type, &flags );
- TRACE("socket %04x, how %i %d %d \n", s, how, type, flags );
+ TRACE("socket %04x, how %i type %d flags %d\n", s, how, type, flags );
if (fd == -1)
return SOCKET_ERROR;
Index: include/winnt.h
===================================================================
RCS file: /home/wine/wine/include/winnt.h,v
retrieving revision 1.144
diff -u -r1.144 winnt.h
--- include/winnt.h 10 Dec 2002 22:56:44 -0000 1.144
+++ include/winnt.h 15 Dec 2002 13:26:01 -0000
@@ -2835,7 +2835,7 @@
typedef struct _SID_AND_ATTRIBUTES {
PSID Sid;
DWORD Attributes;
-} SID_AND_ATTRIBUTES ;
+} SID_AND_ATTRIBUTES;
/* security entities */
#define SECURITY_NULL_RID (0x00000000L)
Index: misc/registry.c
===================================================================
RCS file: /home/wine/wine/misc/registry.c,v
retrieving revision 1.123
diff -u -r1.123 registry.c
--- misc/registry.c 10 Dec 2002 22:56:44 -0000 1.123
+++ misc/registry.c 15 Dec 2002 13:26:02 -0000
@@ -767,6 +767,7 @@
/* subblocks of nk */
#define NT_REG_HASH_BLOCK_ID 0x666c /* lf */
+#define NT_REG_XP_HASH_BLOCK_ID 0x686c /* lh */
#define NT_REG_NOHASH_BLOCK_ID 0x696c /* li */
#define NT_REG_RI_BLOCK_ID 0x6972 /* ri */
@@ -1028,7 +1029,7 @@
fprintf(f,"]\n");
}
- /* loop trough the value list */
+ /* loop through the value list */
vl = (DWORD *)(base+nk->valuelist_off+4);
for (n=0; n<nk->nr_values; n++) {
nt_vk * vk = (nt_vk*)(base+vl[n]+4);
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
