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

Gerald Pfeifer : comdlg32: Remove unused parameters from CFn_WMMeasureItem and CFn_WMDrawItem.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 3ecea9f8265de7796d426aefd8b7c8aaf623050b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecea9f8265de7796d426aefd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 14:55:51 2010 +0100 comdlg32: Remove unused parameters from CFn_WMMeasureItem and CFn_WMDrawItem. --- dlls/comdlg32/fontdlg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 1ad881c..80f1ad9 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -766,7 +766,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) /*********************************************************************** * CFn_WMMeasureItem [internal] */ -static LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam) +static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) { HDC hdc; HFONT hfontprev; @@ -794,7 +794,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam) /*********************************************************************** * CFn_WMDrawItem [internal] */ -static LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam) +static LRESULT CFn_WMDrawItem(LPARAM lParam) { HBRUSH hBrush; WCHAR buffer[40]; @@ -1190,9 +1190,9 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_MEASUREITEM: - return CFn_WMMeasureItem(hDlg, wParam, lParam); + return CFn_WMMeasureItem(hDlg,lParam); case WM_DRAWITEM: - return CFn_WMDrawItem(hDlg, wParam, lParam); + return CFn_WMDrawItem(lParam); case WM_COMMAND: return CFn_WMCommand(hDlg, wParam, lParam, lpcfw); case WM_DESTROY: @@ -1239,9 +1239,9 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_MEASUREITEM: - return CFn_WMMeasureItem(hDlg, wParam, lParam); + return CFn_WMMeasureItem(hDlg, lParam); case WM_DRAWITEM: - return CFn_WMDrawItem(hDlg, wParam, lParam); + return CFn_WMDrawItem(lParam); case WM_COMMAND: return CFn_WMCommand(hDlg, wParam, lParam, lpcf); case WM_DESTROY:

1 0

Gerald Pfeifer : ntdll: Avoid compiler warning in the default case in append_entry.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: dfa200d1e896c4d56e751fa2a0a83c909394a3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa200d1e896c4d56e751fa2a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 22:39:37 2010 +0100 ntdll: Avoid compiler warning in the default case in append_entry. --- dlls/ntdll/directory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index ecd9418..865c2fa 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1120,6 +1120,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK default: assert(0); + return NULL; } memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); io->Information += total_len;

1 0

Yann Droneaud : cmd: Fixed uninitialised field in WCMD_addCommand() ( Valgrind).
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 727df7a2ef98af08f95b5930359055219d97ca6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=727df7a2ef98af08f95b59303… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Sun Mar 7 22:37:23 2010 +0100 cmd: Fixed uninitialised field in WCMD_addCommand() (Valgrind). --- programs/cmd/wcmdmain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b2243e3..b86801c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1636,6 +1636,8 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, } else { thisEntry->command = NULL; + thisEntry->redirects = NULL; + thisEntry->pipeFile[0] = 0x00; } /* Fill in other fields */

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

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

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

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

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

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

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