wine-commits December 2006

wine-commits@winehq.org

4 participants
720 discussions

Alexandre Julliard : winex11.drv: Make sure the drawable rect is always updated and use it where appropriate .
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: d302db41aa4ca227bae6dc623668f040e1b02275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d302db41aa4ca227bae6dc623… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 13:46:15 2006 +0100 winex11.drv: Make sure the drawable rect is always updated and use it where appropriate. --- dlls/winex11.drv/bitblt.c | 10 +++------- dlls/winex11.drv/bitmap.c | 5 +++++ dlls/winex11.drv/init.c | 5 +++++ dlls/winex11.drv/xrender.c | 10 +++------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b143bf4..00bf375 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1149,13 +1149,9 @@ static BOOL BITBLT_GetVisRectangles( X11 if (heightSrc < 0) SWAP_INT32( &rect.top, &rect.bottom ); /* Apparently the clipping and visible regions are only for output, so just check against dc extent here to avoid BadMatch errors */ - if (physDevSrc->bitmap) - { - BITMAP bm; - GetObjectW( physDevSrc->bitmap->hbitmap, sizeof(bm), &bm ); - SetRect( &clipRect, 0, 0, bm.bmWidth, bm.bmHeight ); - } - else clipRect = virtual_screen_rect; + clipRect = physDevSrc->drawable_rect; + OffsetRect( &clipRect, -(physDevSrc->drawable_rect.left + physDevSrc->dc_rect.left), + -(physDevSrc->drawable_rect.top + physDevSrc->dc_rect.top) ); if (!IntersectRect( visRectSrc, &rect, &clipRect )) return FALSE; diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 726581a..75623e4 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -72,6 +72,9 @@ void X11DRV_BITMAP_Init(void) HBITMAP X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) { X_PHYSBITMAP *physBitmap; + BITMAP bitmap; + + if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0; if(physDev->xrender) X11DRV_XRender_UpdateDrawable( physDev ); @@ -81,6 +84,8 @@ HBITMAP X11DRV_SelectBitmap( X11DRV_PDEV physDev->bitmap = physBitmap; physDev->drawable = physBitmap->pixmap; + SetRect( &physDev->drawable_rect, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); + physDev->dc_rect = physDev->drawable_rect; /* Change GC depth if needed */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 9b2b9c8..c33301a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -135,12 +135,17 @@ BOOL X11DRV_CreateDC( HDC hdc, X11DRV_PD physDev->bitmap = &BITMAP_stock_phys_bitmap; physDev->drawable = BITMAP_stock_phys_bitmap.pixmap; physDev->depth = 1; + SetRect( &physDev->drawable_rect, 0, 0, 1, 1 ); + physDev->dc_rect = physDev->drawable_rect; } else { physDev->bitmap = NULL; physDev->drawable = root_window; physDev->depth = screen_depth; + physDev->drawable_rect = virtual_screen_rect; + SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, + virtual_screen_rect.bottom - virtual_screen_rect.top ); } physDev->region = CreateRectRgn( 0, 0, 0, 0 ); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 317a36b..9c5e274 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1327,16 +1327,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_P } } else { XImage *image; - unsigned int w, h, dummy_uint; - Window dummy_window; - int dummy_int; int image_x, image_y, image_off_x, image_off_y, image_w, image_h; RECT extents = {0, 0, 0, 0}; POINT cur = {0, 0}; - - - XGetGeometry(gdi_display, physDev->drawable, &dummy_window, &dummy_int, &dummy_int, - &w, &h, &dummy_uint, &dummy_uint); + int w = physDev->drawable_rect.right - physDev->drawable_rect.left; + int h = physDev->drawable_rect.bottom - physDev->drawable_rect.top; + TRACE("drawable %dx%d\n", w, h); for(idx = 0; idx < count; idx++) {

1 0

Ulrich Czekalla : winex11.drv: Store window and drawable rects in X11DRV_PDEVICE.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 4bdf4345b849d3beb435c5612a8c59b2121d0b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdf4345b849d3beb435c5612… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Dec 7 10:43:59 2006 -0500 winex11.drv: Store window and drawable rects in X11DRV_PDEVICE. --- dlls/winex11.drv/bitblt.c | 90 +++++++++++----------- dlls/winex11.drv/clipping.c | 2 +- dlls/winex11.drv/dce.c | 21 +++-- dlls/winex11.drv/dib.c | 8 +- dlls/winex11.drv/graphics.c | 172 ++++++++++++++++++++-------------------- dlls/winex11.drv/init.c | 8 +- dlls/winex11.drv/opengl.c | 4 +- dlls/winex11.drv/text.c | 10 +- dlls/winex11.drv/x11drv.h | 10 +- dlls/winex11.drv/xrender.c | 46 ++++++------ include/wine/server_protocol.h | 8 +- server/protocol.def | 6 +- server/trace.c | 10 ++- server/window.c | 34 ++++++-- 14 files changed, 224 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bdf4345b849d3beb435c…

1 0

Alexandre Julliard : winex11.drv: Remove unused PropertyAliasMap variable.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: e7b9a5f166cb1e78e87bf432d1275b3b2bda00bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b9a5f166cb1e78e87bf432d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 12:14:38 2006 +0100 winex11.drv: Remove unused PropertyAliasMap variable. --- dlls/winex11.drv/clipboard.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b63fd05..157c0e5 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -301,18 +301,6 @@ static const struct }; -/* Maps equivalent X properties. It is assumed that lpszProperty must already - be in ClipFormats or PropertyFormatMap. */ -static const struct -{ - UINT drvDataProperty; - UINT drvDataAlias; -} PropertyAliasMap[] = -{ - /* DataProperty, DataAlias */ -}; - - /* * Cached clipboard data. */

1 0

Hans Leidekker : mscoree: Add a stub implementation for CorExitProcess and GetRequestedRuntimeInfo.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 8c34da22978590981fcd68d88d311caef1e39779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c34da22978590981fcd68d88… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Dec 11 14:25:39 2006 +0100 mscoree: Add a stub implementation for CorExitProcess and GetRequestedRuntimeInfo. --- dlls/mscoree/mscoree.spec | 4 ++-- dlls/mscoree/mscoree_main.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 32dd72b..80dac08 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -22,7 +22,7 @@ @ stub CorBindToRuntimeEx @ stdcall CorBindToRuntimeHost(wstr wstr wstr ptr long ptr ptr ptr) @ stub CorDllMainWorker -@ stub CorExitProcess +@ stdcall CorExitProcess(long) @ stub CorGetSvc @ stub CorIsLatestSvc @ stub CorMarkThreadInThreadPool @@ -57,7 +57,7 @@ @ stub GetPrivateContextsPerfCounters @ stub GetProcessExecutableHeap @ stub GetRealProcAddress -@ stub GetRequestedRuntimeInfo +@ stdcall GetRequestedRuntimeInfo(wstr wstr wstr long long ptr long ptr ptr long ptr) @ stub GetRequestedRuntimeVersion @ stub GetRequestedRuntimeVersionForCLSID @ stub GetStartupFlags diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6941612..414e725 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -175,6 +175,12 @@ int WINAPI _CorExeMain2(PBYTE ptrMemory, return -1; } +void WINAPI CorExitProcess(int exitCode) +{ + FIXME("(%x) stub\n", exitCode); + ExitProcess(exitCode); +} + void WINAPI _CorImageUnloading(LPCVOID* imageBase) { TRACE("(%p): stub\n", imageBase); @@ -206,10 +212,21 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuf return S_OK; } +HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, + DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, + LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) +{ + FIXME("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p) stub\n", debugstr_w(pExe), + debugstr_w(pwszVersion), debugstr_w(pConfigurationFile), startupFlags, runtimeInfoFlags, pDirectory, + dwDirectory, dwDirectoryLength, pVersion, cchBuffer, dwlength); + return GetCORVersion(pVersion, cchBuffer, dwlength); +} + HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll) { - *phModDll = LoadLibraryW(szDllName); FIXME("(%p %s, %p, %p, %p): semi-stub\n", szDllName, debugstr_w(szDllName), szVersion, pvReserved, phModDll); + + if (phModDll) *phModDll = LoadLibraryW(szDllName); return S_OK; }

