November 2005 - Wine-Commits

wine/dlls/kernel heap.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21170 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:10:02 Modified files: dlls/kernel : heap.c Log message: Robert Lunnon <bobl(a)optushome.com.au> Implement GlobalMemoryStatusEx for Solaris. Patch: http://cvs.winehq.org/patch.py?id=21170 Old revision New revision Changes Path 1.20 1.21 +40 -3 wine/dlls/kernel/heap.c Index: wine/dlls/kernel/heap.c diff -u -p wine/dlls/kernel/heap.c:1.20 wine/dlls/kernel/heap.c:1.21 --- wine/dlls/kernel/heap.c:1.20 8 Nov 2005 16:10: 2 -0000 +++ wine/dlls/kernel/heap.c 8 Nov 2005 16:10: 2 -0000 @@ -40,6 +40,16 @@ # include <unistd.h> #endif +#ifdef sun +/* FIXME: Unfortunately swapctl can't be used with largefile.... */ +# undef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 32 +# include <sys/resource.h> +# include <sys/stat.h> +# include <sys/swap.h> +#endif + + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -1132,6 +1142,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO int size_sys; int mib[2] = { CTL_HW }; #endif +#ifdef sun + long pagesize,maxpages,freepages,swapspace,swapfree; + struct anoninfo swapinf; + int rval; +#endif + if (time(NULL)==cache_lastchecked) { memcpy(lpmemex,&cached_memstatus,sizeof(*lpmemex)); return TRUE; @@ -1200,9 +1216,9 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO if (tmp && *tmp) { lpmemex->ullTotalPhys = *tmp; - free(tmp); - mib[1] = HW_USERMEM; - sysctl(mib, 2, NULL, &size_sys, NULL, 0); + free(tmp); + mib[1] = HW_USERMEM; + sysctl(mib, 2, NULL, &size_sys, NULL, 0); tmp = malloc(size_sys * sizeof(int)); sysctl(mib, 2, tmp, &size_sys, NULL, 0); if (tmp && *tmp) @@ -1221,6 +1237,27 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO free(tmp); } +#elif defined ( sun ) + pagesize=sysconf(_SC_PAGESIZE); + maxpages=sysconf(_SC_PHYS_PAGES); + freepages=sysconf(_SC_AVPHYS_PAGES); + rval=swapctl(SC_AINFO, &swapinf); + if(rval >-1) + { + swapspace=swapinf.ani_max*pagesize; + swapfree=swapinf.ani_free*pagesize; + }else + { + + WARN("Swap size cannot be determined , assuming equal to physical memory\n"); + swapspace=maxpages*pagesize; + swapfree=maxpages*pagesize; + } + lpmemex->ullTotalPhys=pagesize*maxpages; + lpmemex->ullAvailPhys = pagesize*freepages; + lpmemex->ullTotalPageFile = swapspace; + lpmemex->ullAvailPageFile = swapfree; + lpmemex->dwMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys; #endif /* Project2k refuses to start if it sees less than 1Mb of free swap */

1 0

wine/dlls/kernel/tests heap.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21169 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:09:44 Modified files: dlls/kernel/tests: heap.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Take into account some alignment done by HeapAlloc() on Win9x. Patch: http://cvs.winehq.org/patch.py?id=21169 Old revision New revision Changes Path 1.6 1.7 +8 -1 wine/dlls/kernel/tests/heap.c Index: wine/dlls/kernel/tests/heap.c diff -u -p wine/dlls/kernel/tests/heap.c:1.6 wine/dlls/kernel/tests/heap.c:1.7 --- wine/dlls/kernel/tests/heap.c:1.6 8 Nov 2005 16: 9:44 -0000 +++ wine/dlls/kernel/tests/heap.c 8 Nov 2005 16: 9:44 -0000 @@ -25,6 +25,12 @@ #include "winbase.h" #include "wine/test.h" +static SIZE_T resize_9x(SIZE_T size) +{ + DWORD dwSizeAligned = (size + 3) & ~3; + return max(dwSizeAligned, 12); /* at least 12 bytes */ +} + START_TEST(heap) { void *mem; @@ -43,7 +49,8 @@ START_TEST(heap) SIZE_T heap_size; mem = HeapAlloc(GetProcessHeap(), 0, size); heap_size = HeapSize(GetProcessHeap(), 0, mem); - ok(size == heap_size, "HeapSize returned %lu instead of %lu\n", heap_size, size); + ok(heap_size == size || heap_size == resize_9x(size), + "HeapSize returned %lu instead of %lu or %lu\n", heap_size, size, resize_9x(size)); HeapFree(GetProcessHeap(), 0, mem); }

