September 2006 - Wine-commits

Vijay Kiran Kamuju : include: Add some missing definitions in winuser.h.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: a97680751a55e02b6b7e5f561e7c1cfcd4eb7115 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a97680751a55e02b6b7e5f5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Sep 14 15:41:35 2006 -0400 include: Add some missing definitions in winuser.h. --- include/winuser.h | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index cd83c5a..b9962e3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -952,6 +952,12 @@ #define SM_STARTER 88 #define SM_SERVERR2 89 #define SM_CMETRICS 90 +#define SM_REMOTESESSION 0x1000 +#define SM_SHUTTINGDOWN 0x2000 +#define SM_REMOTECONTROL 0x2001 +#define SM_CARETBLINKINGENABLED 0x2002 + +#define PMB_ACTIVE 0x00000001 /* Messages */ @@ -1122,6 +1128,16 @@ #define WM_CHANGEUISTATE 0x0127 #define WM_UPDATEUISTATE 0x0128 #define WM_QUERYUISTATE 0x0129 +/* UI flags for WM_*UISTATE */ +/* for low-order word of wparam */ +#define UIS_SET 1 +#define UIS_CLEAR 2 +#define UIS_INITIALIZE 3 +/* for hi-order word of wparam */ +#define UISF_HIDEFOCUS 0x1 +#define UISF_HIDEACCEL 0x2 +#define UISF_ACTIVE 0x4 + #define WM_LBTRACKPOINT 0x0131 /* Win32 CTLCOLOR messages */ @@ -1133,6 +1149,8 @@ #define WM_CTLCOLORDLG 0x0136 #define WM_CTLCOLORSCROLLBAR 0x0137 #define WM_CTLCOLORSTATIC 0x0138 +#define MN_GETHMENU 0x01E1 + /* Mouse messages */ #define WM_MOUSEMOVE 0x0200 #define WM_LBUTTONDOWN 0x0201 @@ -1198,6 +1216,8 @@ #define PBT_APMPOWERSTATUSCHANGE 0x000A #define PBT_APMOEMEVENT 0x000B #define PBT_APMRESUMEAUTOMATIC 0x0012 +#define PBTF_APMRESUMEFROMFAILURE 0x00000001 + /* MDI messages */ #define WM_MDICREATE 0x0220 #define WM_MDIDESTROY 0x0221 @@ -1239,6 +1259,11 @@ #define WM_IME_REQUEST 0x02 #define WM_IME_KEYDOWN 0x0290 #define WM_IME_KEYUP 0x0291 +#define WM_WTSSESSION_CHANGE 0x02B1 + +#define WM_TABLET_FIRST 0x02c0 +#define WM_TABLET_LAST 0x02df + /* Clipboard command messages */ #define WM_CUT 0x0300 #define WM_COPY 0x0301 @@ -1268,10 +1293,15 @@ #define WM_HOTKEY 0x0312 #define WM_PRINT 0x0317 #define WM_PRINTCLIENT 0x0318 +#define WM_HANDHELDFIRST 0x0358 +#define WM_HANDHELDLAST 0x035F + +#define WM_AFXFIRST 0x0360 +#define WM_AFXLAST 0x037F + #define WM_PENWINFIRST 0x0380 #define WM_PENWINLAST 0x038F - #define WM_APP 0x8000 /* MsgWaitForMultipleObjectsEx flags */ @@ -1304,6 +1334,10 @@ #define IDHELP 9 #define IDTRYAGAIN 10 #define IDCONTINUE 11 +#ifndef IDTIMEOUT +#define IDTIMEOUT 32000 +#endif + /* Used for EnumDisplaySettingsEx */ #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) @@ -3734,11 +3768,12 @@ #define LR_COPYFROMRESOURCE 0x4000 #define LR_SHARED 0x8000 /* Flags for DrawIconEx. */ -#define DI_MASK 1 -#define DI_IMAGE 2 +#define DI_MASK 0x0001 +#define DI_IMAGE 0x0002 #define DI_NORMAL (DI_MASK | DI_IMAGE) -#define DI_COMPAT 4 -#define DI_DEFAULTSIZE 8 +#define DI_COMPAT 0x0004 +#define DI_DEFAULTSIZE 0x0008 +#define DI_NOMIRROR 0x0010 /* WM_NOTIFYFORMAT commands and return values */ #define NFR_ANSI 1

1 0

