December 2014 - Wine-commits

Frédéric Delanoy : French translation for release 1.7.33
by Jeremy Newman 13 Dec '14

13 Dec '14

Module: website Branch: master Commit: af15fbf833a51e95781f07127c049e24a76a62aa URL: http://source.winehq.org/git/website.git/?a=commit;h=af15fbf833a51e95781f07… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 12 21:44:46 2014 +0100 French translation for release 1.7.33 --- news/fr/2014121201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014121201.xml b/news/fr/2014121201.xml new file mode 100644 index 0000000..cfb7cd8 --- /dev/null +++ b/news/fr/2014121201.xml @@ -0,0 +1,15 @@ +<news> +<date>12 décembre 2014</date> +<title>Sortie de Wine 1.7.33</title> +<body> + La version de développement 1.7.33 de Wine est disponible. + <a href="{$root}/announce/1.7.33">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des commandes de copier-coller dans MSHTML.</li> + <li>Prise en charge supplémentaire des polices dans DirectWrite.</li> + <li>Meilleure gestion des pertes de focus dans les fenêtres Direct3D.</li> + <li>Plusieurs DLL jeux d'API supplémentaires.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.33
by Alexandre Julliard 12 Dec '14

12 Dec '14

Module: website Branch: master Commit: 8fcdcb5cde1a827b3b666a9650149bb46b20b3ec URL: http://source.winehq.org/git/website.git/?a=commit;h=8fcdcb5cde1a827b3b666a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 20:56:01 2014 +0100 Wine release 1.7.33 --- news/en/2014121201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014121201.xml b/news/en/2014121201.xml new file mode 100644 index 0000000..039c35b --- /dev/null +++ b/news/en/2014121201.xml @@ -0,0 +1,16 @@ +<news> +<date>December 12, 2014</date> +<title>Wine 1.7.33 Released</title> +<body> + The Wine development release 1.7.33 is now available. + <a href="{$root}/announce/1.7.33">What's new</a> in this release: +<ul> + <li>Support for copy/paste commands in MSHTML.</li> + <li>Some more font support in DirectWrite.</li> + <li>Better handling for loss of focus in Direct3D windows.</li> + <li>Several more API Sets DLLs.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alistair Leslie-Hughes : d3dx9: Make ID3DXFont_PreloadCharacters return S_OK.
by Alexandre Julliard 12 Dec '14

12 Dec '14

Module: wine Branch: master Commit: e5d7982c4d8b3c08c2d2c230b8b525a26d50fa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7982c4d8b3c08c2d2c230b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 11 14:22:51 2014 +1100 d3dx9: Make ID3DXFont_PreloadCharacters return S_OK. --- dlls/d3dx9_36/font.c | 2 +- dlls/d3dx9_36/tests/core.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 014fa95..dd1243e 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -155,7 +155,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) { FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 2990893..b55f7ea 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -511,15 +511,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) hr = ID3DXFont_GetGlyphData(font, 0, &texture, &blackbox, NULL); if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1); ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); - + } hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXFont_PreloadGlyphs(font, 1, 0); - ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXFont_PreloadCharacters(font, 'a', 'a'); ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); - } for(c = 'b'; c <= 'z'; c++) { WORD glyph; @@ -548,7 +547,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) } hr = ID3DXFont_PreloadCharacters(font, 'a', 'z'); - todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n");

1 0

Nikolay Sivov : dwrite_2.idl: Protect from D3DCOLORVALUE redefinition.
by Alexandre Julliard 12 Dec '14

12 Dec '14

Module: wine Branch: master Commit: 099146a6f9990c17f857be364caf4683238a0ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099146a6f9990c17f857be364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 12 14:35:49 2014 +0300 dwrite_2.idl: Protect from D3DCOLORVALUE redefinition. --- include/dwrite_2.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dwrite_2.idl b/include/dwrite_2.idl index 26523da..d2960eb 100644 --- a/include/dwrite_2.idl +++ b/include/dwrite_2.idl @@ -47,6 +47,7 @@ typedef struct DWRITE_TEXT_METRICS1 FLOAT heightIncludingTrailingWhitespace; } DWRITE_TEXT_METRICS1; +cpp_quote("#ifndef D3DCOLORVALUE_DEFINED") typedef struct _D3DCOLORVALUE { union { @@ -66,6 +67,8 @@ typedef struct _D3DCOLORVALUE FLOAT dvA; }; } D3DCOLORVALUE; +cpp_quote("#define D3DCOLORVALUE_DEFINED") +cpp_quote("#endif") typedef D3DCOLORVALUE DWRITE_COLOR_F;