1 0

wine/dlls/wininet internet.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21168 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:09:20 Modified files: dlls/wininet : internet.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Unicodify InternetCheckConnection. Use HeapAlloc'ed buffers where applicable. Patch: http://cvs.winehq.org/patch.py?id=21168 Old revision New revision Changes Path 1.136 1.137 +27 -21 wine/dlls/wininet/internet.c Index: wine/dlls/wininet/internet.c diff -u -p wine/dlls/wininet/internet.c:1.136 wine/dlls/wininet/internet.c:1.137 --- wine/dlls/wininet/internet.c:1.136 8 Nov 2005 16: 9:20 -0000 +++ wine/dlls/wininet/internet.c 8 Nov 2005 16: 9:20 -0000 @@ -2460,16 +2460,16 @@ BOOL WINAPI InternetTimeToSystemTimeW( L } /*********************************************************************** - * InternetCheckConnectionA (WININET.@) + * InternetCheckConnectionW (WININET.@) * * Pings a requested host to check internet connection * * RETURNS * TRUE on success and FALSE on failure. If a failure then - * ERROR_NOT_CONNECTED is placesd into GetLastError + * ERROR_NOT_CONNECTED is placed into GetLastError * */ -BOOL WINAPI InternetCheckConnectionA( LPCSTR lpszUrl, DWORD dwFlags, DWORD dwReserved ) +BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwReserved ) { /* * this is a kludge which runs the resident ping program and reads the output. @@ -2478,8 +2478,11 @@ BOOL WINAPI InternetCheckConnectionA( LP */ BOOL rc = FALSE; - char command[1024]; - char host[1024]; + static const CHAR ping[] = "ping -w 1 "; + static const CHAR redirect[] = " >/dev/null 2>/dev/null"; + CHAR *command = NULL; + WCHAR hostW[1024]; + DWORD len; int status = -1; FIXME("\n"); @@ -2501,30 +2504,32 @@ BOOL WINAPI InternetCheckConnectionA( LP } else { - URL_COMPONENTSA components; + URL_COMPONENTSW components; - ZeroMemory(&components,sizeof(URL_COMPONENTSA)); - components.lpszHostName = (LPSTR)&host; + ZeroMemory(&components,sizeof(URL_COMPONENTSW)); + components.lpszHostName = (LPWSTR)&hostW; components.dwHostNameLength = 1024; - if (!InternetCrackUrlA(lpszUrl,0,0,&components)) + if (!InternetCrackUrlW(lpszUrl,0,0,&components)) goto End; - TRACE("host name : %s\n",components.lpszHostName); + TRACE("host name : %s\n",debugstr_w(components.lpszHostName)); } /* * Build our ping command */ - strcpy(command,"ping -w 1 "); - strcat(command,host); - strcat(command," >/dev/null 2>/dev/null"); + len = WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, NULL, 0, NULL, NULL); + command = HeapAlloc( GetProcessHeap(), 0, strlen(ping)+len+strlen(redirect) ); + strcpy(command,ping); + WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, command+strlen(ping), len, NULL, NULL); + strcat(command,redirect); TRACE("Ping command is : %s\n",command); status = system(command); - TRACE("Ping returned a code of %i \n",status); + TRACE("Ping returned a code of %i\n",status); /* Ping return code of 0 indicates success */ if (status == 0) @@ -2532,6 +2537,7 @@ BOOL WINAPI InternetCheckConnectionA( LP End: + HeapFree( GetProcessHeap(), 0, command ); if (rc == FALSE) SetLastError(ERROR_NOT_CONNECTED); @@ -2540,7 +2546,7 @@ End: /*********************************************************************** - * InternetCheckConnectionW (WININET.@) + * InternetCheckConnectionA (WININET.@) * * Pings a requested host to check internet connection * @@ -2549,17 +2555,17 @@ End: * ERROR_NOT_CONNECTED is placed into GetLastError * */ -BOOL WINAPI InternetCheckConnectionW(LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwReserved) +BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwReserved) { - CHAR *szUrl; + WCHAR *szUrl; INT len; BOOL rc; - len = WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, NULL, 0, NULL, NULL); - if (!(szUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(CHAR)))) + len = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0); + if (!(szUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) return FALSE; - WideCharToMultiByte(CP_ACP, 0, lpszUrl, -1, szUrl, len, NULL, NULL); - rc = InternetCheckConnectionA((LPCSTR)szUrl, dwFlags, dwReserved); + MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, len); + rc = InternetCheckConnectionW(szUrl, dwFlags, dwReserved); HeapFree(GetProcessHeap(), 0, szUrl); return rc;

