December 2007 - Wine-commits

Lei Zhang : quartz: Make video renderer aggregatable.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 932cc2d7f910ec9a7df17384610832922e67b861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932cc2d7f910ec9a7df173846… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 03:16:27 2007 -0800 quartz: Make video renderer aggregatable. --- dlls/quartz/tests/videorenderer.c | 4 -- dlls/quartz/videorenderer.c | 84 ++++++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ce0a43f..3c15772 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -69,18 +69,14 @@ static void test_aggregation(void) /* for aggregation, we should only be able to request IUnknown */ hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (LPVOID*)&pVideoWindowInner); - todo_wine { ok(hr == E_NOINTERFACE, "CoCreateInstance returned %x\n", hr); - } ok(pVideoWindowInner == NULL, "pVideoWindowInner is not NULL\n"); /* aggregation, request IUnknown */ hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&pUnkInner); - todo_wine { ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); ok(pUnkInner != NULL, "pUnkInner is NULL\n"); - } if (!pUnkInner) { diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 67e601e..1a4594c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -46,6 +46,7 @@ static BOOL wnd_class_registered = FALSE; static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IBaseFilterVtbl VideoRenderer_Vtbl; +static const IUnknownVtbl IInner_VTable; static const IBasicVideoVtbl IBasicVideo_VTable; static const IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; @@ -55,6 +56,7 @@ typedef struct VideoRendererImpl const IBaseFilterVtbl * lpVtbl; const IBasicVideoVtbl * IBasicVideo_vtbl; const IVideoWindowVtbl * IVideoWindow_vtbl; + const IUnknownVtbl * IInner_vtbl; LONG refCount; CRITICAL_SECTION csFilter; @@ -79,6 +81,9 @@ typedef struct VideoRendererImpl RECT WindowPos; long VideoWidth; long VideoHeight; + IUnknown * pUnkOuter; + BOOL bUnkOuterValid; + BOOL bAggregatable; } VideoRendererImpl; static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -436,10 +441,11 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) *ppv = NULL; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); + pVideoRenderer->pUnkOuter = pUnkOuter; + pVideoRenderer->bUnkOuterValid = FALSE; + pVideoRenderer->bAggregatable = FALSE; + pVideoRenderer->IInner_vtbl = &IInner_VTable; pVideoRenderer->lpVtbl = &VideoRenderer_Vtbl; pVideoRenderer->IBasicVideo_vtbl = &IBasicVideo_VTable; @@ -482,15 +488,18 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) { - VideoRendererImpl *This = (VideoRendererImpl *)iface; + ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)This; + *ppv = (LPVOID)&(This->IInner_vtbl); else if (IsEqualIID(riid, &IID_IPersist)) *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IMediaFilter)) @@ -513,9 +522,9 @@ static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID r return E_NOINTERFACE; } -static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) +static ULONG WINAPI Inner_AddRef(IUnknown * iface) { - VideoRendererImpl *This = (VideoRendererImpl *)iface; + ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1); @@ -523,9 +532,9 @@ static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) return refCount; } -static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) +static ULONG WINAPI Inner_Release(IUnknown * iface) { - VideoRendererImpl *This = (VideoRendererImpl *)iface; + ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -566,6 +575,61 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) return refCount; } +static const IUnknownVtbl IInner_VTable = +{ + Inner_QueryInterface, + Inner_AddRef, + Inner_Release +}; + +static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +{ + VideoRendererImpl *This = (VideoRendererImpl *)iface; + + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + + if (This->pUnkOuter) + { + if (This->bAggregatable) + return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + HRESULT hr; + + IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); + hr = IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); + IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); + This->bAggregatable = TRUE; + return hr; + } + + *ppv = NULL; + return E_NOINTERFACE; + } + + return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); +} + +static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) +{ + VideoRendererImpl *This = (VideoRendererImpl *)iface; + + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_AddRef(This->pUnkOuter); + return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); +} + +static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) +{ + VideoRendererImpl *This = (VideoRendererImpl *)iface; + + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_Release(This->pUnkOuter); + return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); +} + /** IPersist methods **/ static HRESULT WINAPI VideoRenderer_GetClassID(IBaseFilter * iface, CLSID * pClsid)