1 0

Hans Leidekker : mscoree: Take advantage of an installed Mono for Windows to run .NET applications.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 50f4edae54b1bc0d40f39fa833c78f3033e12dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f4edae54b1bc0d40f39fa83… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Dec 11 22:13:48 2006 +0100 mscoree: Take advantage of an installed Mono for Windows to run .NET applications. --- dlls/mscoree/Makefile.in | 2 +- dlls/mscoree/mscoree_main.c | 92 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 76dc498..77ae5d2 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mscoree.dll -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 C_SRCS = \ mscoree_main.c diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 8caf2fb..6941612 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" #include "wine/debug.h" @@ -74,10 +75,97 @@ BOOL WINAPI _CorDllMain(HINSTANCE hinstD return TRUE; } +static LPWSTR get_mono_exe() +{ + static const WCHAR mono_exe[] = {'b','i','n','\\','m','o','n','o','.','e','x','e',' ',0}; + static const WCHAR mono_key[] = {'S','o','f','t','w','a','r','e','\\','N','o','v','e','l','l','\\','M','o','n','o',0}; + static const WCHAR defaul_clr[] = {'D','e','f','a','u','l','t','C','L','R',0}; + static const WCHAR install_root[] = {'S','d','k','I','n','s','t','a','l','l','R','o','o','t',0}; + static const WCHAR slash[] = {'\\',0}; + + WCHAR version[64], version_key[MAX_PATH], root[MAX_PATH], *ret; + DWORD len, size; + HKEY key; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, mono_key, 0, KEY_READ, &key)) + return NULL; + + len = sizeof(version); + if (RegQueryValueExW(key, defaul_clr, 0, NULL, (LPBYTE)version, &len)) + { + RegCloseKey(key); + return NULL; + } + RegCloseKey(key); + + lstrcpyW(version_key, mono_key); + lstrcatW(version_key, slash); + lstrcatW(version_key, version); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, version_key, 0, KEY_READ, &key)) + return NULL; + + len = sizeof(root); + if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)root, &len)) + { + RegCloseKey(key); + return NULL; + } + RegCloseKey(key); + + size = len + sizeof(slash) + sizeof(mono_exe); + if (!(ret = HeapAlloc(GetProcessHeap(), 0, size))) return NULL; + + lstrcpyW(ret, root); + lstrcatW(ret, slash); + lstrcatW(ret, mono_exe); + + return ret; +} + int WINAPI _CorExeMain(void) { - FIXME("Directly running .NET applications not supported.\n"); - return -1; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR *mono_exe, *cmd_line; + DWORD size, exit_code; + + if (!(mono_exe = get_mono_exe())) + { + MESSAGE("install the Windows version of Mono to run .NET executables\n"); + return -1; + } + + size = (lstrlenW(mono_exe) + lstrlenW(GetCommandLineW()) + 1) * sizeof(WCHAR); + if (!(cmd_line = HeapAlloc(GetProcessHeap(), 0, size))) + { + HeapFree(GetProcessHeap(), 0, mono_exe); + return -1; + } + + lstrcpyW(cmd_line, mono_exe); + HeapFree(GetProcessHeap(), 0, mono_exe); + lstrcatW(cmd_line, GetCommandLineW()); + + TRACE("new command line: %s\n", debugstr_w(cmd_line)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + if (!CreateProcessW(NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + HeapFree(GetProcessHeap(), 0, cmd_line); + return -1; + } + HeapFree(GetProcessHeap(), 0, cmd_line); + + /* wait for the process to exit */ + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess, &exit_code); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + return (int)exit_code; } int WINAPI _CorExeMain2(PBYTE ptrMemory, DWORD cntMemory, LPCWSTR imageName, LPCWSTR loaderName, LPCWSTR cmdLine)