Andrew Talbot : advpack: Remove duplicate function declaration.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 062424b68acae94ab7b79afd316545d830bc22a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=062424b68acae94ab7b79af… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Sep 17 20:28:15 2006 +0100 advpack: Remove duplicate function declaration. --- dlls/advpack/advpack_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 323bd29..3f81bba 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -26,6 +26,5 @@ LPWSTR get_parameter(LPWSTR *params, WCH void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir); HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); #endif /* __ADVPACK_PRIVATE_H */

1 0

Andrew Talbot : netapi32: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: c4f4c2ff84f4578e38172a1b06aa488527c659b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4f4c2ff84f4578e38172a1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 19 17:59:56 2006 +0100 netapi32: Cast-qual warnings fix. --- dlls/netapi32/nbnamecache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index 176105a..82c10a9 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -163,7 +163,7 @@ const NBNameCacheEntry *NBNameCacheFindE NBNameCacheNode **node; EnterCriticalSection(&cache->cs); - node = NBNameCacheWalk(cache, (char*)name); + node = NBNameCacheWalk(cache, (const char *)name); if (node) ret = (*node)->entry; else @@ -185,7 +185,7 @@ BOOL NBNameCacheUpdateNBName(struct NBNa NBNameCacheNode **node; EnterCriticalSection(&cache->cs); - node = NBNameCacheWalk(cache, (char*)name); + node = NBNameCacheWalk(cache, (const char *)name); if (node && *node && (*node)->entry) { memcpy((*node)->entry->nbname, nbname, NCBNAMSZ);

1 0

Andrew Talbot : msvcrt: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: c5df5717e9ef4b551591ca88cbe322b98b2b377d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5df5717e9ef4b551591ca8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Sep 18 22:18:41 2006 +0100 msvcrt: Cast-qual warnings fix. --- dlls/msvcrt/file.c | 5 +++-- dlls/msvcrt/misc.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba5b445..d65f0d3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1980,7 +1980,8 @@ #endif else { unsigned int i, j, nr_lf; - char *s =(char*)buf, *buf_start=(char*)buf, *p; + char *p; + const char *s = (const char *)buf, *buf_start = (const char *)buf; /* find number of \n ( without preceding \r ) */ for ( nr_lf=0,i = 0; i <count; i++) { @@ -1994,7 +1995,7 @@ #endif { if ((p = MSVCRT_malloc(count + nr_lf))) { - for(s=(char*)buf, i=0, j=0; i<count; i++) + for (s = (const char *)buf, i = 0, j = 0; i < count; i++) { if (s[i]== '\n') { diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index a901f4f..99f5214 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -82,7 +82,7 @@ void* CDECL _lfind(const void* match, co { if (cf(match, start) == 0) return (void *)start; /* found */ - start = (char*)start + elem_size; + start = (const char *)start + elem_size; } while (--size); return NULL; }

1 0

Andrew Talbot : kernel32: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 10a0931ebe302fa5a2e3101a4a9d68270cd5136c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10a0931ebe302fa5a2e3101… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 17:41:56 2006 +0100 kernel32: Cast-qual warnings fix. --- dlls/kernel32/resource.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index aed006a..49b2d7a 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -270,12 +270,12 @@ BOOL WINAPI EnumResourceTypesA( HMODULE SetLastError( RtlNtStatusToDosError(status) ); return FALSE; } - et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1); + et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { if (et[i].u1.s1.NameIsString) { - str = (PIMAGE_RESOURCE_DIR_STRING_U) ((LPBYTE) resdir + et[i].u1.s1.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u1.s1.NameOffset); newlen = WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); if (newlen + 1 > len) { @@ -320,12 +320,12 @@ BOOL WINAPI EnumResourceTypesW( HMODULE SetLastError( RtlNtStatusToDosError(status) ); return FALSE; } - et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1); + et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { if (et[i].u1.s1.NameIsString) { - str = (PIMAGE_RESOURCE_DIR_STRING_U) ((LPBYTE) resdir + et[i].u1.s1.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u1.s1.NameOffset); if (str->Length + 1 > len) { len = str->Length + 1; @@ -375,12 +375,12 @@ BOOL WINAPI EnumResourceNamesA( HMODULE if ((status = LdrFindResourceDirectory_U( hmod, &info, 1, &resdir )) != STATUS_SUCCESS) goto done; - et = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); + et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { if (et[i].u1.s1.NameIsString) { - str = (IMAGE_RESOURCE_DIR_STRING_U *) ((LPBYTE) basedir + et[i].u1.s1.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); if (newlen + 1 > len) { @@ -437,12 +437,12 @@ BOOL WINAPI EnumResourceNamesW( HMODULE if ((status = LdrFindResourceDirectory_U( hmod, &info, 1, &resdir )) != STATUS_SUCCESS) goto done; - et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1); + et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { if (et[i].u1.s1.NameIsString) { - str = (IMAGE_RESOURCE_DIR_STRING_U *) ((LPBYTE) basedir + et[i].u1.s1.NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); if (str->Length + 1 > len) { len = str->Length + 1; @@ -500,7 +500,7 @@ BOOL WINAPI EnumResourceLanguagesA( HMOD if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS) goto done; - et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1); + et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); @@ -543,7 +543,7 @@ BOOL WINAPI EnumResourceLanguagesW( HMOD if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS) goto done; - et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1); + et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) { ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam );

1 0

Andrew Talbot : mapi32: Cast-qual warning fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: dce3302f7195d6af55e871f8cbe98dedc728f4f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dce3302f7195d6af55e871f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 19:47:26 2006 +0100 mapi32: Cast-qual warning fix. --- dlls/mapi32/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 9d75f14..c8225b2 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -732,7 +732,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCA */ ULONG WINAPI UlFromSzHex(LPCWSTR lpszHex) { - LPSTR lpStr = (LPSTR)lpszHex; + LPCSTR lpStr = (LPCSTR)lpszHex; ULONG ulRet = 0; TRACE("(%s)\n", debugstr_a(lpStr));

1 0

Andrew Talbot : kernel32: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: ea117516a70ab739ff6b7543aca285f992e70f8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea117516a70ab739ff6b754… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 17:40:01 2006 +0100 kernel32: Cast-qual warnings fix. --- dlls/kernel32/instr.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index e2b65bf..d01bda9 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -125,36 +125,36 @@ static void store_reg( CONTEXT86 *contex switch((regmodrm >> 3) & 7) { case 0: - if (long_op) context->Eax = *(DWORD *)addr; - else SET_LOWORD(context->Eax,*(WORD *)addr); + if (long_op) context->Eax = *(const DWORD *)addr; + else SET_LOWORD(context->Eax, *(const WORD *)addr); break; case 1: - if (long_op) context->Ecx = *(DWORD *)addr; - else SET_LOWORD(context->Ecx,*(WORD *)addr); + if (long_op) context->Ecx = *(const DWORD *)addr; + else SET_LOWORD(context->Ecx, *(const WORD *)addr); break; case 2: - if (long_op) context->Edx = *(DWORD *)addr; - else SET_LOWORD(context->Edx,*(WORD *)addr); + if (long_op) context->Edx = *(const DWORD *)addr; + else SET_LOWORD(context->Edx, *(const WORD *)addr); break; case 3: - if (long_op) context->Ebx = *(DWORD *)addr; - else SET_LOWORD(context->Ebx,*(WORD *)addr); + if (long_op) context->Ebx = *(const DWORD *)addr; + else SET_LOWORD(context->Ebx, *(const WORD *)addr); break; case 4: - if (long_op) context->Esp = *(DWORD *)addr; - else SET_LOWORD(context->Esp,*(WORD *)addr); + if (long_op) context->Esp = *(const DWORD *)addr; + else SET_LOWORD(context->Esp, *(const WORD *)addr); break; case 5: - if (long_op) context->Ebp = *(DWORD *)addr; - else SET_LOWORD(context->Ebp,*(WORD *)addr); + if (long_op) context->Ebp = *(const DWORD *)addr; + else SET_LOWORD(context->Ebp, *(const WORD *)addr); break; case 6: - if (long_op) context->Esi = *(DWORD *)addr; - else SET_LOWORD(context->Esi,*(WORD *)addr); + if (long_op) context->Esi = *(const DWORD *)addr; + else SET_LOWORD(context->Esi, *(const WORD *)addr); break; case 7: - if (long_op) context->Edi = *(DWORD *)addr; - else SET_LOWORD(context->Edi,*(WORD *)addr); + if (long_op) context->Edi = *(const DWORD *)addr; + else SET_LOWORD(context->Edi, *(const WORD *)addr); break; } }

1 0

Andrew Talbot : kernel32: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: e595298a56c8a798cddb4a36762ceba31b2ee47c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e595298a56c8a798cddb4a3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 17:40:19 2006 +0100 kernel32: Cast-qual warnings fix. --- dlls/kernel32/ne_module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 899aa09..20a886f 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -157,7 +157,7 @@ static const IMAGE_DOS_HEADER *find_dll_ int i; const IMAGE_DOS_HEADER *mz_header; const IMAGE_OS2_HEADER *ne_header; - BYTE *name_table; + const BYTE *name_table; for (i = 0; i < MAX_DLLS; i++) { @@ -165,7 +165,7 @@ static const IMAGE_DOS_HEADER *find_dll_ if (mz_header) { ne_header = (const IMAGE_OS2_HEADER *)((const char *)mz_header + mz_header->e_lfanew); - name_table = (BYTE *)ne_header + ne_header->ne_restab; + name_table = (const BYTE *)ne_header + ne_header->ne_restab; /* check the dll file name */ if (!NE_strcasecmp( builtin_dlls[i].file_name, dllname ) || @@ -605,7 +605,7 @@ static void *build_bundle_data( NE_MODUL entry->flags = *table++; table += sizeof(WORD); entry->segnum = *table++; - entry->offs = *(WORD *)table; + entry->offs = *(const WORD *)table; table += sizeof(WORD); entry++; } @@ -617,7 +617,7 @@ static void *build_bundle_data( NE_MODUL entry->type = type; entry->flags = *table++; entry->segnum = type; - entry->offs = *(WORD *)table; + entry->offs = *(const WORD *)table; table += sizeof(WORD); entry++; } @@ -1414,7 +1414,7 @@ static BOOL16 NE_FreeModule( HMODULE16 h pModule->ne_magic = pModule->self = 0; if (pModule->owner32) FreeLibrary( pModule->owner32 ); - else if (pModule->mapping) UnmapViewOfFile( (void *)pModule->mapping ); + else if (pModule->mapping) UnmapViewOfFile( pModule->mapping ); /* Remove it from the linked list */

1 0

Alexandre Julliard : include: Added definitions for the fault address exception information.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: a27d0aa4e95540b5d5d348247c1d9e7daef0f771 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a27d0aa4e95540b5d5d3482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 11:27:53 2006 +0200 include: Added definitions for the fault address exception information. --- dlls/kernel32/except.c | 9 +++++---- dlls/ntdll/signal_i386.c | 3 ++- dlls/winex11.drv/dib.c | 2 +- include/winnt.h | 28 ++++++++++++++++++++++++++++ programs/winedbg/tgt_active.c | 3 ++- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index ed31ab9..1d2690e 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -117,8 +117,9 @@ static int format_exception_msg( const E case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) len = snprintf( buffer, size, "Unhandled page fault on %s access to 0x%08lx", - rec->ExceptionInformation[0] ? "write" : "read", - rec->ExceptionInformation[1]); + rec->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT ? "write" : + rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT ? "execute" : "read", + rec->ExceptionInformation[1]); else len = snprintf( buffer, size, "Unhandled page fault"); break; @@ -448,11 +449,11 @@ LONG WINAPI UnhandledExceptionFilter(PEX { switch(rec->ExceptionInformation[0]) { - case 1: /* write access */ + case EXCEPTION_WRITE_FAULT: if (check_resource_write( (void *)rec->ExceptionInformation[1] )) return EXCEPTION_CONTINUE_EXECUTION; break; - case 8: /* execute access */ + case EXCEPTION_EXECUTE_FAULT: if (check_no_exec( (void *)rec->ExceptionInformation[1] )) return EXCEPTION_CONTINUE_EXECUTION; break; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 72144bd..6ff7e39 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -970,7 +970,8 @@ static void WINAPI raise_segv_exception( case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) { - if ((rec->ExceptionInformation[0] == 8) && check_atl_thunk( rec, context )) goto done; + if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT && check_atl_thunk( rec, context )) + goto done; rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ); } break; diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 51f57c8..9a615d9 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4359,7 +4359,7 @@ static LONG CALLBACK X11DRV_DIB_FaultHan if (!found) return EXCEPTION_CONTINUE_SEARCH; X11DRV_DIB_Lock( physBitmap, DIB_Status_None, FALSE ); - if (ep->ExceptionRecord->ExceptionInformation[0]) { + if (ep->ExceptionRecord->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT) { /* the app tried to write the DIB bits */ X11DRV_DIB_Coerce( physBitmap, DIB_Status_AppMod, FALSE ); } else { diff --git a/include/winnt.h b/include/winnt.h index 3bbbcac..7ae686a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -714,6 +714,10 @@ #define CONTEXT_FULL CONTEXT8 typedef CONTEXT86 CONTEXT; +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + #endif /* __i386__ */ typedef struct _LDT_ENTRY { @@ -754,6 +758,10 @@ #define CONTEXT_DEBUG_REGISTERS (CONTEXT #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + typedef struct DECLSPEC_ALIGN(16) _M128A { ULONGLONG Low; LONGLONG High; @@ -877,6 +885,10 @@ #define CONTEXT_FLOATING_POINT (CONTEXT_ #define CONTEXT_INTEGER (CONTEXT_ALPHA | 0x00000004L) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + typedef struct _CONTEXT { /* selected by CONTEXT_FLOATING_POINT */ @@ -973,6 +985,10 @@ #define CONTEXT_INTEGER (CONTEXT #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + typedef struct _CONTEXT { /* The flags values within this flag control the contents of a CONTEXT record. @@ -1028,6 +1044,10 @@ #define CONTEXT_INTEGER (CONTEXT #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + typedef struct _CONTEXT { DWORD Argument[4]; @@ -1123,6 +1143,10 @@ #define CONTEXT_INTEGER 0x0004 #define CONTEXT_DEBUG_REGISTERS 0x0008 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + typedef struct { /* These are selected by CONTEXT_FLOATING_POINT */ @@ -1267,6 +1291,10 @@ #define CONTEXT_INTEGER (CONTEXT #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + typedef struct _CONTEXT { DWORD ContextFlags; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 3a1fb4f..7636b16 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -307,7 +307,8 @@ static DWORD dbg_handle_exception(const case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) dbg_printf("page fault on %s access to 0x%08lx", - rec->ExceptionInformation[0] ? "write" : "read", + rec->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT ? "write" : + rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT ? "execute" : "read", rec->ExceptionInformation[1]); else dbg_printf("page fault");

1 0

Andrew Talbot : kernel32: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 2b164a2d4186e5567755bf8a8568273f6582d1bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b164a2d4186e5567755bf8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 14 17:39:53 2006 +0100 kernel32: Cast-qual warnings fix. --- dlls/kernel32/heap.c | 2 +- dlls/kernel32/registry16.c | 2 +- dlls/kernel32/time.c | 2 +- dlls/kernel32/volume.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dc481c4..6c44fd7 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -303,7 +303,7 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWO #define MAGIC_GLOBAL_USED 0x5342 #define HANDLE_TO_INTERN(h) ((PGLOBAL32_INTERN)(((char *)(h))-2)) #define INTERN_TO_HANDLE(i) ((HGLOBAL) &((i)->Pointer)) -#define POINTER_TO_HANDLE(p) (*(((HGLOBAL *)(p))-2)) +#define POINTER_TO_HANDLE(p) (*(((const HGLOBAL *)(p))-2)) #define ISHANDLE(h) (((ULONG_PTR)(h)&2)!=0) #define ISPOINTER(h) (((ULONG_PTR)(h)&2)==0) /* align the storage needed for the HGLOBAL on an 8byte boundary thus diff --git a/dlls/kernel32/registry16.c b/dlls/kernel32/registry16.c index 5295bbc..5c84f12 100644 --- a/dlls/kernel32/registry16.c +++ b/dlls/kernel32/registry16.c @@ -198,7 +198,7 @@ DWORD WINAPI RegSetValueEx16( HKEY hkey, { if (!advapi32) init_func_ptrs(); fix_win16_hkey( &hkey ); - if (!count && (type==REG_SZ)) count = strlen( (char*) data); + if (!count && (type==REG_SZ)) count = strlen( (const char *)data ); return pRegSetValueExA( hkey, name, reserved, type, data, count ); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 0768266..5528a7c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -416,7 +416,7 @@ DWORD WINAPI GetTimeZoneInformation( LPT BOOL WINAPI SetTimeZoneInformation( const TIME_ZONE_INFORMATION *tzinfo ) { NTSTATUS status; - status = RtlSetTimeZoneInformation( (RTL_TIME_ZONE_INFORMATION*) tzinfo ); + status = RtlSetTimeZoneInformation( (const RTL_TIME_ZONE_INFORMATION *)tzinfo ); if ( status != STATUS_SUCCESS ) SetLastError( RtlNtStatusToDosError(status) ); return !status; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index ab23b14..ad83e3e 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -375,7 +375,7 @@ static void VOLUME_GetSuperblockLabel( e } } if (label_len) RtlMultiByteToUnicodeN( label, (len-1) * sizeof(WCHAR), - &label_len, (char*)label_ptr, label_len ); + &label_len, (LPCSTR)label_ptr, label_len ); label_len /= sizeof(WCHAR); label[label_len] = 0; while (label_len && label[label_len-1] == ' ') label[--label_len] = 0;

1 0