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

Francois Gouget : kernel32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: ecc04f6996a4ec2d9fd1be9ff0df823f521113e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc04f6996a4ec2d9fd1be9ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:39:31 2015 +0100 kernel32: Remove unneeded NONAMELESSXXX directives. --- dlls/kernel32/change.c | 1 - dlls/kernel32/comm.c | 2 -- dlls/kernel32/oldconfig.c | 2 -- dlls/kernel32/path.c | 2 -- dlls/kernel32/sync.c | 4 +--- dlls/kernel32/time.c | 3 +-- dlls/kernel32/virtual.c | 3 +-- 7 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index ab9432f..f3aec8d 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -27,7 +27,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index c6a8ec2..1c6f1af 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -25,8 +25,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 4a5355d..2c8bc18 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -42,8 +42,6 @@ # include <linux/hdreg.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 5dd221f..7fe229f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -28,8 +28,6 @@ #include <stdio.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 04b3270..a07ce97 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -29,11 +29,9 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 21ac120..2f7142b 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -39,10 +39,9 @@ #include <machine/limits.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winternl.h" diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 2df19a7..03ef38c 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -30,10 +30,9 @@ # include <unistd.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Francois Gouget : krnl386.exe16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: bc68822c09b7125572d4a08b9784a86a81ab7954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc68822c09b7125572d4a08b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:40:57 2015 +0100 krnl386.exe16: Remove unneeded NONAMELESSXXX directives. --- dlls/krnl386.exe16/file.c | 2 -- dlls/krnl386.exe16/int2f.c | 3 +-- dlls/krnl386.exe16/local.c | 2 +- dlls/krnl386.exe16/vga.c | 2 +- dlls/krnl386.exe16/vxd.c | 3 +-- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 37c401a..1386fe1 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -30,8 +30,6 @@ #include <stdio.h> #include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 046410f..f5b5aaa 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -25,10 +25,9 @@ #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "wine/winbase16.h" #include "wine/debug.h" #include "winternl.h" diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index 3eaa6ec..4e69a90 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -30,7 +30,7 @@ #include "config.h" #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include <stdlib.h> #include <string.h> #include "wine/winbase16.h" diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index ade19f7..c7745d4 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -22,7 +22,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index a3ff9ee..d140964 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -34,10 +34,9 @@ #include <string.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h"

1 0

Francois Gouget : ieframe: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 6ddd8795154a80731f1697633bc58e729729d5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ddd8795154a80731f1697633… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 11:11:10 2015 +0100 ieframe: Remove unneeded NONAMELESSXXX directives. Move a NONAMELESSUNION directive to the one C file that needs it. --- dlls/ieframe/ieframe.h | 1 - dlls/ieframe/intshcut.c | 2 ++ dlls/ieframe/navigate.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index cdfdf21..f8c204c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index a780fea..b2d3ba9 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -29,6 +29,8 @@ #include <stdio.h> +#define NONAMELESSUNION + #include "ieframe.h" #include "shlobj.h" diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index d1a9a50..9c5b88a 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -17,7 +17,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ieframe.h"

1 0

Francois Gouget : ieframe/tests: NONAMELESSUNION is not needed when using the U() macro.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 4af6be9d3a656718e838611a4b8dbf8d354e439a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af6be9d3a656718e838611a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 11:11:14 2015 +0100 ieframe/tests: NONAMELESSUNION is not needed when using the U() macro. --- dlls/ieframe/tests/intshcut.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index d1da424..ef99d42 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -22,7 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Sebastian Lackner : ole32: Wait a bit before doing next sanity check in StorageImpl_LockRegionSync.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 66e8060204c91d37ee6aef078d779b7ee667159f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e8060204c91d37ee6aef078… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 12 07:19:54 2015 +0100 ole32: Wait a bit before doing next sanity check in StorageImpl_LockRegionSync. --- dlls/ole32/storage32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8963044..b4401a6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2917,6 +2917,8 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs ILockBytes_UnlockRegion(This->lockBytes, sanity_offset, sanity_cb, 0); hr = STG_E_ACCESSDENIED; } + + last_sanity_check = current_time; } Sleep(delay); if (delay < 150) delay++;

1 0

Nikolay Sivov : wshom.ocx: Implement Terminate().
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: ed92458754ce21b4d4719168515866fc1bb340ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92458754ce21b4d47191685… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 10:36:46 2015 +0300 wshom.ocx: Implement Terminate(). --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 18e1b96..b1949ed 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = wshom.ocx -IMPORTS = uuid oleaut32 ole32 shell32 advapi32 +IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 C_SRCS = \ shell.c \ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index dcf1462..97781a5 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -254,13 +254,37 @@ static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) return E_NOTIMPL; } +BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) +{ + INT *count = (INT*)lParam; + + (*count)++; + PostMessageW(hwnd, WM_CLOSE, 0, 0); + /* try to send it to all windows, even if failed for some */ + return TRUE; +} + static HRESULT WINAPI WshExec_Terminate(IWshExec *iface) { WshExec *This = impl_from_IWshExec(iface); + BOOL ret, kill = FALSE; + INT count = 0; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + ret = EnumThreadWindows(This->info.dwThreadId, enum_thread_wnd_proc, (LPARAM)&count); + if (ret && count) { + /* manual testing shows that it waits 2 seconds before forcing termination */ + if (WaitForSingleObject(This->info.hProcess, 2000) != WAIT_OBJECT_0) + kill = TRUE; + } + else + kill = TRUE; + + if (kill) + TerminateProcess(This->info.hProcess, 0); + + return S_OK; } static const IWshExecVtbl WshExecVtbl = {

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

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 : 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

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