wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Andrew Eikum : shell32/tests: Fix win8 knownfolders relative and parsed paths.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: dd275615db9294e18c59675d8e1a21d4cd1bbdb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd275615db9294e18c59675d8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:11:48 2015 -0500 shell32/tests: Fix win8 knownfolders relative and parsed paths. --- dlls/shell32/tests/shellpath.c | 196 ++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd275615db9294e18c596…

1 0

Andrew Eikum : shell32/tests: A couple of win8 fixes.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 1b4272639be094ffa2aa6ddbf2baf8c31d544ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4272639be094ffa2aa6ddbf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:11:16 2015 -0500 shell32/tests: A couple of win8 fixes. --- dlls/shell32/tests/shellpath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index af88c6b..14cb34a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -111,7 +111,7 @@ static const BYTE folderType[] = { PT_FOLDER, PT_FOLDERW }; static const BYTE favoritesType[] = { PT_FOLDER, PT_FOLDERW, 0, PT_IESPECIAL2 /* Win98 */ }; static const BYTE folderOrSpecialType[] = { PT_FOLDER, PT_IESPECIAL2 }; static const BYTE personalType[] = { PT_FOLDER, PT_GUID, PT_DRIVE, 0xff /* Win9x */, - PT_IESPECIAL2 /* Win98 */, 0 /* Vista */ }; + PT_IESPECIAL2 /* Win98 */, 0 /* Vista */, PT_SHELLEXT /* win8 */ }; /* FIXME: don't know the type of 0x71 returned by Vista/2008 for printers */ static const BYTE printersType[] = { PT_YAGUID, PT_SHELLEXT, 0x71 }; static const BYTE ieSpecialType[] = { PT_IESPECIAL2 }; @@ -568,6 +568,7 @@ static void test_PidlTypes(void) /* FIXME: Should be in shobjidl.idl */ DEFINE_GUID(CLSID_NetworkExplorerFolder, 0xF02C1A0D, 0xBE21, 0x4350, 0x88, 0xB0, 0x73, 0x67, 0xFC, 0x96, 0xEF, 0x3C); +DEFINE_GUID(_CLSID_Documents, 0xA8CDFF1C, 0x4878, 0x43be, 0xB5, 0xFD, 0xF8, 0x09, 0x1C, 0x1C, 0x60, 0xD0); /* Verifies various shell virtual folders have the correct well-known GUIDs. */ static void test_GUIDs(void) @@ -577,7 +578,7 @@ static void test_GUIDs(void) matchGUID(CSIDL_DRIVES, &CLSID_MyComputer, NULL); matchGUID(CSIDL_INTERNET, &CLSID_Internet, NULL); matchGUID(CSIDL_NETWORK, &CLSID_NetworkPlaces, &CLSID_NetworkExplorerFolder); /* Vista and higher */ - matchGUID(CSIDL_PERSONAL, &CLSID_MyDocuments, NULL); + matchGUID(CSIDL_PERSONAL, &CLSID_MyDocuments, &_CLSID_Documents /* win8 */); matchGUID(CSIDL_COMMON_DOCUMENTS, &CLSID_CommonDocuments, NULL); matchGUID(CSIDL_PRINTERS, &CLSID_Printers, NULL); }

1 0

