wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Austin English : ntoskrnl.exe: Add KeEnterCriticalRegion/ KeLeaveCriticalRegion stubs.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 1a45f75dedf895d32c348ed460258048e65c25c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a45f75dedf895d32c348ed46… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 28 23:03:06 2015 -0400 ntoskrnl.exe: Add KeEnterCriticalRegion/KeLeaveCriticalRegion stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a4a37d9..96af772 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2304,3 +2304,19 @@ PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lo FIXME("(%p %p) stub\n", head, lock); return ExInterlockedRemoveHeadList( head, lock ); } + +/*********************************************************************** + * KeEnterCriticalRegion (NTOSKRNL.EXE.@) + */ +void WINAPI KeEnterCriticalRegion(void) +{ + FIXME(": stub\n"); +} + +/*********************************************************************** + * KeLeaveCriticalRegion (NTOSKRNL.EXE.@) + */ +void WINAPI KeLeaveCriticalRegion(void) +{ + FIXME(": stub\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0bb7d04..58ad879 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -523,7 +523,7 @@ @ stub KeDeregisterBugCheckReasonCallback @ stub KeDetachProcess @ stub KeDisconnectInterrupt -@ stub KeEnterCriticalRegion +@ stdcall KeEnterCriticalRegion() @ stub KeEnterKernelDebugger @ stub KeFindConfigurationEntry @ stub KeFindConfigurationNextEntry @@ -563,7 +563,7 @@ @ stub KeInsertQueueDpc @ stub KeIsAttachedProcess @ stub KeIsExecutingDpc -@ stub KeLeaveCriticalRegion +@ stdcall KeLeaveCriticalRegion() @ stub KeLoaderBlock @ stub KeNumberProcessors @ stub KeProfileInterrupt

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::Discontinuity.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: b0a9d16cfba262ab92cfc33294336581d1d81bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9d16cfba262ab92cfc3329… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:56:14 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::Discontinuity. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 41d1d21..835426f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -748,7 +748,18 @@ static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) static HRESULT WINAPI XA2SRC_Discontinuity(IXAudio2SourceVoice *iface) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p\n", This); + + EnterCriticalSection(&This->lock); + + if(This->nbufs > 0){ + DWORD last = (This->first_buf + This->nbufs - 1) % XAUDIO2_MAX_QUEUED_BUFFERS; + This->buffers[last].xa2buffer.Flags |= XAUDIO2_END_OF_STREAM; + } + + LeaveCriticalSection(&This->lock); + return S_OK; }

1 0

Andrew Eikum : xaudio2: Call OnStreamEnd callback.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 8366165e4069dd761f3c5bf386b13d675a593327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8366165e4069dd761f3c5bf38… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:56:02 2015 -0500 xaudio2: Call OnStreamEnd callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/xaudio2_7/xaudio_dll.c | 5 +++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 2cea7af..716fe23 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -374,9 +374,11 @@ static const IXAudio2VoiceCallbackVtbl vcb_buf_vtbl = { static IXAudio2VoiceCallback vcb_buf = { &vcb_buf_vtbl }; static int nloopends = 0; +static int nstreamends = 0; static void WINAPI loop_buf_OnStreamEnd(IXAudio2VoiceCallback *This) { + ++nstreamends; } static void WINAPI loop_buf_OnBufferStart(IXAudio2VoiceCallback *This, @@ -421,7 +423,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) XAUDIO2_BUFFER buf; XAUDIO2_VOICE_STATE state; struct vcb_buf_testdata testdata[5]; - int i; + int i, timeout; obs_calls = 0; obe_calls = 0; @@ -434,6 +436,7 @@ static void test_buffer_callbacks(IXAudio2 *xa) hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + /* test OnBufferStart/End callbacks */ fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; fmt.nChannels = 2; fmt.nSamplesPerSec = 44100; @@ -487,14 +490,48 @@ static void test_buffer_callbacks(IXAudio2 *xa) ok(state.SamplesPlayed == 4410 * 5, "Got wrong samples played\n"); - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); + if(xaudio27) + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + else + IXAudio2SourceVoice_DestroyVoice(src); + + + /* test OnStreamEnd callback */ + XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + buf.Flags = XAUDIO2_END_OF_STREAM; + + hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); + ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + timeout = 0; + while(nstreamends == 0 && timeout < 1000){ + Sleep(100); + timeout += 100; + } + + ok(nstreamends == 1, "Got wrong number of OnStreamEnd calls: %u\n", nstreamends); + + /* xaudio resets SamplesPlayed after processing an end-of-stream buffer */ + if(xaudio27) + IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); + else + IXAudio2SourceVoice_GetState(src, &state, 0); + ok(state.SamplesPlayed == 0, "Got wrong samples played\n"); if(xaudio27) IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); else IXAudio2SourceVoice_DestroyVoice(src); + IXAudio2MasteringVoice_DestroyVoice(master); + + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); } static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 673f53d..41d1d21 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -3092,9 +3092,14 @@ static void update_source_state(XA2SourceImpl *src) TRACE("%p: done with buffer %u\n", src, old_buf); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + src->played_frames = 0; + if(src->cb){ IXAudio2VoiceCallback_OnBufferEnd(src->cb, src->buffers[old_buf].xa2buffer.pContext); + if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) + IXAudio2VoiceCallback_OnStreamEnd(src->cb); if(src->nbufs > 0) IXAudio2VoiceCallback_OnBufferStart(src->cb,

1 0

Andrew Eikum : xaudio2: Implement IXAudio2MasteringVoice::GetVoiceDetails.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: b28b4cc18d412697aeedfa955b7cba0c15f2deb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28b4cc18d412697aeedfa955… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 13:55:53 2015 -0500 xaudio2: Implement IXAudio2MasteringVoice::GetVoiceDetails. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8b41cbb..673f53d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1132,6 +1132,9 @@ static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, { IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVoiceDetails); + pVoiceDetails->CreationFlags = 0; + pVoiceDetails->InputChannels = This->fmt.Format.nChannels; + pVoiceDetails->InputSampleRate = This->fmt.Format.nSamplesPerSec; } static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface,