1 0

Anatoly Lyutin : start: Convert to Unicode.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 67271dcf3b265a7405c0ec85929229cafc55d897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67271dcf3b265a7405c0ec859… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Tue Dec 11 23:14:13 2007 +0300 start: Convert to Unicode. --- programs/start/Makefile.in | 2 +- programs/start/start.c | 133 ++++++++++++++++++++++++++------------------ 2 files changed, 79 insertions(+), 56 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index e889acc..d7deed0 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = start.exe -APPMODE = -mconsole +APPMODE = -mconsole -municode IMPORTS = shell32 user32 kernel32 C_SRCS = start.c diff --git a/programs/start/start.c b/programs/start/start.c index 773544f..58748c8 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -3,6 +3,7 @@ * Compatible with Microsoft's "c:\windows\command\start.exe" * * Copyright 2003 Dan Kegel + * Copyright 2007 Lyutin Anatoly (Etersoft) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,40 +26,40 @@ #include <stdlib.h> #include <shlobj.h> +#include <wine/unicode.h> +#include <wine/debug.h> + #include "resources.h" +WINE_DEFAULT_DEBUG_CHANNEL(start); + /** Output given message to stdout without formatting. */ -static void output(const char *message) +static void output(const WCHAR *message) { DWORD count; - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), message, strlen(message), &count, NULL); -} + DWORD res; + int wlen = strlenW(message); -/** - Output given message, - followed by ": ", - followed by description of given GetLastError() value to stdout, - followed by a trailing newline, - then terminate. -*/ -static void fatal_error(const char *msg, DWORD error_code) -{ - LPVOID lpMsgBuf; - int status; + if (!wlen) return; - output(msg); - output(": "); - status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPTSTR) & lpMsgBuf, 0, NULL); - if (!status) { - output("FormatMessage failed\n"); - } else { - output(lpMsgBuf); - LocalFree((HLOCAL) lpMsgBuf); - output("\n"); + res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL); + + /* If writing to console fails, assume its file + i/o so convert to OEM codepage and output */ + if (!res) + { + DWORD len; + char *mesA; + /* Convert to OEM, then output */ + len = WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, NULL, 0, NULL, NULL ); + mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char)); + if (!mesA) return; + WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, mesA, len, NULL, NULL ); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, mesA); } - ExitProcess(1); } /** @@ -68,24 +69,47 @@ static void fatal_error(const char *msg, DWORD error_code) followed by a trailing newline, then terminate. */ + +static void fatal_error(const WCHAR *msg, DWORD error_code) +{ + LPVOID lpMsgBuf; + int status; + static const WCHAR colonsW[] = { ':', ' ', 0 }; + static const WCHAR newlineW[] = { '\n', 0 }; + + output(msg); + output(colonsW); + status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPWSTR) & lpMsgBuf, 0, NULL); + if (!status) + { + WINE_ERR("FormatMessage failed\n"); + } else + { + output(lpMsgBuf); + LocalFree((HLOCAL) lpMsgBuf); + output(newlineW); + } + ExitProcess(1); +} + static void fatal_string_error(int which, DWORD error_code) { - char msg[2048]; + WCHAR msg[2048]; - if (!LoadString(GetModuleHandle(NULL), which, - msg, sizeof(msg))) - fatal_error("LoadString failed", GetLastError()); + if (!LoadStringW(GetModuleHandle(NULL), which, + msg, sizeof(msg)/sizeof(WCHAR))) + WINE_ERR("LoadString failed, error %d\n", GetLastError()); fatal_error(msg, error_code); } static void fatal_string(int which) { - char msg[2048]; + WCHAR msg[2048]; - if (!LoadString(GetModuleHandle(NULL), which, - msg, sizeof(msg))) - fatal_error("LoadString failed", GetLastError()); + if (!LoadStringW(GetModuleHandle(NULL), which, + msg, sizeof(msg)/sizeof(WCHAR))) + WINE_ERR("LoadString failed, error %d\n", GetLastError()); output(msg); ExitProcess(1); @@ -101,39 +125,43 @@ static void license(void) fatal_string(STRING_LICENSE); } -static char *build_args( int argc, char **argv ) +static WCHAR *build_args( int argc, WCHAR **argvW ) { - int i, len = 1; - char *ret, *p; + int i, wlen = 1; + WCHAR *ret, *p; + static const WCHAR FormatQuotesW[] = { ' ', '\"', '%', 's', '\"', 0 }; + static const WCHAR FormatW[] = { ' ', '%', 's', 0 }; for (i = 0; i < argc; i++ ) { - len += strlen(argv[i]) + 1; - if (strchr(argv[i], ' ')) - len += 2; + wlen += strlenW(argvW[i]) + 1; + if (strchrW(argvW[i], ' ')) + wlen += 2; } - ret = HeapAlloc( GetProcessHeap(), 0, len ); + ret = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(WCHAR) ); ret[0] = 0; for (i = 0, p = ret; i < argc; i++ ) { - if (strchr(argv[i], ' ')) - p += sprintf(p, " \"%s\"", argv[i]); + if (strchrW(argvW[i], ' ')) + p += sprintfW(p, FormatQuotesW, argvW[i]); else - p += sprintf(p, " %s", argv[i]); + p += sprintfW(p, FormatW, argvW[i]); } return ret; } -int main(int argc, char *argv[]) +int wmain (int argc, WCHAR *argv[]) { - SHELLEXECUTEINFO sei; - char *args; + SHELLEXECUTEINFOW sei; + WCHAR *args = NULL; int i; + static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; + memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.lpVerb = "open"; + sei.lpVerb = openW; sei.nShow = SW_SHOWNORMAL; /* Dunno what these mean, but it looks like winMe's start uses them */ sei.fMask = SEE_MASK_FLAG_DDEWAIT| @@ -175,7 +203,7 @@ int main(int argc, char *argv[]) sei.fMask |= SEE_MASK_NOCLOSEPROCESS; break; default: - printf("Option '%s' not recognized\n", argv[i]+ci-1); + WINE_ERR("Option '%s' not recognized\n", wine_dbgstr_w( argv[i]+ci-1)); usage(); } /* Skip to next slash */ @@ -192,20 +220,15 @@ int main(int argc, char *argv[]) args = build_args( argc - i, &argv[i] ); sei.lpParameters = args; - if (!ShellExecuteEx(&sei)) + if (!ShellExecuteExW(&sei)) fatal_string_error(STRING_EXECFAIL, GetLastError()); HeapFree( GetProcessHeap(), 0, args ); if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; - DWORD waitcode; - waitcode = WaitForSingleObject(sei.hProcess, INFINITE); - if (waitcode) - fatal_error("WaitForSingleObject", GetLastError()); - if (!GetExitCodeProcess(sei.hProcess, &exitcode)) - fatal_error("GetExitCodeProcess", GetLastError()); - /* fixme: haven't tested whether exit code works properly */ + WaitForSingleObject(sei.hProcess, INFINITE); + GetExitCodeProcess(sei.hProcess, &exitcode); ExitProcess(exitcode); }

