wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Alexandre Julliard : gdi32: Determine the default anti-aliasing parameters in the null driver SelectFont entry point .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5c02c352d9df394fa97a45965c8d32ddcb1abcd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02c352d9df394fa97a45965… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:32:15 2012 +0100 gdi32: Determine the default anti-aliasing parameters in the null driver SelectFont entry point. --- dlls/gdi32/driver.c | 5 -- dlls/gdi32/font.c | 93 ++++++++++++++++++++++------------------------ dlls/gdi32/freetype.c | 48 +++++++++++++++-------- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 76 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 2ab0778..f5cadbe 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -552,11 +552,6 @@ static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush return brush; } -static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) -{ - return 0; -} - static HPALETTE nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) { return palette; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 09ea1b7..b289fa9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -260,8 +260,6 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -enum smoothing { no_smoothing, aa_smoothing, subpixel_smoothing }; - static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) { static const WCHAR desktop[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -279,28 +277,6 @@ static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) return err; } -static enum smoothing get_default_smoothing( void ) -{ - static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; - DWORD type, err; - - /* FIXME: Ignoring FontSmoothing for now since this is - set to off by default in wine.inf */ - - err = get_desktop_value( smoothing_type, &type ); - if (err) return aa_smoothing; - - switch (type) - { - case 1: /* FE_FONTSMOOTHINGSTANDARD */ - return aa_smoothing; - case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ - return subpixel_smoothing; - } - - return aa_smoothing; -} - static UINT get_subpixel_orientation( void ) { static const WCHAR smoothing_orientation[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', @@ -321,39 +297,28 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) +static UINT get_default_smoothing( void ) { - enum smoothing smoothing; + static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; + DWORD type, err; - switch (lf->lfQuality) - { - case NONANTIALIASED_QUALITY: - return GGO_BITMAP; - case ANTIALIASED_QUALITY: - smoothing = aa_smoothing; - break; - case CLEARTYPE_QUALITY: - case CLEARTYPE_NATURAL_QUALITY: - smoothing = subpixel_smoothing; - break; - case DEFAULT_QUALITY: - case DRAFT_QUALITY: - case PROOF_QUALITY: - default: - smoothing = get_default_smoothing(); - } + /* FIXME: Ignoring FontSmoothing for now since this is + set to off by default in wine.inf */ - switch (smoothing) + err = get_desktop_value( smoothing_type, &type ); + if (err) return 0; + + switch (type) { - case subpixel_smoothing: - return get_subpixel_orientation(); - case aa_smoothing: + case 1: /* FE_FONTSMOOTHINGSTANDARD */ return GGO_GRAY4_BITMAP; - default: - return GGO_BITMAP; + case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ + return get_subpixel_orientation(); } + return 0; } + /*********************************************************************** * GdiGetCodePage (GDI32.@) */ @@ -697,6 +662,36 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) /*********************************************************************** + * nulldrv_SelectFont + */ +HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + LOGFONTW lf; + + if (*aa_flags) return 0; + + GetObjectW( font, sizeof(lf), &lf ); + switch (lf.lfQuality) + { + case NONANTIALIASED_QUALITY: + *aa_flags = GGO_BITMAP; + break; + case ANTIALIASED_QUALITY: + *aa_flags = GGO_GRAY4_BITMAP; + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + *aa_flags = get_subpixel_orientation(); + break; + default: + *aa_flags = get_default_smoothing(); + break; + } + return 0; +} + + +/*********************************************************************** * FONT_EnumInstance * * Note: plf is really an ENUMLOGFONTEXW, and ptm is a NEWTEXTMETRICEXW. diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c7b40..fcdcca9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4953,27 +4953,41 @@ found_face: done: if (ret) { - if (!*aa_flags) *aa_flags = ret->aa_flags; - if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); - /* fixup the antialiasing flags for that font */ - switch (*aa_flags) + switch (lf.lfQuality) { - case WINE_GGO_HRGB_BITMAP: - case WINE_GGO_HBGR_BITMAP: - case WINE_GGO_VRGB_BITMAP: - case WINE_GGO_VBGR_BITMAP: - if (is_subpixel_rendering_enabled()) break; - *aa_flags = GGO_GRAY4_BITMAP; - /* fall through */ - case GGO_GRAY4_BITMAP: - if (is_hinting_enabled()) + case NONANTIALIASED_QUALITY: + case ANTIALIASED_QUALITY: + next->funcs->pSelectFont( dev, hfont, aa_flags ); + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + default: + if (!*aa_flags) *aa_flags = ret->aa_flags; + next->funcs->pSelectFont( dev, hfont, aa_flags ); + + /* fixup the antialiasing flags for that font */ + switch (*aa_flags) { - WORD gasp_flags; - if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) - *aa_flags = GGO_BITMAP; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + if (is_subpixel_rendering_enabled()) break; + *aa_flags = GGO_GRAY4_BITMAP; + /* fall through */ + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + if (is_hinting_enabled()) + { + WORD gasp_flags; + if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + *aa_flags = GGO_BITMAP; + } } - break; } dc->gdiFont = ret; physdev->font = ret; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 084245e..e3fe577 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -278,9 +278,6 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; -/* font.c */ -extern UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) DECLSPEC_HIDDEN; - /* freetype.c */ /* Undocumented structure filled in by GdiRealizationInfo */ @@ -394,6 +391,7 @@ extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *ggo_flags ) DECLSPEC_HIDDEN; extern INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, INT x_src, INT y_src, UINT start, UINT lines, const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;

1 0

Sam Edwards : opengl32: Implement wglUseFontOutlines curve smoothing.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 2a208bd2ad6442db9b02f3002defce3d9db455b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a208bd2ad6442db9b02f3002… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Thu Nov 1 16:39:47 2012 -0600 opengl32: Implement wglUseFontOutlines curve smoothing. --- dlls/opengl32/wgl.c | 222 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 173 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a208bd2ad6442db9b02f…

1 0

Tatyana Fokina : ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 9d4fcaf2bbdb0ff148d623b78231441d73162086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4fcaf2bbdb0ff148d623b78… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Fri Nov 2 15:56:50 2012 +0400 ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath. --- dlls/ole32/compobj.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2019b41..9c92c32 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -967,16 +967,14 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, * * Reads a registry value and expands it when necessary */ -static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen) +static DWORD COM_RegReadPath(HKEY hkeyroot, WCHAR * dst, DWORD dstlen) { DWORD ret; - HKEY key; DWORD keytype; WCHAR src[MAX_PATH]; DWORD dwLength = dstlen * sizeof(WCHAR); - if((ret = RegOpenKeyExW(hkeyroot, keyname, 0, KEY_READ, &key)) == ERROR_SUCCESS) { - if( (ret = RegQueryValueExW(key, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { + if( (ret = RegQueryValueExW(hkeyroot, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { if (keytype == REG_EXPAND_SZ) { if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA; } else { @@ -992,9 +990,7 @@ static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *v } lstrcpynW(dst, src, dstlen); } - } - RegCloseKey (key); - } + } return ret; } @@ -1019,7 +1015,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(params->hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(params->hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2383,7 +2379,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -4299,7 +4295,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { WCHAR dllpath[MAX_PATH+1]; - if (COM_RegReadPath(hkey, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(hkey, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32))

1 0

André Hentschel : d3dx9_36: D3DXCreateFontIndirectW seems no longer to be a stub.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7d1fa526e6b5e6588c819af7a4aa6f73ebaa4f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1fa526e6b5e6588c819af7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 18:06:03 2012 +0100 d3dx9_36: D3DXCreateFontIndirectW seems no longer to be a stub. --- dlls/d3dx9_36/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 65adff1..d2bc4bc 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -301,7 +301,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ IDirect3D9 *d3d; HRESULT hr; - FIXME("(%p, %p, %p): stub\n", device, desc, font); + TRACE("(%p, %p, %p)\n", device, desc, font); if( !device || !desc || !font ) return D3DERR_INVALIDCALL;

1 0

Detlef Riekenberg : winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 8a3211af4cdee3832514693a667c562c4aedfc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3211af4cdee3832514693a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:01:08 2012 +0100 winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option. --- dlls/winhttp/session.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3617b20..3889922 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -182,6 +182,9 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_RECEIVE_TIMEOUT: session->recv_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: + FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

Frédéric Delanoy : msvfw32: Fix a leak (coverity) .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 86544ce98f90cbd8ef504ea63c0bf50063bf7364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86544ce98f90cbd8ef504ea63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 2 23:49:29 2012 +0100 msvfw32: Fix a leak (coverity). --- dlls/msvfw32/msvideo_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index f27d3ec..f418481 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1512,7 +1512,10 @@ static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode) fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName); if (fnGetFileName == NULL) + { + FreeLibrary(hComdlg32); return FALSE; + } /* FIXME: need to add OFN_ENABLEHOOK and our own handler */ ret = fnGetFileName(lpofn);

1 0

Christian Costa : d3dxof/tests: Pass level by value in process_data rather than a pointer.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 6be32ec80c0a3561bb2705a6e3bc707de11adee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be32ec80c0a3561bb2705a6e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:47:06 2012 +0100 d3dxof/tests: Pass level by value in process_data rather than a pointer. --- dlls/d3dxof/tests/d3dxof.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 9ff76b2..e25b4ab 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -613,7 +613,7 @@ static void test_syntax(void) * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 -static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) +static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) { HRESULT hr; char name[100]; @@ -636,7 +636,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetType: %x\n", hr); hr = IDirectXFileData_GetData(lpDirectXFileData, NULL, &size, (void**)&pData); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); debugstr_guid(str_clsid, &clsid); debugstr_guid(str_clsid_type, clsid_type); @@ -657,7 +657,9 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) } printf("\n"); } - (*plevel)++; + + level++; + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(lpDirectXFileData, &pChildObj))) { LPDIRECTXFILEDATA p1; @@ -668,17 +670,17 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileData, (void **) &p1); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data (%d)\n", j); - process_data(p1, plevel); + process_data(p1, level); IDirectXFileData_Release(p1); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileDataReference, (void **) &p2); if (SUCCEEDED(hr)) { LPDIRECTXFILEDATA pfdo; - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); #if 0 @@ -688,21 +690,21 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); #endif IDirectXFileDataReference_Resolve(p2, &pfdo); - process_data(pfdo, plevel); + process_data(pfdo, level); IDirectXFileData_Release(pfdo); IDirectXFileDataReference_Release(p2); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileBinary, (void **) &p3); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Binary (%d)\n", j); IDirectXFileBinary_Release(p3); } IDirectXFileObject_Release(pChildObj); } - (*plevel)--; + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); } @@ -761,9 +763,8 @@ static void test_dump(void) while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData))) { - int level = 0; printf("\n"); - process_data(lpDirectXFileData, &level); + process_data(lpDirectXFileData, 0); IDirectXFileData_Release(lpDirectXFileData); } ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr);

1 0

Christian Costa : dmusic: Init port caps dwSize member before calling GetPortCaps.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f3e883878d8bfb6efc128293a461df8aa089e228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e883878d8bfb6efc128293a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:13 2012 +0100 dmusic: Init port caps dwSize member before calling GetPortCaps. --- dlls/dmusic/dmusic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index d914ce4..bdefe3a 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -389,6 +389,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) { + port->caps.dwSize = sizeof(port->caps); hr = IDirectMusicSynth8_GetPortCaps(synth, &port->caps); IDirectMusicSynth8_Release(synth); }

1 0

Christian Costa : dmusic: Remove unused variables.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f7a9df5ecbc9d398d43ebda68ef99991cf2da3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a9df5ecbc9d398d43ebda68… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:45 2012 +0100 dmusic: Remove unused variables. --- dlls/dmusic/collection.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c1545b2..e4ac798 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -489,7 +489,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, StreamCount, ListSize[2], ListCount[2]; LARGE_INTEGER liMove; /* used when skipping chunks */ ULARGE_INTEGER dlibCollectionPosition, dlibInstrumentPosition, dlibWavePoolPosition; @@ -689,8 +689,6 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case FOURCC_LIST: { IStream_Read(stream, &chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(chunk.fccID)); - ListSize[2] = chunk.dwSize - sizeof(FOURCC); - ListCount[2] = 0; switch (chunk.fccID) { default: { TRACE_(dmfile)(": unknown (skipping)\n");

1 0

Ken Thomases : opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 26670de2107ebe2c59711b52e74426acf96c85c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26670de2107ebe2c59711b52e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Nov 4 17:28:51 2012 -0600 opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl. --- dlls/opengl32/make_opengl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 0651904..bd230b2 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -821,7 +821,8 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; +print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER;

1 0

Henri Verbeet : wined3d: Enable or disable the fragment pipe in shader_select().
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 0e856abf6da1f9d4c40fd0d08ad395112525ff4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e856abf6da1f9d4c40fd0d08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:33 2012 +0100 wined3d: Enable or disable the fragment pipe in shader_select(). --- dlls/wined3d/arb_program_shader.c | 49 +++++++++++++++++++----------------- dlls/wined3d/context.c | 33 +++++++------------------ dlls/wined3d/glsl_shader.c | 17 ++++-------- dlls/wined3d/shader.c | 20 +++++++------- dlls/wined3d/wined3d_private.h | 11 +++++++- 5 files changed, 60 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e856abf6da1f9d4c40fd…

1 0

Henri Verbeet : wined3d: Simplify shader selection.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: d74cb4571b0d3301568efef3d4de3fb30e19625c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74cb4571b0d3301568efef3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:32 2012 +0100 wined3d: Simplify shader selection. --- dlls/wined3d/arb_program_shader.c | 45 +++++------------------- dlls/wined3d/ati_fragment_shader.c | 12 +----- dlls/wined3d/context.c | 17 +++++++-- dlls/wined3d/state.c | 67 +++++++----------------------------- dlls/wined3d/wined3d_private.h | 32 +++++++++-------- 5 files changed, 56 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d74cb4571b0d3301568ef…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE4.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5190792b333738d176b9937bd8df6edb9d8e0902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5190792b333738d176b9937bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:31 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE4. --- dlls/ddraw/tests/dsurface.c | 4 ++-- include/d3d.h | 11 ++++++----- include/ddraw.h | 32 +++++++++++++++++++------------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 4e7d505..513183f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -901,8 +901,8 @@ static void GetDDInterface_2(void) static void GetDDInterface_4(void) { + IDirectDrawSurface4 *dsurface4; LPDIRECTDRAWSURFACE2 dsurface2; - LPDIRECTDRAWSURFACE4 dsurface4; DDSURFACEDESC2 surface; HRESULT ret; IDirectDraw2 *dd2; @@ -973,7 +973,7 @@ static void GetDDInterface_4(void) static void GetDDInterface_7(void) { IDirectDrawSurface7 *dsurface7; - LPDIRECTDRAWSURFACE4 dsurface4; + IDirectDrawSurface4 *dsurface4; DDSURFACEDESC2 surface; HRESULT ret; IDirectDraw2 *dd2; diff --git a/include/d3d.h b/include/d3d.h index 5677f6a..98a45ba 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -310,7 +310,8 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; - STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk) PURE; + STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, + struct IDirect3DDevice3 **device, IUnknown *outer) PURE; STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) PURE; STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; STDMETHOD(EvictManagedTextures)(THIS) PURE; @@ -809,8 +810,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; /*** IDirect3DViewport3 methods ***/ - STDMETHOD(SetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 lpDDS) PURE; - STDMETHOD(GetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 *lplpDDS,LPBOOL lpValid) PURE; + STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; + STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE; STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; }; #undef INTERFACE @@ -1149,8 +1150,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE; STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpDirect3DViewport3) PURE; - STDMETHOD(SetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE4 lpNewRenderTarget, DWORD dwFlags) PURE; - STDMETHOD(GetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE4 *lplpRenderTarget) PURE; + STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface4 *surface, DWORD flags) PURE; + STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface4 **surface) PURE; STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexTypeDesc, DWORD dwFlags) PURE; STDMETHOD(BeginIndexed)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwNumVertices, DWORD dwFlags) PURE; STDMETHOD(Vertex)(THIS_ LPVOID lpVertexType) PURE; diff --git a/include/ddraw.h b/include/ddraw.h index b6333c7..88660ba 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1061,7 +1061,8 @@ DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); -typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(struct IDirectDrawSurface4 *surface, + DDSURFACEDESC2 *surface_desc, void *ctx); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(struct IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *ctx); @@ -1625,15 +1626,17 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /*0c*/ STDMETHOD(Compact)(THIS) PURE; /*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE; /*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE; -/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE4 *lplpDDSurface, IUnknown *pUnkOuter) PURE; -/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface, LPDIRECTDRAWSURFACE4 *lplpDupDDSurface) PURE; +/*18*/ STDMETHOD(CreateSurface)(THIS_ DDSURFACEDESC2 *surface_desc, + struct IDirectDrawSurface4 **surface, IUnknown *outer) PURE; +/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ struct IDirectDrawSurface4 *src_surface, + struct IDirectDrawSurface4 **dst_surface) PURE; /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; /*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; -/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE4 *lplpGDIDDSurface) PURE; +/*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface4 **surface) PURE; /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; /*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; /*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE; @@ -1645,7 +1648,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /* added in v2 */ /*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; /* added in v4 */ -/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE4 *pSurf) PURE; +/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface4 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; /*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE; /*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) PURE; @@ -2278,16 +2281,18 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawSurface4 methods ***/ - STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ IDirectDrawSurface4 *attachment) PURE; STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; - STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; + STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface4 *src_surface, RECT *src_rect, + DWORD flags, DDBLTFX *fx) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; - STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; - STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; + STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface4 *src_surface, + RECT *src_rect, DWORD flags) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface4 *attachment) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpfnCallback) PURE; - STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; - STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4 *lplpDDAttachedSurface) PURE; + STDMETHOD(Flip)(THIS_ IDirectDrawSurface4 *dst_surface, DWORD flags) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS2 *caps, IDirectDrawSurface4 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE; @@ -2308,9 +2313,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; - STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE4 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *src_rect, IDirectDrawSurface4 *dst_surface, RECT *dst_rect, + DWORD flags, DDOVERLAYFX *fx) PURE; STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSReference) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD flags, IDirectDrawSurface4 *reference_surface) PURE; /* added in v2 */ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE7.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 1216eb577b1a6f8f82ce96856af9503202cb7daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1216eb577b1a6f8f82ce96856… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:30 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE7. --- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/dsurface.c | 2 +- include/d3d.h | 16 +++++++++------- include/ddraw.h | 32 +++++++++++++++++++------------- 4 files changed, 31 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1216eb577b1a6f8f82ce9…

1 0

Henri Verbeet : mmdevapi: Avoid a couple of dependencies on ddraw.h.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5e93aa38ab788a671b0b64272702e422e608f9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e93aa38ab788a671b0b64272… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:29 2012 +0100 mmdevapi: Avoid a couple of dependencies on ddraw.h. --- dlls/mmdevapi/audiovolume.c | 2 +- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/main.c | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 84377a5..4cc3226 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -32,7 +32,7 @@ #include "ole2.h" #include "mmdeviceapi.h" -#include "dshow.h" +#include "mmsystem.h" #include "dsound.h" #include "audioclient.h" #include "endpointvolume.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 40c8c6f..d7c5a44 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "initguid.h" #include "ole2.h" #include "mmdeviceapi.h" #include "dshow.h" diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index bd2e461..1518b02 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -32,10 +32,9 @@ #include "olectl.h" #include "rpcproxy.h" #include "propsys.h" -#include "initguid.h" #include "propkeydef.h" #include "mmdeviceapi.h" -#include "dshow.h" +#include "mmsystem.h" #include "dsound.h" #include "audioclient.h" #include "endpointvolume.h"

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: d55bb4497f380aba5e4bd691fd5e21ce18fe51a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55bb4497f380aba5e4bd691f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:58 2012 +0100 Assorted spelling fixes. --- dlls/ntdll/nt.c | 2 +- dlls/urlmon/axinstall.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ab08190..d415db4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1143,7 +1143,7 @@ void fill_cpu_info(void) } #else num = 1; - FIXME("Detecting the number of processors not suported.\n"); + FIXME("Detecting the number of processors is not supported.\n"); #endif NtCurrentTeb()->Peb->NumberOfProcessors = num; diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index dedfb15..9f53ce0 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -324,7 +324,7 @@ static HRESULT install_file(install_ctx_t *ctx, const WCHAR *cache_file) if(!strcmpW(ext, cab_extW)) { hres = install_cab_file(ctx); }else { - FIXME("Unsupported extention %s\n", debugstr_w(ext)); + FIXME("Unsupported extension %s\n", debugstr_w(ext)); hres = E_NOTIMPL; } SysFreeString(path); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bfd051b..7f90549 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -732,8 +732,8 @@ for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) -if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) -if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) +if 0xA1 EQU "161" (echo hexa should be recognized) else (echo string/hexa compare ok) +if "0xA1" EQU 161 (echo hexa should be recognized) else (echo string/hexa compare ok) for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10

1 0

Francois Gouget : msvcp71: Remove an unused VTBL wrapper.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f397f482172326f0f0a265850ca1e9a885ce27fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f397f482172326f0f0a265850… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:47 2012 +0100 msvcp71: Remove an unused VTBL wrapper. --- dlls/msvcp71/msvcp71.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index cb36893..bcc3685 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -49,7 +49,6 @@ DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); -DEFINE_VTBL_WRAPPER(52); #endif

1 0

Francois Gouget : kernel32/tests: Make test_CompareStringOrdinal() static.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: a4f2c0052639344ecbf93b1dfbb43745cc0e3b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f2c0052639344ecbf93b1df… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:40 2012 +0100 kernel32/tests: Make test_CompareStringOrdinal() static. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 197f562..ebd7278 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3480,7 +3480,7 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); } -void test_CompareStringOrdinal(void) +static void test_CompareStringOrdinal(void) { INT ret; WCHAR test1[] = { 't','e','s','t',0 };

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: b7576d6f04c533100772c710585e2486209899cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7576d6f04c533100772c7105… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Nov 3 19:50:23 2012 +0200 po: Update Finnish translation. --- po/fi.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/fi.po b/po/fi.po index 36cbd97..30a01f3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8253,44 +8253,36 @@ msgid "Security Warning" msgstr "Turvallisuusvaroitus" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Haluatko jatkaa joka tapauksessa?" +msgstr "Haluatko asentaa tämän ohjelmiston?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Sijainti:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Asenna/Poista" +msgstr "Älä asenna" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Asennuksen jälkeen ActiveX voi täysin hallita tietokonettasi. Asenna vain, " +"jos luotat yllä mainittuun lähteeseen täysin." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Muunnoksissa tapahtui virhe.\n" +msgstr "Komponentin asennus epäonnistui: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Asenna" +msgstr "Asenna (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Asenna" +msgstr "Asenna" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 571d595b16fbeed6d96474e69ea7ca0a4229032d URL: http://source.winehq.org/git/wine.git/?a=commit;h=571d595b16fbeed6d96474e69… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Nov 3 18:44:13 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index d99b240..7462b4c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-27 10:40+0300\n" +"PO-Revision-Date: 2012-11-03 18:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8270,44 +8270,36 @@ msgid "Security Warning" msgstr "Įspėjimas apie saugumą" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Ar vis tiek norite tęsti?" +msgstr "Ar norite įdiegti šią programinę įrangą?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Vieta:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Įdiegti/Pašalinti" +msgstr "Nediegti" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Kai įdiegta, ActiveX turi visišką prieigą prie kompiuterio. Nespauskite " +"„Įdiegti“, nebent visiškai pasitikite šaltiniu aukščiau." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Nepavyko pritaikyti įdiegimo transformacijos.\n" +msgstr "Nepavyko įdiegti komponento: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Įdiegti" +msgstr "Įdiegti (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Įdiegti" +msgstr "Įdiegti" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

André Hentschel : dmloader: Fix sizeof statement ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 295ffdfa964183afeba40fca75d926d3232b98df URL: http://source.winehq.org/git/wine.git/?a=commit;h=295ffdfa964183afeba40fca7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:13 2012 +0100 dmloader: Fix sizeof statement (coverity). --- dlls/dmloader/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index f97fad4..cfb3de9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -767,7 +767,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByU TRACE("(%p, %p)\n", This, pObject); - if (IsBadReadPtr (pObject, sizeof(LPUNKNOWN))) { + if (IsBadReadPtr (pObject, sizeof(*pObject))) { ERR(": pObject bad write pointer\n"); return E_POINTER; }

1 0

André Hentschel : d3dx9_36: Return on error (coverity) .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: e15618a89649db1ee0b91d6120cf77806d0fa59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15618a89649db1ee0b91d612… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:26 2012 +0100 d3dx9_36: Return on error (coverity). --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 10c3a73..f1ad7c8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3582,7 +3582,7 @@ static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name) hr = IDirectXFileObject_GetName(filedata, *name, &name_len); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, *name); - if (!name_len) + else if (!name_len) (*name)[0] = 0; return hr;

1 0

André Hentschel : urlmon: Fix copy and paste error ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 93936c4f9986eb411168402288f072632a469c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93936c4f9986eb41116840228… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:03 2012 +0100 urlmon: Fix copy and paste error (coverity). --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 18e2ebb..0a68b43 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -272,7 +272,7 @@ static inline BOOL is_drive_path(const WCHAR *str) { } static inline BOOL is_unc_path(const WCHAR *str) { - return (str[0] == '\\' && str[0] == '\\'); + return (str[0] == '\\' && str[1] == '\\'); } static inline BOOL is_forbidden_dos_path_char(WCHAR val) {

1 0

André Hentschel : riched20: Remove duplicate operand in expression (coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 34f74fdc7182006d69e5971b1f8ca0f7b78f571f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f74fdc7182006d69e5971b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:25:52 2012 +0100 riched20: Remove duplicate operand in expression (coverity). --- dlls/riched20/writer.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a5e5d50..653eab6 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -251,11 +251,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } while (item); item = ME_GetParagraph(pFirstRun); do { - if (item->member.para.pCell && item->member.para.pCell) + if ((pCell = item->member.para.pCell)) { - pCell = item->member.para.pCell; - if (pCell) - { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, &pCell->member.cell.border.bottom, @@ -275,7 +272,6 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } } } - } } if (item == pLastPara) break;

1 0

André Hentschel : winex11: Avoid memory leaks ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 574cf27f2afd676fb90087be1c0bd6967c1ca160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574cf27f2afd676fb90087be1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:25:45 2012 +0100 winex11: Avoid memory leaks (coverity). --- dlls/winex11.drv/clipboard.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index bd3ef7b..e2f5b12 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1370,6 +1370,8 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p } if (bits.free) bits.free( &bits ); } + + HeapFree(GetProcessHeap(), 0, lpdata); } return hClipData; @@ -1489,7 +1491,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A /* Turn on the DDESHARE flag to enable shared 32 bit memory */ hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes); if (hClipData == 0) + { + HeapFree(GetProcessHeap(), 0, lpdata); return NULL; + } if ((lpClipData = GlobalLock(hClipData))) {

1 0

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 November 2012