1 0

Nikolay Sivov : dwrite: Handle fonts with broken usWinDescent values.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 5cb954aa6aa60464a364b645227a3d00d2295740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb954aa6aa60464a364b6452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 27 22:53:42 2015 +0300 dwrite: Handle fonts with broken usWinDescent values. --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fd471ef..82e0a9c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -960,7 +960,9 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T USHORT version = GET_BE_WORD(tt_os2->version); metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); - metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); + /* Some fonts have usWinDescent value stored as signed short, which could be wrongly + interpreted as large unsigned value. */ + metrics->descent = abs((SHORT)GET_BE_WORD(tt_os2->usWinDescent)); /* line gap is estimated using two sets of ascender/descender values and 'hhea' line gap */ if (tt_hhea) {

1 0

Nikolay Sivov : gdi32/freetype: Handle fonts with broken usWinDescent values.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: af5884ffe5a8ba50630cf8e180ddb4d700d8117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5884ffe5a8ba50630cf8e18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 27 22:52:56 2015 +0300 gdi32/freetype: Handle fonts with broken usWinDescent values. --- dlls/gdi32/freetype.c | 20 +++++++++++++++----- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 60ffc45..8e89cc5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4185,6 +4185,13 @@ BOOL WineEngInit(void) return TRUE; } +/* Some fonts have large usWinDescent values, as a result of storing signed short + in unsigned field. That's probably caused by sTypoDescent vs usWinDescent confusion in + some font generation tools. */ +static inline USHORT get_fixed_windescent(USHORT windescent) +{ + return abs((SHORT)windescent); +} static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) { @@ -4214,12 +4221,13 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) */ if(height > 0) { - if(pOS2->usWinAscent + pOS2->usWinDescent == 0) + USHORT windescent = get_fixed_windescent(pOS2->usWinDescent); + if(pOS2->usWinAscent + windescent == 0) ppem = MulDiv(ft_face->units_per_EM, height, pHori->Ascender - pHori->Descender); else ppem = MulDiv(ft_face->units_per_EM, height, - pOS2->usWinAscent + pOS2->usWinDescent); + pOS2->usWinAscent + windescent); if(ppem > MAX_PPEM) { WARN("Ignoring too large height %d, ppem %d\n", height, ppem); ppem = 1; @@ -7340,6 +7348,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) WCHAR *family_nameW, *style_nameW, *face_nameW, *full_nameW; char *cp; INT ascent, descent; + USHORT windescent; TRACE("font=%p\n", font); @@ -7408,7 +7417,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) pPost = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_post); /* we can live with this failing */ - TRACE("OS/2 winA = %d winD = %d typoA = %d typoD = %d typoLG = %d avgW %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", + TRACE("OS/2 winA = %u winD = %u typoA = %d typoD = %d typoLG = %d avgW %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", pOS2->usWinAscent, pOS2->usWinDescent, pOS2->sTypoAscender, pOS2->sTypoDescender, pOS2->sTypoLineGap, pOS2->xAvgCharWidth, @@ -7421,12 +7430,13 @@ static BOOL get_outline_text_metrics(GdiFont *font) #define TM font->potm->otmTextMetrics - if(pOS2->usWinAscent + pOS2->usWinDescent == 0) { + windescent = get_fixed_windescent(pOS2->usWinDescent); + if(pOS2->usWinAscent + windescent == 0) { ascent = pHori->Ascender; descent = -pHori->Descender; } else { ascent = pOS2->usWinAscent; - descent = pOS2->usWinDescent; + descent = windescent; } font->ntmCellHeight = ascent + descent; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cdc7726..e04ee1e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3718,7 +3718,7 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) TEXTMETRICW tmW; ascent = GET_BE_WORD(tt_os2.usWinAscent); - descent = GET_BE_WORD(tt_os2.usWinDescent); + descent = abs((SHORT)GET_BE_WORD(tt_os2.usWinDescent)); cell_height = ascent + descent; ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", font_name, ntm->ntmCellHeight, cell_height, ascent, descent);

1 0

Vincent Povirk : setupapi/tests: Add tests for dirid values.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: f0009e17e44e8832ec44dce5c00ccc5c237ee981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0009e17e44e8832ec44dce5c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Sep 26 12:39:39 2015 -0500 setupapi/tests: Add tests for dirid values. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/setupapi/tests/install.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a98cbec..10161f0 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -720,6 +720,55 @@ static void test_inffilelist(void) RemoveDirectoryA(dirA); } +static const char dirid_inf[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=Add.Settings\n" + "[Add.Settings]\n" + "HKCU,Software\\Wine\\setupapitest,dirid,,%%%i%%\n"; + +static void check_dirid(int dirid, LPCSTR expected) +{ + char buffer[sizeof(dirid_inf)+11]; + char path[MAX_PATH], actual[MAX_PATH]; + LONG ret; + DWORD size; + + sprintf(buffer, dirid_inf, dirid); + + create_inf_file(inffile, buffer); + + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + size = sizeof(actual); + ret = RegGetValueA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", "dirid", + RRF_RT_REG_SZ|RRF_ZEROONFAILURE, NULL, &actual, &size); + ok(ret == ERROR_SUCCESS, "Failed getting value for dirid %i, err=%d\n", dirid, ret); + ok(!strcmp(actual, expected), "Expected path for dirid %i was \"%s\", got \"%s\"\n", dirid, expected, actual); + + ok_registry(TRUE); + ret = DeleteFileA(inffile); + ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); +} + +/* Test dirid values */ +static void test_dirid(void) +{ + char expected[MAX_PATH]; + + check_dirid(DIRID_NULL, ""); + + GetWindowsDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_WINDOWS, expected); + + GetSystemDirectoryA(expected, MAX_PATH); + check_dirid(DIRID_SYSTEM, expected); + + strcat(expected, "\\unknown"); + check_dirid(40, expected); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -770,6 +819,7 @@ START_TEST(install) test_registry(); test_install_svc_from(); test_driver_install(); + test_dirid(); UnhookWindowsHookEx(hhook);

