wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

André Hentschel : winegcc: Respect TMPDIR environment variable.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: wine Branch: master Commit: 20006966ab737e3da0ed107cf0dfb1e349be205d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20006966ab737e3da0ed107cf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 23 22:22:28 2014 +0200 winegcc: Respect TMPDIR environment variable. --- tools/winegcc/winegcc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 72e2e69..a2f09d2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -268,9 +268,12 @@ static char* get_temp_file(const char* prefix, const char* suffix) fd = mkstemps( tmp, strlen(suffix) ); if (fd == -1) { - /* could not create it in current directory, try in /tmp */ + /* could not create it in current directory, try in TMPDIR */ + const char* tmpdir; + free(tmp); - tmp = strmake("/tmp/%s-XXXXXX%s", prefix, suffix); + if (!(tmpdir = getenv("TMPDIR"))) tmpdir = "/tmp"; + tmp = strmake("%s/%s-XXXXXX%s", tmpdir, prefix, suffix); fd = mkstemps( tmp, strlen(suffix) ); if (fd == -1) error( "could not create temp file\n" ); }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.27
by Jeremy Newman 24 Sep '14

24 Sep '14

Module: website Branch: master Commit: d0d42f73cd998fb7e7523191cd2bed986d85f007 URL: http://source.winehq.org/git/website.git/?a=commit;h=d0d42f73cd998fb7e75231… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Sep 24 06:59:42 2014 +0200 Polish translation for release 1.7.27 --- news/pl/2014091901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014091901.xml b/news/pl/2014091901.xml new file mode 100644 index 0000000..c9f68a1 --- /dev/null +++ b/news/pl/2014091901.xml @@ -0,0 +1,15 @@ +<news> +<date>Wrzesień 19, 2014</date> +<title>Wydano Wine 1.7.27</title> +<body> + Wydanie rozwojowe Wine 1.7.27 jest już dostępne. + <a href="{$root}/announce/1.7.27">Co nowego</a> w tym wydaniu: +<ul> + <li>Wykonano pracę na rzecz obsługi Direct2D.</li> + <li>Kilka poprawek do interfejsów RichEdit.</li> + <li>Wstępna obsługa dla ICMP w wersji 6.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.27.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jacek Caban : winegecko.php: Added 2.34-beta1 release.
by Alexandre Julliard 24 Sep '14

24 Sep '14

Module: tools Branch: master Commit: deae54c081caad4248c727544c6288b347f2445f URL: http://source.winehq.org/git/tools.git/?a=commit;h=deae54c081caad4248c72754… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 12:46:45 2014 +0200 winegecko.php: Added 2.34-beta1 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index 151a2d5..a67f423 100644 --- a/winegecko.php +++ b/winegecko.php @@ -78,7 +78,9 @@ $aFileSizes = array( '2.24-beta1-x86'=>22354944, '2.24-beta1-x86_64'=>23590400, '2.24-x86'=>22373888, - '2.24-x86_64'=>23608320 + '2.24-x86_64'=>23608320, + '2.34-beta1-x86'=>28131328, + '2.34-beta1-x86_64'=>29696000 ); // Exact size of the file:

1 0

Piotr Caban : user32: Return early on child windows in DrawMenuBar.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: dcdf4dbf151606416abfe54b4436096cae433ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdf4dbf151606416abfe54b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 23 16:51:53 2014 +0200 user32: Return early on child windows in DrawMenuBar. --- dlls/user32/menu.c | 2 ++ dlls/user32/tests/msg.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 9e05dd4..f0eb66b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4360,6 +4360,8 @@ BOOL WINAPI DrawMenuBar( HWND hWnd ) if (!IsWindow( hWnd )) return FALSE; + if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) + return TRUE; if ((hMenu = GetMenu( hWnd )) && (lppop = MENU_GetMenu( hMenu ))) { lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6badca1..90b87cb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4871,6 +4871,18 @@ static void test_messages(void) flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); + + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_CHILD|WS_VISIBLE, + 0, 0, 100, 100, hparent, 0, GetModuleHandleA(0), NULL); + ok(hwnd != 0, "Failed to create custom dialog window\n"); + flush_events(); + flush_sequence(); + ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + flush_events(); + ok_sequence(WmEmptySeq, "DrawMenuBar for a child window", FALSE); + DestroyWindow(hwnd); flush_sequence();

1 0

