March 2010 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Rename functions conflicting with mingw headers.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: b90320652d94f31d0e4d8722568ca2826cf929c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90320652d94f31d0e4d87225… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:00:26 2010 +0200 msvcrt: Rename functions conflicting with mingw headers. --- dlls/msvcrt/file.c | 10 +++++----- dlls/msvcrt/math.c | 6 +++--- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 7 ++++--- dlls/msvcrt/msvcrt.spec | 20 ++++++++++---------- dlls/msvcrt/process.c | 14 +++++++------- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/wcs.c | 2 +- 8 files changed, 32 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b90320652d94f31d0e4d8…

1 0

Piotr Caban : msvcrt: Avoid using scalb function.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 8a57f501c84410f8478c930698d37ea7601cd55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a57f501c84410f8478c93069… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:01:13 2010 +0200 msvcrt: Avoid using scalb function. --- dlls/msvcrt/math.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ae408b9..317c8eb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -465,10 +465,8 @@ unsigned int CDECL _rotr(unsigned int num, int shift) */ double CDECL MSVCRT__scalb(double num, MSVCRT_long power) { - /* Note - Can't forward directly as libc expects y as double */ - double dblpower = (double)power; if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return scalb(num, dblpower); + return ldexp(num, power); } /*********************************************************************

1 0

Mikhail Maroukhine : usp10: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 2a8972378f1e938736489979d6d8d2ba0668e224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8972378f1e938736489979d… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 16:28:31 2010 +0700 usp10: Fix compiler warnings with flag -Wcast-qual. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b9c3adb..4ac3b43 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -686,7 +686,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, int numGlyphsReturned; /* FIXME: non unicode strings */ - WCHAR* pStr = (WCHAR*)pString; + const WCHAR* pStr = (const WCHAR*)pString; hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned);

1 0

Mikhail Maroukhine : winex11.drv: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 3069ad44cb87cdbc82e7116f21370b9043ae4306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3069ad44cb87cdbc82e7116f2… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 19:52:16 2010 +0700 winex11.drv: Fix compiler warnings with flag -Wcast-qual. --- dlls/winex11.drv/dib.c | 3 ++- dlls/winex11.drv/ime.c | 4 ++-- dlls/winex11.drv/settings.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 2021aab..ed65af3 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4049,7 +4049,8 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start { unsigned int srcwidthb = ds.dsBm.bmWidthBytes; int dstwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); - LPBYTE dbits = physBitmap->base, sbits = (LPBYTE)bits + (startscan * srcwidthb); + LPBYTE dbits = physBitmap->base; + const BYTE *sbits = (const BYTE*)bits + (startscan * srcwidthb); int widthb; UINT y; diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index f9e0538..2fcd285 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -189,7 +189,7 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, return currentOffset; } -static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) +static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { /* we need to make sure the CompStr, CompClaus and CompAttr fields are all * set and correct */ @@ -923,7 +923,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, if (dwCompLen && lpComp) { - newCompStr = updateCompStr(lpIMC->hCompStr, (LPWSTR)lpComp, dwCompLen / sizeof(WCHAR)); + newCompStr = updateCompStr(lpIMC->hCompStr, (LPCWSTR)lpComp, dwCompLen / sizeof(WCHAR)); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e2aafbc..7f0753a 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -243,7 +243,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) return FALSE; #define set_value(name, data) \ - if (RegSetValueExA(hkey, name, 0, REG_DWORD, (LPBYTE)(data), sizeof(DWORD))) \ + if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ ret = FALSE set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel);

1 0

Mikhail Maroukhine : wininet: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 25306d8be369d5a60464fd6c612b2139a9646e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25306d8be369d5a60464fd6c6… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 21:14:01 2010 +0700 wininet: Fix compiler warnings with flag -Wcast-qual. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cb76884..6a39c69 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1175,8 +1175,8 @@ static inline HASH_CACHEFILE_ENTRY * URLCache_HashEntryFromOffset(LPCURLCACHE_HE static inline BOOL URLCache_IsHashEntryValid(LPCURLCACHE_HEADER pHeader, const HASH_CACHEFILE_ENTRY *pHashEntry) { /* check pHashEntry located within acceptable bounds in the URL cache mapping */ - return ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) >= ENTRY_START_OFFSET) && - ((DWORD)((LPBYTE)pHashEntry - (LPBYTE)pHeader) < pHeader->dwFileSize); + return ((DWORD)((const BYTE*)pHashEntry - (const BYTE*)pHeader) >= ENTRY_START_OFFSET) && + ((DWORD)((const BYTE*)pHashEntry - (const BYTE*)pHeader) < pHeader->dwFileSize); } static BOOL URLCache_FindHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, struct _HASH_ENTRY ** ppHashEntry)