1 0

Aric Stewart : usp10/tests: Catch case where enumerated font name is too long.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 0072188b69df43460d213f12efe06bb17720de93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0072188b69df43460d213f12e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 25 10:11:26 2015 -0500 usp10/tests: Catch case where enumerated font name is too long. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0db98d9..92b17c5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1993,6 +1993,11 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { + if (strlen((char *)efnd.elf[i].elfFullName) >= LF_FACESIZE) + { + trace("Font name to long to test: %s\n",(char *)efnd.elf[i].elfFullName); + continue; + } lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); @@ -2034,6 +2039,11 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { + if (strlen((char *)efnd.elf[i].elfFullName) >= LF_FACESIZE) + { + trace("Font name to long to test: %s\n",(char *)efnd.elf[i].elfFullName); + continue; + } lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font);

1 0

Marcus Meissner : bcrypt: Add BCryptCreateHash stub.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 5b33f18cfc11f73e8b85fcae0f7e9a6326c8c5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b33f18cfc11f73e8b85fcae0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 25 11:23:40 2015 +0200 bcrypt: Add BCryptCreateHash stub. Signed-off-By: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 8 ++++++++ include/bcrypt.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 18d4d48..1c848e1 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -4,7 +4,7 @@ @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext -@ stub BCryptCreateHash +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) @ stub BCryptDecrypt @ stub BCryptDeleteContext @ stub BCryptDeriveKey diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4663e0f..b716aea 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -115,3 +115,11 @@ NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE* hash, UCHAR* hashobject, + ULONG hashobjectlen, UCHAR *secret, ULONG secretlen, ULONG flags) +{ + FIXME("%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, hash, hashobject, hashobjectlen, secret, secretlen, flags); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index d9b8cc6..fe3d854 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -49,6 +49,7 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_HANDLE; +typedef PVOID BCRYPT_HASH_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002

1 0

Michael Müller : wineconsole: Forward child process exitcode.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 5d4a9617898c898e9e095ee11d9430fcb48b27e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4a9617898c898e9e095ee11… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Sep 24 04:34:57 2015 +0200 wineconsole: Forward child process exitcode. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- programs/wineconsole/winecon_private.h | 1 + programs/wineconsole/wineconsole.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 2178dd0..5608f99 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -59,6 +59,7 @@ struct inner_data { HANDLE hConIn; /* console input handle */ HANDLE hConOut; /* screen buffer handle: has to be changed when active sb changes */ HANDLE hSynchro; /* waitable handle signalled by server when something in server has been modified */ + HANDLE hProcess; /* handle to the child process or NULL */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ INT nCmdShow; /* argument of WinMain */ BOOL in_set_config; /* to handle re-entrant calls to WINECON_SetConfig */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index b8b517a..e1ee55b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -541,6 +541,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConIn) CloseHandle(data->hConIn); if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); + if (data->hProcess) CloseHandle(data->hProcess); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); @@ -749,7 +750,7 @@ static int WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); if (done) { - CloseHandle(info.hProcess); + data->hProcess = info.hProcess; CloseHandle(info.hThread); } @@ -892,8 +893,18 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh if (!ret) { - WINE_TRACE("calling MainLoop.\n"); - ret = data->fnMainLoop(data); + DWORD exitcode; + + WINE_TRACE("calling MainLoop.\n"); + ret = data->fnMainLoop(data); + + if (!ret && data->hProcess && + WaitForSingleObject(data->hProcess, INFINITE) == WAIT_OBJECT_0 && + GetExitCodeProcess(data->hProcess, &exitcode)) + { + WINE_TRACE("forwarding exitcode %u from child process\n", exitcode); + ret = exitcode; + } } WINECON_Delete(data);

1 0

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 October 2015