1 0

Aric Stewart : gdi32: Cache font enum info.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 3c9e7aba75cc70639ea15705429c42499254e497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9e7aba75cc70639ea157054… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 11 22:09:21 2007 +0900 gdi32: Cache font enum info. Cache the enum info so that repeated calls to EnumFontFamiles and such does not have to repeatedly load the font file. --- dlls/gdi32/freetype.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b6a9344..f8b4e92 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -259,6 +259,11 @@ typedef struct tagFace { Bitmap_Size size; /* set if face is a bitmap */ BOOL external; /* TRUE if we should manually add this font to the registry */ struct tagFamily *family; + /* Cached data for Enum */ + BOOL cache_valid; + ENUMLOGFONTEXW elf; + NEWTEXTMETRICEXW ntm; + DWORD type; } Face; typedef struct tagFamily { @@ -1234,6 +1239,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ } } face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); + face->cache_valid = FALSE; list_add_tail(&family->faces, &face->entry); face->StyleName = StyleW; if (file) @@ -3253,6 +3259,15 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, GdiFont *font = alloc_font(); LONG width, height; + if (face->cache_valid) + { + TRACE("Cached\n"); + memcpy(pelf,&face->elf,sizeof(ENUMLOGFONTEXW)); + memcpy(pntm,&face->ntm,sizeof(NEWTEXTMETRICEXW)); + *ptype = face->type; + return; + } + if(face->scalable) { height = 100; width = 0; @@ -3348,6 +3363,11 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pelf->elfScript[0] = '\0'; /* This will get set in WineEngEnumFonts */ + memcpy(&face->elf,pelf,sizeof(ENUMLOGFONTEXW)); + memcpy(&face->ntm,pntm,sizeof(NEWTEXTMETRICEXW)); + face->type = *ptype; + face->cache_valid = TRUE; + free_font(font); }

