Wine-commits

Download

wine-commits@list.winehq.org

December 2016

2 participants
342 discussions

Bruno Jesus : winmm: Return meaningful value in WINMM_CreateIData.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: a6f43ecf9b58133430cce9a266264c3c6407ad4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f43ecf9b58133430cce9a26… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 1 11:32:34 2016 -0200 winmm: Return meaningful value in WINMM_CreateIData. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f2d0858..0f3cd5d 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -79,7 +79,7 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - return TRUE; + return psLastEvent != NULL; } /****************************************************************** @@ -137,9 +137,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - if (!WINMM_CreateIData(hInstDLL)) - return FALSE; - break; + if (!WINMM_CreateIData(hInstDLL)) + return FALSE; + + break; case DLL_PROCESS_DETACH: if(fImpLoad) break;

1 0

Jacek Caban : mshtml: Silence a noisy FIXME.
by Alexandre Julliard 01 Dec '16

01 Dec '16

Module: wine Branch: master Commit: 61cb24f40faadaaf845af054e625fb22b082cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cb24f40faadaaf845af054e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 15:17:28 2016 +0100 mshtml: Silence a noisy FIXME. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ad949fd..cfa3753 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -500,8 +500,8 @@ static HRESULT WINAPI HttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { BSCallback *This = impl_from_IHttpNegotiate2(iface); - FIXME("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); + return E_NOTIMPL; /* FIXME */ } static const IHttpNegotiate2Vtbl HttpNegotiate2Vtbl = {

1 0

Jump to page: