wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Paul Vriens : shlwapi/tests: Fix a test failure on NT4.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 2448b8da9be9bebbecf8c500c5b5409b81c9055a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2448b8da9be9bebbecf8c500c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 13 11:26:14 2010 +0100 shlwapi/tests: Fix a test failure on NT4. --- dlls/shlwapi/tests/ordinal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 83aec78..083934b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1683,10 +1683,11 @@ if (0) flags = FDTF_SHORTDATE | FDTF_LTRDATE | FDTF_RTLDATE; SetLastError(0xdeadbeef); + buff[0] = 0; /* NT4 doesn't clear the buffer on failure */ ret = pSHFormatDateTimeW(&filetime, &flags, buff, sizeof(buff)/sizeof(WCHAR)); ok(ret == lstrlenW(buff)+1, "got %d\n", ret); ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe */ + broken(GetLastError() == ERROR_INVALID_FLAGS), /* Win9x/WinMe/NT4 */ "expected 0xdeadbeef, got %d\n", GetLastError()); /* now check returned strings */

1 0

André Hentschel : documentation: Keep README. de in sync.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: a26c3bc0335ff3b0020c15ae8f3bf0d2dc183f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26c3bc0335ff3b0020c15ae8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 12 20:02:08 2010 +0100 documentation: Keep README.de in sync. --- documentation/README.de | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 310f6a5..ba265cd 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -159,20 +159,9 @@ Hinweis: Der Pfad zur Datei wird auch zum Pfad hinzugefügt, wenn ein vollständ Dateiname auf der Kommandozeile angegeben wird. Die Entwicklung von Wine ist noch nicht abgeschlossen, daher können einige -Programme abstürzen. Vorausgesetzt, dass Sie winedbg korrekt entsprechend -documentation/debugger.sgml einrichten, werden Sie dann in einem Debugger landen, -um das Problem untersuchen und beheben zu können. -Weitere Informationen zu diesem Thema entnehmen Sie bitte der Datei -documentation/debugging.sgml. - -Sie sollten Backups von allen wichtigen Dateien machen, auf die Sie Wine -Zugriff gewähren, oder spezielle Kopien für Wine anlegen, da Benutzer einige -Fälle gemeldet haben, in denen Dateien zerstört wurden. Führen Sie zum Beispiel -NICHT den Explorer aus, wenn Sie kein geeignetes Backup haben, da er manchmal -Verzeichnise verstümmelt / umbenennnt. Selbst andere MS-Applikationen wie z.B -der Messenger sind nicht sicher, da sie unter Umständen den Explorer aufrufen. -Diese spezielle Beschädigung (!$!$!$!$.pfr) kann zumindest teilweise durch -http://home.nexgo.de/andi.mohr/download/decorrupt_explorer behoben werden. +Programme abstürzen. In diesem Fall startet der Debugger, so dass Sie das Problem +untersuchen und beheben können. Weitere Informationen zu diesem Thema entnehmen Sie +bitte dem Kapitel Debugging aus dem Wine Developer's Guide. 7. WEITERFÜHRENDE INFORMATIONEN @@ -198,7 +187,7 @@ Git: Der aktuelle Wine-Entwicklungs-Zweig ist über Git verfügbar. Besuchen Sie http://www.winehq.org/site/git für weitere Informationen. Mailing-Listen: - Es gibt mehrere Mailing-Listen für die Wine-Entwickler; Schauen Sie + Es gibt mehrere Mailing-Listen für die Wine-User und -Entwickler; Schauen Sie sich bitte dazu http://www.winehq.org/forums an. Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org

1 0

Huw Davies : wineps.drv: Retrieve the full printer name to avoid truncation when the name is 32 characters or longer .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 547e97a461ade867dea1a1313c94243f9560d41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=547e97a461ade867dea1a1313… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 10:42:44 2010 +0000 wineps.drv: Retrieve the full printer name to avoid truncation when the name is 32 characters or longer. --- dlls/wineps.drv/init.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ef5d9d8..685a56a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -305,27 +305,22 @@ BOOL CDECL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWST { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; - char *deviceA; /* If no device name was specified, retrieve the device name - * from the DEVMODE structure from the DC's physDev. + * from the PRINTERINFO structure from the DC's physDev. * (See CreateCompatibleDC) */ if ( !device && *pdev ) { - physDev = *pdev; - deviceA = HeapAlloc(GetProcessHeap(), 0, CCHDEVICENAME); - lstrcpynA(deviceA, (LPCSTR)physDev->Devmode->dmPublic.dmDeviceName, CCHDEVICENAME); + pi = PSDRV_FindPrinterInfo((*pdev)->pi->FriendlyName); } else { DWORD len = WideCharToMultiByte(CP_ACP, 0, device, -1, NULL, 0, NULL, NULL); - deviceA = HeapAlloc(GetProcessHeap(), 0, len); + char *deviceA = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_ACP, 0, device, -1, deviceA, len, NULL, NULL); + pi = PSDRV_FindPrinterInfo(deviceA); + HeapFree(GetProcessHeap(), 0, deviceA); } - pi = PSDRV_FindPrinterInfo(deviceA); - - HeapFree(GetProcessHeap(), 0, deviceA); - deviceA = NULL; TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), initData);

1 0

Roderick Colenbrander : opengl32: Add OpenGL 3.3/4.0 extensions.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: e18afef774e8d8bbe723914d350ed155b5093ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18afef774e8d8bbe723914d3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 11 16:11:57 2010 +0100 opengl32: Add OpenGL 3.3/4.0 extensions. --- dlls/opengl32/opengl_ext.c | 1232 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1222 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e18afef774e8d8bbe7239…

1 0