1 0

Rob Shearman : widl: Swap the version packing order back to what typelibs expect.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 00db711c6feffedaa80e3e72ad7193cff6661f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00db711c6feffedaa80e3e72a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 12:40:23 2007 +0000 widl: Swap the version packing order back to what typelibs expect. --- tools/widl/utils.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 1cd3dd3..7d6ce5c 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -46,8 +46,10 @@ size_t widl_getline(char **linep, size_t *lenp, FILE *fp); UUID *parse_uuid(const char *u); int is_valid_uuid(const char *s); -#define MAKEVERSION(major, minor) ((((major) & 0xffff) << 16) | ((minor) & 0xffff)) -#define MAJORVERSION(version) (((version) >> 16) & 0xffff) -#define MINORVERSION(version) ((version) & 0xffff) +/* typelibs expect the minor version to be stored in the higher bits and + * major to be stored in the lower bits */ +#define MAKEVERSION(major, minor) ((((minor) & 0xffff) << 16) | ((major) & 0xffff)) +#define MAJORVERSION(version) ((version) & 0xffff) +#define MINORVERSION(version) (((version) >> 16) & 0xffff) #endif

1 0

Rob Shearman : rpcrt4: Add tests for freeing non-NdrAllocate allocated memory blocks.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 9642714d0647481d72f1d0fb1bb36e79d8ad4a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9642714d0647481d72f1d0fb1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 12:40:27 2007 +0000 rpcrt4: Add tests for freeing non-NdrAllocate allocated memory blocks. --- dlls/rpcrt4/tests/ndr_marshall.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index f0028bd..d19d50f 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1195,6 +1195,14 @@ todo_wine { NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); ok(my_free_called == 1, "free called %d\n", my_free_called); + mem = my_alloc(10); + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); +todo_wine { + ok(my_free_called == 1, "free called %d\n", my_free_called); +} + /* Server */ my_alloc_called = 0; StubMsg.IsClient = 0; @@ -1232,6 +1240,14 @@ todo_wine { ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + mem = my_alloc(10); + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); +todo_wine { + ok(my_free_called == 1, "free called %d\n", my_free_called); +} + HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); }

1 0