Jacek Caban : wininet: Get rid of no longer needed sock_get_error.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 8ef78d068f7d6b41fde4824d693b2af042bf7098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef78d068f7d6b41fde4824d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 11 16:52:51 2015 +0100 wininet: Get rid of no longer needed sock_get_error. --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/internet.h | 1 - dlls/wininet/netconnection.c | 24 +++++++++--------------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 9be3096..8944c5c 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1222,7 +1222,7 @@ static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD s res = sock_send(lpwh->nDataSocket, buffer, size, 0); *written = res>0 ? res : 0; - return res >= 0 ? ERROR_SUCCESS : sock_get_error(); + return res >= 0 ? ERROR_SUCCESS : WSAGetLastError(); } static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) @@ -2564,7 +2564,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0) { - ERR("Unable to connect (%d)\n", sock_get_error()); + ERR("Unable to connect (%d)\n", WSAGetLastError()); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); closesocket(nsocket); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e0baf2a..3f1da71 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -434,7 +434,6 @@ BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; -int sock_get_error(void) DECLSPEC_HIDDEN; int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ca668f2..a268aa7 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -301,7 +301,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { - res = sock_get_error(); + res = WSAGetLastError(); if (res == WSAEINPROGRESS || res == WSAEWOULDBLOCK) { FD_SET set; int res; @@ -410,12 +410,6 @@ void NETCON_unload(void) WSACleanup(); } -/* translate a unix error code into a winsock one */ -int sock_get_error(void) -{ - return WSAGetLastError(); -} - int sock_send(int fd, const void *msg, size_t len, int flags) { int ret; @@ -423,7 +417,7 @@ int sock_send(int fd, const void *msg, size_t len, int flags) { ret = send(fd, msg, len, flags); } - while(ret == -1 && sock_get_error() == WSAEINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -434,7 +428,7 @@ int sock_recv(int fd, void *msg, size_t len, int flags) { ret = recv(fd, msg, len, flags); } - while(ret == -1 && sock_get_error() == WSAEINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -671,7 +665,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, if(!connection->secure) { *sent = sock_send(connection->socket, msg, len, flags); - return *sent == -1 ? sock_get_error() : ERROR_SUCCESS; + return *sent == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { @@ -723,7 +717,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 0) { if(!buf_len) { - if(sock_get_error() == WSAEWOULDBLOCK) { + if(WSAGetLastError() == WSAEWOULDBLOCK) { TRACE("would block\n"); return WSAEWOULDBLOCK; } @@ -763,7 +757,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking set_socket_blocking(conn->socket, mode); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) { - if(size < 0 && sock_get_error() == WSAEWOULDBLOCK) { + if(size < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { TRACE("would block\n"); /* FIXME: Optimize extra_buf usage. */ @@ -838,7 +832,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t set_socket_blocking(connection->socket, mode); *recvd = sock_recv(connection->socket, buf, len, flags); - return *recvd == -1 ? sock_get_error() : ERROR_SUCCESS; + return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { @@ -926,7 +920,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); set_socket_blocking(netconn->socket, BLOCKING_ALLOW); - return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); + return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); } LPCVOID NETCON_GetCert(netconn_t *connection) @@ -974,7 +968,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) if (result == -1) { WARN("setsockopt failed\n"); - return sock_get_error(); + return WSAGetLastError(); } return ERROR_SUCCESS; }

1 0

Jacek Caban : wmvcore: Added WMCreateWriter implementation.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: f0aff23dddc1b0935d9350519de1cd892a297896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0aff23dddc1b0935d9350519… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 11 15:29:51 2015 +0100 wmvcore: Added WMCreateWriter implementation. --- dlls/wmvcore/Makefile.in | 3 +- dlls/wmvcore/wmvcore.h | 36 ++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 18 +--- dlls/wmvcore/writer.c | 206 ++++++++++++++++++++++++++++++++++++++++++++ include/wmsdkidl.idl | 2 + 6 files changed, 248 insertions(+), 19 deletions(-) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 354ae83..bec1032 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -2,4 +2,5 @@ MODULE = wmvcore.dll IMPORTS = kernel32 C_SRCS = \ - wmvcore_main.c + wmvcore_main.c \ + writer.c diff --git a/dlls/wmvcore/wmvcore.h b/dlls/wmvcore/wmvcore.h new file mode 100644 index 0000000..f4b0963 --- /dev/null +++ b/dlls/wmvcore/wmvcore.h @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#define EXTERN_GUID DEFINE_GUID + +#include "windef.h" +#include "winbase.h" + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 3799865..a3f23eb 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -12,7 +12,7 @@ @ stdcall WMCreateReader(ptr long ptr) @ stub WMCreateReaderPriv @ stdcall WMCreateSyncReader(ptr long ptr) -@ stub WMCreateWriter +@ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink @ stub WMCreateWriterNetworkSink @ stub WMCreateWriterPriv diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 3382542..4698e62 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -16,30 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include "wmvcore.h" -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" #include "initguid.h" #include "wmsdkidl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c new file mode 100644 index 0000000..3629d4d --- /dev/null +++ b/dlls/wmvcore/writer.c @@ -0,0 +1,206 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 "wmvcore.h" +#include "wmsdkidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); + +typedef struct { + IWMWriter IWMWriter_iface; + LONG ref; +} WMWriter; + +static inline WMWriter *impl_from_IWMWriter(IWMWriter *iface) +{ + return CONTAINING_RECORD(iface, WMWriter, IWMWriter_iface); +} + +static HRESULT WINAPI WMWriter_QueryInterface(IWMWriter *iface, REFIID riid, void **ppv) +{ + WMWriter *This = impl_from_IWMWriter(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMWriter_iface; + }else if(IsEqualGUID(&IID_IWMWriter, riid)) { + TRACE("(%p)->(IID_IWMWriter %p)\n", This, ppv); + *ppv = &This->IWMWriter_iface; + }else { + FIXME("Unsupported iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMWriter_AddRef(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMWriter_Release(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMWriter_SetProfileByID(IWMWriter *iface, REFGUID guidProfile) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%s)\n", This, debugstr_guid(guidProfile)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_SetProfile(IWMWriter *iface, IWMProfile *profile) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%p)\n", This, profile); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_SetOutputFilename(IWMWriter *iface, const WCHAR *filename) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(filename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputCount(IWMWriter *iface, DWORD *pcInputs) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%p)\n", This, pcInputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps **input) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_SetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps *input) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputFormatCount(IWMWriter *iface, DWORD dwInputNumber, DWORD *pcFormat) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, dwInputNumber, pcFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_GetInputFormat(IWMWriter *iface, DWORD dwInputNumber, DWORD dwFormatNumber, + IWMInputMediaProps **props) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %d %p)\n", This, dwInputNumber, dwFormatNumber, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_BeginWriting(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_EndWriting(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_AllocateSample(IWMWriter *iface, DWORD size, INSSBuffer **sample) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %p)\n", This, size, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_WriteSample(IWMWriter *iface, DWORD dwInputNum, QWORD cnsSampleTime, + DWORD flags, INSSBuffer *sample) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)->(%d %s %x %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMWriter_Flush(IWMWriter *iface) +{ + WMWriter *This = impl_from_IWMWriter(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMWriterVtbl WMWriterVtbl = { + WMWriter_QueryInterface, + WMWriter_AddRef, + WMWriter_Release, + WMWriter_SetProfileByID, + WMWriter_SetProfile, + WMWriter_SetOutputFilename, + WMWriter_GetInputCount, + WMWriter_GetInputProps, + WMWriter_SetInputProps, + WMWriter_GetInputFormatCount, + WMWriter_GetInputFormat, + WMWriter_BeginWriting, + WMWriter_EndWriting, + WMWriter_AllocateSample, + WMWriter_WriteSample, + WMWriter_Flush +}; + +HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) +{ + WMWriter *ret; + + TRACE("(%p %p)\n", reserved, writer); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IWMWriter_iface.lpVtbl = &WMWriterVtbl; + ret->ref = 1; + + *writer = &ret->IWMWriter_iface; + return S_OK; +} diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 4e2dba7..da228e7 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -587,6 +587,8 @@ interface IWMWriter : IUnknown HRESULT Flush(); } +cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") + cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_RGB1, 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70);")

1 0

Jacek Caban : d3drmdef.h: Fixed a typo.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 4e35d5874864e98ee949105f0fa5f6a79e005451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e35d5874864e98ee949105f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 11 14:56:07 2015 +0100 d3drmdef.h: Fixed a typo. --- include/d3drmdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3drmdef.h b/include/d3drmdef.h index 673c409..aa77c2c 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -92,7 +92,7 @@ typedef DWORD D3DRMRENDERQUALITY, *LPD3DRMRENDERQUALITY; #define D3DRMRENDER_UNLITFLAT (D3DRMSHADE_FLAT+D3DRMLIGHT_OFF+D3DRMFILL_SOLID) #define D3DRMRENDER_FLAT (D3DRMSHADE_FLAT+D3DRMLIGHT_ON+D3DRMFILL_SOLID) #define D3DRMRENDER_GOURAUD (D3DRMSHADE_GOURAUD+D3DRMLIGHT_ON+D3DRMFILL_SOLID) -#define D3DRMRENDER_PHONG (D3DRMSHADE_PHONG+D3DRMLIGHT_ON+D3DRMFILL_SOLID +#define D3DRMRENDER_PHONG (D3DRMSHADE_PHONG+D3DRMLIGHT_ON+D3DRMFILL_SOLID) #define D3DRMRENDERMODE_BLENDEDTRANSPARENCY 1 #define D3DRMRENDERMODE_SORTEDTRANSPARENCY 2

1 0

Frédéric Delanoy : French translation for release 1.7.38
by Jeremy Newman 12 Mar '15

12 Mar '15

Module: website Branch: master Commit: 6de1cfbbb4c796bd3de72479b5f835d461a7fed3 URL: http://source.winehq.org/git/website.git/?a=commit;h=6de1cfbbb4c796bd3de724… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 11 10:39:59 2015 +0100 French translation for release 1.7.38 --- news/fr/2015030601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2015030601.xml b/news/fr/2015030601.xml new file mode 100644 index 0000000..82dcdf4 --- /dev/null +++ b/news/fr/2015030601.xml @@ -0,0 +1,17 @@ +<news> +<date>6 mars 2015</date> +<title>Sortie de Wine 1.7.38</title> +<body> + La version de développement 1.7.38 de Wine est disponible. + <a href="{$root}/announce/1.7.38">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Gecko basée sur Firefox 36.</li> + <li>Prise en charge des barres de défilement utilisant un thème.</li> + <li>Mise à jour du moteur Mono.</li> + <li>Interface RPC plus compatible pour le contrôle des services.</li> + <li>Prise en charge de X Drag & Drop version 5.</li> + <li>Correctifs d'utilisation des threads dans la prise en charge des méthodes de saisie.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.38.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 : ntoskrnl: Allow IoCompleteRequest to report completion asynchronously.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 4c1da45567f861bf23694dc16e94a8bd48e071d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1da45567f861bf23694dc16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 22:48:22 2015 +0900 ntoskrnl: Allow IoCompleteRequest to report completion asynchronously. --- dlls/ntoskrnl.exe/ntoskrnl.c | 99 +++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 65702aa..0ba26b2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -129,55 +129,54 @@ static HANDLE get_device_manager(void) } /* process an ioctl request for a given device */ -static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, ULONG in_size, - void *out_buff, ULONG *out_size ) +static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, + ULONG in_size, ULONG out_size, HANDLE ioctl ) { IRP *irp; - void *sys_buff = NULL; + void *out_buff = NULL; FILE_OBJECT file; - IO_STATUS_BLOCK iosb; LARGE_INTEGER count; - TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, *out_size ); + TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, out_size ); /* so we can spot things that we should initialize */ memset( &file, 0x88, sizeof(file) ); - if ((code & 3) == METHOD_BUFFERED) + if ((code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size ); + + if (out_size) { - if (!(sys_buff = HeapAlloc( GetProcessHeap(), 0, max( in_size, *out_size ) ))) - return STATUS_NO_MEMORY; - memcpy( sys_buff, in_buff, in_size ); + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; + if ((code & 3) == METHOD_BUFFERED) + { + memcpy( out_buff, in_buff, in_size ); + in_buff = out_buff; + } } - irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, *out_size, - FALSE, NULL, &iosb ); + /* note: we abuse UserIosb to store the server handle to the ioctl */ + irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, out_size, + FALSE, NULL, (IO_STATUS_BLOCK *)ioctl ); if (!irp) { - HeapFree( GetProcessHeap(), 0, sys_buff ); + HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_NO_MEMORY; } irp->RequestorMode = UserMode; - irp->AssociatedIrp.SystemBuffer = ((code & 3) == METHOD_BUFFERED) ? sys_buff : in_buff; - irp->UserBuffer = out_buff; irp->Tail.Overlay.OriginalFileObject = &file; file.FsContext = NULL; file.FsContext2 = NULL; - IoAllocateMdl( out_buff, *out_size, FALSE, FALSE, irp ); + KeQueryTickCount( &count ); /* update the global KeTickCount */ device->CurrentIrp = irp; - KeQueryTickCount( &count ); /* update the global KeTickCount */ - IoCallDriver( device, irp ); - *out_size = (iosb.u.Status >= 0) ? iosb.Information : 0; - if (out_buff && (code & 3) == METHOD_BUFFERED) memcpy( out_buff, sys_buff, *out_size ); + device->CurrentIrp = NULL; - HeapFree( GetProcessHeap(), 0, sys_buff ); - return iosb.u.Status; + return STATUS_SUCCESS; } @@ -187,10 +186,10 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) { HANDLE manager = get_device_manager(); - obj_handle_t ioctl = 0; + HANDLE ioctl = 0; NTSTATUS status = STATUS_SUCCESS; ULONG code = 0; - void *in_buff, *out_buff = NULL; + void *in_buff; DEVICE_OBJECT *device = NULL; ULONG in_size = 4096, out_size = 0; HANDLE handles[2]; @@ -211,14 +210,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) SERVER_START_REQ( get_next_device_request ) { req->manager = wine_server_obj_handle( manager ); - req->prev = ioctl; + req->prev = wine_server_obj_handle( ioctl ); req->status = status; - wine_server_add_data( req, out_buff, out_size ); wine_server_set_reply( req, in_buff, in_size ); if (!(status = wine_server_call( req ))) { code = reply->code; - ioctl = reply->next; + ioctl = wine_server_ptr_handle( reply->next ); device = wine_server_get_ptr( reply->user_ptr ); client_tid = reply->client_tid; client_pid = reply->client_pid; @@ -237,10 +235,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) switch(status) { case STATUS_SUCCESS: - HeapFree( GetProcessHeap(), 0, out_buff ); - if (out_size) out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ); - else out_buff = NULL; - status = process_ioctl( device, code, in_buff, in_size, out_buff, &out_size ); + status = process_ioctl( device, code, in_buff, in_size, out_size, ioctl ); + if (status == STATUS_SUCCESS) ioctl = 0; /* status reported by IoCompleteRequest */ break; case STATUS_BUFFER_OVERFLOW: HeapFree( GetProcessHeap(), 0, in_buff ); @@ -251,7 +247,6 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0) { HeapFree( GetProcessHeap(), 0, in_buff ); - HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_SUCCESS; } break; @@ -504,10 +499,26 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, irpsp->Parameters.DeviceIoControl.IoControlCode = code; irpsp->Parameters.DeviceIoControl.InputBufferLength = in_len; irpsp->Parameters.DeviceIoControl.OutputBufferLength = out_len; - irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; irpsp->DeviceObject = device; irpsp->CompletionRoutine = NULL; + switch (code & 3) + { + case METHOD_BUFFERED: + irp->AssociatedIrp.SystemBuffer = in_buff; + break; + case METHOD_IN_DIRECT: + case METHOD_OUT_DIRECT: + irp->AssociatedIrp.SystemBuffer = in_buff; + IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp ); + break; + case METHOD_NEITHER: + irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; + break; + } + + irp->RequestorMode = KernelMode; + irp->UserBuffer = out_buff; irp->UserIosb = iosb; irp->UserEvent = event; return irp; @@ -958,13 +969,12 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) { IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; - IO_STATUS_BLOCK *iosb; NTSTATUS status, stat; + HANDLE ioctl; int call_flag = 0; TRACE( "%p %u\n", irp, priority_boost ); - iosb = irp->UserIosb; status = irp->IoStatus.u.Status; while (irp->CurrentLocation <= irp->StackCount) { @@ -991,11 +1001,26 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) return; } } - if (iosb) + + ioctl = (HANDLE)irp->UserIosb; + if (ioctl) { - iosb->u.Status = irp->IoStatus.u.Status; - if (iosb->u.Status >= 0) iosb->Information = irp->IoStatus.Information; + HANDLE manager = get_device_manager(); + void *out_buff = irp->UserBuffer; + + SERVER_START_REQ( set_ioctl_result ) + { + req->manager = wine_server_obj_handle( manager ); + req->handle = wine_server_obj_handle( ioctl ); + req->status = irp->IoStatus.u.Status; + if (irp->IoStatus.u.Status >= 0 && out_buff) + wine_server_add_data( req, out_buff, irp->IoStatus.Information ); + wine_server_call( req ); + } + SERVER_END_REQ; + HeapFree( GetProcessHeap(), 0, out_buff ); } + IoFreeIrp( irp ); }

1 0

Alexandre Julliard : server: Add a request to store the results of an ioctl asynchronously.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: ecf7ed66509b462b7a9cd6e23dbd1b2b43f515d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf7ed66509b462b7a9cd6e23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 22:45:51 2015 +0900 server: Add a request to store the results of an ioctl asynchronously. --- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/device.c | 20 ++++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 6 ++++++ server/trace.c | 11 +++++++++++ 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9d645d7..1b7831e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3128,6 +3128,21 @@ struct ioctl_reply +struct set_ioctl_result_request +{ + struct request_header __header; + obj_handle_t manager; + obj_handle_t handle; + unsigned int status; + /* VARARG(data,bytes); */ +}; +struct set_ioctl_result_reply +{ + struct reply_header __header; +}; + + + struct get_ioctl_result_request { struct request_header __header; @@ -5211,6 +5226,7 @@ enum request REQ_register_async, REQ_cancel_async, REQ_ioctl, + REQ_set_ioctl_result, REQ_get_ioctl_result, REQ_create_named_pipe, REQ_get_named_pipe_info, @@ -5473,6 +5489,7 @@ union generic_request struct register_async_request register_async_request; struct cancel_async_request cancel_async_request; struct ioctl_request ioctl_request; + struct set_ioctl_result_request set_ioctl_result_request; struct get_ioctl_result_request get_ioctl_result_request; struct create_named_pipe_request create_named_pipe_request; struct get_named_pipe_info_request get_named_pipe_info_request; @@ -5733,6 +5750,7 @@ union generic_reply struct register_async_reply register_async_reply; struct cancel_async_reply cancel_async_reply; struct ioctl_reply ioctl_reply; + struct set_ioctl_result_reply set_ioctl_result_reply; struct get_ioctl_result_reply get_ioctl_result_reply; struct create_named_pipe_reply create_named_pipe_reply; struct get_named_pipe_info_reply get_named_pipe_info_reply; @@ -5848,6 +5866,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 459 +#define SERVER_PROTOCOL_VERSION 460 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index c5e3107..9d1bf35 100644 --- a/server/device.c +++ b/server/device.c @@ -531,6 +531,26 @@ DECL_HANDLER(get_next_device_request) } +/* store results of an async ioctl */ +DECL_HANDLER(set_ioctl_result) +{ + struct ioctl_call *ioctl; + struct device_manager *manager; + + if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager, + 0, &device_manager_ops ))) + return; + + if ((ioctl = (struct ioctl_call *)get_handle_obj( current->process, req->handle, 0, &ioctl_call_ops ))) + { + set_ioctl_result( ioctl, req->status, get_req_data(), get_req_data_size() ); + close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ + release_object( ioctl ); + } + release_object( manager ); +} + + /* retrieve results of an async ioctl */ DECL_HANDLER(get_ioctl_result) { diff --git a/server/protocol.def b/server/protocol.def index 7ec380b..2cd8272 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2262,6 +2262,15 @@ enum message_type @END +/* Store results of an async ioctl */ +@REQ(set_ioctl_result) + obj_handle_t manager; /* handle to the device manager */ + obj_handle_t handle; /* handle to the ioctl */ + unsigned int status; /* status of the ioctl */ + VARARG(data,bytes); /* output data of the ioctl */ +@END + + /* Retrieve results of an async ioctl */ @REQ(get_ioctl_result) obj_handle_t handle; /* handle to the device */ diff --git a/server/request.h b/server/request.h index e28757c..022feff 100644 --- a/server/request.h +++ b/server/request.h @@ -248,6 +248,7 @@ DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); DECL_HANDLER(cancel_async); DECL_HANDLER(ioctl); +DECL_HANDLER(set_ioctl_result); DECL_HANDLER(get_ioctl_result); DECL_HANDLER(create_named_pipe); DECL_HANDLER(get_named_pipe_info); @@ -509,6 +510,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_register_async, (req_handler)req_cancel_async, (req_handler)req_ioctl, + (req_handler)req_set_ioctl_result, (req_handler)req_get_ioctl_result, (req_handler)req_create_named_pipe, (req_handler)req_get_named_pipe_info, @@ -1511,6 +1513,10 @@ C_ASSERT( sizeof(struct ioctl_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, options) == 12 ); C_ASSERT( sizeof(struct ioctl_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_ioctl_result_request, manager) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_ioctl_result_request, handle) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_ioctl_result_request, status) == 20 ); +C_ASSERT( sizeof(struct set_ioctl_result_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_ioctl_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_ioctl_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_ioctl_result_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 1bda4cd..c7f4921 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2732,6 +2732,14 @@ static void dump_ioctl_reply( const struct ioctl_reply *req ) dump_varargs_bytes( ", out_data=", cur_size ); } +static void dump_set_ioctl_result_request( const struct set_ioctl_result_request *req ) +{ + fprintf( stderr, " manager=%04x", req->manager ); + fprintf( stderr, ", handle=%04x", req->handle ); + fprintf( stderr, ", status=%08x", req->status ); + dump_varargs_bytes( ", data=", cur_size ); +} + static void dump_get_ioctl_result_request( const struct get_ioctl_result_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4230,6 +4238,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_register_async_request, (dump_func)dump_cancel_async_request, (dump_func)dump_ioctl_request, + (dump_func)dump_set_ioctl_result_request, (dump_func)dump_get_ioctl_result_request, (dump_func)dump_create_named_pipe_request, (dump_func)dump_get_named_pipe_info_request, @@ -4488,6 +4497,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_ioctl_reply, + NULL, (dump_func)dump_get_ioctl_result_reply, (dump_func)dump_create_named_pipe_reply, (dump_func)dump_get_named_pipe_info_reply, @@ -4746,6 +4756,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "register_async", "cancel_async", "ioctl", + "set_ioctl_result", "get_ioctl_result", "create_named_pipe", "get_named_pipe_info",

1 0

Alexandre Julliard : server: Allow device manager ioctls to run asynchronously.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 0157f7688813e9f4d04855f97c3053e104a31ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0157f7688813e9f4d04855f97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 22:44:51 2015 +0900 server: Allow device manager ioctls to run asynchronously. --- server/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/device.c b/server/device.c index df65aa9..c5e3107 100644 --- a/server/device.c +++ b/server/device.c @@ -313,7 +313,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ { struct device *device = get_fd_user( fd ); struct ioctl_call *ioctl; - obj_handle_t handle; + obj_handle_t handle = 0; if (!device->manager) /* it has been deleted */ { @@ -327,7 +327,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ ioctl->thread = (struct thread *)grab_object( current ); ioctl->user_arg = async_data->arg; - if (!(handle = alloc_handle( current->process, ioctl, SYNCHRONIZE, 0 ))) + if (blocking && !(handle = alloc_handle( current->process, ioctl, SYNCHRONIZE, 0 ))) { release_object( ioctl ); return 0; @@ -335,7 +335,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ if (!(ioctl->async = fd_queue_async( device->fd, async_data, ASYNC_TYPE_WAIT ))) { - close_handle( current->process, handle ); + if (handle) close_handle( current->process, handle ); release_object( ioctl ); return 0; }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 3535f6f4a74639c3dbed5922f77adf390d877c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3535f6f4a74639c3dbed5922f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 11 11:31:54 2015 +0100 po: Update French translation. --- po/fr.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9826d64..d0bdf3e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3160,10 +3160,8 @@ msgid "&View Source" msgstr "Afficher la &source" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Propriétés" +msgstr "Proprié&tés" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -11649,10 +11647,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erreur : paramètre de ligne de commande invalide\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Erreur : impossible d'ajouter des clés à une machine distante\n" +msgstr "Erreur : impossible d'accéder à une machine distante\n" #: reg.rc:38 msgid "" @@ -11662,10 +11658,8 @@ msgstr "" "spécifiée\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Type non pris en charge.\n" +msgstr "Erreur : type non pris en charge\n" #: regedit.rc:34 msgid "&Registry"

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
78
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 2015