1 0

Alexandre Julliard : Release 1.7.33.
by Alexandre Julliard 12 Dec '14

12 Dec '14

Module: wine Branch: master Commit: aa026e061446d5afee9d55b808402998fae94f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa026e061446d5afee9d55b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 20:46:47 2014 +0100 Release 1.7.33. --- ANNOUNCE | 540 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 284 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa026e061446d5afee9d5…

1 0

Tag wine-1.7.33 : Alexandre Julliard : Release 1.7.33
by Alexandre Julliard 12 Dec '14

12 Dec '14

Module: wine Branch: refs/tags/wine-1.7.33 Tag: 7e8ab80caa6fb7726104096395ea851b353419b5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=7e8ab80caa6fb7726104096395ea… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 20:46:47 2014 +0100 Release 1.7.33

1 0

Jacek Caban : dxgi1_2.idl: Added IDXGISwapChain1 declaration.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: ae1f015dab4eb6db007bdd38eca97e9eec6c69aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1f015dab4eb6db007bdd38e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 17:37:11 2014 +0100 dxgi1_2.idl: Added IDXGISwapChain1 declaration. --- include/dxgi1_2.idl | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.h | 12 ++++++++ 2 files changed, 97 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index 27dc34c..bba4ab8 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -24,6 +24,14 @@ typedef enum _DXGI_OFFER_RESOURCE_PRIORITY { DXGI_OFFER_RESOURCE_PRIORITY_HIGH } DXGI_OFFER_RESOURCE_PRIORITY; +typedef enum DXGI_ALPHA_MODE { + DXGI_ALPHA_MODE_UNSPECIFIED = 0, + DXGI_ALPHA_MODE_PREMULTIPLIED = 1, + DXGI_ALPHA_MODE_STRAIGHT = 2, + DXGI_ALPHA_MODE_IGNORE = 3, + DXGI_ALPHA_MODE_FORCE_DWORD = 0xffffffff +} DXGI_ALPHA_MODE; + [ object, uuid(05008617-fbfd-4051-a790-144884b4f6a9), @@ -45,3 +53,80 @@ interface IDXGIDevice2 : IDXGIDevice1 HRESULT EnqueueSetEvent( [in] HANDLE hEvent); } + +typedef enum DXGI_SCALING { + DXGI_SCALING_STRETCH = 0, + DXGI_SCALING_NONE = 1 +} DXGI_SCALING; + +typedef struct DXGI_SWAP_CHAIN_DESC1 { + UINT Width; + UINT Height; + DXGI_FORMAT Format; + BOOL Stereo; + DXGI_SAMPLE_DESC SampleDesc; + DXGI_USAGE BufferUsage; + UINT BufferCount; + DXGI_SCALING Scaling; + DXGI_SWAP_EFFECT SwapEffect; + DXGI_ALPHA_MODE AlphaMode; + UINT Flags; +} DXGI_SWAP_CHAIN_DESC1; + +typedef struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC { + DXGI_RATIONAL RefreshRate; + DXGI_MODE_SCANLINE_ORDER ScanlineOrdering; + DXGI_MODE_SCALING Scaling; + BOOL Windowed; +} DXGI_SWAP_CHAIN_FULLSCREEN_DESC; + +typedef struct DXGI_PRESENT_PARAMETERS { + UINT DirtyRectsCount; + RECT *pDirtyRects; + RECT *pScrollRect; + POINT *pScrollOffset; +} DXGI_PRESENT_PARAMETERS; + +[ + object, + uuid(790a45f7-0d42-4876-983a-0a55cfe6f4aa), + local, + pointer_default(unique) +] +interface IDXGISwapChain1 : IDXGISwapChain +{ + HRESULT GetDesc1( + [out] DXGI_SWAP_CHAIN_DESC1 *pDesc); + + HRESULT GetFullscreenDesc( + [out] DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc); + + HRESULT GetHwnd( + [out] HWND *pHwnd); + + HRESULT GetCoreWindow( + [in] REFIID refiid, + [out] void **ppUnk); + + HRESULT Present1( + [in] UINT SyncInterval, + [in] UINT PresentFlags, + [in] const DXGI_PRESENT_PARAMETERS *pPresentParameters); + + BOOL IsTemporaryMonoSupported(); + + HRESULT GetRestrictToOutput( + [out] IDXGIOutput **ppRestrictToOutput); + + HRESULT SetBackgroundColor( + [in] const DXGI_RGBA *pColor); + + HRESULT GetBackgroundColor( + [out] DXGI_RGBA *pColor); + + HRESULT SetRotation( + [in] DXGI_MODE_ROTATION Rotation); + + HRESULT GetRotation( + [out] DXGI_MODE_ROTATION *pRotation); +} diff --git a/include/dxgitype.h b/include/dxgitype.h index e89e055..13df046 100644 --- a/include/dxgitype.h +++ b/include/dxgitype.h @@ -21,6 +21,18 @@ #include "dxgiformat.h" +#ifndef D3DCOLORVALUE_DEFINED +typedef struct _D3DCOLORVALUE { + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +typedef D3DCOLORVALUE DXGI_RGBA; + typedef struct DXGI_SAMPLE_DESC { UINT Count; UINT Quality;