Alexandre Julliard : hhctrl.ocx: Store a copy of the string pointers to enable freeing them without casting away const .
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 7293f00d9dccf1411ed84817755c6378377bbc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7293f00d9dccf1411ed848177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 13 13:48:00 2007 +0100 hhctrl.ocx: Store a copy of the string pointers to enable freeing them without casting away const. --- dlls/hhctrl.ocx/chm.c | 30 +++++++++++++++--------------- dlls/hhctrl.ocx/help.c | 22 +++++++++++----------- dlls/hhctrl.ocx/hhctrl.h | 15 ++++++++++++++- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 1c18240..013cb7d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -200,10 +200,10 @@ LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) * FIXME: There may be more than one window type in the file, so * add the ability to choose a certain window type */ -BOOL LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) +BOOL LoadWinTypeFromCHM(HHInfo *info) { LARGE_INTEGER liOffset; - IStorage *pStorage = pChmInfo->pStorage; + IStorage *pStorage = info->pCHMInfo->pStorage; IStream *pStream; HRESULT hr; DWORD cbRead; @@ -221,26 +221,26 @@ BOOL LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) if (FAILED(hr)) goto done; /* read the HH_WINTYPE struct data */ - hr = IStream_Read(pStream, pHHWinType, sizeof(*pHHWinType), &cbRead); + hr = IStream_Read(pStream, &info->WinType, sizeof(info->WinType), &cbRead); if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - pHHWinType->pszType = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszType)); - pHHWinType->pszCaption = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszCaption)); - pHHWinType->pszToc = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszToc)); - pHHWinType->pszIndex = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszIndex)); - pHHWinType->pszFile = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszFile)); - pHHWinType->pszHome = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszHome)); - pHHWinType->pszJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump1)); - pHHWinType->pszJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump2)); - pHHWinType->pszUrlJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump1)); - pHHWinType->pszUrlJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump2)); - + info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); + info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); + info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); + info->WinType.pszIndex = info->pszIndex = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszIndex)); + info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); + info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); + info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); + info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); + info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); + info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case */ #if 0 - pHHWinType->pszCustomTabs = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszCustomTabs); + info->WinType.pszCustomTabs = info->pszCustomTabs = CHM_ReadString(pChmInfo, (DWORD_PTR)info->WinType.pszCustomTabs); #endif done: diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 85c076d..c49d3cf 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -922,16 +922,16 @@ void ReleaseHelpViewer(HHInfo *info) return; /* Free allocated strings */ - heap_free((LPWSTR)info->WinType.pszType); - heap_free((LPWSTR)info->WinType.pszCaption); - heap_free((LPWSTR)info->WinType.pszToc); - heap_free((LPWSTR)info->WinType.pszIndex); - heap_free((LPWSTR)info->WinType.pszFile); - heap_free((LPWSTR)info->WinType.pszHome); - heap_free((LPWSTR)info->WinType.pszJump1); - heap_free((LPWSTR)info->WinType.pszJump2); - heap_free((LPWSTR)info->WinType.pszUrlJump1); - heap_free((LPWSTR)info->WinType.pszUrlJump2); + heap_free(info->pszType); + heap_free(info->pszCaption); + heap_free(info->pszToc); + heap_free(info->pszIndex); + heap_free(info->pszFile); + heap_free(info->pszHome); + heap_free(info->pszJump1); + heap_free(info->pszJump2); + heap_free(info->pszUrlJump1); + heap_free(info->pszUrlJump2); if (info->pCHMInfo) CloseCHM(info->pCHMInfo); @@ -958,7 +958,7 @@ HHInfo *CreateHelpViewer(LPCWSTR filename) return NULL; } - if (!LoadWinTypeFromCHM(info->pCHMInfo, &info->WinType)) { + if (!LoadWinTypeFromCHM(info)) { ReleaseHelpViewer(info); return NULL; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 73ec569..26c9d4d 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -92,6 +92,19 @@ typedef struct { IOleObject *wb_object; HH_WINTYPEW WinType; + + LPWSTR pszType; + LPWSTR pszCaption; + LPWSTR pszToc; + LPWSTR pszIndex; + LPWSTR pszFile; + LPWSTR pszHome; + LPWSTR pszJump1; + LPWSTR pszJump2; + LPWSTR pszUrlJump1; + LPWSTR pszUrlJump2; + LPWSTR pszCustomTabs; + CHMInfo *pCHMInfo; ContentItem *content; HWND hwndTabCtrl; @@ -111,7 +124,7 @@ void InitContent(HHInfo*); void ReleaseContent(HHInfo*); CHMInfo *OpenCHM(LPCWSTR szFile); -BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); +BOOL LoadWinTypeFromCHM(HHInfo *info); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*);

1 0