1 0

Paul Vriens : winspool/tests: Don't treat having no printers as a failure.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: e9cd221e803a94f160dba69c6c79ea3b5c943701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cd221e803a94f160dba69c6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Dec 12 10:22:49 2006 +0100 winspool/tests: Don't treat having no printers as a failure. --- dlls/winspool.drv/tests/info.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 786ea3f..dec988e 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1637,15 +1637,37 @@ static void test_EnumPrinters(void) DWORD ret; SetLastError(0xdeadbeef); + neededA = -1; ret = EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededA, &num); - ok(ret == 0, "ret %d\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); + if (!ret) + { + /* We have 1 or more printers */ + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); + ok(neededA > 0, "Expected neededA to show the number of needed bytes\n"); + } + else + { + /* We don't have any printers defined */ + ok(GetLastError() == S_OK, "gle %d\n", GetLastError()); + ok(neededA == 0, "Expected neededA to be zero\n"); + } ok(num == 0, "num %d\n", num); SetLastError(0xdeadbeef); + neededW = -1; ret = EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededW, &num); - ok(ret == 0, "ret %d\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); + if (!ret) + { + /* We have 1 or more printers */ + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); + ok(neededW > 0, "Expected neededW to show the number of needed bytes\n"); + } + else + { + /* We don't have any printers defined */ + ok(GetLastError() == S_OK, "gle %d\n", GetLastError()); + ok(neededW == 0, "Expected neededW to be zero\n"); + } ok(num == 0, "num %d\n", num); /* Outlook2003 relies on the buffer size returned by EnumPrintersA being big enough

1 0

Paul Vriens : winspool/tests: Make default_printer a global variable.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 7dd8066941f8fba96f7e41626c26e4658ecb425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd8066941f8fba96f7e41626… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Dec 12 10:22:32 2006 +0100 winspool/tests: Make default_printer a global variable. --- dlls/winspool.drv/tests/info.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 8f3bdd0..786ea3f 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -55,6 +55,8 @@ struct monitor_entry { CHAR dllname[32]; }; +static LPSTR default_printer = NULL; + /* report common behavior only once */ static DWORD report_deactivated_spooler = 1; #define RETURN_ON_DEACTIVATED_SPOOLER(res) \ @@ -70,7 +72,6 @@ static DWORD report_deactivated_spooler static LPSTR find_default_printer(VOID) { - static LPSTR default_printer = NULL; static char buffer[DEFAULT_PRINTER_SIZE]; DWORD needed; DWORD res; @@ -1218,7 +1219,6 @@ static void test_OpenPrinter(void) { PRINTER_DEFAULTSA defaults; HANDLE hprinter; - LPSTR default_printer; DWORD res; DWORD size; CHAR buffer[DEFAULT_PRINTER_SIZE]; @@ -1311,7 +1311,7 @@ static void test_OpenPrinter(void) /* Get Handle for the default Printer */ - if ((default_printer = find_default_printer())) + if (default_printer) { hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); @@ -1386,7 +1386,6 @@ static void test_OpenPrinter(void) static void test_SetDefaultPrinter(void) { DWORD res; - LPSTR default_printer; DWORD size = DEFAULT_PRINTER_SIZE; CHAR buffer[DEFAULT_PRINTER_SIZE]; CHAR org_value[DEFAULT_PRINTER_SIZE]; @@ -1395,8 +1394,6 @@ static void test_SetDefaultPrinter(void) if (!pSetDefaultPrinterA) return; /* only supported on win2k and above */ - default_printer = find_default_printer(); - /* backup the original value */ org_value[0] = '\0'; SetLastError(MAGIC_DEAD); @@ -1486,14 +1483,12 @@ static void test_SetDefaultPrinter(void) static void test_GetPrinterDriver(void) { - LPSTR default_printer; HANDLE hprn; BOOL ret; BYTE *buf; INT level; DWORD needed, filled; - default_printer = find_default_printer(); if (!default_printer) { trace("There is no default printer installed, skiping the test\n"); @@ -1599,12 +1594,10 @@ static void test_DEVMODE(const DEVMODE * static void test_DocumentProperties(void) { - LPSTR default_printer; HANDLE hprn; LONG dm_size, ret; DEVMODE *dm; - default_printer = find_default_printer(); if (!default_printer) { trace("There is no default printer installed, skiping the test\n"); @@ -1662,8 +1655,6 @@ static void test_EnumPrinters(void) START_TEST(info) { - LPSTR default_printer; - hwinspool = GetModuleHandleA("winspool.drv"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA");