Roderick Colenbrander : wgl: Add more OpenGL diagnosing checks.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 22a247047dd5b20ae074902eecad0a9b86499812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a247047dd5b20ae074902ee… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 11 14:10:51 2010 +0100 wgl: Add more OpenGL diagnosing checks. --- dlls/winex11.drv/opengl.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e784844..859cf94 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -375,6 +375,21 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); } + else + { + /* In general you would expect that if direct rendering is returned, that you receive hardware + * accelerated OpenGL rendering. The definition of direct rendering is that rendering is performed + * client side without sending all GL commands to X using the GLX protocol. When Mesa falls back to + * software rendering, it shows direct rendering. + * + * Depending on the cause of software rendering a different rendering string is shown. In case Mesa fails + * to load a DRI module 'Software Rasterizer' is returned. When Mesa is compiled as a OpenGL reference driver + * it shows 'Mesa X11'. + */ + const char *gl_renderer = (const char *)pglGetString(GL_RENDERER); + if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11")) + ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL drivers haven't been installed correctly\n"); + } if(vis) XFree(vis); if(ctx) {

1 0

Dmitry Timoshkov : gdi32: Fix GDI locking in SetBitmapBits.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: c7b45aa8d335b15b00755edd14a47fc90dd2f725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b45aa8d335b15b00755edd1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 10 16:30:28 2010 +0800 gdi32: Fix GDI locking in SetBitmapBits. --- dlls/gdi32/bitmap.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index dfb8916..937a67d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -436,11 +436,13 @@ LONG WINAPI SetBitmapBits( LONG count, /* [in] Number of bytes in bitmap array */ LPCVOID bits) /* [in] Address of array with bitmap bits */ { - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); + BITMAPOBJ *bmp; LONG height, ret; - if ((!bmp) || (!bits)) - return 0; + if (!bits) return 0; + + bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); + if (!bmp) return 0; if (count < 0) { WARN("(%d): Negative number of bytes passed???\n", count );

1 0

Maarten Lankhorst : dsound: Improve underrun behavior.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 1719f8faf1ed70b98b486eeabe079301746fc86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1719f8faf1ed70b98b486eeab… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 10 09:02:44 2010 +0100 dsound: Improve underrun behavior. --- dlls/dsound/mixer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index d014c4b..698e586 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -599,7 +599,9 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi { /* Should *NEVER* happen */ ERR("Fatal error. Under/Overflow? primary_done=%d, mixpos=%d/%d (%d/%d), primary_mixpos=%d, writepos=%d, mixlen=%d\n", primary_done,dsb->buf_mixpos,dsb->tmp_buffer_len,dsb->sec_mixpos, dsb->buflen, dsb->primary_mixpos, writepos, mixlen); - return 0; + dsb->primary_mixpos = writepos + mixlen; + dsb->primary_mixpos %= dsb->device->buflen; + return mixlen; } /* take into account already mixed data */

1 0

Michael Stefaniuc : ddraw: Remove redundant memset.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 67a2751b94e95130de8ae707c890450466a1a5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a2751b94e95130de8ae707c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 9 23:48:31 2010 +0100 ddraw: Remove redundant memset. --- dlls/ddraw/executebuffer.c | 2 -- dlls/ddraw/material.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2f42688..129a0b8 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -703,7 +703,6 @@ IDirect3DExecuteBufferImpl_Lock(IDirect3DExecuteBuffer *iface, TRACE("(%p)->(%p)\n", This, lpDesc); dwSize = lpDesc->dwSize; - memset(lpDesc, 0, dwSize); memcpy(lpDesc, &This->desc, dwSize); if (TRACE_ON(d3d7)) { @@ -789,7 +788,6 @@ IDirect3DExecuteBufferImpl_GetExecuteData(IDirect3DExecuteBuffer *iface, TRACE("(%p)->(%p): stub!\n", This, lpData); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); memcpy(lpData, &This->data, dwSize); if (TRACE_ON(d3d7)) { diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 6f162f7..d75501e 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -294,7 +294,6 @@ IDirect3DMaterialImpl_GetMaterial(IDirect3DMaterial3 *iface, /* Copies the material structure */ EnterCriticalSection(&ddraw_cs); dwSize = lpMat->dwSize; - memset(lpMat, 0, dwSize); memcpy(lpMat, &This->mat, dwSize); LeaveCriticalSection(&ddraw_cs);

1 0

André Hentschel : oleaut32/tests: Remove a todo_wine from a dead test.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: db020d58d1e389610a724ba285a50ea42e26fb08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db020d58d1e389610a724ba28… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 9 20:28:30 2010 +0100 oleaut32/tests: Remove a todo_wine from a dead test. --- dlls/oleaut32/tests/vartype.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 79b6b93..b973a54 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5238,10 +5238,8 @@ static void test_SysAllocStringLen(void) if (0) { str = SysAllocStringLen(szTest, 0x80000000); - todo_wine { ok (str == NULL, "Expected NULL, got %p\n", str); } - } str = SysAllocStringLen(NULL, 0); ok (str != NULL, "Expected non-NULL\n");

1 0

Nicolas Le Cam : wine.inf: Define the Win64 DefaultInstall.Services section .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 40680e8af92c0453f723eae37b668b846388afea URL: http://source.winehq.org/git/wine.git/?a=commit;h=40680e8af92c0453f723eae37… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Mar 8 22:26:29 2010 +0100 wine.inf: Define the Win64 DefaultInstall.Services section. --- tools/wine.inf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1dc6632..9c9721a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -111,6 +111,11 @@ AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=TermService,0,TerminalServices +[DefaultInstall.ntamd64.Services] +AddService=MountMgr,0x800,MountMgrService +AddService=Spooler,0,SpoolerService +AddService=TermService,0,TerminalServices + [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32"

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
92
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 March 2010