Alexandre Julliard : user32: Print the RegisterHotKey fixme only once.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: e533e50d59cea7c464641d49f7d2d7f918a5d923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e533e50d59cea7c464641d49f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 13 14:33:35 2007 +0100 user32: Print the RegisterHotKey fixme only once. --- dlls/user32/input.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dfb5201..7796e96 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -788,7 +788,8 @@ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) */ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) { - FIXME_(keyboard)("(%p,%d,0x%08x,%d): stub\n",hwnd,id,modifiers,vk); + static int once; + if (!once++) FIXME_(keyboard)("(%p,%d,0x%08x,%d): stub\n",hwnd,id,modifiers,vk); return TRUE; } @@ -797,7 +798,8 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) */ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { - FIXME_(keyboard)("(%p,%d): stub\n",hwnd,id); + static int once; + if (!once++) FIXME_(keyboard)("(%p,%d): stub\n",hwnd,id); return TRUE; }

1 0

Lei Zhang : quartz: Add videorenderer QueryInterface test.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 4f6f1bcb6e82b3d53c084797ac5ba3d4967c3046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6f1bcb6e82b3d53c084797a… Author: Lei Zhang <thestig(a)google.com> Date: Wed Dec 12 16:51:55 2007 -0800 quartz: Add videorenderer QueryInterface test. --- dlls/quartz/tests/Makefile.in | 5 +- dlls/quartz/tests/videorenderer.c | 103 +++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 5163157..5c97b6d 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -4,12 +4,13 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = quartz.dll IMPORTS = ole32 kernel32 -EXTRALIBS = -lstrmiids +EXTRALIBS = -lstrmiids -luuid CTESTS = \ filtergraph.c \ memallocator.c \ - referenceclock.c + referenceclock.c \ + videorenderer.c @MAKE_TEST_RULES@ diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c new file mode 100644 index 0000000..dde6886 --- /dev/null +++ b/dlls/quartz/tests/videorenderer.c @@ -0,0 +1,103 @@ +/* + * Unit tests for Video Renderer functions + * + * Copyright (C) 2007 Google (Lei Zhang) + * + * 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 + */ + +#define COBJMACROS + +#include "wine/test.h" +#include "dshow.h" + +#define QI_SUCCEED(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ + ok(ppv != NULL, "Pointer is NULL\n"); + +#define ADDREF_EXPECT(iface, num) if (iface) { \ + hr = IUnknown_AddRef(iface); \ + ok(hr == num, "IUnknown_AddRef should return %d, got %d\n", num, hr); \ +} + +#define RELEASE_EXPECT(iface, num) if (iface) { \ + hr = IUnknown_Release(iface); \ + ok(hr == num, "IUnknown_Release should return %d, got %d\n", num, hr); \ +} + +static IUnknown *pVideoRenderer = NULL; + +static int create_video_renderer(void) +{ + HRESULT hr; + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (LPVOID*)&pVideoRenderer); + return (hr == S_OK && pVideoRenderer != NULL); +} + +static void release_video_renderer(void) +{ + HRESULT hr; + + hr = IUnknown_Release(pVideoRenderer); + ok(hr == 0, "IUnknown_Release failed with %x\n", hr); +} + +static void test_query_interface(void) +{ + HRESULT hr; + IBaseFilter *pBaseFilter = NULL; + IBasicVideo *pBasicVideo = NULL; + IDirectDrawVideo *pDirectDrawVideo = NULL; + IKsPropertySet *pKsPropertySet = NULL; + IMediaPosition *pMediaPosition = NULL; + IMediaSeeking *pMediaSeeking = NULL; + IQualityControl *pQualityControl = NULL; + IQualProp *pQualProp = NULL; + IVideoWindow *pVideoWindow = NULL; + + QI_SUCCEED(pVideoRenderer, IID_IBaseFilter, pBaseFilter); + RELEASE_EXPECT(pBaseFilter, 1); + QI_SUCCEED(pVideoRenderer, IID_IBasicVideo, pBasicVideo); + RELEASE_EXPECT(pBasicVideo, 1); + todo_wine { + QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); + RELEASE_EXPECT(pDirectDrawVideo, 1); + QI_SUCCEED(pVideoRenderer, IID_IKsPropertySet, pKsPropertySet); + RELEASE_EXPECT(pKsPropertySet, 1); + QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); + RELEASE_EXPECT(pMediaPosition, 1); + QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); + RELEASE_EXPECT(pMediaSeeking, 1); + QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); + RELEASE_EXPECT(pQualityControl, 1); + QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); + RELEASE_EXPECT(pQualProp, 1); + } + QI_SUCCEED(pVideoRenderer, IID_IVideoWindow, pVideoWindow); + RELEASE_EXPECT(pVideoWindow, 1); +} + +START_TEST(videorenderer) +{ + CoInitialize(NULL); + if (!create_video_renderer()) + return; + + test_query_interface(); + + release_video_renderer(); +}