Andrei Slăvoiu : wined3d: Pass the capabilities directly to d3d_level_from_gl_info and rename it to d3d_level_from_caps.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: 9d0f924d1b0b694f0d71742267a66be625bccc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0f924d1b0b694f0d7174226… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Sep 21 22:58:17 2014 +0300 wined3d: Pass the capabilities directly to d3d_level_from_gl_info and rename it to d3d_level_from_caps. --- dlls/wined3d/directx.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925ff98..5d84533 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1679,47 +1679,33 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info); -static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops); - -static enum wined3d_d3d_level d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) +static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps, DWORD glsl_version) { - struct shader_caps shader_caps; - struct fragment_caps fragment_caps; - const struct wined3d_shader_backend_ops *shader_backend; - const struct fragment_pipeline *fragment_pipeline; - - shader_backend = select_shader_backend(gl_info); - shader_backend->shader_get_caps(gl_info, &shader_caps); - - if (shader_caps.vs_version >= 5) + if (shader_caps->vs_version >= 5) return WINED3D_D3D_LEVEL_11; - if (shader_caps.vs_version == 4) + if (shader_caps->vs_version == 4) { /* No backed supports SM 5 at the moment */ - if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 00)) + if (glsl_version >= MAKEDWORD_VERSION(4, 00)) return WINED3D_D3D_LEVEL_11; return WINED3D_D3D_LEVEL_10; } - if (shader_caps.vs_version == 3) + if (shader_caps->vs_version == 3) { /* Wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed * on compatibility contexts */ - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) + if (glsl_version >= MAKEDWORD_VERSION(1, 30)) return WINED3D_D3D_LEVEL_10; return WINED3D_D3D_LEVEL_9_SM3; } - if (shader_caps.vs_version == 2) + if (shader_caps->vs_version == 2) return WINED3D_D3D_LEVEL_9_SM2; - if (shader_caps.vs_version == 1) + if (shader_caps->vs_version == 1) return WINED3D_D3D_LEVEL_8; - fragment_pipeline = select_fragment_implementation(gl_info, shader_backend); - fragment_pipeline->get_caps(gl_info, &fragment_caps); - - if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) + if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) return WINED3D_D3D_LEVEL_7; - if (fragment_caps.MaxSimultaneousTextures > 1) + if (fragment_caps->MaxSimultaneousTextures > 1) return WINED3D_D3D_LEVEL_6; return WINED3D_D3D_LEVEL_5; @@ -2280,8 +2266,8 @@ card_vendor_table[] = }; -static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) +static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps, + DWORD glsl_version, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) { /* A Direct3D device object contains the PCI id (vendor + device) of the * videocard which is used for rendering. Various applications use this @@ -2334,7 +2320,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * memory can be overruled using a registry setting. */ unsigned int i; - enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); + enum wined3d_d3d_level d3d_level = d3d_level_from_caps(shader_caps, fragment_caps, glsl_version); enum wined3d_pci_device device; for (i = 0; i < (sizeof(card_vendor_table) / sizeof(*card_vendor_table)); ++i) @@ -3031,7 +3017,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) card_vendor = wined3d_guess_card_vendor(gl_vendor_str, gl_renderer_str); TRACE("Found GL_VENDOR (%s)->(0x%04x/0x%04x).\n", debugstr_a(gl_vendor_str), gl_vendor, card_vendor); - device = wined3d_guess_card(gl_info, gl_renderer_str, &gl_vendor, &card_vendor); + device = wined3d_guess_card(&shader_caps, &fragment_caps, gl_info->glsl_version, gl_renderer_str, &gl_vendor, &card_vendor); TRACE("Found (fake) card: 0x%x (vendor id), 0x%x (device id).\n", card_vendor, device); gl_info->wrap_lookup[WINED3D_TADDRESS_WRAP - WINED3D_TADDRESS_WRAP] = GL_REPEAT;

1 0