1 0

wine/dlls/shell32 systray.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21167 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 10:08:17 Modified files: dlls/shell32 : systray.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Move functions a bit to get rid of a static declaration. Patch: http://cvs.winehq.org/patch.py?id=21167 Old revision New revision Changes Path 1.30 1.31 +34 -35 wine/dlls/shell32/systray.c Index: wine/dlls/shell32/systray.c diff -u -p wine/dlls/shell32/systray.c:1.30 wine/dlls/shell32/systray.c:1.31 --- wine/dlls/shell32/systray.c:1.30 8 Nov 2005 16: 8:17 -0000 +++ wine/dlls/shell32/systray.c 8 Nov 2005 16: 8:17 -0000 @@ -53,8 +53,6 @@ typedef struct SystrayItem { static SystrayItem *systray=NULL; static int firstSystray=TRUE; /* defer creation of window class until first systray item is created */ -static BOOL SYSTRAY_Delete(PNOTIFYICONDATAA pnid); - #define ICON_SIZE GetSystemMetrics(SM_CXSMICON) /* space around icon (forces icon to center of KDE systray area) */ @@ -69,6 +67,40 @@ static BOOL SYSTRAY_ItemIsEqual(PNOTIFYI return TRUE; } + +static void SYSTRAY_ItemTerm(SystrayItem *ptrayItem) +{ + if(ptrayItem->notifyIcon.hIcon) + DestroyIcon(ptrayItem->notifyIcon.hIcon); + if(ptrayItem->hWndToolTip) + DestroyWindow(ptrayItem->hWndToolTip); + if(ptrayItem->hWnd) + DestroyWindow(ptrayItem->hWnd); + return; +} + + +static BOOL SYSTRAY_Delete(PNOTIFYICONDATAA pnid) +{ + SystrayItem **ptrayItem = &systray; + + while (*ptrayItem) { + if (SYSTRAY_ItemIsEqual(pnid, &(*ptrayItem)->notifyIcon)) { + SystrayItem *next = (*ptrayItem)->nextTrayItem; + TRACE("%p: %p %s\n", *ptrayItem, (*ptrayItem)->notifyIcon.hWnd, (*ptrayItem)->notifyIcon.szTip); + SYSTRAY_ItemTerm(*ptrayItem); + + HeapFree(GetProcessHeap(),0,*ptrayItem); + *ptrayItem = next; + + return TRUE; + } + ptrayItem = &((*ptrayItem)->nextTrayItem); + } + + return FALSE; /* not found */ +} + static LRESULT CALLBACK SYSTRAY_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HDC hdc; @@ -225,18 +257,6 @@ static BOOL SYSTRAY_ItemInit(SystrayItem } -static void SYSTRAY_ItemTerm(SystrayItem *ptrayItem) -{ - if(ptrayItem->notifyIcon.hIcon) - DestroyIcon(ptrayItem->notifyIcon.hIcon); - if(ptrayItem->hWndToolTip) - DestroyWindow(ptrayItem->hWndToolTip); - if(ptrayItem->hWnd) - DestroyWindow(ptrayItem->hWnd); - return; -} - - static void SYSTRAY_ItemSetMessage(SystrayItem *ptrayItem, UINT uCallbackMessage) { ptrayItem->notifyIcon.uCallbackMessage = uCallbackMessage; @@ -325,27 +345,6 @@ static BOOL SYSTRAY_Modify(PNOTIFYICONDA } -static BOOL SYSTRAY_Delete(PNOTIFYICONDATAA pnid) -{ - SystrayItem **ptrayItem = &systray; - - while (*ptrayItem) { - if (SYSTRAY_ItemIsEqual(pnid, &(*ptrayItem)->notifyIcon)) { - SystrayItem *next = (*ptrayItem)->nextTrayItem; - TRACE("%p: %p %s\n", *ptrayItem, (*ptrayItem)->notifyIcon.hWnd, (*ptrayItem)->notifyIcon.szTip); - SYSTRAY_ItemTerm(*ptrayItem); - - HeapFree(GetProcessHeap(),0,*ptrayItem); - *ptrayItem = next; - - return TRUE; - } - ptrayItem = &((*ptrayItem)->nextTrayItem); - } - - return FALSE; /* not found */ -} - /************************************************************************* * */