1 0

Maarten Lankhorst : winealsa: Don't require a cswitch control for capture.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: affd447db0c7cb9c4c056916ce930d0ffd9511aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=affd447db0c7cb9c4c056916c… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Wed Dec 12 23:48:04 2007 +0100 winealsa: Don't require a cswitch control for capture. --- dlls/winealsa.drv/mixer.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 6b13610..90b539e 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -233,8 +233,7 @@ static int blacklisted(snd_mixer_elem_t *elem) BOOL blisted = 0; if (!snd_mixer_selem_has_playback_volume(elem) && - (!snd_mixer_selem_has_capture_volume(elem) || - !snd_mixer_selem_has_capture_switch(elem))) + !snd_mixer_selem_has_capture_volume(elem)) blisted = 1; TRACE("%s: %x\n", name, blisted); @@ -382,7 +381,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ else if (!capt) continue; - if (capt && snd_mixer_selem_has_capture_switch(elem)) + if (capt && snd_mixer_selem_has_capture_volume(elem)) { (++mline)->component = comp; MultiByteToWideChar(CP_UNIXCP, 0, name, -1, mline->name, MAXPNAMELEN); @@ -473,7 +472,7 @@ static void ALSA_MixerInit(void) captelem = elem; else if (!blacklisted(elem)) { - if (snd_mixer_selem_has_capture_switch(elem)) + if (snd_mixer_selem_has_capture_volume(elem)) ++capcontrols; if (snd_mixer_selem_has_playback_volume(elem)) { @@ -1306,14 +1305,14 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) return MMSYSERR_INVALPARAM; } - Ml->fdwLine = MIXERLINE_LINEF_ACTIVE; Ml->dwUser = 0; - + Ml->fdwLine = MIXERLINE_LINEF_DISCONNECTED; switch (qf) { case MIXER_GETLINEINFOF_COMPONENTTYPE: { Ml->dwLineID = 0xFFFF; + TRACE("Looking for componenttype %d/%x\n", Ml->dwComponentType, Ml->dwComponentType); for (idx = 0; idx < mmixer->chans; ++idx) if (mmixer->lines[idx].component == Ml->dwComponentType) { @@ -1383,6 +1382,8 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags) return MMSYSERR_INVALPARAM; } + Ml->fdwLine &= ~MIXERLINE_LINEF_DISCONNECTED; + Ml->fdwLine |= MIXERLINE_LINEF_ACTIVE; if (Ml->dwLineID >= mmixer->dests) Ml->fdwLine |= MIXERLINE_LINEF_SOURCE;

1 0

Lionel Debroux : msi: Fix missing alloc check.
by Alexandre Julliard 13 Dec '07

13 Dec '07

Module: wine Branch: master Commit: 1bed47a3b3fbfdb89a5ea560227661b21cbcd03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bed47a3b3fbfdb89a5ea5602… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Dec 9 20:14:47 2007 +0100 msi: Fix missing alloc check. --- dlls/msi/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d0e91cd..fae8fcf 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -409,6 +409,9 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, style |= WS_CHILD; control = msi_alloc( sizeof *control + strlenW(name)*sizeof(WCHAR) ); + if (!control) + return NULL; + strcpyW( control->name, name ); list_add_head( &dialog->controls, &control->entry ); control->handler = NULL;

1 0