1 0

Austin English : mfreadwrite: Add stub dll.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 89ecba6c48bdb74595740b012c01d226c9d11595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ecba6c48bdb74595740b012… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 10 15:51:07 2014 -0800 mfreadwrite: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/mfreadwrite/Makefile.in | 4 ++++ dlls/mfreadwrite/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 7 +++++++ 5 files changed, 52 insertions(+) diff --git a/configure b/configure index eebde01..a9ee86f 100755 --- a/configure +++ b/configure @@ -1097,6 +1097,7 @@ enable_mciqtz32 enable_mciseq enable_mciwave enable_mfplat +enable_mfreadwrite enable_mgmtapi enable_midimap enable_mlang @@ -17180,6 +17181,7 @@ wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave wine_fn_config_dll mfplat enable_mfplat +wine_fn_config_dll mfreadwrite enable_mfreadwrite wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang clean,implib diff --git a/configure.ac b/configure.ac index 9458b2b..de6d2cc 100644 --- a/configure.ac +++ b/configure.ac @@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) WINE_CONFIG_DLL(mfplat) +WINE_CONFIG_DLL(mfreadwrite) WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[clean,implib]) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in new file mode 100644 index 0000000..7cf3a59 --- /dev/null +++ b/dlls/mfreadwrite/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mfreadwrite.dll + +C_SRCS = \ + main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c new file mode 100644 index 0000000..a72f634 --- /dev/null +++ b/dlls/mfreadwrite/main.c @@ -0,0 +1,38 @@ +/* + * + * Copyright 2014 Austin English + * + * 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. + * + * 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec new file mode 100644 index 0000000..1f9f30f --- /dev/null +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -0,0 +1,7 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub MFCreateSinkWriterFromMediaSink +@ stub MFCreateSinkWriterFromURL +@ stub MFCreateSourceReaderFromByteStream +@ stub MFCreateSourceReaderFromMediaSource +@ stub MFCreateSourceReaderFromURL

1 0

André Hentschel : msrle32: Remove superfluous defines.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: 4d24fc415fffefa6659fcafff70cd5f608b71943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d24fc415fffefa6659fcafff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 10 23:47:12 2014 +0100 msrle32: Remove superfluous defines. --- dlls/msrle32/msrle32.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index aba94a0..bd02ae6 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -36,13 +36,10 @@ static HINSTANCE MSRLE32_hModule = 0; #define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) -#define ABS(a) ((a) < 0 ? -(a) : (a)) -#define SQR(a) ((a) * (a)) - static inline WORD ColorCmp(WORD clr1, WORD clr2) { UINT a = clr1 - clr2; - return SQR(a); + return a * a; } static inline WORD Intensity(RGBQUAD clr) {

1 0

André Hentschel : itss/tests: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 11 Dec '14

11 Dec '14

Module: wine Branch: master Commit: a6657bb084dfba0664dc360ad3740f450b76709a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6657bb084dfba0664dc360ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 10 23:47:20 2014 +0100 itss/tests: Fix compiler warnings with flag -Wunused-macros. --- dlls/itss/tests/protocol.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 6fd3431..663411f 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -41,12 +41,6 @@ called_ ## func = TRUE; \ }while(0) -#define CHECK_EXPECT2(func) \ - do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ - }while(0) - #define SET_CALLED(func) \ expect_ ## func = called_ ## func = FALSE

1 0