1 0

wine/dlls/comctl32 treeview.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21166 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 07:11:48 Modified files: dlls/comctl32 : treeview.c Log message: Alex Villacís Lasso <a_villacis(a)palosanto.com> Do not issue a GetUpdateRect() to query an update region for WM_PAINT(wParam=HDC) case. Instead, use GetClientRect() for a bounding rect. Patch: http://cvs.winehq.org/patch.py?id=21166 Old revision New revision Changes Path 1.176 1.177 +2 -12 wine/dlls/comctl32/treeview.c Index: wine/dlls/comctl32/treeview.c diff -u -p wine/dlls/comctl32/treeview.c:1.176 wine/dlls/comctl32/treeview.c:1.177 --- wine/dlls/comctl32/treeview.c:1.176 8 Nov 2005 13:11:48 -0000 +++ wine/dlls/comctl32/treeview.c 8 Nov 2005 13:11:48 -0000 @@ -2849,18 +2849,8 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, W if (wParam) { hdc = (HDC)wParam; - if (!GetUpdateRect(infoPtr->hwnd, &rc, TRUE)) - { - HBITMAP hbitmap; - BITMAP bitmap; - hbitmap = GetCurrentObject(hdc, OBJ_BITMAP); - if (!hbitmap) return 0; - GetObjectW(hbitmap, sizeof(BITMAP), &bitmap); - rc.left = 0; rc.top = 0; - rc.right = bitmap.bmWidth; - rc.bottom = bitmap.bmHeight; - TREEVIEW_EraseBackground(infoPtr, (HDC)wParam); - } + GetClientRect(infoPtr->hwnd, &rc); + TREEVIEW_EraseBackground(infoPtr, hdc); } else {

1 0

wine/dlls/msxml3 tests/domdoc.c msxml_private. ...
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21165 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 07:10:49 Modified files: dlls/msxml3/tests: domdoc.c dlls/msxml3 : msxml_private.h domdoc.c Makefile.in Added files: dlls/msxml3 : parseerror.c Log message: Huw Davies <huw(a)codeweavers.com> Implement get_parseError. Patch: http://cvs.winehq.org/patch.py?id=21165 Old revision New revision Changes Path 1.6 1.7 +10 -0 wine/dlls/msxml3/tests/domdoc.c 1.10 1.11 +2 -0 wine/dlls/msxml3/msxml_private.h 1.16 1.17 +4 -2 wine/dlls/msxml3/domdoc.c 1.7 1.8 +2 -1 wine/dlls/msxml3/Makefile.in Added 1.1 +0 -0 wine/dlls/msxml3/parseerror.c

1 0