Andrei Slăvoiu : wined3d: Adjust the Intel fallbacks to better reflect reality.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: 24f661674fa61bedc274af07507872da1f3fad02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f661674fa61bedc274af075… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Sep 21 22:58:12 2014 +0300 wined3d: Adjust the Intel fallbacks to better reflect reality. --- dlls/wined3d/directx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 79b2590..925ff98 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2217,12 +2217,12 @@ card_fallback_amd[] = }, card_fallback_intel[] = { - CARD_INTEL_915G, /* D3D5 */ - CARD_INTEL_915G, /* D3D6 */ - CARD_INTEL_915G, /* D3D7 */ + CARD_INTEL_845G, /* D3D5 */ + CARD_INTEL_845G, /* D3D6 */ + CARD_INTEL_845G, /* D3D7 */ CARD_INTEL_915G, /* D3D8 */ CARD_INTEL_915G, /* D3D9_SM2 */ - CARD_INTEL_915G, /* D3D9_SM3 */ + CARD_INTEL_945G, /* D3D9_SM3 */ CARD_INTEL_G45, /* D3D10 */ CARD_INTEL_IVBD, /* D3D11 */ };

1 0

André Hentschel : ntdll: Use a dynamic buffer for change notification data.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: 6d50cfcac28f84e07777fc10874887356832102e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d50cfcac28f84e07777fc108… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 22 23:43:26 2014 +0200 ntdll: Use a dynamic buffer for change notification data. --- dlls/ntdll/directory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 01998b2..9b5852a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3307,8 +3307,10 @@ struct read_changes_info HANDLE FileHandle; PVOID Buffer; ULONG BufferSize; + ULONG data_size; PIO_APC_ROUTINE apc; void *apc_arg; + char data[1]; }; /* callback for ioctl user APC */ @@ -3322,14 +3324,13 @@ static void WINAPI read_changes_user_apc( void *arg, IO_STATUS_BLOCK *io, ULONG static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) { struct read_changes_info *info = user; - char data[PATH_MAX]; NTSTATUS ret; int size; SERVER_START_REQ( read_change ) { req->handle = wine_server_obj_handle( info->FileHandle ); - wine_server_set_reply( req, data, PATH_MAX ); + wine_server_set_reply( req, info->data, info->data_size ); ret = wine_server_call( req ); size = wine_server_reply_size( reply ); } @@ -3340,7 +3341,7 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st PFILE_NOTIFY_INFORMATION pfni = info->Buffer; int i, left = info->BufferSize; DWORD *last_entry_offset = NULL; - struct filesystem_event *event = (struct filesystem_event*)data; + struct filesystem_event *event = (struct filesystem_event*)info->data; while (size && left >= sizeof(*pfni)) { @@ -3413,6 +3414,7 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, { struct read_changes_info *info; NTSTATUS status; + ULONG size = max( 4096, BufferSize ); ULONG_PTR cvalue = ApcRoutine ? 0 : (ULONG_PTR)ApcContext; TRACE("%p %p %p %p %p %p %u %u %d\n", @@ -3425,7 +3427,7 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, if (CompletionFilter == 0 || (CompletionFilter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof *info ); + info = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct read_changes_info, data[size] )); if (!info) return STATUS_NO_MEMORY; @@ -3434,6 +3436,7 @@ NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, info->BufferSize = BufferSize; info->apc = ApcRoutine; info->apc_arg = ApcContext; + info->data_size = size; SERVER_START_REQ( read_directory_changes ) {

1 0

Alistair Leslie-Hughes : dpvoice: Add IDirectPlayVoiceServer support.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: 95763d9146bc2e881e70ec1a1ee0d7b641a54bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=95763d9146bc2e881e70ec1a1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 23 14:26:15 2014 +1000 dpvoice: Add IDirectPlayVoiceServer support. --- dlls/dpvoice/Makefile.in | 3 +- dlls/dpvoice/dvoice_private.h | 1 + dlls/dpvoice/main.c | 1 + dlls/dpvoice/server.c | 196 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 200 insertions(+), 1 deletion(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index 186a44e..25334b5 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -3,7 +3,8 @@ IMPORTS = dxguid uuid C_SRCS = \ client.c \ - main.c + main.c \ + server.c RC_SRCS = version.rc diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index a008924..0ee2658 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -21,5 +21,6 @@ #define __DVOICE_PRIVATE_H__ extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; #endif diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 84f739c..608d1cd 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -95,6 +95,7 @@ static const IClassFactoryVtbl DICF_Vtbl = { static IClassFactoryImpl DPVOICE_CFS[] = { { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceClient, DPVOICE_CreateDirectPlayVoiceClient }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlayVoiceServer, DPVOICE_CreateDirectPlayVoiceServer }, { { NULL }, 0, NULL, NULL } }; diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c new file mode 100644 index 0000000..eb2c9ed --- /dev/null +++ b/dlls/dpvoice/server.c @@ -0,0 +1,196 @@ + /* + * DirectPlay Voice Server Interface + * + * Copyright (C) 2014 Alistair Leslie-Hughes + * + * 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> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +#include "dvoice.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpvoice); + +typedef struct IDirectPlayVoiceServerImpl +{ + IDirectPlayVoiceServer IDirectPlayVoiceServer_iface; + LONG ref; +} IDirectPlayVoiceServerImpl; + +static inline IDirectPlayVoiceServerImpl *impl_from_IDirectPlayVoiceServer(IDirectPlayVoiceServer *iface) +{ + return CONTAINING_RECORD(iface, IDirectPlayVoiceServerImpl, IDirectPlayVoiceServer_iface); +} + +static HRESULT WINAPI dpvserver_QueryInterface(IDirectPlayVoiceServer *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectPlayVoiceServer)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} +static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnknown *lpVoid, PDVMESSAGEHANDLER pMessageHandler, + void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p %p %p %p %d\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p %d\n", This, pSessionDesc, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %d\n", This, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_GetSessionDesc(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pvSessionDesc) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p\n", This, pvSessionDesc); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_SetSessionDesc(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p\n", This, pSessionDesc); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_GetCaps(IDirectPlayVoiceServer *iface, PDVCAPS pDVCaps) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p\n", This, pDVCaps); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *iface, void *pData, DWORD *pdwDataSize, + DWORD *pdwNumElements, DWORD dwFlags) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface, DVID dvSource, PDVID pdvIDTargets, + DWORD dwNumTargets, DWORD dwFlags) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %d %p %d %d\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface, DVID dvSource, PDVID pdvIDTargets, + DWORD *pdwNumTargets, DWORD dwFlags) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %d %p %p %d\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) +{ + IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); + FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + return E_NOTIMPL; +} + +static const IDirectPlayVoiceServerVtbl DirectPlayVoiceServer_Vtbl = +{ + dpvserver_QueryInterface, + dpvserver_AddRef, + dpvserver_Release, + dpvserver_Initialize, + dpvserver_StartSession, + dpvserver_StopSession, + dpvserver_GetSessionDesc, + dpvserver_SetSessionDesc, + dpvserver_GetCaps, + dpvserver_GetCompressionTypes, + dpvserver_SetTransmitTargets, + dpvserver_GetTransmitTargets, + dpvserver_SetNotifyMask +}; + +HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) +{ + IDirectPlayVoiceServerImpl* server; + HRESULT ret; + + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + server = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlayVoiceServerImpl)); + if (!server) + return E_OUTOFMEMORY; + + server->IDirectPlayVoiceServer_iface.lpVtbl = &DirectPlayVoiceServer_Vtbl; + server->ref = 1; + + ret = IDirectPlayVoiceServer_QueryInterface(&server->IDirectPlayVoiceServer_iface, riid, ppobj); + IDirectPlayVoiceServer_Release(&server->IDirectPlayVoiceServer_iface); + + return ret; +}

1 0

Alistair Leslie-Hughes : dpvoice: Add IDirectPlayVoiceClient Support.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: 300f53a4f842d1fe6844c8652eeeb3859c5964cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=300f53a4f842d1fe6844c8652… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 14 14:53:58 2014 +1000 dpvoice: Add IDirectPlayVoiceClient Support. --- dlls/dpvoice/Makefile.in | 2 + dlls/dpvoice/client.c | 234 ++++++++++++++++++++++++++++++++++++++++++ dlls/dpvoice/dvoice_private.h | 25 +++++ dlls/dpvoice/main.c | 90 +++++++++++++++- 4 files changed, 347 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=300f53a4f842d1fe6844c…

1 0

Qian Hong : mshtml: Don't pass NULL string pointer to jscript engine.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: d62f0f5e6305ccd43407c1805e991c351687a80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62f0f5e6305ccd43407c1805… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Sep 23 16:56:15 2014 +0800 mshtml: Don't pass NULL string pointer to jscript engine. --- dlls/mshtml/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index e5f4ab1..da6839f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -739,7 +739,7 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) hres = bind_mon_to_wstr(script_host->window, mon, &text); IMoniker_Release(mon); - if(FAILED(hres)) + if(FAILED(hres) || !text) return; parse_text(script_host, text);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
31
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 September 2014