1 0

Mikhail Maroukhine : wintrust: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 968b98f84242bab11d824980f696d18651222574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968b98f84242bab11d824980f… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 21:30:39 2010 +0700 wintrust: Fix compiler warnings with flag -Wcast-qual. --- dlls/wintrust/asn.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 69c9dd3..8659266 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1348,7 +1348,7 @@ static BOOL CRYPT_AsnDecodeSPCLinkInternal(DWORD dwCertEncodingType, link->dwLinkChoice = SPC_FILE_LINK_CHOICE; for (i = 0; i < dataLen / sizeof(WCHAR); i++) link->u.pwszFile[i] = - hton16(*(WORD *)(ptr + i * sizeof(WCHAR))); + hton16(*(const WORD *)(ptr + i * sizeof(WCHAR))); link->u.pwszFile[realDataLen / sizeof(WCHAR)] = '\0'; TRACE("returning file %s\n", debugstr_w(link->u.pwszFile)); }

1 0

Mikhail Maroukhine : ws2_32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: cad91b8d503cd04d89bd176038b850482adc1225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad91b8d503cd04d89bd17603… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 21:43:07 2010 +0700 ws2_32: Fix compiler warnings with flag -Wcast-qual. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ac9fe75..e4ee97c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3352,7 +3352,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return SOCKET_ERROR; } get_per_thread_data()->opentype = *(const int *)optval; - TRACE("setting global SO_OPENTYPE = 0x%x\n", *((int*)optval) ); + TRACE("setting global SO_OPENTYPE = 0x%x\n", *((const int*)optval) ); return 0; #ifdef SO_RCVTIMEO

1 0