wine/dlls hhctrl.ocx/hhctrl.c gdi/font.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21164 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:55:40 Modified files: dlls/hhctrl.ocx: hhctrl.c dlls/gdi : font.c Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Correct some allocated buffer lengths while converting to Unicode. Patch: http://cvs.winehq.org/patch.py?id=21164 Old revision New revision Changes Path 1.10 1.11 +1 -1 wine/dlls/hhctrl.ocx/hhctrl.c 1.24 1.25 +9 -11 wine/dlls/gdi/font.c Index: wine/dlls/hhctrl.ocx/hhctrl.c diff -u -p wine/dlls/hhctrl.ocx/hhctrl.c:1.10 wine/dlls/hhctrl.ocx/hhctrl.c:1.11 --- wine/dlls/hhctrl.ocx/hhctrl.c:1.10 8 Nov 2005 12:55:40 -0000 +++ wine/dlls/hhctrl.ocx/hhctrl.c 8 Nov 2005 12:55:40 -0000 @@ -111,7 +111,7 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCST { DWORD len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 ); - wfile = HeapAlloc( GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)); + wfile = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len ); } Index: wine/dlls/gdi/font.c diff -u -p wine/dlls/gdi/font.c:1.24 wine/dlls/gdi/font.c:1.25 --- wine/dlls/gdi/font.c:1.24 8 Nov 2005 12:55:40 -0000 +++ wine/dlls/gdi/font.c 8 Nov 2005 12:55:40 -0000 @@ -344,15 +344,14 @@ static void FONT_NewTextMetricExWToA(con /*********************************************************************** * FONT_mbtowc * - * Returns a '\0' terminated Unicode translation of str using the - * charset of the currently selected font in hdc. If count is -1 then - * str is assumed to be '\0' terminated, otherwise it contains the - * number of bytes to convert. If plenW is non-NULL, on return it - * will point to the number of WCHARs (excluding the '\0') that have - * been written. If pCP is non-NULL, on return it will point to the - * codepage used in the conversion. - * The caller should free the returned LPWSTR from the process - * heap itself. + * Returns a Unicode translation of str using the charset of the + * currently selected font in hdc. If count is -1 then str is assumed + * to be '\0' terminated, otherwise it contains the number of bytes to + * convert. If plenW is non-NULL, on return it will point to the + * number of WCHARs that have been written. If pCP is non-NULL, on + * return it will point to the codepage used in the conversion. The + * caller should free the returned LPWSTR from the process heap + * itself. */ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) { @@ -401,9 +400,8 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCST if(count == -1) count = strlen(str); lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, (lenW + 1) * sizeof(WCHAR)); + strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); MultiByteToWideChar(cp, 0, str, count, strW, lenW); - strW[lenW] = '\0'; TRACE("mapped %s -> %s\n", debugstr_an(str, count), debugstr_wn(strW, lenW)); if(plenW) *plenW = lenW; if(pCP) *pCP = cp;

1 0

wine/dlls user/static.c user/listbox.c user/ed ...
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21163 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:52:35 Modified files: dlls/user : static.c listbox.c edit.c button.c dlls/comctl32 : updown.c treeview.c trackbar.c tooltips.c toolbar.c tab.c syslink.c status.c rebar.c propsheet.c progress.c pager.c monthcal.c hotkey.c header.c datetime.c animate.c Log message: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Handle WM_PRINTCLIENT. Don't use SelectClipRgn in WM_PRINTCLIENT. Patch: http://cvs.winehq.org/patch.py?id=21163 Old revision New revision Changes Path 1.8 1.9 +1 -0 wine/dlls/user/static.c 1.24 1.25 +1 -0 wine/dlls/user/listbox.c 1.40 1.41 +1 -0 wine/dlls/user/edit.c 1.10 1.11 +4 -10 wine/dlls/user/button.c 1.70 1.71 +1 -0 wine/dlls/comctl32/updown.c 1.175 1.176 +1 -2 wine/dlls/comctl32/treeview.c 1.67 1.68 +1 -0 wine/dlls/comctl32/trackbar.c 1.79 1.80 +1 -0 wine/dlls/comctl32/tooltips.c 1.227 1.228 +1 -0 wine/dlls/comctl32/toolbar.c 1.121 1.122 +1 -0 wine/dlls/comctl32/tab.c 1.13 1.14 +1 -0 wine/dlls/comctl32/syslink.c 1.76 1.77 +1 -0 wine/dlls/comctl32/status.c 1.112 1.113 +1 -2 wine/dlls/comctl32/rebar.c 1.136 1.137 +1 -0 wine/dlls/comctl32/propsheet.c 1.43 1.44 +1 -0 wine/dlls/comctl32/progress.c 1.55 1.56 +2 -0 wine/dlls/comctl32/pager.c 1.60 1.61 +1 -0 wine/dlls/comctl32/monthcal.c 1.34 1.35 +1 -0 wine/dlls/comctl32/hotkey.c 1.86 1.87 +1 -0 wine/dlls/comctl32/header.c 1.61 1.62 +1 -0 wine/dlls/comctl32/datetime.c 1.69 1.70 +1 -0 wine/dlls/comctl32/animate.c

1 0