1 0

Andrew Talbot : msvcrt/tests: Cast-qual warnings fix.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 9317377fb853a199643b10e4efc34869dec47eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9317377fb853a199643b10e4e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Dec 11 21:41:58 2006 +0000 msvcrt/tests: Cast-qual warnings fix. --- dlls/msvcrt/tests/printf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 7613c91..53d88f4 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -504,7 +504,8 @@ static void test_fwprintf( void ) const char *string="not a wide string"; todo_wine { - ok(fwprintf(fopen("nul","r+"),(wchar_t *)string) == -1,"Non-wide string should not be printed by fwprintf\n"); + ok(fwprintf(fopen("nul","r+"),(const wchar_t *)string) == -1, + "Non-wide string should not be printed by fwprintf\n"); } }

1 0

Andrew Talbot : msvcrt/tests: Cast-qual warnings fix.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: 24c4f46da47125adf410cbec2d5fae7477cb163f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c4f46da47125adf410cbec2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Dec 11 21:41:00 2006 +0000 msvcrt/tests: Cast-qual warnings fix. --- dlls/msvcrt/tests/cpp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 5909aae..a411212 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -140,7 +140,7 @@ inline static void* do_call_func1(void * return (void*)retval; } -inline static void* do_call_func2(void *func, void *_this, void* arg) +inline static void* do_call_func2(void *func, void *_this, const void* arg) { volatile void* retval = 0; __asm @@ -164,7 +164,7 @@ static void* do_call_func1(void *func, v : "memory" ); return ret; } -static void* do_call_func2(void *func, void *_this, void* arg) +static void* do_call_func2(void *func, void *_this, const void* arg) { void* ret; __asm__ __volatile__ ("pushl %2\n\tcall *%1" @@ -176,7 +176,7 @@ static void* do_call_func2(void *func, v #endif #define call_func1(x,y) do_call_func1((void*)x,(void*)y) -#define call_func2(x,y,z) do_call_func2((void*)x,(void*)y,(void*)z) +#define call_func2(x,y,z) do_call_func2((void*)x,(void*)y,(const void*)z) /* Some exports are only available in later versions */ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y)

1 0

Andrew Talbot : msi/tests: Cast-qual warning fix.
by Alexandre Julliard 12 Dec '06

12 Dec '06

Module: wine Branch: master Commit: ebd6f7d1cec37e7777847ab19566a2051a0c1007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd6f7d1cec37e7777847ab19… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Dec 11 21:30:51 2006 +0000 msi/tests: Cast-qual warning fix. --- dlls/msi/tests/install.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 86d67b0..3541ab2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -811,6 +811,7 @@ static void create_cc_test_files(void) CCAB cabParams; HFCI hfci; ERF erf; + static CHAR cab_context[] = "test%d.cab"; BOOL res; create_file("maximus", 500); @@ -821,7 +822,7 @@ static void create_cc_test_files(void) hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, (void*)"test%d.cab"); + get_temp_file, &cabParams, cab_context); ok(hfci != NULL, "Failed to create an FCI context\n"); /* spews out hundreds of cab files. re-enable when cabinet.dll is fixed */

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2006