Mikhail Maroukhine : programs: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 93d9d8a3af4419e7913d9aa7818d4131864b7672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d9d8a3af4419e7913d9aa78… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 22:24:36 2010 +0700 programs: Fix compiler warnings with flag -Wcast-qual. --- programs/cmd/directory.c | 6 +++--- programs/services/services.c | 2 +- programs/wineboot/wineboot.c | 2 +- programs/winedbg/tgt_active.c | 4 ++-- programs/winemenubuilder/winemenubuilder.c | 14 +++++++------- programs/winhlp32/hlpfile.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 6d32ea6..4e72d33 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -123,8 +123,8 @@ static WCHAR * WCMD_filesize64 (ULONGLONG n) { */ static int WCMD_dir_sort (const void *a, const void *b) { - WIN32_FIND_DATAW *filea = (WIN32_FIND_DATAW *)a; - WIN32_FIND_DATAW *fileb = (WIN32_FIND_DATAW *)b; + const WIN32_FIND_DATAW *filea = (const WIN32_FIND_DATAW *)a; + const WIN32_FIND_DATAW *fileb = (const WIN32_FIND_DATAW *)b; int result = 0; /* If /OG or /O-G supplied, dirs go at the top or bottom, ignoring the @@ -154,7 +154,7 @@ static int WCMD_dir_sort (const void *a, const void *b) /* Order by Date: (Takes into account which date (/T option) */ } else if (dirOrder == Date) { - FILETIME *ft; + const FILETIME *ft; ULONG64 timea, timeb; if (dirTime == Written) { diff --git a/programs/services/services.c b/programs/services/services.c index d6f5e6d..a5eb2f7 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -149,7 +149,7 @@ static DWORD reg_set_string_value(HKEY hKey, LPCWSTR value_name, LPCWSTR string) return ERROR_SUCCESS; } - return RegSetValueExW(hKey, value_name, 0, REG_SZ, (LPBYTE)string, sizeof(WCHAR)*(strlenW(string) + 1)); + return RegSetValueExW(hKey, value_name, 0, REG_SZ, (const BYTE*)string, sizeof(WCHAR)*(strlenW(string) + 1)); } DWORD save_service_config(struct service_entry *entry) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 8748a6a..15dfe14 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -161,7 +161,7 @@ done: /* wrapper for RegSetValueExW */ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) { - return RegSetValueExW( hkey, name, 0, REG_SZ, (BYTE *)value, (strlenW(value) + 1) * sizeof(WCHAR) ); + return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (strlenW(value) + 1) * sizeof(WCHAR) ); } /* create the volatile hardware registry keys */ diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 232b2cc..cbcc297 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -245,7 +245,7 @@ static void dbg_exception_epilog(void) static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance) { BOOL is_debug = FALSE; - THREADNAME_INFO* pThreadName; + const THREADNAME_INFO* pThreadName; struct dbg_thread* pThread; assert(dbg_curr_thread); @@ -260,7 +260,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance is_debug = TRUE; break; case EXCEPTION_NAME_THREAD: - pThreadName = (THREADNAME_INFO*)(rec->ExceptionInformation); + pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread; else diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 62165f6..0ab3639 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -922,7 +922,7 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con HKEY hkey = open_menus_reg_key(); if (hkey) { - RegSetValueExA(hkey, location, 0, REG_SZ, (BYTE*) unix_link, lstrlenA(unix_link) + 1); + RegSetValueExA(hkey, location, 0, REG_SZ, (const BYTE*) unix_link, lstrlenA(unix_link) + 1); RegCloseKey(hkey); } else @@ -1061,7 +1061,7 @@ end: HKEY hkey = open_menus_reg_key(); if (hkey) { - RegSetValueExA(hkey, menuPath, 0, REG_SZ, (BYTE*) unix_link, lstrlenA(unix_link) + 1); + RegSetValueExA(hkey, menuPath, 0, REG_SZ, (const BYTE*) unix_link, lstrlenA(unix_link) + 1); RegCloseKey(hkey); } } @@ -1748,12 +1748,12 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI HKEY subkey; if (RegCreateKeyW(assocKey, extension, &subkey) == ERROR_SUCCESS) { - RegSetValueExA(subkey, "MimeType", 0, REG_SZ, (BYTE*) mimeType, lstrlenA(mimeType) + 1); - RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); - RegSetValueExA(subkey, "AppName", 0, REG_SZ, (BYTE*) appName, lstrlenA(appName) + 1); + RegSetValueExA(subkey, "MimeType", 0, REG_SZ, (const BYTE*) mimeType, lstrlenA(mimeType) + 1); + RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); + RegSetValueExA(subkey, "AppName", 0, REG_SZ, (const BYTE*) appName, lstrlenA(appName) + 1); if (docName) - RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); - RegSetValueExA(subkey, "DesktopFile", 0, REG_SZ, (BYTE*) desktopFile, (lstrlenA(desktopFile) + 1)); + RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); + RegSetValueExA(subkey, "DesktopFile", 0, REG_SZ, (const BYTE*) desktopFile, (lstrlenA(desktopFile) + 1)); RegCloseKey(subkey); } else diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 2d685ae..7031c76 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -492,7 +492,7 @@ static int comp_FindSubFile(void *p, const void *key, int leaf, void** next) { *next = (char *)p+strlen(p)+(leaf?5:3); - WINE_TRACE("Comparing '%s' with '%s'\n", (char *)p, (char *)key); + WINE_TRACE("Comparing '%s' with '%s'\n", (char *)p, (const char *)key); return strcmp(p, key); } @@ -1601,7 +1601,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xEE: case 0xEF: { - char* ptr = (char*) format + 8; + const char* ptr = (const char*) format + 8; BYTE type = format[3]; int wnd = -1;

1 0

Mikhail Maroukhine : tools: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 3f1c2d5e3558ab7a07888344edb91d03bab4f32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1c2d5e3558ab7a07888344e… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sun Mar 28 23:19:18 2010 +0700 tools: Fix compiler warnings with flag -Wcast-qual. --- tools/winedump/emf.c | 6 +++--- tools/winedump/msc.c | 20 ++++++++++---------- tools/winedump/pe.c | 22 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 79103c5..68f5b41 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -171,16 +171,16 @@ static int dump_emfrecord(void) case EMR_EXTSELECTCLIPRGN: { const EMREXTSELECTCLIPRGN *clip = PRD(offset, sizeof(*clip)); - const RGNDATA *data = (RGNDATA *)clip->RgnData; + const RGNDATA *data = (const RGNDATA *)clip->RgnData; DWORD i, rc_count = 0; - RECT *rc; + const RECT *rc; if (length >= sizeof(*clip) + sizeof(*data)) rc_count = data->rdh.nCount; printf("%-20s %08x\n", "EMREXTSELECTCLIPRGN", length); printf("mode %d, rects %d\n", clip->iMode, rc_count); - for (i = 0, rc = (RECT *)data->Buffer; i < rc_count; i++, rc++) + for (i = 0, rc = (const RECT *)data->Buffer; i < rc_count; i++, rc++) printf(" (%d,%d)-(%d,%d)", rc->left, rc->top, rc->right, rc->bottom); if (rc_count != 0) printf("\n"); break; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 95cc251..ccd4664 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1331,26 +1331,26 @@ int codeview_dump_symbols(const void* root, unsigned long size) case S_SECTINFO_V3: printf("\tSSection Info: seg=%04x ?=%04x rva=%08x size=%08x attr=%08x %s\n", - *(unsigned short*)((const char*)sym + 4), - *(unsigned short*)((const char*)sym + 6), - *(unsigned*)((const char*)sym + 8), - *(unsigned*)((const char*)sym + 12), - *(unsigned*)((const char*)sym + 16), + *(const unsigned short*)((const char*)sym + 4), + *(const unsigned short*)((const char*)sym + 6), + *(const unsigned*)((const char*)sym + 8), + *(const unsigned*)((const char*)sym + 12), + *(const unsigned*)((const char*)sym + 16), (const char*)sym + 20); break; case S_SUBSECTINFO_V3: printf("\tSSubSection Info: addr=%04x:%08x size=%08x attr=%08x %s\n", - *(unsigned short*)((const char*)sym + 16), - *(unsigned*)((const char*)sym + 12), - *(unsigned*)((const char*)sym + 4), - *(unsigned*)((const char*)sym + 8), + *(const unsigned short*)((const char*)sym + 16), + *(const unsigned*)((const char*)sym + 12), + *(const unsigned*)((const char*)sym + 4), + *(const unsigned*)((const char*)sym + 8), (const char*)sym + 18); break; case S_ENTRYPOINT_V3: printf("\tSEntryPoint: id=%x '%s'\n", - *(unsigned*)((const char*)sym + 4), (const char*)sym + 8); + *(const unsigned*)((const char*)sym + 4), (const char*)sym + 8); break; default: diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 2c84bd5..7275b2c 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -377,7 +377,7 @@ void dump_section(const IMAGE_SECTION_HEADER *sectHead, const char* strtable) /* long section name ? */ if (strtable && sectHead->Name[0] == '/' && - ((offset = atoi((const char*)sectHead->Name + 1)) < *(DWORD*)strtable)) + ((offset = atoi((const char*)sectHead->Name + 1)) < *(const DWORD*)strtable)) printf(" %.8s (%s)", sectHead->Name, strtable + offset); else printf(" %-8.8s", sectHead->Name); @@ -589,7 +589,7 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; - union handler_data *handler_data; + const union handler_data *handler_data; const struct unwind_info *info; unsigned int i, count; @@ -629,12 +629,12 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) case UWOP_ALLOC_LARGE: if (info->opcodes[i].info) { - count = *(DWORD *)&info->opcodes[i+1]; + count = *(const DWORD *)&info->opcodes[i+1]; i += 2; } else { - count = *(USHORT *)&info->opcodes[i+1] * 8; + count = *(const USHORT *)&info->opcodes[i+1] * 8; i++; } printf( "sub $0x%x,%%rsp\n", count ); @@ -648,22 +648,22 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) info->frame_offset * 16, reg_names[info->frame_reg] ); break; case UWOP_SAVE_NONVOL: - count = *(USHORT *)&info->opcodes[i+1] * 8; + count = *(const USHORT *)&info->opcodes[i+1] * 8; printf( "mov %%%s,0x%x(%%rsp)\n", reg_names[info->opcodes[i].info], count ); i++; break; case UWOP_SAVE_NONVOL_FAR: - count = *(DWORD *)&info->opcodes[i+1]; + count = *(const DWORD *)&info->opcodes[i+1]; printf( "mov %%%s,0x%x(%%rsp)\n", reg_names[info->opcodes[i].info], count ); i += 2; break; case UWOP_SAVE_XMM128: - count = *(USHORT *)&info->opcodes[i+1] * 16; + count = *(const USHORT *)&info->opcodes[i+1] * 16; printf( "movaps %%xmm%u,0x%x(%%rsp)\n", info->opcodes[i].info, count ); i++; break; case UWOP_SAVE_XMM128_FAR: - count = *(DWORD *)&info->opcodes[i+1]; + count = *(const DWORD *)&info->opcodes[i+1]; printf( "movaps %%xmm%u,0x%x(%%rsp)\n", info->opcodes[i].info, count ); i += 2; break; @@ -676,7 +676,7 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) } } - handler_data = (union handler_data *)&info->opcodes[(info->count + 1) & ~1]; + handler_data = (const union handler_data *)&info->opcodes[(info->count + 1) & ~1]; if (info->flags & UNW_FLAG_CHAININFO) { printf( " -> function %08x-%08x\n", @@ -685,7 +685,7 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) } if (info->flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) printf( " handler %08x data at %08x\n", handler_data->handler, - (ULONG)(function->UnwindData + (char *)(&handler_data->handler + 1) - (char *)info )); + (ULONG)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); } static void dump_dir_exceptions(void) @@ -995,7 +995,7 @@ static void dump_dir_reloc(void) unsigned int i, size = 0; const USHORT *relocs; const IMAGE_BASE_RELOCATION *rel = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_BASERELOC, &size); - const IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); + const IMAGE_BASE_RELOCATION *end = (const IMAGE_BASE_RELOCATION *)((const char *)rel + size); static const char * const names[] = { "BASED_ABSOLUTE",

1 0

Morten Rønne : krnl386.exe: Fix VGA video mode 17.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: ffc939766463eb81f835647545fb8174a2e2f300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc939766463eb81f83564754… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sun Mar 28 15:56:28 2010 +0200 krnl386.exe: Fix VGA video mode 17. --- dlls/krnl386.exe16/vga.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index 3c904be..03d7f83 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -173,7 +173,7 @@ const VGA_MODE VGA_modelist[] = {0x000e, GRAPHIC, 80, 25, 8, 8, 640, 200, 4, 16, 4, FALSE}, /* VGA graphics mode 14 */ {0x000f, GRAPHIC, 80, 25, 8, 14, 640, 350, 0, 0, 2, FALSE}, /* VGA graphics mode 15 */ {0x0010, GRAPHIC, 80, 25, 8, 14, 640, 350, 4, 16, 2, FALSE}, /* VGA graphics mode 16 */ - {0x0012, GRAPHIC, 80, 30, 8, 16, 640, 480, 1, 2, 1, FALSE}, /* VGA graphics mode 17 */ + {0x0011, GRAPHIC, 80, 30, 8, 16, 640, 480, 1, 2, 1, FALSE}, /* VGA graphics mode 17 */ {0x0012, GRAPHIC, 80, 30, 8, 16, 640, 480, 4, 16, 1, FALSE}, /* VGA graphics mode 18 */ {0x0013, GRAPHIC, 40, 25, 8, 8, 320, 200, 8, 256, 1, TRUE}, /* VGA graphics mode 19 */ /* VESA 7-bit modes */

1 0