wine/dlls/wined3d directx.c
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21162 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:47:05 Modified files: dlls/wined3d : directx.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Fix parsing of version number. Patch: http://cvs.winehq.org/patch.py?id=21162 Old revision New revision Changes Path 1.58 1.59 +1 -0 wine/dlls/wined3d/directx.c Index: wine/dlls/wined3d/directx.c diff -u -p wine/dlls/wined3d/directx.c:1.58 wine/dlls/wined3d/directx.c:1.59 --- wine/dlls/wined3d/directx.c:1.58 8 Nov 2005 12:47: 5 -0000 +++ wine/dlls/wined3d/directx.c 8 Nov 2005 12:47: 5 -0000 @@ -277,6 +277,7 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine if (*gl_string_cursor != '.') WARN_(d3d_caps)("malformed GL_VERSION (%s)\n", debugstr_a(gl_string)); ++gl_string_cursor; + cursor = 0; while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { tmp[cursor++] = *gl_string_cursor; ++gl_string_cursor;

1 0

wine/dlls/msxml3 nodemap.c nodelist.c node.c e ...
by Alexandre Julliard Nov. 8, 2005

Nov. 8, 2005

ChangeSet ID: 21161 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/08 06:46:43 Modified files: dlls/msxml3 : nodemap.c nodelist.c node.c element.c domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Fix cut-n-paste error in licence text. Patch: http://cvs.winehq.org/patch.py?id=21161 Old revision New revision Changes Path 1.7 1.8 +2 -2 wine/dlls/msxml3/nodemap.c 1.5 1.6 +2 -2 wine/dlls/msxml3/nodelist.c 1.12 1.13 +2 -2 wine/dlls/msxml3/node.c 1.9 1.10 +2 -2 wine/dlls/msxml3/element.c 1.15 1.16 +2 -2 wine/dlls/msxml3/domdoc.c Index: wine/dlls/msxml3/nodemap.c diff -u -p wine/dlls/msxml3/nodemap.c:1.7 wine/dlls/msxml3/nodemap.c:1.8 --- wine/dlls/msxml3/nodemap.c:1.7 8 Nov 2005 12:46:43 -0000 +++ wine/dlls/msxml3/nodemap.c 8 Nov 2005 12:46:43 -0000 @@ -3,12 +3,12 @@ * * Copyright 2005 Mike McCormack * - * iface library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * iface library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. Index: wine/dlls/msxml3/nodelist.c diff -u -p wine/dlls/msxml3/nodelist.c:1.5 wine/dlls/msxml3/nodelist.c:1.6 --- wine/dlls/msxml3/nodelist.c:1.5 8 Nov 2005 12:46:43 -0000 +++ wine/dlls/msxml3/nodelist.c 8 Nov 2005 12:46:43 -0000 @@ -3,12 +3,12 @@ * * Copyright 2005 Mike McCormack * - * iface library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * iface library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.12 wine/dlls/msxml3/node.c:1.13 --- wine/dlls/msxml3/node.c:1.12 8 Nov 2005 12:46:43 -0000 +++ wine/dlls/msxml3/node.c 8 Nov 2005 12:46:43 -0000 @@ -3,12 +3,12 @@ * * Copyright 2005 Mike McCormack * - * iface library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * iface library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. Index: wine/dlls/msxml3/element.c diff -u -p wine/dlls/msxml3/element.c:1.9 wine/dlls/msxml3/element.c:1.10 --- wine/dlls/msxml3/element.c:1.9 8 Nov 2005 12:46:43 -0000 +++ wine/dlls/msxml3/element.c 8 Nov 2005 12:46:43 -0000 @@ -3,12 +3,12 @@ * * Copyright 2005 Mike McCormack * - * iface library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * iface library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. Index: wine/dlls/msxml3/domdoc.c diff -u -p wine/dlls/msxml3/domdoc.c:1.15 wine/dlls/msxml3/domdoc.c:1.16 --- wine/dlls/msxml3/domdoc.c:1.15 8 Nov 2005 12:46:43 -0000 +++ wine/dlls/msxml3/domdoc.c 8 Nov 2005 12:46:43 -0000 @@ -3,12 +3,12 @@ * * Copyright 2005 Mike McCormack * - * iface library is free software; you can redistribute it and/or + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * iface library is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details.

1 0